diff -Nru "/tmp/tmpdO65hx/hoNCbJkA_9/wala-1.3.9/After Importing WALA Into Eclipse.launch" "/tmp/tmpdO65hx/vj4dUdzt1P/wala-1.5.1/After Importing WALA Into Eclipse.launch"
--- "/tmp/tmpdO65hx/hoNCbJkA_9/wala-1.3.9/After Importing WALA Into Eclipse.launch"	1970-01-01 00:00:00.000000000 +0000
+++ "/tmp/tmpdO65hx/vj4dUdzt1P/wala-1.5.1/After Importing WALA Into Eclipse.launch"	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.buildship.core.launch.runconfiguration">
+<listAttribute key="arguments"/>
+<booleanAttribute key="build_scans_enabled" value="false"/>
+<stringAttribute key="gradle_distribution" value="GRADLE_DISTRIBUTION(WRAPPER)"/>
+<stringAttribute key="gradle_user_home" value=""/>
+<listAttribute key="jvm_arguments"/>
+<booleanAttribute key="offline_mode" value="false"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<booleanAttribute key="override_workspace_settings" value="false"/>
+<booleanAttribute key="show_console_view" value="true"/>
+<booleanAttribute key="show_execution_view" value="true"/>
+<listAttribute key="tasks">
+<listEntry value="afterEclipseBuildshipImport"/>
+</listAttribute>
+<stringAttribute key="working_dir" value="${workspace_loc:/com.ibm.wala}"/>
+</launchConfiguration>
diff -Nru wala-1.3.9/appveyor.yml.disabled wala-1.5.1/appveyor.yml.disabled
--- wala-1.3.9/appveyor.yml.disabled	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/appveyor.yml.disabled	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,25 @@
+os: Visual Studio 2015
+
+install:
+  - ps: |
+      Add-Type -AssemblyName System.IO.Compression.FileSystem
+      if (!(Test-Path -Path "C:\maven" )) {
+        (new-object System.Net.WebClient).DownloadFile(
+          'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip',
+          'C:\maven-bin.zip'
+        )
+        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
+      }
+  - cmd: SET PATH=C:\maven\apache-maven-3.3.9\bin;%JAVA_HOME%\bin;%PATH%
+  - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
+  - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
+
+build_script:
+  - mvn clean verify -DskipTests=true -B -q
+
+test_script:
+  - mvn clean verify -B -q
+
+cache:
+  - C:\maven\
+  - C:\Users\appveyor\.m2
\ No newline at end of file
diff -Nru wala-1.3.9/build.gradle wala-1.5.1/build.gradle
--- wala-1.3.9/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,186 @@
+////////////////////////////////////////////////////////////////////////
+//
+//  plugin configuration must precede everything else
+//
+
+plugins {
+	id 'com.diffplug.gradle.p2.asmaven' version '3.17.0'
+	id 'com.github.hauner.jarTest' version '1.0.1' apply false
+	id 'de.undercouch.download'
+	id 'nebula.lint' version '8.3.1'
+	id 'nebula.source-jar' version '7.0.1' apply false
+	id 'maven-publish'
+}
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  required Eclipse components
+//
+
+p2AsMaven {
+	group 'eclipse-deps', {
+		repoEclipse '4.7.2'
+		slicingOption 'latestVersionOnly', 'true'
+		iu 'org.eclipse.core.commands'
+		iu 'org.eclipse.core.contenttype'
+		iu 'org.eclipse.core.jobs'
+		iu 'org.eclipse.core.resources'
+		iu 'org.eclipse.core.runtime'
+		iu 'org.eclipse.equinox.app'
+		iu 'org.eclipse.equinox.common'
+		iu 'org.eclipse.equinox.preferences'
+		iu 'org.eclipse.jdt.core'
+		iu 'org.eclipse.jface'
+		iu 'org.eclipse.osgi'
+		iu 'org.eclipse.pde.core'
+		iu 'org.eclipse.swt'
+		iu 'org.eclipse.ui.ide'
+		iu 'org.eclipse.ui.workbench'
+	}
+	group 'wst-deps', {
+		repo 'http://download.eclipse.org/releases/oxygen'
+		slicingOption 'latestVersionOnly', 'true'
+		iu 'org.eclipse.wst.jsdt.core'
+		iu 'org.eclipse.wst.jsdt.ui'
+	}
+}
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  common Java setup shared by multiple projects
+//
+
+group name
+version '1.5.1'
+
+subprojects { subproject ->
+	// skip generic Java setup for the few projects that have no Java code whatsoever
+	switch (subproject.name) {
+		case 'com.ibm.wala-repository':
+		case ~/.*_feature/:
+			return
+	}
+
+	apply plugin: 'java'
+	apply plugin: 'maven-publish'
+	apply plugin: 'nebula.source-jar'
+
+	version rootProject.version
+
+	repositories {
+		mavenCentral()
+		maven {
+			url "$rootProject.buildDir/p2asmaven/maven"
+		}
+	}
+
+	jar.manifest.from('META-INF/MANIFEST.MF')
+
+	publishing.publications {
+		mavenJava(MavenPublication) {
+			from components.java
+		}
+	}
+
+	task afterEclipseBuildshipImport(dependsOn: processTestResources)
+	task prepareIntelliJIDEA
+
+	test {
+		include '**/*Test.class'
+		include '**/*TestCase.class'
+		include '**/*Tests.class'
+		include '**/Test*.class'
+		exclude '**/*AndroidLibs*.class'
+
+		maxParallelForks = Integer.MAX_VALUE
+	}
+}
+
+task afterEclipseBuildshipImport(type: Exec) {
+	commandLine './revert-launchers.sh'
+}
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  find platform-specific SWT implementations
+//
+
+def osgi_platform
+
+switch (System.getProperty('os.name')) {
+	case ~/Mac OS X/:
+		osgi_platform = 'cocoa.macosx.x86_64'
+		break
+	case ~/Windows.*/:
+		osgi_platform = 'win32.win32.x86_64'
+		break
+	case ~/Linux/:
+		osgi_platform = 'gtk.linux.x86_64'
+		break
+}
+
+System.setProperty('osgi.platform', osgi_platform)
+
+subprojects {
+	configurations.all {
+		resolutionStrategy {
+			// failOnVersionConflict()
+			dependencySubstitution {
+				substitute module('eclipse-deps:org.eclipse.swt.${osgi.platform}') with module("eclipse-deps:org.eclipse.swt.${System.getProperty('osgi.platform')}:3.+")
+			}
+		}
+	}
+}
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  optional lint checking of Gradle scripts
+//
+
+allprojects {
+	apply plugin: 'nebula.lint'
+	gradleLint.alwaysRun = false
+	gradleLint {
+		rules = ['all-dependency']
+		excludedRules = [
+			'duplicate-dependency-class',
+			'transitive-duplicate-dependency-class',
+			'unused-dependency',
+			]
+	}
+}
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  disable Javadoc linter until documentation is in better shape
+//
+
+allprojects {
+	tasks.withType(Javadoc) {
+		options.addBooleanOption('Xdoclint:all,-missing', true)
+		options.quiet()
+	}
+}
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  Eclipse IDE integration
+//
+
+// workaround for <https://github.com/gradle/gradle/issues/4802>
+allprojects {
+	apply plugin: 'eclipse'
+
+	eclipse.classpath.file.whenMerged {
+		entries.each {
+			if (it in org.gradle.plugins.ide.eclipse.model.AbstractClasspathEntry && it.entryAttributes['gradle_used_by_scope'] == 'test')
+				it.entryAttributes['test'] = true
+		}
+	}
+}
diff -Nru wala-1.3.9/build-maven-jars.py wala-1.5.1/build-maven-jars.py
--- wala-1.3.9/build-maven-jars.py	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/build-maven-jars.py	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+
+# script to build jars for maven central
+import sys
+import subprocess
+import os
+
+# action should be either 'install' (for local test)
+# or 'deploy' (for deployment to maven central).
+# if current version is SNAPSHOT, will only be deployed
+# to sonatype's staging servers.  otherwise, will be
+# deployed to maven central
+action = sys.argv[1]
+
+# projects for which we should build jars, in order
+# will be prefixed with 'com.ibm.wala.'
+projects = [
+    "util",
+    "shrike",
+    "core",
+    "cast",
+    "cast.java",
+    "cast.java.ecj",
+    "cast.js",
+    "cast.js.rhino",
+    "dalvik",
+    "scandroid"
+    ]
+
+for proj in projects:
+    full_proj = "com.ibm.wala." + proj
+    print(full_proj)
+    os.chdir(full_proj)
+    mvnCmd = "mvn -f mvncentral.xml clean " + action
+    try:
+        subprocess.check_output(mvnCmd, shell=True)
+    except subprocess.CalledProcessError as e:
+        print("OUTPUT")
+        print(e.output)
+        raise
+    os.chdir("..")    
+
diff -Nru wala-1.3.9/buildSrc/build.gradle wala-1.5.1/buildSrc/build.gradle
--- wala-1.3.9/buildSrc/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/buildSrc/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,7 @@
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	compile 'de.undercouch:gradle-download-task:3.4.3'
+}
diff -Nru wala-1.3.9/buildSrc/.gitignore wala-1.5.1/buildSrc/.gitignore
--- wala-1.3.9/buildSrc/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/buildSrc/.gitignore	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1 @@
+/.gradle/
diff -Nru wala-1.3.9/buildSrc/src/main/groovy/package-list.groovy wala-1.5.1/buildSrc/src/main/groovy/package-list.groovy
--- wala-1.3.9/buildSrc/src/main/groovy/package-list.groovy	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/buildSrc/src/main/groovy/package-list.groovy	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,31 @@
+import org.gradle.api.tasks.*
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  create a Javadoc-style "package-list" file
+//
+
+@CacheableTask
+class CreatePackageList extends org.gradle.api.DefaultTask {
+
+	@PathSensitive(PathSensitivity.RELATIVE)
+	@Input Object sourceSet
+
+	@OutputFile File packageList = new File("$temporaryDir/package-list")
+
+	@TaskAction
+	def create() {
+		sourceSet.sourceCollections.collect { collection ->
+			def sourceRoot = collection.tree.dir.toPath()
+			collection.collect { source ->
+				def javaSourceFilePath = source.toPath()
+				def parentPath = javaSourceFilePath.parent
+				def relativePath = sourceRoot.relativize(parentPath)
+				relativePath.toString().replace(File.separator, '.')
+			}
+		}.flatten().sort().unique().each {
+			packageList << "$it\n"
+		}
+	}
+}
diff -Nru wala-1.3.9/buildSrc/src/main/groovy/verified-download.groovy wala-1.5.1/buildSrc/src/main/groovy/verified-download.groovy
--- wala-1.3.9/buildSrc/src/main/groovy/verified-download.groovy	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/buildSrc/src/main/groovy/verified-download.groovy	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,53 @@
+import org.gradle.api.tasks.*
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  download and use checksum to verify that we got what we expected
+//
+
+@CacheableTask
+class VerifiedDownload extends org.gradle.api.DefaultTask {
+
+	// URL of resource to download
+	def @Input src
+
+	// expected checksum of resource as hex digits
+	def @Input checksum
+
+	// algorithm to use for computing checksum
+	def @Input algorithm = 'MD5'
+
+	// whether to use ETag for selective downloading
+	def @Input useETag = true
+
+	// local file into which resource should be saved
+	def @OutputFile dest
+
+	File getDest() {
+		return project.file(dest)
+	}
+
+	VerifiedDownload() {
+		outputs.upToDateWhen {
+			getDest().exists()
+		}
+	}
+
+	@TaskAction
+	downloadAndVerify() {
+		def destFile = getDest()
+		project.download {
+			src this.src
+			dest destFile
+			overwrite true
+			onlyIfModified true
+			useETag this.useETag
+		}
+		project.verifyChecksum {
+			src destFile
+			algorithm this.algorithm
+			checksum this.checksum
+		}
+	}
+}
diff -Nru wala-1.3.9/change-version.py wala-1.5.1/change-version.py
--- wala-1.3.9/change-version.py	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/change-version.py	2019-01-29 17:08:39.000000000 +0000
@@ -5,6 +5,10 @@
 import sys
 import subprocess
 
+def runAndPrint(cmd):
+    print cmd
+    subprocess.check_output(cmd, shell=True)
+
 oldVersion = sys.argv[1]
 newVersion = sys.argv[2]
 
@@ -13,13 +17,11 @@
 oldVersion = oldVersion.replace(".", "\.")
 newVersion = newVersion.replace(".", "\.")
 
-cleanCmd = "mvn clean -q"
-print cleanCmd
-subprocess.check_output(cleanCmd, shell=True)
-
-xmlCmd = "find -E ./ -regex \".*(pom|mvncentral)\.xml\" | xargs -n 1 perl -pi -e \'s/" + oldVersion + "/" + newVersion + "/g\'"
-print xmlCmd
-subprocess.check_output(xmlCmd, shell=True)
+runAndPrint("mvn clean -q")
+
+runAndPrint("find -E ./ -regex \".*(pom|mvncentral)\.xml\" | xargs -n 1 perl -pi -e \'s/" + oldVersion + "/" + newVersion + "/g\'")
+
+runAndPrint("perl -pi -e \'s/" + oldVersion + "/" + newVersion + "/g\' build.gradle")
 
 oldIsSnapshot = oldVersion.endswith("SNAPSHOT")
 newIsSnapShot = newVersion.endswith("SNAPSHOT")
@@ -27,10 +29,7 @@
 bundleOld = oldVersion if not oldIsSnapshot else oldVersion.replace("-SNAPSHOT","\.qualifier")
 bundleNew = newVersion if not newIsSnapShot else newVersion.replace("-SNAPSHOT","\.qualifier")
 
-otherCmd = "find -E ./ -regex \".*(MANIFEST\.MF|feature\.xml)\" | xargs -n 1 perl -pi -e \'s/" + bundleOld + "/" + bundleNew + "/g\'"
-
-print otherCmd
-subprocess.check_output(otherCmd, shell=True)
+runAndPrint("find -E ./ -regex \".*(MANIFEST\.MF|feature\.xml)\" | xargs -n 1 perl -pi -e \'s/" + bundleOld + "/" + bundleNew + "/g\'")
 
 print "done"
     
diff -Nru wala-1.3.9/com.ibm.wala.cast/build.gradle wala-1.5.1/com.ibm.wala.cast/build.gradle
--- wala-1.3.9/com.ibm.wala.cast/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,106 @@
+plugins {
+	id 'cpp'
+	id 'eclipse'
+}
+
+eclipse.project.natures 'org.eclipse.pde.PluginNature'
+
+sourceSets.main.java.srcDirs = ['source/java']
+
+dependencies {
+	compile(
+		'commons-io:commons-io:2.4',
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.shrike'),
+		project(':com.ibm.wala.util'),
+		)
+}
+
+javadoc {
+	def js = ':com.ibm.wala.cast.js'
+	evaluationDependsOn(js)
+
+	dependsOn "$js:compileJava"
+	js = project(js)
+	doFirst {
+		classpath += files js.compileJava
+	}
+
+	dependsOn js.createPackageList
+	options.linksOffline js.javadoc.outputDirectory.path, js.createPackageList.packageList.parent
+}
+
+def currentJavaHome = org.gradle.internal.jvm.Jvm.current().javaHome
+
+model {
+	repositories {
+		libs(PrebuiltLibraries) {
+			jdk {
+				def jniIncludeDir = "$currentJavaHome/include"
+				headers.srcDir jniIncludeDir
+				binaries.withType(SharedLibraryBinary) {
+					switch (targetPlatform.operatingSystem.name) {
+						case 'linux':
+							headers.srcDirs "$jniIncludeDir/linux"
+							def subdirs = ['jre/lib/amd64/server', 'lib/amd64/server', 'lib/server']
+							def candidates = subdirs.collect { file("$currentJavaHome/$it/libjvm.so") }
+							sharedLibraryLinkFile = candidates.find { it.exists() }
+							break
+						case 'osx':
+							headers.srcDirs "$jniIncludeDir/darwin"
+							sharedLibraryLinkFile = file("$currentJavaHome/jre/lib/server/libjvm.dylib")
+							break
+						case 'windows':
+							headers.srcDirs "$jniIncludeDir/win32"
+							sharedLibraryLinkFile = file("$currentJavaHome/lib/jvm.lib")
+							break
+					}
+				}
+			}
+		}
+	}
+
+	components {
+		cast(NativeLibrarySpec) {
+			sources.cpp {
+				def cSourceDir = 'source/c'
+				source {
+					srcDirs = ["$cSourceDir/jni"]
+					include '*.cpp'
+				}
+				exportedHeaders.srcDirs = ["$cSourceDir/include"]
+				lib library: 'jdk'
+			}
+
+			binaries {
+				withType(StaticLibraryBinarySpec) {
+					buildable = false
+				}
+				withType(SharedLibraryBinarySpec) {
+					def libDir = $.repositories['libs'].resolveLibrary('jdk')
+						.binaries.withType(SharedLibraryBinary)
+						.find { it.targetPlatform.name == targetPlatform.name }
+						.sharedLibraryLinkFile.parent
+					linker.args "-Wl,-rpath,$libDir"
+					if (targetPlatform.operatingSystem.name == 'osx') {
+						linker.args "-Wl,-install_name,@rpath/$sharedLibraryFile.name"
+					}
+				}
+			}
+		}
+	}
+}
+
+// TODO: if we eventually stop supporting Maven, then we may be able
+// to discard the "copyJarsIntoLib" task and the corresponding lines
+// in "META-INF/MANIFEST.MF" and "build.properties"
+
+task copyJarsIntoLib(type: Sync) {
+	def commonsIoJar = configurations.runtimeClasspath.files[0]
+	assert commonsIoJar.name.startsWith('commons-io-')
+	from commonsIoJar
+	into 'lib'
+}
+
+assemble.dependsOn copyJarsIntoLib
+clean.dependsOn cleanCopyJarsIntoLib
diff -Nru wala-1.3.9/com.ibm.wala.cast/build.properties wala-1.5.1/com.ibm.wala.cast/build.properties
--- wala-1.3.9/com.ibm.wala.cast/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 source.. =  source/java/
-output.. = bin/
+output.. = bin/main
 bin.includes = META-INF/,\
-	           lib/commons-io-2.4.jar,\
-               .
+               lib/commons-io-2.4.jar,\
+               .,\
+               OSGI-INF/
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.cast/build.xml wala-1.5.1/com.ibm.wala.cast/build.xml
--- wala-1.3.9/com.ibm.wala.cast/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/build.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  =======================================================================
-    WALA CAst build file
-  =======================================================================
--->
-<project name="com.ibm.wala.cast" default="getJars" basedir=".">
-	<!-- Software version details -->
-	<property name="name" value="walacast" />
-	<property name="module_name" value="com.ibm.wala.cast" />
-	<property name="Name" value="walacast" />
-	<property name="version" value="1-alpha" />
-
-	<!-- Compilation switches -->
-	<property name="debug" value="true" />
-	<property name="deprecation" value="false" />
-	<property name="optimize" value="true" />
-	<property name="javacFailOnError" value="true" />
-	<property name="javacDebugInfo" value="on" />
-	<property name="javacVerbose" value="false" />
-
-	<!-- Set global properties for this build -->
-	<property name="src" value="source/java" />
-	<property name="nativesourcedir" value="source/c" />
-	<property name="src.tests" value="tests" />
-	<property name="build" value="build" />
-	<property name="build.result" value="${basedir}" />
-	<property name="build.tests" value="build/tests" />
-	<property name="build.javadocs" value="${build}/javadocs" />
-	<property name="publish.javadocs" value="javadocs/com.ibm.wala.cast" />
-	<property name="dist" value="dist" />
-	<property name="etc" value="etc" />
-	<property name="docs" value="docs" />
-	<property name="lib" value="lib" />
-	<property name="mainlib" value="../mainlib" />
-	<property name="sharedlib" value="../sharedlib" />
-
-  <target name="properties" if="eclipse.running">
-    <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-  </target>
-
-  <target name="init" depends="properties">
-    <condition property="pluginTemp" value="${buildTempFolder}/plugins">
-      <isset property="buildTempFolder"/>
-    </condition>
-    <property name="pluginTemp" value="${basedir}"/>
-    <condition property="build.result.folder" value="${pluginTemp}/com.ibm.wala.core.testdata">
-      <isset property="buildTempFolder"/>
-    </condition>
-    <property name="build.result.folder" value="${basedir}"/>
-    <property name="temp.folder" value="${basedir}/temp.folder"/>
-    <property name="plugin.destination" value="${basedir}"/>
-  </target>
-
-  <target name="CommonsIoPresent" depends="init">
-    <available file="${plugin.destination}/lib/commons-io-2.4.jar" property="commons.io.present"/>
-  </target>
-
-  <target name="fetchCommonsIo" depends="CommonsIoPresent" unless="commons.io.present">
-    <delete dir="${temp.folder}"/>
-    <mkdir dir="${temp.folder}"/>
-	<get src="http://apache.openmirror.de//commons/io/binaries/commons-io-2.4-bin.zip" dest="${temp.folder}/commons-io-2.4.zip"/>
-    <unzip src="${temp.folder}/commons-io-2.4.zip" dest="${temp.folder}"/>
-    <copy file="${temp.folder}/commons-io-2.4/commons-io-2.4.jar" tofile="${plugin.destination}/lib/commons-io-2.4.jar" />
-    <delete dir="${temp.folder}"/>
-  </target>
-
-  <target name="getJars" depends="fetchCommonsIo" />
-
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast/.classpath wala-1.5.1/com.ibm.wala.cast/.classpath
--- wala-1.3.9/com.ibm.wala.cast/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="source/java"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.cast/.cvsignore wala-1.5.1/com.ibm.wala.cast/.cvsignore
--- wala-1.3.9/com.ibm.wala.cast/.cvsignore	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/.cvsignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-bin
-domo-trace.txt*
diff -Nru "/tmp/tmpdO65hx/hoNCbJkA_9/wala-1.3.9/com.ibm.wala.cast/.externalToolBuilders/make WALA.CAst.launch" "/tmp/tmpdO65hx/vj4dUdzt1P/wala-1.5.1/com.ibm.wala.cast/.externalToolBuilders/make WALA.CAst.launch"
--- "/tmp/tmpdO65hx/hoNCbJkA_9/wala-1.3.9/com.ibm.wala.cast/.externalToolBuilders/make WALA.CAst.launch"	2016-05-10 12:59:26.000000000 +0000
+++ "/tmp/tmpdO65hx/vj4dUdzt1P/wala-1.5.1/com.ibm.wala.cast/.externalToolBuilders/make WALA.CAst.launch"	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="${build_project}/source/c/cbuild.sh"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project}/source/c"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${bash}"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-</launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.cast/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WALA CAst core Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast
-Bundle-Version: 1.3.9
-Bundle-Vendor: IBM
+Bundle-Version: 1.5.1
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.core,
  com.ibm.wala.shrike
 Bundle-ActivationPolicy: lazy
@@ -28,5 +28,6 @@
  com.ibm.wala.cast.util,
  org.apache.commons.io,
  org.apache.commons.io.input
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: com.ibm.wala.cast
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/mvncentral.xml wala-1.5.1/com.ibm.wala.cast/mvncentral.xml
--- wala-1.3.9/com.ibm.wala.cast/mvncentral.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/mvncentral.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.wala</groupId>
   <artifactId>com.ibm.wala.cast</artifactId>
-  <version>1.3.9</version>  
+  <version>1.5.1</version>
   <packaging>jar</packaging>
   <name>WALA CAst</name>
   <description>WALA Common AST core library</description>
@@ -44,13 +44,18 @@
   <dependencies>
     <dependency>
       <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.util</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.core</artifactId>
-      <version>1.3.9</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.shrike</artifactId>
-      <version>1.3.9</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -65,6 +70,18 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </repository>
   </repositories>  
+
+  <profiles>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
   
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
@@ -74,8 +91,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.2</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
 
@@ -107,6 +124,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <additionalparam>${javadoc.options}</additionalparam>
+        </configuration>        
         <version>2.9.1</version>
         <executions>
           <execution>
diff -Nru wala-1.3.9/com.ibm.wala.cast/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast
+Bundle-Vendor = IBM
+Bundle-Name = WALA CAst core Plug-in
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast/pom.xml wala-1.5.1/com.ibm.wala.cast/pom.xml
--- wala-1.3.9/com.ibm.wala.cast/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,12 +5,32 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
   <artifactId>com.ibm.wala.cast</artifactId>
   <packaging>eclipse-plugin</packaging>
 	<build>
-               <plugins>
+		<plugins>
+		  <plugin>
+		    <groupId>org.codehaus.mojo</groupId>
+		    <artifactId>exec-maven-plugin</artifactId>
+		    <version>1.6.0</version>
+		    <executions>
+		      <execution>
+			<phase>compile</phase>
+			<configuration>
+			  <executable>bash</executable>
+			  <arguments>
+			    <argument>${basedir}/source/c/cbuild.sh</argument>
+			  </arguments>
+			  <workingDirectory>${basedir}/source/c</workingDirectory>
+			</configuration>
+			<goals>
+			  <goal>exec</goal>
+			</goals>
+		      </execution>
+		    </executions>
+ 		  </plugin>
                     <plugin>
                         <artifactId>maven-dependency-plugin</artifactId>
                             <executions>
diff -Nru wala-1.3.9/com.ibm.wala.cast/.project wala-1.5.1/com.ibm.wala.cast/.project
--- wala-1.3.9/com.ibm.wala.cast/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.cast</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/make WALA.CAst.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.cast/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,78 +1,126 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.cast/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=2
+compilers.p.build.bin.includes=2
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=2
+compilers.p.build.source.library=2
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=2
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.cast/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.cast/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.cast/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/cbuild.sh wala-1.5.1/com.ibm.wala.cast/source/c/cbuild.sh
--- wala-1.3.9/com.ibm.wala.cast/source/c/cbuild.sh	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/cbuild.sh	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -eu
 
 if (uname | grep -i "cygwin"); then
 	# This should be the default for most of cases;
@@ -8,5 +8,9 @@
 	
 	cmd.exe /c "call \"$MSVC\\vcvarsall.bat\" $ARCH && make"
 else
-	make
+	make --quiet
 fi
+
+# Local variables:
+# eval: (smie-config-local '((8 :after "else" 2) (8 :elem basic 2)))
+# End:
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/.cvsignore wala-1.5.1/com.ibm.wala.cast/source/c/.cvsignore
--- wala-1.3.9/com.ibm.wala.cast/source/c/.cvsignore	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/.cvsignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-Makefile.configuration
-CAstWrapper.lib
-CAstWrapper.exp
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/include/cast_constants.h wala-1.5.1/com.ibm.wala.cast/source/c/include/cast_constants.h
--- wala-1.3.9/com.ibm.wala.cast/source/c/include/cast_constants.h	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/include/cast_constants.h	2019-01-29 17:08:39.000000000 +0000
@@ -87,6 +87,13 @@
 _CAstNodeType(INCLUDE)
 _CAstNodeType(NAMED_ENTITY_REF);
 _CAstNodeType(MACRO_VAR);
+_CAstNodeType(COMPREHENSION_EXPR);
+_CAstNodeType(NEW_ENCLOSING);
+_CAstNodeType(NARY_EXPR);
+_CAstNodeType(SPECIAL_PARENT_SCOPE);
+_CAstNodeType(YIELD_STMT);
+_CAstNodeType(FORIN_LOOP);
+_CAstNodeType(TYPE_LITERAL_EXPR);
 
 #undef _CODE_CONSTANTS
 #undef _CPP_CONSTANTS
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/include/CAstWrapper.h wala-1.5.1/com.ibm.wala.cast/source/c/include/CAstWrapper.h
--- wala-1.3.9/com.ibm.wala.cast/source/c/include/CAstWrapper.h	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/include/CAstWrapper.h	2019-01-29 17:08:39.000000000 +0000
@@ -4,6 +4,7 @@
 #include <list>
 #include "jni.h"
 #include "Exceptions.h"
+#include "launch.h"
 
 using namespace std;
 
@@ -53,6 +54,7 @@
   jclass CAstInterface;
   jclass CAstPrinter;
   jclass CAstSymbol;
+  jclass CAstType;
   jclass NativeEntity;
   jclass NativeClassEntity;
   jclass NativeCodeEntity;
@@ -103,6 +105,9 @@
   jmethodID codeSetLabelledGotoTarget;
   jobject callReference;
 
+  static bool initialized;
+  static void initialize(JNIEnv *java_env);
+  
 public:
 
 #define _INCLUDE_CONSTANTS 
@@ -121,6 +126,8 @@
 
   CAstWrapper(JNIEnv *env, Exceptions &ex, jobject Ast);
 
+  virtual ~CAstWrapper() { }
+  
   void assertIsCAstNode(jobject, int);
 
   jobject makeNode(int);
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/include/Exceptions.h wala-1.5.1/com.ibm.wala.cast/source/c/include/Exceptions.h
--- wala-1.3.9/com.ibm.wala.cast/source/c/include/Exceptions.h	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/include/Exceptions.h	2019-01-29 17:08:39.000000000 +0000
@@ -37,7 +37,14 @@
 
 #define CATCH()			\
   }				\
-}				\
+}
+
+#define START_CATCH_BLOCK()	\
+  } else {
+
+#define END_CATCH_BLOCK()	\
+  }				\
+}
 
 #define THROW(CPP_EXP_NAME, MESSAGE)	\
 (CPP_EXP_NAME).throwException(__FILE__, __LINE__, MESSAGE)
@@ -45,6 +52,11 @@
 #define THROW_ANY_EXCEPTION(CPP_EXP_NAME)	\
 (CPP_EXP_NAME).throwAnyException(__FILE__, __LINE__)
 
+#define NULL_CHECK(cpp_exp_name, c_expr) \
+  if ((c_expr) == NULL) {						\
+  (CPP_EXP_NAME).throwException(__FILE__, __LINE__, "unexpected null value"); \
+}
+
 #if __WIN32__
 #ifdef BUILD_CAST_DLL
 #define DLLEXPORT __declspec(dllexport)
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/include/launch.h wala-1.5.1/com.ibm.wala.cast/source/c/include/launch.h
--- wala-1.3.9/com.ibm.wala.cast/source/c/include/launch.h	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/include/launch.h	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,9 @@
+#ifndef _CAST_LAUNCH_H
+#define _CAST_LAUNCH_H
+
+#include "jni.h"
+
+extern JNIEnv *launch_jvm(char *);
+extern void kill();
+
+#endif
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/jni/CAstWrapper.cpp wala-1.5.1/com.ibm.wala.cast/source/c/jni/CAstWrapper.cpp
--- wala-1.3.9/com.ibm.wala.cast/source/c/jni/CAstWrapper.cpp	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/jni/CAstWrapper.cpp	2019-01-29 17:08:39.000000000 +0000
@@ -1,20 +1,18 @@
-#include <jni.h>
-
-#include <iterator>
-
-#include <stdarg.h>
-#include <string.h>
 #include <CAstWrapper.h>
-
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__APPLE__)
-#define strndup(s,n) strdup(s)
-#endif
+#include <cstring>
+#include <iterator>
+#include <jni.h>
+#include <sstream>
+#include <string>
 
 #define __SIG( __nm ) "L" __nm ";"
 
 #define __CTN "com/ibm/wala/cast/tree/CAst"
 #define __CTS __SIG(  __CTN )
 
+#define __CTI "com/ibm/wala/cast/tree/impl/CAstImpl"
+#define __CII __SIG(  __CTI )
+
 #define __CEN "com/ibm/wala/cast/tree/CAstEntity"
 #define __CES __SIG(  __CEN )
 
@@ -66,6 +64,11 @@
 CAstWrapper::CAstWrapper(JNIEnv *env, Exceptions &ex, jobject xlator) 
   : java_ex(ex), env(env), xlator(xlator)
 {
+  if (!initialized) {
+    initialized = true;
+    initialize(env);
+  }
+  
   this->CAstNode = env->FindClass( __CNN );
   this->CAstInterface = env->FindClass( __CTN );
   this->HashSet = env->FindClass("java/util/HashSet");
@@ -74,11 +77,15 @@
     env->FindClass("com/ibm/wala/cast/ir/translator/NativeBridge");
   this->NativeTranslatorToCAst =
     env->FindClass("com/ibm/wala/cast/ir/translator/NativeTranslatorToCAst");
+  THROW_ANY_EXCEPTION(java_ex);
 
   jfieldID castFieldID = env->GetFieldID(NativeBridge, "Ast", "Lcom/ibm/wala/cast/tree/CAst;");
+  THROW_ANY_EXCEPTION(java_ex);
   this->Ast = env->GetObjectField(xlator, castFieldID);
+  THROW_ANY_EXCEPTION(java_ex);
 
   jclass xlatorCls = env->FindClass( XlatorCls );
+  THROW_ANY_EXCEPTION(java_ex);
   this->_makeLocation = env->GetMethodID(xlatorCls, "makeLocation", "(IIII)Lcom/ibm/wala/cast/tree/CAstSourcePositionMap$Position;");
   THROW_ANY_EXCEPTION(java_ex);
 
@@ -206,21 +213,21 @@
   THROW_ANY_EXCEPTION(java_ex);
   this->_getEntityName = env->GetMethodID(castEntity, "getName", "()Ljava/lang/String;");
 
+  CAstType = env->FindClass("com/ibm/wala/cast/tree/CAstType");
   CAstSymbol = env->FindClass("com/ibm/wala/cast/tree/impl/CAstSymbolImpl");
   THROW_ANY_EXCEPTION(java_ex);
   this->castSymbolInit1 = 
-    env->GetMethodID(CAstSymbol, "<init>", "(Ljava/lang/String;)V");
+    env->GetMethodID(CAstSymbol, "<init>", "(Ljava/lang/String;Lcom/ibm/wala/cast/tree/CAstType;)V");
   THROW_ANY_EXCEPTION(java_ex);
   this->castSymbolInit2 = 
-    env->GetMethodID(CAstSymbol, "<init>", "(Ljava/lang/String;Z)V");
+    env->GetMethodID(CAstSymbol, "<init>", "(Ljava/lang/String;Lcom/ibm/wala/cast/tree/CAstType;Z)V");
   THROW_ANY_EXCEPTION(java_ex);
   this->castSymbolInit3 = 
-    env->GetMethodID(CAstSymbol, "<init>", "(Ljava/lang/String;ZZ)V");
+    env->GetMethodID(CAstSymbol, "<init>", "(Ljava/lang/String;Lcom/ibm/wala/cast/tree/CAstType;ZZ)V");
   THROW_ANY_EXCEPTION(java_ex);
   this->castSymbolInit4 = 
-    env->GetMethodID(CAstSymbol, "<init>", "(Ljava/lang/String;ZZLjava/lang/Object;)V");
+    env->GetMethodID(CAstSymbol, "<init>", "(Ljava/lang/String;Lcom/ibm/wala/cast/tree/CAstType;ZZLjava/lang/Object;)V");
   THROW_ANY_EXCEPTION(java_ex);
-
 }
 
 #define _CPP_CONSTANTS 
@@ -252,16 +259,13 @@
     jstring jclsstr = (jstring)env->CallObjectMethod(cls, toString);
     const char *cclsstr = env->GetStringUTFChars(jclsstr, NULL);
 
-#if defined(_MSC_VER)
-	char* buf = (char*)_alloca(strlen(cstr) + strlen(cclsstr) + 100);
-#else
-    char buf[ strlen(cstr) + strlen(cclsstr) + 100 ];
-#endif
-    sprintf(buf, "argument %d (%s of type %s) is not a CAstNode\n", n, cstr, cclsstr); 
+    ostringstream formatter;
+    formatter << "argument " << n << " (" << cstr << " of type " << cclsstr << ") is not a CAstNode\n";
+    const string message = formatter.str();
 
     env->ReleaseStringUTFChars(jstr, cstr);
     env->ReleaseStringUTFChars(jclsstr, cclsstr);
-    THROW(java_ex, buf);
+    THROW(java_ex, message.c_str());
   }
 }
   
@@ -405,14 +409,12 @@
   return r;
 }
 
-jobject CAstWrapper::makeConstant(const char *strData) {
-  return makeConstant(strData, strlen(strData));
+jobject CAstWrapper::makeConstant(const char *strData, int strLen) {
+  return makeConstant(string(strData, strLen).c_str());
 }
 
-jobject CAstWrapper::makeConstant(const char *strData, int strLen) {
-  char *safeData = strndup(strData, strLen);
-  jobject val = env->NewStringUTF( safeData );
-  delete safeData;
+jobject CAstWrapper::makeConstant(const char *strData) {
+  jobject val = env->NewStringUTF( strData );
   jobject r = env->CallObjectMethod(Ast, makeObject, val);
   THROW_ANY_EXCEPTION(java_ex);
   LOG(r);
@@ -576,9 +578,7 @@
 }
 
 jobject CAstWrapper::makeSymbol(const char *name) {
-  char *safeName = strndup(name, strlen(name)+1);
-  jobject val = env->NewStringUTF( safeName );
-  delete safeName;
+  jobject val = env->NewStringUTF( name );
 
   jobject s = env->NewObject(CAstSymbol, castSymbolInit1, val);
   THROW_ANY_EXCEPTION(java_ex);
@@ -588,9 +588,7 @@
 }
 
 jobject CAstWrapper::makeSymbol(const char *name, bool isFinal) {
-  char *safeName = strndup(name, strlen(name)+1);
-  jobject val = env->NewStringUTF( safeName );
-  delete safeName;
+  jobject val = env->NewStringUTF( name );
 
   THROW_ANY_EXCEPTION(java_ex);
 
@@ -602,9 +600,7 @@
 jobject 
   CAstWrapper::makeSymbol(const char *name, bool isFinal, bool isCaseInsensitive) 
 {
-  char *safeName = strndup(name, strlen(name)+1);
-  jobject val = env->NewStringUTF( safeName );
-  delete safeName;
+  jobject val = env->NewStringUTF( name );
 
   jobject s = env->NewObject(CAstSymbol, castSymbolInit3, val, isFinal, isCaseInsensitive);
   THROW_ANY_EXCEPTION(java_ex);
@@ -619,9 +615,7 @@
 			  bool isCaseInsensitive, 
 			  jobject defaultValue) 
 {
-  char *safeName = strndup(name, strlen(name)+1);
-  jobject val = env->NewStringUTF( safeName );
-  delete safeName;
+  jobject val = env->NewStringUTF( name );
 
   jobject s = env->NewObject(CAstSymbol, castSymbolInit4, val, isFinal, isCaseInsensitive, defaultValue);
   THROW_ANY_EXCEPTION(java_ex);
@@ -691,10 +685,8 @@
 }
 
 jobject CAstWrapper::makeGlobalEntity(char *name, jobject type, list<jobject> *modifiers) {
-  char *safeData = strdup(name);
-  jobject val = env->NewStringUTF( safeData );
+  jobject val = env->NewStringUTF( name );
   THROW_ANY_EXCEPTION(java_ex);
-  delete safeData;
 
   jobject entity = env->NewObject(NativeGlobalEntity, globalEntityInit, val, type, makeSet(modifiers));
   THROW_ANY_EXCEPTION(java_ex);
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/jni/Exceptions.cpp wala-1.5.1/com.ibm.wala.cast/source/c/jni/Exceptions.cpp
--- wala-1.3.9/com.ibm.wala.cast/source/c/jni/Exceptions.cpp	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/jni/Exceptions.cpp	2019-01-29 17:08:39.000000000 +0000
@@ -1,11 +1,12 @@
+#include <csetjmp>
 #include <jni.h>
-#include <setjmp.h>
-#include <string.h>
+#include <sstream>
+#include <string>
 #include "Exceptions.h"
 
-#ifdef _MSC_VER
-#include <malloc.h>
-#endif
+using std::ostringstream;
+using std::string;
+
 
 Exceptions::Exceptions(JNIEnv *java_env, jmp_buf& c_env) : 
   _java_env(java_env), 
@@ -23,14 +24,18 @@
   if (_java_env->ExceptionCheck()) throwException(file_name, line_number);
 }
 
+static void formatExceptionMessage(ostringstream &formatter, const char *file_name, int line_number) {
+  formatter << "exception at " << file_name << ':' << line_number;
+}
+
 void Exceptions::throwException(const char *file_name, int line_number) {
   jthrowable real_ex = _java_env->ExceptionOccurred();
   _java_env->ExceptionClear();
 
-  char msg[strlen(file_name) + 1024];
-  memset(msg, 0, strlen(file_name) + 1024);
-  sprintf(msg, "exception at %s:%d", file_name, line_number);
-  jstring java_message = _java_env->NewStringUTF(msg);
+  ostringstream formatter;
+  formatExceptionMessage(formatter, file_name, line_number);
+  string message = formatter.str();
+  jstring java_message = _java_env->NewStringUTF(message.c_str());
 
   jthrowable ex = (jthrowable)
     _java_env->NewObject(_jre, _wrapper_ctr, java_message, real_ex);
@@ -47,10 +52,11 @@
 
 void 
 Exceptions::throwException(const char *file_name, int line_number, const char *c_message) {
-  char msg[strlen(file_name) + strlen(c_message) + 1024]; 
-  memset(msg, 0, strlen(file_name) + strlen(c_message) + 1024);
-  sprintf(msg, "exception at %s:%d: %s", file_name, line_number, c_message);
-  jstring java_message = _java_env->NewStringUTF(msg);
+  ostringstream formatter;
+  formatExceptionMessage(formatter, file_name, line_number);
+  formatter << ": " << c_message;
+  string message = formatter.str();
+  jstring java_message = _java_env->NewStringUTF(message.c_str());
   jthrowable ex = (jthrowable)_java_env->NewObject(_jre, _ctr, java_message);
   _java_env->Throw(ex);
   
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/jni/Java_com_ibm_wala_cast_ir_translator_NativeBridge.cpp wala-1.5.1/com.ibm.wala.cast/source/c/jni/Java_com_ibm_wala_cast_ir_translator_NativeBridge.cpp
--- wala-1.3.9/com.ibm.wala.cast/source/c/jni/Java_com_ibm_wala_cast_ir_translator_NativeBridge.cpp	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/jni/Java_com_ibm_wala_cast_ir_translator_NativeBridge.cpp	2019-01-29 17:08:39.000000000 +0000
@@ -3,15 +3,10 @@
 
 #include "CAstWrapper.h"
 #include "Exceptions.h"
-#include "com_ibm_wala_cast_ir_translator_NativeBridge.h"
 
-extern "C" {
+bool CAstWrapper::initialized = false;
 
-JNIEXPORT void JNICALL 
-Java_com_ibm_wala_cast_ir_translator_NativeBridge_initialize(
-  JNIEnv *env, 
-  jclass cls)
-{
+void CAstWrapper::initialize(JNIEnv *env) {
   TRY(exp, env)
 
   jclass CAstNode = env->FindClass( "com/ibm/wala/cast/tree/CAstNode" );
@@ -38,4 +33,3 @@
   CATCH()
 }
 
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/jni/launch.cpp wala-1.5.1/com.ibm.wala.cast/source/c/jni/launch.cpp
--- wala-1.3.9/com.ibm.wala.cast/source/c/jni/launch.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/jni/launch.cpp	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,47 @@
+#include <cstdio>
+ #include <jni.h>
+#include <string>
+#include "Exceptions.h"
+#include "CAstWrapper.h"
+#include "launch.h"
+
+JavaVM *javaVM;
+
+static string javaPathFlag(const string &kind, const char *classpath) {
+   return "-Djava." + kind + ".path=" + classpath;
+}
+
+JNIEnv *launch_jvm(char *classpath) {
+   JavaVMOption jvmopt[2];
+
+   string buf_jcp = javaPathFlag("class", classpath);
+   jvmopt[0].optionString = const_cast<char *>(buf_jcp.c_str());
+
+   string buf_jlp = javaPathFlag("library", classpath);
+   jvmopt[1].optionString = const_cast<char *>(buf_jlp.c_str());
+
+   JavaVMInitArgs vmArgs;
+   vmArgs.version = JNI_VERSION_1_8;
+   vmArgs.nOptions = 2;
+   vmArgs.options = jvmopt;
+   vmArgs.ignoreUnrecognized = JNI_TRUE;
+
+   // Create the JVM
+   JNIEnv *jniEnv;
+   long flag = JNI_CreateJavaVM(&javaVM, (void**)
+      &jniEnv, &vmArgs);
+   if (flag == JNI_ERR) {
+     fprintf(stderr, "Error creating VM. Exiting...\n");
+      return NULL;
+   }
+
+   return jniEnv;
+}
+
+void kill() {
+   javaVM->DestroyJavaVM();
+}
+
+// Local variables:
+// c-basic-offset: 3
+// End:
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/Makefile wala-1.5.1/com.ibm.wala.cast/source/c/Makefile
--- wala-1.3.9/com.ibm.wala.cast/source/c/Makefile	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/Makefile	2019-01-29 17:08:39.000000000 +0000
@@ -1,87 +1,32 @@
 
 include Makefile.configuration
 
-#
-# in theory, these definitions should not need to be changed
-#
-
-ifeq (x$(PLATFORM),x)
-  PLATFORM=$(shell uname -s)
-endif
-
-C_GENERATED=$(DOMO_AST_BIN)libcast/
-
-JAVAH_GENERATED=$(C_GENERATED)
-ifeq ($(PLATFORM),windows)
-  CC=i686-mingw32-g++
-else
-  CC=g++
-endif
-
-vpath %.cpp	jni
-
-JAVA_INCLUDES = -I$(JAVA_SDK)include
-
-CAPA_INCLUDE_DIR = include/
-CAPA_INCLUDES = -I$(CAPA_INCLUDE_DIR) -I$(C_GENERATED)
-
-CAPA_JNI_BRIDGE_HEADER = $(C_GENERATED)com_ibm_wala_cast_ir_translator_NativeBridge.h
-CAPA_JNI_XLATOR_HEADER = $(C_GENERATED)com_ibm_wala_cast_ir_translator_NativeTranslatorToCAst.h
-CAPA_JNI_HEADERS = $(CAPA_JNI_BRIDGE_HEADER) $(CAPA_JNI_XLATOR_HEADER)
-
-INCLUDES = $(CAPA_INCLUDES) $(JAVA_INCLUDES)
-
-CAPA_SOURCES = $(notdir $(wildcard jni/*.cpp))
-CAPA_OBJECTS = $(patsubst %.cpp,$(C_GENERATED)%.o,$(CAPA_SOURCES))
-
-ifeq ($(PLATFORM),windows)
-	ALL_FLAGS = -gstabs+ $(TRACE) $(INCLUDES) -DBUILD_CAST_DLL
-	DLLEXT = dll
-else
-ifeq ($(PLATFORM),Darwin)
-	ALL_FLAGS = -gstabs+ $(TRACE) $(INCLUDES) -fPIC
-	DLLEXT = jnilib
-else
-	ALL_FLAGS = -pthread -gstabs+ $(TRACE) $(INCLUDES) -fPIC
-	DLLEXT = so
-endif
-endif
-
-ifeq ($(PLATFORM),windows)
-	CC_LDFLAGS = -shared -Wl,--add-stdcall-alias -Wl,-export-all-symbols
-	LIBPREFIX = 
-else
-ifeq ($(PLATFORM),Darwin)
-	CC_LDFLAGS = -dynamiclib -Wl,-flat_namespace
-	LIBPREFIX = lib
-else
-	CC_LDFLAGS = -pthread -shared
-	LIBPREFIX = lib
-endif
-endif
+include Makefile.definitions
 
 #
 # rules
 #
 
-default:	$(DOMO_AST_BIN)$(LIBPREFIX)cast.$(DLLEXT)
+default:	$(DOMO_AST_BIN)$(LIBPREFIX)cast.$(DLLEXT) $(DOMO_AST_BIN)$(LIBPREFIX)cast.a
 
 bindir:
 	mkdir -p $(C_GENERATED)
 
 $(CAPA_JNI_BRIDGE_HEADER):	$(DOMO_AST_BIN)com/ibm/wala/cast/ir/translator/NativeBridge.class bindir
-	$(JAVA_SDK)bin/javah -classpath "$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.ir.translator.NativeBridge
+	$(JAVA_HOME)/bin/javah -classpath "$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.ir.translator.NativeBridge
 
 $(CAPA_JNI_XLATOR_HEADER):	$(DOMO_AST_BIN)com/ibm/wala/cast/ir/translator/NativeTranslatorToCAst.class bindir
-	$(JAVA_SDK)bin/javah -classpath "$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.ir.translator.NativeTranslatorToCAst
+	$(JAVA_HOME)/bin/javah -classpath "$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.ir.translator.NativeTranslatorToCAst
 
 $(CAPA_OBJECTS): $(C_GENERATED)%.o:	%.cpp $(CAPA_JNI_HEADERS) bindir
-	echo $(CAPA_OBJECTS)
 	$(CC) $(ALL_FLAGS) -o $@ -c $<
 
 $(DOMO_AST_BIN)$(LIBPREFIX)cast.$(DLLEXT):	$(CAPA_OBJECTS)
 	$(CC) $(CC_LDFLAGS) $^ -o $@
 
+$(DOMO_AST_BIN)$(LIBPREFIX)cast.a:	$(CAPA_OBJECTS)
+	ar -r $@ $^
+
 clean:
 	rm -rf $(C_GENERATED) hs_err_pid*
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/Makefile.configuration wala-1.5.1/com.ibm.wala.cast/source/c/Makefile.configuration
--- wala-1.3.9/com.ibm.wala.cast/source/c/Makefile.configuration	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/Makefile.configuration	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,12 @@
+# -*- makefile -*-
+
+# configuration of installed Java SDK
+JRE_DIR := $(shell java -XshowSettings:properties -version 2>&1 | sed -n 's/^ *java\.home = \(.*\)/\1/p')/
+JAVA_SDK := $(realpath $(JRE_DIR)..)/
+JNI_MD_DIR := $(notdir $(patsubst %/,%,$(dir $(wildcard $(JAVA_SDK)include/*/jni_md.h))))
+
+# configuration of WALA build tree
+CAST_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))../..)/
+DOMO_AST_BIN := $(CAST_DIR)target/classes/
+JAVAH_CLASS_PATH := :$(CAST_DIR)target/classes/
+TRACE :=
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/Makefile.configuration.sample wala-1.5.1/com.ibm.wala.cast/source/c/Makefile.configuration.sample
--- wala-1.3.9/com.ibm.wala.cast/source/c/Makefile.configuration.sample	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/Makefile.configuration.sample	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#
-# global configuration.  adjust for your system.
-#
-
-# The root of the java SDK to use (must end in /)
-JAVA_SDK = /System/Library/Frameworks/JavaVM.framework/Home/
-
-# Path .class files of the com.ibm.domo.ast Java code (must end in /)
-DOMO_AST_BIN = <Workspace>/com.ibm.wala.cast/bin/
-
-# Extra stuff needed in the classpath of javah (must start with path separator)
-JAVAH_CLASS_PATH = :<Workspace>/com.ibm.wala.cast/bin/
-
-# enable debugging flags
-TRACE =
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/c/Makefile.definitions wala-1.5.1/com.ibm.wala.cast/source/c/Makefile.definitions
--- wala-1.3.9/com.ibm.wala.cast/source/c/Makefile.definitions	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/c/Makefile.definitions	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,64 @@
+#
+# in theory, these definitions should not need to be changed
+#
+
+ifeq (x$(PLATFORM),x)
+  PLATFORM=$(shell uname -s)
+endif
+
+C_GENERATED=$(DOMO_AST_BIN)libcast/
+
+JAVAH_GENERATED=$(C_GENERATED)
+ifeq ($(PLATFORM),windows)
+  CC=i686-mingw32-g++
+else
+  CC=g++
+endif
+
+vpath %.cpp	jni
+
+JAVA_INCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(JNI_MD_DIR) -DWALA_CLASSPATH="\"$(DOMO_AST_BIN)$(JAVAH_CLASS_PATH)\"" 
+
+CAPA_INCLUDE_DIR = ../../../com.ibm.wala.cast/source/c/include/
+CAPA_INCLUDES = -I$(CAPA_INCLUDE_DIR) -I$(C_GENERATED)
+
+CAPA_JNI_BRIDGE_HEADER = $(C_GENERATED)com_ibm_wala_cast_ir_translator_NativeBridge.h
+CAPA_JNI_XLATOR_HEADER = $(C_GENERATED)com_ibm_wala_cast_ir_translator_NativeTranslatorToCAst.h
+CAPA_JNI_HEADERS = $(CAPA_JNI_BRIDGE_HEADER) $(CAPA_JNI_XLATOR_HEADER)
+
+INCLUDES = $(CAPA_INCLUDES) $(JAVA_INCLUDES)
+
+CAPA_SOURCES = $(notdir $(wildcard jni/*.cpp))
+CAPA_OBJECTS = $(patsubst %.cpp,$(C_GENERATED)%.o,$(CAPA_SOURCES))
+
+ifeq ($(PLATFORM),windows)
+	ALL_FLAGS = -g $(TRACE) $(INCLUDES) -DBUILD_CAST_DLL
+	DLLEXT = dll
+else
+ifeq ($(PLATFORM),Darwin)
+	ALL_FLAGS = -g $(TRACE) $(INCLUDES) -fPIC
+	DLLEXT = jnilib
+else
+	ALL_FLAGS = -pthread -g $(TRACE) $(INCLUDES) -fPIC
+	DLLEXT = so
+endif
+endif
+
+ifeq ($(PLATFORM),windows)
+	CC_LDFLAGS = -shared -Wl,--add-stdcall-alias -Wl,-export-all-symbols
+	LIBPREFIX = 
+else
+ifeq ($(PLATFORM),Darwin)
+	CC_LDFLAGS = -dynamiclib -Wl,-flat_namespace
+	LIBPREFIX = lib
+else
+	CC_LDFLAGS = -pthread -shared
+	LIBPREFIX = lib
+endif
+endif
+
+CC_LD_PATHS = -L$(JAVA_HOME)/jre/lib/amd64/server -Wl,-rpath -Wl,$(JAVA_HOME)/jre/lib/amd64/server -L$(JAVA_HOME)/jre/lib/x86_64/server -Wl,-rpath -Wl,$(JAVA_HOME)/jre/lib/x86_64/server -L$(JAVA_HOME)/jre/lib/x64/server -Wl,-rpath -Wl,$(JAVA_HOME)/jre/lib/x64/server -L$(JAVA_HOME)/jre/lib/server -Wl,-rpath -Wl,$(JAVA_HOME)/jre/lib/server -L$(JAVA_HOME)/jre/lib -Wl,-rpath -Wl,$(JAVA_HOME)/jre/lib -ljvm
+
+CC_LDFLAGS += $(CC_LD_PATHS)
+
+
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/analysis/typeInference/AstTypeInference.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/analysis/typeInference/AstTypeInference.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/analysis/typeInference/AstTypeInference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/analysis/typeInference/AstTypeInference.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,9 +21,10 @@
 import com.ibm.wala.cast.ir.ssa.AstIsDefinedInstruction;
 import com.ibm.wala.cast.ir.ssa.AstLexicalRead;
 import com.ibm.wala.cast.ir.ssa.AstLexicalWrite;
+import com.ibm.wala.cast.ir.ssa.AstPropertyRead;
+import com.ibm.wala.cast.ir.ssa.AstPropertyWrite;
 import com.ibm.wala.cast.ir.ssa.EachElementGetInstruction;
 import com.ibm.wala.cast.ir.ssa.EachElementHasNextInstruction;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.IR;
 
 public abstract class AstTypeInference extends TypeInference {
@@ -32,6 +33,15 @@
 
   protected class AstTypeOperatorFactory extends TypeOperatorFactory implements AstInstructionVisitor {
     @Override
+    public void visitPropertyRead(AstPropertyRead inst) {
+      result = new DeclaredTypeOperator(new ConeType(cha.getRootClass()));
+    }
+
+    @Override
+    public void visitPropertyWrite(AstPropertyWrite inst) {
+    }
+
+    @Override
     public void visitAstLexicalRead(AstLexicalRead inst) {
       result = new DeclaredTypeOperator(new ConeType(cha.getRootClass()));
     }
@@ -73,9 +83,9 @@
     public void visitEcho(AstEchoInstruction inst) {
 
     }
-  };
+  }
 
-  public AstTypeInference(IR ir, IClassHierarchy cha, TypeAbstraction booleanType, boolean doPrimitives) {
+  public AstTypeInference(IR ir, TypeAbstraction booleanType, boolean doPrimitives) {
     super(ir, doPrimitives);
     this.booleanType = booleanType;
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ArgumentInstanceContext.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ArgumentInstanceContext.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ArgumentInstanceContext.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ArgumentInstanceContext.java	2019-01-29 17:08:39.000000000 +0000
@@ -75,8 +75,8 @@
 
   @Override
   public String toString() {
-    return "ArgumentInstanceContext [base=" + base + ", index=" + index + ", instanceKey=" + instanceKey + "]";
+    return "ArgumentInstanceContext [base=" + base + ", index=" + index + ", instanceKey=" + instanceKey + ']';
   }
   
   
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstCallGraph.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstCallGraph.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,8 +11,8 @@
 package com.ibm.wala.cast.ipa.callgraph;
 
 import java.util.ConcurrentModificationException;
-import java.util.Iterator;
 import java.util.Set;
+import java.util.function.Function;
 
 import com.ibm.wala.cast.ir.cfg.AstInducedCFG;
 import com.ibm.wala.cast.ir.ssa.AstLexicalRead;
@@ -20,37 +20,35 @@
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.AbstractRootMethod;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.callgraph.impl.ExplicitCallGraph;
-import com.ibm.wala.ipa.callgraph.impl.FakeRootMethod;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.ssa.DefUse;
-import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.SSANewInstruction;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.functions.Function;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 public class AstCallGraph extends ExplicitCallGraph {
-  public AstCallGraph(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-    super(cha, options, cache);
+  public AstCallGraph(IMethod fakeRootClass2, AnalysisOptions options, IAnalysisCacheView cache) {
+    super(fakeRootClass2, options, cache);
   }
 
   public static class AstFakeRoot extends AbstractRootMethod {
 
-    public AstFakeRoot(MethodReference rootMethod, IClass declaringClass, IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
+    public AstFakeRoot(MethodReference rootMethod, IClass declaringClass, IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
       super(rootMethod, declaringClass, cha, options, cache);
     }
 
-    public AstFakeRoot(MethodReference rootMethod, IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
+    public AstFakeRoot(MethodReference rootMethod, IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
       super(rootMethod, cha, options, cache);
     }
 
@@ -68,25 +66,34 @@
 
   public static abstract class ScriptFakeRoot extends AstFakeRoot {
 
-    public ScriptFakeRoot(MethodReference rootMethod, IClass declaringClass, IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
+    public ScriptFakeRoot(MethodReference rootMethod, IClass declaringClass, IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
       super(rootMethod, declaringClass, cha, options, cache);
     }
 
-    public ScriptFakeRoot(MethodReference rootMethod, IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
+    public ScriptFakeRoot(MethodReference rootMethod, IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
       super(rootMethod, cha, options, cache);
     }
 
     public abstract SSAAbstractInvokeInstruction addDirectCall(int functionVn, int[] argVns, CallSiteReference callSite);
 
+    @Override
+    public SSANewInstruction addAllocation(TypeReference T) {
+      if (cha.isSubclassOf(cha.lookupClass(T), cha.lookupClass(declaringClass.getClassLoader().getLanguage().getRootType()))) {
+        int instance = nextLocal++;
+        NewSiteReference ref = NewSiteReference.make(statements.size(), T);
+        SSANewInstruction result = getDeclaringClass().getClassLoader().getInstructionFactory().NewInstruction(statements.size(), instance, ref);
+        statements.add(result);
+        return result;
+      } else {
+        return super.addAllocation(T);
+      }
+    }
+
   }
 
   public class AstCGNode extends ExplicitNode {
     private Set<Function<Object, Object>> callbacks;
 
-    private IR cachedIR;
-    
-    private DefUse cachedDU;
-    
     private AstCGNode(IMethod method, Context context) {
       super(method, context);
     }
@@ -96,8 +103,8 @@
         boolean done = false;
         while (!done) {
           try {
-            for (Iterator<Function<Object, Object>> x = callbacks.iterator(); x.hasNext();) {
-              x.next().apply(null);
+            for (Function<Object, Object> function : callbacks) {
+              function.apply(null);
             }
           } catch (ConcurrentModificationException e) {
             done = false;
@@ -113,7 +120,7 @@
     }
 
     private boolean hasAllCallbacks(Set<Function<Object, Object>> callbacks) {
-      return callbacks != null && callbacks.containsAll(callbacks);
+      return callbacks != null && this.callbacks.containsAll(callbacks);
     }
 
     public void addCallback(Function<Object, Object> callback) {
@@ -124,8 +131,8 @@
 
         callbacks.add(callback);
 
-        for (Iterator ps = getCallGraph().getPredNodes(this); ps.hasNext();) {
-          ((AstCGNode) ps.next()).addCallback(callback);
+        for (CGNode p : Iterator2Iterable.make(getCallGraph().getPredNodes(this))) {
+          ((AstCGNode) p).addCallback(callback);
         }
       }
     }
@@ -138,8 +145,8 @@
 
         callbacks.addAll(callback);
 
-        for (Iterator ps = getCallGraph().getPredNodes(this); ps.hasNext();) {
-          ((AstCGNode) ps.next()).addAllCallbacks(callback);
+        for (CGNode p : Iterator2Iterable.make(getCallGraph().getPredNodes(this))) {
+          ((AstCGNode) p).addAllCallbacks(callback);
         }
       }
     }
@@ -167,9 +174,4 @@
     return new AstCGNode(method, context);
   }
 
-  @Override
-  protected CGNode makeFakeRootNode() throws CancelException {
-    return findOrCreateNode(new AstFakeRoot(FakeRootMethod.rootMethod, cha, options, getAnalysisCache()), Everywhere.EVERYWHERE);
-  }
-
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstContextInsensitiveSSAContextInterpreter.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstContextInsensitiveSSAContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstContextInsensitiveSSAContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstContextInsensitiveSSAContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,10 +17,9 @@
 import com.ibm.wala.classLoader.CodeScanner;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
-import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.ContextInsensitiveSSAInterpreter;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.util.collections.EmptyIterator;
@@ -33,11 +32,11 @@
  */
 public class AstContextInsensitiveSSAContextInterpreter extends ContextInsensitiveSSAInterpreter {
 
-  public AstContextInsensitiveSSAContextInterpreter(AnalysisOptions options, AnalysisCache cache) {
+  public AstContextInsensitiveSSAContextInterpreter(AnalysisOptions options, IAnalysisCacheView cache) {
     super(options, cache);
   }
 
-  public boolean understands(IMethod method, Context context) {
+  public boolean understands(IMethod method) {
     return method instanceof AstMethod;
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstGlobalPointerKey.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstGlobalPointerKey.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstGlobalPointerKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstGlobalPointerKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -35,7 +35,7 @@
 
   @Override
   public String toString() {
-    return "[global: " + globalName + "]";
+    return "[global: " + globalName + ']';
   }
 }
     
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/AstSSAPropagationCallGraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,26 +22,29 @@
 import com.ibm.wala.cast.ir.ssa.AstEchoInstruction;
 import com.ibm.wala.cast.ir.ssa.AstGlobalRead;
 import com.ibm.wala.cast.ir.ssa.AstGlobalWrite;
-import com.ibm.wala.cast.ir.ssa.AstIRFactory.AstIR;
+import com.ibm.wala.cast.ir.ssa.AstIRFactory;
 import com.ibm.wala.cast.ir.ssa.AstInstructionVisitor;
 import com.ibm.wala.cast.ir.ssa.AstIsDefinedInstruction;
-import com.ibm.wala.cast.ir.ssa.AstLexicalAccess;
 import com.ibm.wala.cast.ir.ssa.AstLexicalAccess.Access;
 import com.ibm.wala.cast.ir.ssa.AstLexicalRead;
 import com.ibm.wala.cast.ir.ssa.AstLexicalWrite;
+import com.ibm.wala.cast.ir.ssa.AstPropertyRead;
+import com.ibm.wala.cast.ir.ssa.AstPropertyWrite;
 import com.ibm.wala.cast.ir.ssa.EachElementGetInstruction;
 import com.ibm.wala.cast.ir.ssa.EachElementHasNextInstruction;
 import com.ibm.wala.cast.ir.translator.AstTranslator;
 import com.ibm.wala.cast.loader.AstMethod;
 import com.ibm.wala.cast.loader.AstMethod.LexicalInformation;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
 import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.fixpoint.AbstractOperator;
 import com.ibm.wala.fixpoint.IntSetVariable;
 import com.ibm.wala.fixpoint.UnaryOperator;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.ExplicitCallGraph;
 import com.ibm.wala.ipa.callgraph.propagation.AbstractFieldPointerKey;
 import com.ibm.wala.ipa.callgraph.propagation.HeapModel;
@@ -63,14 +66,15 @@
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.modref.ArrayLengthKey;
 import com.ibm.wala.ssa.DefUse;
-import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
+import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAPutInstruction;
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.intset.IntSet;
-import com.ibm.wala.util.intset.IntSetAction;
 import com.ibm.wala.util.intset.IntSetUtil;
 import com.ibm.wala.util.intset.MutableIntSet;
 import com.ibm.wala.util.intset.MutableMapping;
@@ -102,6 +106,7 @@
    * each language can specify whether a particular field name should be stored
    * in object catalogs or not. By default, always return false.
    */
+  @SuppressWarnings("unused")
   protected boolean isUncataloguedField(IClass type, String fieldName) {
     return false;
   }
@@ -115,9 +120,9 @@
   
   public abstract GlobalObjectKey getGlobalObject(Atom language);
 
-  protected AstSSAPropagationCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache,
+  protected AstSSAPropagationCallGraphBuilder(IMethod fakeRootClass, AnalysisOptions options, IAnalysisCacheView cache,
       PointerKeyFactory pointerKeyFactory) {
-    super(cha, options, cache, pointerKeyFactory);
+    super(fakeRootClass, options, cache, pointerKeyFactory);
   }
 
   public SSAContextInterpreter makeDefaultContextInterpreters(SSAContextInterpreter appContextInterpreter, AnalysisOptions options,
@@ -196,6 +201,16 @@
       }
 
       @Override
+      public void visitPropertyRead(AstPropertyRead instruction) {
+
+      }
+
+      @Override
+      public void visitPropertyWrite(AstPropertyWrite instruction) {
+
+      }
+
+      @Override
       public void visitAstLexicalRead(AstLexicalRead instruction) {
 
       }
@@ -240,7 +255,7 @@
 
       }
     }
-  };
+  }
 
   // /////////////////////////////////////////////////////////////////////////
   //
@@ -249,8 +264,8 @@
   // /////////////////////////////////////////////////////////////////////////
 
   @Override
-  protected ExplicitCallGraph createEmptyCallGraph(IClassHierarchy cha, AnalysisOptions options) {
-    return new AstCallGraph(cha, options, getAnalysisCache());
+  protected ExplicitCallGraph createEmptyCallGraph(IMethod fakeRootClass, AnalysisOptions options) {
+    return new AstCallGraph(fakeRootClass, options, getAnalysisCache());
   }
 
   public static class AstInterestingVisitor extends InterestingVisitor implements AstInstructionVisitor {
@@ -260,6 +275,16 @@
     }
 
     @Override
+    public void visitPropertyRead(AstPropertyRead instruction) {
+      bingo = true;
+    }
+
+    @Override
+    public void visitPropertyWrite(AstPropertyWrite instruction) {
+      bingo = true;
+    }
+
+    @Override
     public void visitAstLexicalRead(AstLexicalRead instruction) {
       bingo = true;
     }
@@ -314,7 +339,7 @@
   public boolean hasNoInterestingUses(CGNode node, int vn, DefUse du) {
     if (node.getMethod() instanceof AstMethod) {
       // uses in nested functions are interesting
-      IntSet uses = ((AstIR) node.getIR()).lexicalInfo().getAllExposedUses();
+      IntSet uses = ((AstIRFactory.AstIR) node.getIR()).lexicalInfo().getAllExposedUses();
       if (uses.contains(vn)) {
         return false;
       }
@@ -357,8 +382,8 @@
       return ((AstPointerKeyFactory) getBuilder().getPointerKeyFactory()).getPointerKeysForReflectedFieldWrite(I, F);
     }
 
-    private void visitLexical(AstLexicalAccess instruction, final LexicalOperator op) {
-      op.doLexicalPointerKeys(false);
+    private static void visitLexical(final LexicalOperator op) {
+      op.doLexicalPointerKeys();
       // I have no idea what the code below does, but commenting it out doesn't
       // break any regression tests. --MS
       // if (! checkLexicalInstruction(instruction)) {
@@ -366,26 +391,56 @@
       // }
     }
 
+    @Override
+    public void visitPropertyRead(AstPropertyRead instruction) {
+      if (AstSSAPropagationCallGraphBuilder.DEBUG_PROPERTIES) {
+        Position instructionPosition = getInstructionPosition(instruction);
+        if (instructionPosition != null) {
+          System.err.println("processing read instruction " + instruction + ", position " + instructionPosition);
+        }
+      }
+      newFieldRead(node, instruction.getUse(0), instruction.getUse(1), instruction.getDef(0));
+    }
+
+    private Position getInstructionPosition(SSAInstruction instruction) {
+      IMethod method = node.getMethod();
+      if (method instanceof AstMethod) {
+        return ((AstMethod) method).getSourcePosition(instruction.iindex);
+      }
+      return null;
+    }
+
+    @Override
+    public void visitPropertyWrite(AstPropertyWrite instruction) {
+      if (AstSSAPropagationCallGraphBuilder.DEBUG_PROPERTIES) {
+        Position instructionPosition = getInstructionPosition(instruction);
+        if (instructionPosition != null) {
+          System.err.println("processing write instruction " + instruction + ", position " + instructionPosition);
+        }
+      }
+      newFieldWrite(node, instruction.getUse(0), instruction.getUse(1), instruction.getUse(2));
+    }
 
 
     @Override
     public void visitAstLexicalRead(AstLexicalRead instruction) {
-      visitLexical(instruction, new LexicalOperator((AstCGNode) node, instruction.getAccesses(), true) {
+      visitLexical(new LexicalOperator((AstCGNode) node, instruction.getAccesses(), true) {
         @Override
         protected void action(PointerKey lexicalKey, int vn) {
           PointerKey lval = getPointerKeyForLocal(vn);
           if (lexicalKey instanceof LocalPointerKey) {
             CGNode lnode = ((LocalPointerKey) lexicalKey).getNode();
             int lvn = ((LocalPointerKey) lexicalKey).getValueNumber();
-            IR lir = getBuilder().getCFAContextInterpreter().getIR(lnode);
+            IRView lir = getBuilder().getCFAContextInterpreter().getIRView(lnode);
             SymbolTable lsymtab = lir.getSymbolTable();
-            DefUse ldu = getAnalysisCache().getSSACache().findOrCreateDU(lir, lnode.getContext());
+            DefUse ldu = getBuilder().getCFAContextInterpreter().getDU(lnode);
+            // DefUse ldu = getAnalysisCache().getDefUse(lir);
             if (contentsAreInvariant(lsymtab, ldu, lvn)) {
               InstanceKey[] ik = getInvariantContents(lsymtab, ldu, lnode, lvn);
               system.recordImplicitPointsToSet(lexicalKey);
-              for (int i = 0; i < ik.length; i++) {
-                system.findOrCreateIndexForInstanceKey(ik[i]);
-                system.newConstraint(lval, ik[i]);
+              for (InstanceKey element : ik) {
+                system.findOrCreateIndexForInstanceKey(element);
+                system.newConstraint(lval, element);
               }
 
               return;
@@ -399,16 +454,16 @@
 
     @Override
     public void visitAstLexicalWrite(AstLexicalWrite instruction) {
-      visitLexical(instruction, new LexicalOperator((AstCGNode) node, instruction.getAccesses(), false) {
+      visitLexical(new LexicalOperator((AstCGNode) node, instruction.getAccesses(), false) {
         @Override
         protected void action(PointerKey lexicalKey, int vn) {
           PointerKey rval = getPointerKeyForLocal(vn);
           if (contentsAreInvariant(symbolTable, du, vn)) {
             InstanceKey[] ik = getInvariantContents(vn);
             system.recordImplicitPointsToSet(rval);
-            for (int i = 0; i < ik.length; i++) {
-              system.findOrCreateIndexForInstanceKey(ik[i]);
-              system.newConstraint(lexicalKey, ik[i]);
+            for (InstanceKey element : ik) {
+              system.findOrCreateIndexForInstanceKey(element);
+              system.newConstraint(lexicalKey, element);
             }
           } else {
             system.newConstraint(lexicalKey, assignOperator, rval);
@@ -470,17 +525,14 @@
         system.newSideEffect(new UnaryOperator<PointsToSetVariable>() {
           @Override
           public byte evaluate(PointsToSetVariable lhs, PointsToSetVariable rhs) {
-            final IntSetVariable objects = rhs;
+            final IntSetVariable<?> objects = rhs;
             if (objects.getValue() != null) {
-              objects.getValue().foreach(new IntSetAction() {
-                @Override
-                public void act(int optr) {
-                  InstanceKey object = system.getInstanceKey(optr);
-                  if (!getBuilder().isUncataloguedField(object.getConcreteType(), hack)) {
-                    PointerKey cat = getPointerKeyForObjectCatalog(object);
-                    if (cat != null) {
-                      system.newConstraint(cat, fieldNameKeys[0]);
-                    }
+              objects.getValue().foreach(optr -> {
+                InstanceKey object = system.getInstanceKey(optr);
+                if (!getBuilder().isUncataloguedField(object.getConcreteType(), hack)) {
+                  PointerKey cat = getPointerKeyForObjectCatalog(object);
+                  if (cat != null) {
+                    system.newConstraint(cat, fieldNameKeys[0]);
                   }
                 }
               });
@@ -526,8 +578,8 @@
 
       if (contentsAreInvariant(symbolTable, du, rval)) {
         InstanceKey objects[] = getInvariantContents(rval);
-        for (int i = 0; i < objects.length; i++) {
-          PointerKey catalog = getPointerKeyForObjectCatalog(objects[i]);
+        for (InstanceKey object : objects) {
+          PointerKey catalog = getPointerKeyForObjectCatalog(object);
           system.newConstraint(lk, assignOperator, catalog);
         }
       }
@@ -536,16 +588,13 @@
         system.newSideEffect(new UnaryOperator<PointsToSetVariable>() {
           @Override
           public byte evaluate(PointsToSetVariable lhs, PointsToSetVariable rhs) {
-            final IntSetVariable objects = rhs;
+            final IntSetVariable<?> objects = rhs;
             if (objects.getValue() != null) {
-              objects.getValue().foreach(new IntSetAction() {
-                @Override
-                public void act(int optr) {
-                  InstanceKey object = system.getInstanceKey(optr);
-                  PointerKey objCatalog = getPointerKeyForObjectCatalog(object);
-                  if (objCatalog != null) {
-                    system.newConstraint(lk, assignOperator, objCatalog);
-                  }
+              objects.getValue().foreach(optr -> {
+                InstanceKey object = system.getInstanceKey(optr);
+                PointerKey objCatalog = getPointerKeyForObjectCatalog(object);
+                if (objCatalog != null) {
+                  system.newConstraint(lk, assignOperator, objCatalog);
                 }
               });
             }
@@ -612,16 +661,16 @@
        * perform the necessary {@link #action(PointerKey, int)}s for the
        * accesses. For each access, we determine the possible {@link CGNode}s
        * corresponding to its definer (see
-       * {@link AstConstraintVisitor#getLexicalDefiners(CGNode, String)). Handle
+       * {@link AstConstraintVisitor#getLexicalDefiners(CGNode, Pair)}). Handle
        * using
        * {@link AstConstraintVisitor#handleRootLexicalReference(String, String, CGNode)}
        * .
        */
-      private void doLexicalPointerKeys(boolean funargsOnly) {
-        for (int i = 0; i < accesses.length; i++) {
-          final String name = accesses[i].variableName;
-          final String definer = accesses[i].variableDefiner;
-          final int vn = accesses[i].valueNumber;
+      private void doLexicalPointerKeys() {
+        for (Access accesse : accesses) {
+          final String name = accesse.variableName;
+          final String definer = accesse.variableDefiner;
+          final int vn = accesse.valueNumber;
 
           if (AstTranslator.DEBUG_LEXICAL)
             System.err.println(("looking up lexical parent " + definer));
@@ -639,7 +688,7 @@
 
       @Override
       public byte evaluate(PointsToSetVariable lhs, PointsToSetVariable rhs) {
-        doLexicalPointerKeys(true);
+        doLexicalPointerKeys();
         return NOT_CHANGED;
       }
 
@@ -700,15 +749,15 @@
         final Set<CGNode> result = HashSetFactory.make();
         PointerKey F = getBuilder().getPointerKeyForLocal(opNode, 1);
 
-        IR ir = getBuilder().getCFAContextInterpreter().getIR(opNode);
+        IRView ir = getBuilder().getCFAContextInterpreter().getIRView(opNode);
         SymbolTable symtab = ir.getSymbolTable();
         DefUse du = getBuilder().getCFAContextInterpreter().getDU(opNode);
         if (contentsAreInvariant(symtab, du, 1)) {
           system.recordImplicitPointsToSet(F);
           final InstanceKey[] functionKeys = getInvariantContents(symtab, du, opNode, 1);
-          for (int f = 0; f < functionKeys.length; f++) {
-            system.findOrCreateIndexForInstanceKey(functionKeys[f]);
-            ScopeMappingInstanceKey K = (ScopeMappingInstanceKey) functionKeys[f];
+          for (InstanceKey functionKey : functionKeys) {
+            system.findOrCreateIndexForInstanceKey(functionKey);
+            ScopeMappingInstanceKey K = (ScopeMappingInstanceKey) functionKey;
             Iterator<CGNode> x = K.getFunargNodes(definer);
             while (x.hasNext()) {
               result.add(x.next());
@@ -717,19 +766,16 @@
         } else {
           PointsToSetVariable FV = system.findOrCreatePointsToSet(F);
           if (FV.getValue() != null) {
-            FV.getValue().foreach(new IntSetAction() {
-              @Override
-              public void act(int ptr) {
-                InstanceKey iKey = system.getInstanceKey(ptr);
-                if (iKey instanceof ScopeMappingInstanceKey) {
-                  ScopeMappingInstanceKey K = (ScopeMappingInstanceKey) iKey;
-                  Iterator<CGNode> x = K.getFunargNodes(definer);
-                  while (x.hasNext()) {
-                    result.add(x.next());
-                  }
-                } else {
-                  Assertions.UNREACHABLE("unexpected instance key " + iKey);
+            FV.getValue().foreach(ptr -> {
+              InstanceKey iKey = system.getInstanceKey(ptr);
+              if (iKey instanceof ScopeMappingInstanceKey) {
+                ScopeMappingInstanceKey K = (ScopeMappingInstanceKey) iKey;
+                Iterator<CGNode> x = K.getFunargNodes(definer);
+                while (x.hasNext()) {
+                  result.add(x.next());
                 }
+              } else {
+                //Assertions.UNREACHABLE("unexpected instance key " + iKey);
               }
             });
           }
@@ -739,13 +785,6 @@
       }
     }
 
-    private boolean isEqual(Object a, Object b) {
-      if (a == null)
-        return b == null;
-      else
-        return a.equals(b);
-    }
-
     private Set<PointerKey> discoveredUpwardFunargs = HashSetFactory.make();
 
     /**
@@ -755,13 +794,13 @@
     private void addUpwardFunargConstraints(PointerKey lhs, String name, String definer, CGNode definingNode) {
       discoveredUpwardFunargs.add(lhs);
 
-      LexicalInformation LI = ((AstIR) definingNode.getIR()).lexicalInfo();
-      Pair[] names = LI.getExposedNames();
+      LexicalInformation LI = ((AstIRFactory.AstIR) definingNode.getIR()).lexicalInfo();
+      Pair<String, String>[] names = LI.getExposedNames();
       for (int i = 0; i < names.length; i++) {
         if (name.equals(names[i].fst) && definer.equals(names[i].snd)) {
           int vn = LI.getExitExposedUses()[i];
           if (vn > 0) {
-            IR ir = getBuilder().getCFAContextInterpreter().getIR(definingNode);
+            IRView ir = getBuilder().getCFAContextInterpreter().getIRView(definingNode);
             DefUse du = getBuilder().getCFAContextInterpreter().getDU(definingNode);
             SymbolTable st = ir.getSymbolTable();
 
@@ -770,9 +809,9 @@
             if (contentsAreInvariant(st, du, vn)) {
               system.recordImplicitPointsToSet(rhs);
               final InstanceKey[] objs = getInvariantContents(st, du, definingNode, vn);
-              for (int f = 0; f < objs.length; f++) {
-                system.findOrCreateIndexForInstanceKey(objs[f]);
-                system.newConstraint(lhs, objs[f]);
+              for (InstanceKey obj : objs) {
+                system.findOrCreateIndexForInstanceKey(obj);
+                system.newConstraint(lhs, obj);
               }
             } else {
               system.newConstraint(lhs, assignOperator, rhs);
@@ -821,7 +860,7 @@
 
           @Override
           public String toString() {
-            return "[upward:" + getName() + ":" + definingNode + "]";
+            return "[upward:" + getName() + ':' + definingNode + ']';
           }
         }
 
@@ -851,7 +890,7 @@
 
     private void newFieldOperation(CGNode opNode, final int objVn, final int fieldsVn, final boolean isLoadOperation,
         final ReflectedFieldAction action) {
-      IR ir = getBuilder().getCFAContextInterpreter().getIR(opNode);
+      IRView ir = getBuilder().getCFAContextInterpreter().getIRView(opNode);
       SymbolTable symtab = ir.getSymbolTable();
       DefUse du = getBuilder().getCFAContextInterpreter().getDU(opNode);
       PointerKey objKey = getBuilder().getPointerKeyForLocal(opNode, objVn);
@@ -860,15 +899,15 @@
       // log field access
       if (DEBUG_PROPERTIES) {
         if (isLoadOperation)
-          System.err.print(("adding read of " + objKey + "." + fieldKey + ":"));
+          System.err.print(("adding read of " + objKey + '.' + fieldKey + ':'));
         else
-          System.err.print(("adding write of " + objKey + "." + fieldKey + ":"));
+          System.err.print(("adding write of " + objKey + '.' + fieldKey + ':'));
 
         if (contentsAreInvariant(symtab, du, objVn)) {
           System.err.print(" constant obj:");
           InstanceKey[] x = getInvariantContents(symtab, du, opNode, objVn);
-          for (int i = 0; i < x.length; i++) {
-            System.err.print((x[i].toString() + " "));
+          for (InstanceKey element : x) {
+            System.err.print((element.toString() + ' '));
           }
         } else {
           System.err.print((" obj:" + system.findOrCreatePointsToSet(objKey)));
@@ -877,8 +916,8 @@
         if (contentsAreInvariant(symtab, du, fieldsVn)) {
           System.err.print(" constant prop:");
           InstanceKey[] x = getInvariantContents(symtab, du, opNode, fieldsVn);
-          for (int i = 0; i < x.length; i++) {
-            System.err.print((x[i].toString() + " "));
+          for (InstanceKey element : x) {
+            System.err.print((element.toString() + ' '));
           }
         } else {
           System.err.print((" props:" + system.findOrCreatePointsToSet(fieldKey)));
@@ -890,14 +929,14 @@
       // make sure instance keys get mapped for PointerAnalysisImpl
       if (contentsAreInvariant(symtab, du, objVn)) {
         InstanceKey[] x = getInvariantContents(symtab, du, opNode, objVn);
-        for (int i = 0; i < x.length; i++) {
-          system.findOrCreateIndexForInstanceKey(x[i]);
+        for (InstanceKey element : x) {
+          system.findOrCreateIndexForInstanceKey(element);
         }
       }
       if (contentsAreInvariant(symtab, du, fieldsVn)) {
         InstanceKey[] x = getInvariantContents(symtab, du, opNode, fieldsVn);
-        for (int i = 0; i < x.length; i++) {
-          system.findOrCreateIndexForInstanceKey(x[i]);
+        for (InstanceKey element : x) {
+          system.findOrCreateIndexForInstanceKey(element);
         }
       }
 
@@ -935,7 +974,7 @@
 
     protected void newFieldOperationFieldConstant(CGNode opNode, final boolean isLoadOperation, final ReflectedFieldAction action,
         final int objVn, final InstanceKey[] fieldsKeys) {
-      IR ir = getBuilder().getCFAContextInterpreter().getIR(opNode);
+      IRView ir = getBuilder().getCFAContextInterpreter().getIRView(opNode);
       SymbolTable symtab = ir.getSymbolTable();
       DefUse du = getBuilder().getCFAContextInterpreter().getDU(opNode);
       PointerKey objKey = getBuilder().getPointerKeyForLocal(opNode, objVn);
@@ -960,37 +999,31 @@
 
         @Override
         public byte evaluate(PointsToSetVariable lhs, final PointsToSetVariable[] rhs) {
-          final IntSetVariable receivers = rhs[0];
-          final IntSetVariable fields = rhs[1];
+          final IntSetVariable<?> receivers = rhs[0];
+          final IntSetVariable<?> fields = rhs[1];
           if (receivers.getValue() != null && fields.getValue() != null) {
-            receivers.getValue().foreach(new IntSetAction() {
-              @Override
-              public void act(final int rptr) {
-                final InstanceKey receiver = system.getInstanceKey(rptr);
+            receivers.getValue().foreach(rptr -> {
+              final InstanceKey receiver = system.getInstanceKey(rptr);
 
-                if (!isLoadOperation) {
-                  PointerKey cat = getPointerKeyForObjectCatalog(receiver);
-                  if (cat != null) {
-                    system.newConstraint(cat, assignOperator, fieldKey);
-                  }
+              if (!isLoadOperation) {
+                PointerKey cat = getPointerKeyForObjectCatalog(receiver);
+                if (cat != null) {
+                  system.newConstraint(cat, assignOperator, fieldKey);
                 }
+              }
 
-                fields.getValue().foreach(new IntSetAction() {
-                  @Override
-                  public void act(int fptr) {
-                    if (!doneField.contains(fptr) || !doneReceiver.contains(rptr)) {
-                      InstanceKey field = system.getInstanceKey(fptr);
-                      for (Iterator keys = isLoadOperation ? getPointerKeysForReflectedFieldRead(receiver, field)
-                          : getPointerKeysForReflectedFieldWrite(receiver, field); keys.hasNext();) {
-                        AbstractFieldPointerKey key = (AbstractFieldPointerKey) keys.next();
-                        if (DEBUG_PROPERTIES)
-                          action.dump(key, false, false);
-                        action.action(key);
-                      }
-                    }
+              fields.getValue().foreach(fptr -> {
+                if (!doneField.contains(fptr) || !doneReceiver.contains(rptr)) {
+                  InstanceKey field = system.getInstanceKey(fptr);
+                  for (PointerKey pkey : Iterator2Iterable.make(isLoadOperation ? getPointerKeysForReflectedFieldRead(receiver, field)
+                      : getPointerKeysForReflectedFieldWrite(receiver, field))) {
+                    AbstractFieldPointerKey key = (AbstractFieldPointerKey) pkey;
+                    if (DEBUG_PROPERTIES)
+                      action.dump(key, false, false);
+                    action.action(key);
                   }
-                });
-              }
+                }
+              });
             });
             doneReceiver.addAll(receivers.getValue());
             doneField.addAll(fields.getValue());
@@ -1021,31 +1054,28 @@
       system.newSideEffect(new UnaryOperator<PointsToSetVariable>() {
         @Override
         public byte evaluate(PointsToSetVariable lhs, PointsToSetVariable rhs) {
-          final IntSetVariable objects = rhs;
+          final IntSetVariable<?> objects = rhs;
           if (objects.getValue() != null) {
-            objects.getValue().foreach(new IntSetAction() {
-              @Override
-              public void act(int optr) {
-                InstanceKey object = system.getInstanceKey(optr);
-                PointerKey objCatalog = getPointerKeyForObjectCatalog(object);
-                for (int f = 0; f < fieldsKeys.length; f++) {
-                  if (isLoadOperation) {
-                    for (Iterator keys = getPointerKeysForReflectedFieldRead(object, fieldsKeys[f]); keys.hasNext();) {
-                      AbstractFieldPointerKey key = (AbstractFieldPointerKey) keys.next();
-                      if (DEBUG_PROPERTIES)
-                        action.dump(key, true, false);
-                      action.action(key);
-                    }
-                  } else {
-                    if (objCatalog != null) {
-                      system.newConstraint(objCatalog, fieldsKeys[f]);
-                    }
-                    for (Iterator keys = getPointerKeysForReflectedFieldWrite(object, fieldsKeys[f]); keys.hasNext();) {
-                      AbstractFieldPointerKey key = (AbstractFieldPointerKey) keys.next();
-                      if (DEBUG_PROPERTIES)
-                        action.dump(key, true, false);
-                      action.action(key);
-                    }
+            objects.getValue().foreach(optr -> {
+              InstanceKey object = system.getInstanceKey(optr);
+              PointerKey objCatalog = getPointerKeyForObjectCatalog(object);
+              for (InstanceKey fieldsKey : fieldsKeys) {
+                if (isLoadOperation) {
+                  for (PointerKey pkey : Iterator2Iterable.make(getPointerKeysForReflectedFieldRead(object, fieldsKey))) {
+                    AbstractFieldPointerKey key = (AbstractFieldPointerKey) pkey;
+                    if (DEBUG_PROPERTIES)
+                      action.dump(key, true, false);
+                    action.action(key);
+                  }
+                } else {
+                  if (objCatalog != null) {
+                    system.newConstraint(objCatalog, fieldsKey);
+                  }
+                  for (PointerKey pkey : Iterator2Iterable.make(getPointerKeysForReflectedFieldWrite(object, fieldsKey))) {
+                    AbstractFieldPointerKey key = (AbstractFieldPointerKey) pkey;
+                    if (DEBUG_PROPERTIES)
+                      action.dump(key, true, false);
+                    action.action(key);
                   }
                 }
               }
@@ -1074,8 +1104,8 @@
     protected void newFieldOperationOnlyObjectConstant(final boolean isLoadOperation, final ReflectedFieldAction action,
         final PointerKey fieldKey, final InstanceKey[] objKeys) {
       if (!isLoadOperation) {
-        for (int o = 0; o < objKeys.length; o++) {
-          PointerKey objCatalog = getPointerKeyForObjectCatalog(objKeys[o]);
+        for (InstanceKey objKey : objKeys) {
+          PointerKey objCatalog = getPointerKeyForObjectCatalog(objKey);
           if (objCatalog != null) {
             system.newConstraint(objCatalog, assignOperator, fieldKey);
           }
@@ -1085,20 +1115,17 @@
       system.newSideEffect(new UnaryOperator<PointsToSetVariable>() {
         @Override
         public byte evaluate(PointsToSetVariable lhs, PointsToSetVariable rhs) {
-          final IntSetVariable fields = rhs;
+          final IntSetVariable<?> fields = rhs;
           if (fields.getValue() != null) {
-            fields.getValue().foreach(new IntSetAction() {
-              @Override
-              public void act(int fptr) {
-                InstanceKey field = system.getInstanceKey(fptr);
-                for (int o = 0; o < objKeys.length; o++) {
-                  for (Iterator keys = isLoadOperation ? getPointerKeysForReflectedFieldRead(objKeys[o], field)
-                      : getPointerKeysForReflectedFieldWrite(objKeys[o], field); keys.hasNext();) {
-                    AbstractFieldPointerKey key = (AbstractFieldPointerKey) keys.next();
-                    if (DEBUG_PROPERTIES)
-                      action.dump(key, false, true);
-                    action.action(key);
-                  }
+            fields.getValue().foreach(fptr -> {
+              InstanceKey field = system.getInstanceKey(fptr);
+              for (InstanceKey objKey : objKeys) {
+                for (PointerKey pkey : Iterator2Iterable.make(isLoadOperation ? getPointerKeysForReflectedFieldRead(objKey, field)
+                    : getPointerKeysForReflectedFieldWrite(objKey, field))) {
+                  AbstractFieldPointerKey key = (AbstractFieldPointerKey) pkey;
+                  if (DEBUG_PROPERTIES)
+                    action.dump(key, false, true);
+                  action.action(key);
                 }
               }
             });
@@ -1125,22 +1152,22 @@
 
     protected void newFieldOperationObjectAndFieldConstant(final boolean isLoadOperation, final ReflectedFieldAction action,
         final InstanceKey[] objKeys, InstanceKey[] fieldsKeys) {
-      for (int o = 0; o < objKeys.length; o++) {
-        PointerKey objCatalog = getPointerKeyForObjectCatalog(objKeys[o]);
-        for (int f = 0; f < fieldsKeys.length; f++) {
+      for (InstanceKey objKey : objKeys) {
+        PointerKey objCatalog = getPointerKeyForObjectCatalog(objKey);
+        for (InstanceKey fieldsKey : fieldsKeys) {
           if (isLoadOperation) {
-            for (Iterator keys = getPointerKeysForReflectedFieldRead(objKeys[o], fieldsKeys[f]); keys.hasNext();) {
-              AbstractFieldPointerKey key = (AbstractFieldPointerKey) keys.next();
+            for (PointerKey pkey : Iterator2Iterable.make(getPointerKeysForReflectedFieldRead(objKey, fieldsKey))) {
+              AbstractFieldPointerKey key = (AbstractFieldPointerKey) pkey;
               if (DEBUG_PROPERTIES)
                 action.dump(key, true, true);
               action.action(key);
             }
           } else {
             if (objCatalog != null) {
-              system.newConstraint(objCatalog, fieldsKeys[f]);
+              system.newConstraint(objCatalog, fieldsKey);
             }
-            for (Iterator keys = getPointerKeysForReflectedFieldWrite(objKeys[o], fieldsKeys[f]); keys.hasNext();) {
-              AbstractFieldPointerKey key = (AbstractFieldPointerKey) keys.next();
+            for (PointerKey pkey : Iterator2Iterable.make(getPointerKeysForReflectedFieldWrite(objKey, fieldsKey))) {
+              AbstractFieldPointerKey key = (AbstractFieldPointerKey) pkey;
               if (DEBUG_PROPERTIES)
                 action.dump(key, true, true);
               action.action(key);
@@ -1151,7 +1178,7 @@
     }
 
     public void newFieldWrite(CGNode opNode, int objVn, int fieldsVn, int rhsVn) {
-      IR ir = getBuilder().getCFAContextInterpreter().getIR(opNode);
+      IRView ir = getBuilder().getCFAContextInterpreter().getIRView(opNode);
       SymbolTable symtab = ir.getSymbolTable();
       DefUse du = getBuilder().getCFAContextInterpreter().getDU(opNode);
       PointerKey rhsKey = getBuilder().getPointerKeyForLocal(opNode, rhsVn);
@@ -1172,18 +1199,18 @@
 
       @Override
       public void dump(AbstractFieldPointerKey fieldKey, boolean constObj, boolean constProp) {
-        System.err.println(("writing fixed rvals to " + fieldKey + " " + constObj + ", " + constProp));
-        for (int i = 0; i < rhsFixedValues.length; i++) {
-          System.err.println(("writing " + rhsFixedValues[i]));
+        System.err.println(("writing fixed rvals to " + fieldKey + ' ' + constObj + ", " + constProp));
+        for (InstanceKey rhsFixedValue : rhsFixedValues) {
+          System.err.println(("writing " + rhsFixedValue));
         }
       }
 
       @Override
       public void action(AbstractFieldPointerKey fieldKey) {
         if (!representsNullType(fieldKey.getInstanceKey())) {
-          for (int i = 0; i < rhsFixedValues.length; i++) {
-            system.findOrCreateIndexForInstanceKey(rhsFixedValues[i]);
-            system.newConstraint(fieldKey, rhsFixedValues[i]);
+          for (InstanceKey rhsFixedValue : rhsFixedValues) {
+            system.findOrCreateIndexForInstanceKey(rhsFixedValue);
+            system.newConstraint(fieldKey, rhsFixedValue);
           }
         }
       }
@@ -1206,7 +1233,7 @@
 
       @Override
       public void dump(AbstractFieldPointerKey fieldKey, boolean constObj, boolean constProp) {
-        System.err.println(("write " + rhs + " to " + fieldKey + " " + constObj + ", " + constProp));
+        System.err.println(("write " + rhs + " to " + fieldKey + ' ' + constObj + ", " + constProp));
       }
 
       @Override
@@ -1215,7 +1242,7 @@
           system.newConstraint(fieldKey, assignOperator, rhs);
         }
       }
-    };
+    }
 
     public void newFieldWrite(CGNode opNode, int objVn, int fieldsVn, final PointerKey rhs) {
       newFieldOperation(opNode, objVn, fieldsVn, false, new NormalWriter(rhs));
@@ -1233,7 +1260,7 @@
       newFieldOperation(opNode, objVn, fieldsVn, true, new ReflectedFieldAction() {
         @Override
         public void dump(AbstractFieldPointerKey fieldKey, boolean constObj, boolean constProp) {
-          System.err.println(("read " + lhs + " from " + fieldKey + " " + constObj + ", " + constProp));
+          System.err.println(("read " + lhs + " from " + fieldKey + ' ' + constObj + ", " + constProp));
         }
 
         @Override
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstAnalysisScope.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstAnalysisScope.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstAnalysisScope.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstAnalysisScope.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,14 +10,13 @@
 package com.ibm.wala.cast.ipa.callgraph;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 
 import com.ibm.wala.cast.loader.SingleClassLoaderFactory;
 import com.ibm.wala.classLoader.ArrayClassLoader;
 import com.ibm.wala.classLoader.Language;
-import com.ibm.wala.classLoader.SourceModule;
+import com.ibm.wala.classLoader.Module;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.util.debug.Assertions;
@@ -31,20 +30,18 @@
     this.theLoader = loaders.getTheReference();
   }
 
-  public CAstAnalysisScope(String[] sourceFileNames, SingleClassLoaderFactory loaders, Collection<Language> languages)
-      throws IOException {
+  public CAstAnalysisScope(String[] sourceFileNames, SingleClassLoaderFactory loaders, Collection<Language> languages) {
     this(loaders, languages);
-    for (int i = 0; i < sourceFileNames.length; i++) {
-      File F = new File(sourceFileNames[i]);
+    for (String sourceFileName : sourceFileNames) {
+      File F = new File(sourceFileName);
       addSourceFileToScope(theLoader, F, F.getPath());
     }
   }
 
-  public CAstAnalysisScope(SourceModule[] sources, SingleClassLoaderFactory loaders, Collection<Language> languages)
-      throws IOException {
+  public CAstAnalysisScope(Module[] sources, SingleClassLoaderFactory loaders, Collection<Language> languages) {
     this(loaders, languages);
-    for (int i = 0; i < sources.length; i++) {
-      addToScope(theLoader, sources[i]);
+    for (Module source : sources) {
+      addToScope(theLoader, source);
     }
   }
 
@@ -97,15 +94,11 @@
    */
   @Override
   public ClassLoaderReference getSyntheticLoader() {
-    Assertions.UNREACHABLE();
     return null;
   }
 
   /**
    * Add a class file to the scope for a loader
-   * 
-   * @param loader
-   * @param file
    */
   @Override
   public void addClassFileToScope(ClassLoaderReference loader, File file) {
@@ -113,7 +106,7 @@
   }
 
   /**
-   * @return the ClassLoaderReference specified by <code>name</code>.
+   * @return the ClassLoaderReference specified by {@code name}.
    */
   @Override
   public ClassLoaderReference getLoader(Atom name) {
@@ -138,6 +131,6 @@
 
   @Override
   public String toString() {
-    return super.toString() + "\n" + theLoader + ": " + getModules(theLoader);
+    return super.toString() + '\n' + theLoader + ": " + getModules(theLoader);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CAstCallGraphUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,25 +16,26 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collections;
-import java.util.Iterator;
-
 import org.apache.commons.io.ByteOrderMark;
 import org.apache.commons.io.input.BOMInputStream;
 
 import com.ibm.wala.cast.loader.SingleClassLoaderFactory;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.Language;
+import com.ibm.wala.classLoader.Module;
 import com.ibm.wala.classLoader.SourceFileModule;
-import com.ibm.wala.classLoader.SourceModule;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
-import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ssa.IRFactory;
+import com.ibm.wala.ssa.IRView;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 
 public class CAstCallGraphUtil {
@@ -49,7 +50,7 @@
     // URLs. It seems that, in DOS, URL.getFile() does not return a
     // \-separated file name, but rather one with /'s. Rather makes one
     // wonder why the function is called get_File_ :(
-    return makeSourceModule(script, dir + "/" + name);
+    return makeSourceModule(script, dir + '/' + name);
   }
 
   public static SourceFileModule makeSourceModule(URL script, String scriptName) {
@@ -78,19 +79,18 @@
     };
   }
 
-  public static AnalysisScope makeScope(String[] files, SingleClassLoaderFactory loaders, Language language) throws IOException {
+  public static AnalysisScope makeScope(String[] files, SingleClassLoaderFactory loaders, Language language) {
     CAstAnalysisScope result = new CAstAnalysisScope(files, loaders, Collections.singleton(language));
     return result;
   }
 
-  public static AnalysisScope makeScope(SourceModule[] files, SingleClassLoaderFactory loaders, Language language)
-      throws IOException {
+  public static AnalysisScope makeScope(Module[] files, SingleClassLoaderFactory loaders, Language language) {
     CAstAnalysisScope result = new CAstAnalysisScope(files, loaders, Collections.singleton(language));
     return result;
   }
 
-  public static AnalysisCache makeCache(IRFactory<IMethod> factory) {
-    return new AnalysisCache(factory);
+  public static IAnalysisCacheView makeCache(IRFactory<IMethod> factory) {
+    return new AnalysisCacheImpl(factory);
   }
 
   public static String getShortName(CGNode nd) {
@@ -110,7 +110,7 @@
           if (s.indexOf('(') != -1) {
             String functionName = s.substring(s.indexOf('(') + 1, s.indexOf(')'));
             functionName = functionName.substring(functionName.lastIndexOf('/') + 1);
-            result += " " + functionName;
+            result += ' ' + functionName;
           }
         }
         result = "ctor of " + result;
@@ -119,23 +119,22 @@
     return result;
   }
 
-  public static void dumpCG(PointerAnalysis<InstanceKey> PA, CallGraph CG) {
+  public static void dumpCG(SSAContextInterpreter interp, PointerAnalysis<? extends InstanceKey> PA, CallGraph CG) {
     if (AVOID_DUMP)
       return;
-    for (Iterator x = CG.iterator(); x.hasNext();) {
-      CGNode N = (CGNode) x.next();
+    for (CGNode N : CG) {
       System.err.print("callees of node " + getShortName(N) + " : [");
       boolean fst = true;
-      for (Iterator<? extends CGNode> ns = CG.getSuccNodes(N); ns.hasNext();) {
+      for (CGNode n : Iterator2Iterable.make(CG.getSuccNodes(N))) {
         if (fst)
           fst = false;
         else
           System.err.print(", ");
-        System.err.print(getShortName(ns.next()));
+        System.err.print(getShortName(n));
       }
       System.err.println("]");
       System.err.println("\nIR of node " + N.getGraphNodeId() + ", context " + N.getContext());
-      IR ir = N.getIR();
+      IRView ir = interp.getIRView(N);
       if (ir != null) {
         System.err.println(ir);
       } else {
@@ -144,8 +143,7 @@
     }
 
     System.err.println("pointer analysis");
-    for (Iterator x = PA.getPointerKeys().iterator(); x.hasNext();) {
-      PointerKey n = (PointerKey) x.next();
+    for (PointerKey n : PA.getPointerKeys()) {
       try {
         System.err.println((n + " --> " + PA.getPointsToSet(n)));
       } catch (Throwable e) {
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageCallGraph.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageCallGraph.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,18 +19,20 @@
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.AbstractRootMethod;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.callgraph.impl.FakeRootMethod;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
-import com.ibm.wala.ssa.SSAInvokeInstruction;
 import com.ibm.wala.ssa.SSANewInstruction;
+import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.FieldReference;
+import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.HashMapFactory;
@@ -49,9 +51,9 @@
  */
 public class CrossLanguageCallGraph extends AstCallGraph {
 
-  public CrossLanguageCallGraph(TargetLanguageSelector<AbstractRootMethod, CrossLanguageCallGraph> roots, IClassHierarchy cha,
-      AnalysisOptions options, AnalysisCache cache) {
-    super(cha, options, cache);
+  public CrossLanguageCallGraph(TargetLanguageSelector<AbstractRootMethod, CrossLanguageCallGraph> roots, IMethod fakeRootClass2,
+      AnalysisOptions options, IAnalysisCacheView cache) {
+    super(fakeRootClass2, options, cache);
     this.roots = roots;
   }
 
@@ -91,14 +93,20 @@
     return (AbstractRootMethod) languageRoots.get(language);
   }
 
+  public static ClassLoaderReference crossCoreLoader = ClassLoaderReference.Primordial;
+  
+  public static TypeReference fakeRootClass = TypeReference.findOrCreate(crossCoreLoader, TypeName.findOrCreate("CrossFakeRoot"));
+  
+  public static MethodReference rootMethod = MethodReference.findOrCreate(fakeRootClass, FakeRootMethod.name, FakeRootMethod.descr);
+  
   public class CrossLanguageFakeRoot extends ScriptFakeRoot {
 
-    public CrossLanguageFakeRoot(IClass declaringClass, IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-      super(FakeRootMethod.rootMethod, declaringClass, cha, options, cache);
+    public CrossLanguageFakeRoot(IClass declaringClass, IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
+      super(rootMethod, declaringClass, cha, options, cache);
     }
 
-    public CrossLanguageFakeRoot(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-      super(FakeRootMethod.rootMethod, cha, options, cache);
+    public CrossLanguageFakeRoot(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
+      super(rootMethod, cha, options, cache);
     }
 
     public int addPhi(TypeReference type, int[] values) {
@@ -138,14 +146,14 @@
     }
 
     @Override
-    public SSAInvokeInstruction addInvocation(int[] params, CallSiteReference site) {
+    public SSAAbstractInvokeInstruction addInvocation(int[] params, CallSiteReference site) {
       TypeReference type = site.getDeclaredTarget().getDeclaringClass();
       Atom language = type.getClassLoader().getLanguage();
       AbstractRootMethod root = getLanguageRoot(language);
       return root.addInvocation(params, site);
     }
 
-    public SSAInvokeInstruction addInvocationInternal(int[] params, CallSiteReference site) {
+    public SSAAbstractInvokeInstruction addInvocationInternal(int[] params, CallSiteReference site) {
       return super.addInvocation(params, site);
     }
 
@@ -165,7 +173,7 @@
     }
   }
 
-  Iterator getLanguageRoots() {
+  Iterator<CGNode> getLanguageRoots() {
     return languageRootNodes.iterator();
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageClassTargetSelector.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageClassTargetSelector.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageClassTargetSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageClassTargetSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -29,9 +29,9 @@
  */
 public class CrossLanguageClassTargetSelector implements ClassTargetSelector {
 
-  private final Map languageSelectors;
+  private final Map<Atom, ClassTargetSelector> languageSelectors;
 
-  public CrossLanguageClassTargetSelector(Map languageSelectors) {
+  public CrossLanguageClassTargetSelector(Map<Atom, ClassTargetSelector> languageSelectors) {
     this.languageSelectors = languageSelectors;
   }
 
@@ -43,7 +43,7 @@
   }
 
   private ClassTargetSelector getSelector(NewSiteReference site) {
-    return (ClassTargetSelector)languageSelectors.get(getLanguage(site));
+    return languageSelectors.get(getLanguage(site));
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageContextSelector.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageContextSelector.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -35,9 +35,9 @@
  */
 public class CrossLanguageContextSelector implements ContextSelector {
 
-  private final Map languageSelectors;
+  private final Map<Atom, ContextSelector> languageSelectors;
 
-  public CrossLanguageContextSelector(Map languageSelectors) {
+  public CrossLanguageContextSelector(Map<Atom, ContextSelector> languageSelectors) {
     this.languageSelectors = languageSelectors;
   }
 
@@ -50,7 +50,7 @@
   }
 
   private ContextSelector getSelector(CallSiteReference site) {
-    return (ContextSelector)languageSelectors.get(getLanguage(site));
+    return languageSelectors.get(getLanguage(site));
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageMethodTargetSelector.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageMethodTargetSelector.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageMethodTargetSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageMethodTargetSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,7 +15,6 @@
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
 import com.ibm.wala.types.MethodReference;
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageSSAPropagationCallGraphBuilder.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageSSAPropagationCallGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageSSAPropagationCallGraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/CrossLanguageSSAPropagationCallGraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,14 +10,13 @@
  *******************************************************************************/
 package com.ibm.wala.cast.ipa.callgraph;
 
-import java.util.Iterator;
-
 import com.ibm.wala.cast.ipa.callgraph.AstSSAPropagationCallGraphBuilder.AstPointerAnalysisImpl.AstImplicitPointsToSetVisitor;
 import com.ibm.wala.cast.util.TargetLanguageSelector;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.AbstractRootMethod;
 import com.ibm.wala.ipa.callgraph.impl.ExplicitCallGraph;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
@@ -28,7 +27,6 @@
 import com.ibm.wala.ipa.callgraph.propagation.PointsToMap;
 import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.propagation.PropagationSystem;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.util.intset.MutableMapping;
 import com.ibm.wala.util.strings.Atom;
 
@@ -47,16 +45,16 @@
 
   protected abstract TargetLanguageSelector<AbstractRootMethod, CrossLanguageCallGraph> makeRootNodeSelector();
 
-  protected CrossLanguageSSAPropagationCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache,
+  protected CrossLanguageSSAPropagationCallGraphBuilder(IMethod fakeRootClass, AnalysisOptions options, IAnalysisCacheView cache,
       PointerKeyFactory pointerKeyFactory) {
-    super(cha, options, cache, pointerKeyFactory);
+    super(fakeRootClass, options, cache, pointerKeyFactory);
     visitors = makeMainVisitorSelector();
     interesting = makeInterestingVisitorSelector();
   }
 
   @Override
-  protected ExplicitCallGraph createEmptyCallGraph(IClassHierarchy cha, AnalysisOptions options) {
-    return new CrossLanguageCallGraph(makeRootNodeSelector(), cha, options, getAnalysisCache());
+  protected ExplicitCallGraph createEmptyCallGraph(IMethod fakeRootClass, AnalysisOptions options) {
+    return new CrossLanguageCallGraph(makeRootNodeSelector(), fakeRootClass, options, getAnalysisCache());
   }
 
   protected static Atom getLanguage(CGNode node) {
@@ -65,7 +63,7 @@
 
   @Override
   protected InterestingVisitor makeInterestingVisitor(CGNode node, int vn) {
-    return interesting.get(getLanguage(node), new Integer(vn));
+    return interesting.get(getLanguage(node), Integer.valueOf(vn));
   }
 
   @Override
@@ -103,8 +101,8 @@
 
   @Override
   protected void customInit() {
-    for (Iterator roots = ((CrossLanguageCallGraph) callGraph).getLanguageRoots(); roots.hasNext();) {
-      markDiscovered((CGNode) roots.next());
+    for (CGNode root : callGraph) {
+      markDiscovered(root);
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/DelegatingAstPointerKeys.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/DelegatingAstPointerKeys.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/DelegatingAstPointerKeys.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/DelegatingAstPointerKeys.java	2019-01-29 17:08:39.000000000 +0000
@@ -76,10 +76,10 @@
 
   @Override
   public Iterator<PointerKey> getPointerKeysForReflectedFieldWrite(InstanceKey I, InstanceKey F) {
-    List<PointerKey> result = new LinkedList<PointerKey>();
+    List<PointerKey> result = new LinkedList<>();
 
     if (F instanceof ConstantKey) {
-      PointerKey ifk = getInstanceFieldPointerKeyForConstant(I, (ConstantKey) F);
+      PointerKey ifk = getInstanceFieldPointerKeyForConstant(I, (ConstantKey<?>) F);
       if (ifk != null) {
         result.add(ifk);
       }
@@ -92,24 +92,19 @@
 
   /**
    * get type for F appropriate for use in a field name.
-   * 
-   * @param F
-   * @return
    */
   protected IClass getFieldNameType(InstanceKey F) {
     return F.getConcreteType();
   }
 
   /**
-   * if F is a supported constant representing a field, return the corresponding {@link InstanceFieldKey} for I.  Otherwise, return <code>null</code>.
-   * @param F
-   * @return
+   * if F is a supported constant representing a field, return the corresponding {@link InstanceFieldKey} for I.  Otherwise, return {@code null}.
    */
-  protected PointerKey getInstanceFieldPointerKeyForConstant(InstanceKey I, ConstantKey F) {
+  protected PointerKey getInstanceFieldPointerKeyForConstant(InstanceKey I, ConstantKey<?> F) {
     Object v = F.getValue();
     // FIXME: current only constant string are handled
-    if (v instanceof String) {
-      IField f = I.getConcreteType().getField(Atom.findOrCreateUnicodeAtom((String) v));
+    if (I.getConcreteType().getClassLoader().getLanguage().modelConstant(v)) {
+      IField f = I.getConcreteType().getField(Atom.findOrCreateUnicodeAtom(String.valueOf(v)));
       return getPointerKeyForInstanceField(I, f);
     }
     return null;
@@ -118,11 +113,12 @@
   @Override
   public Iterator<PointerKey> getPointerKeysForReflectedFieldRead(InstanceKey I, InstanceKey F) {
     if (F instanceof ConstantKey) {
-      PointerKey ifk = getInstanceFieldPointerKeyForConstant(I, (ConstantKey) F);
+      PointerKey ifk = getInstanceFieldPointerKeyForConstant(I, (ConstantKey<?>) F);
       if (ifk != null) {
-        return new NonNullSingletonIterator<PointerKey>(ifk);
+        return new NonNullSingletonIterator<>(ifk);
       }
     }
-    return new NonNullSingletonIterator<PointerKey>(ReflectedFieldPointerKey.mapped(new ConcreteTypeKey(getFieldNameType(F)), I));
+    PointerKey x = ReflectedFieldPointerKey.mapped(new ConcreteTypeKey(getFieldNameType(F)), I);
+    return new NonNullSingletonIterator<>(x);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/GlobalObjectKey.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/GlobalObjectKey.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/GlobalObjectKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/GlobalObjectKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,8 +23,9 @@
 /**
  * Represents the JavaScript global object.  
  * 
- * @see JSSSAPropagationCallGraphBuilder
+ * @see com.ibm.wala.cast.js.ipa.callgraph.JSSSAPropagationCallGraphBuilder
  */
+@SuppressWarnings({"javadoc", "JavadocReference"})
 public class GlobalObjectKey implements InstanceKey {
 
   private final IClass concreteType;
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/MiscellaneousHacksContextSelector.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/MiscellaneousHacksContextSelector.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/MiscellaneousHacksContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/MiscellaneousHacksContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *****************************************************************************/
 package com.ibm.wala.cast.ipa.callgraph;
 
-import java.util.Iterator;
 import java.util.Set;
 
 import com.ibm.wala.classLoader.CallSiteReference;
@@ -46,8 +45,7 @@
     basePolicy = base;
     specialPolicy = special;
     methodsToSpecialize = HashSetFactory.make();
-    for (int i = 0; i < descriptors.length; i++) {
-      String[] descr = descriptors[i];
+    for (String[] descr : descriptors) {
       switch (descr.length) {
 
       // loader name, loader language, classname, method name, method descr
@@ -82,8 +80,8 @@
         IClass klass = cha.lookupClass(TypeReference.findOrCreate(new ClassLoaderReference(Atom.findOrCreateUnicodeAtom(descr[0]),
             ClassLoaderReference.Java, null), TypeName.string2TypeName(descr[1])));
 
-        for (Iterator M = klass.getDeclaredMethods().iterator(); M.hasNext();) {
-          methodsToSpecialize.add(((IMethod) M.next()).getReference());
+        for (IMethod M : klass.getDeclaredMethods()) {
+          methodsToSpecialize.add(M.getReference());
         }
 
         break;
@@ -93,8 +91,8 @@
       case 1: {
         IClass klass = cha.lookupClass(TypeReference.findOrCreate(ClassLoaderReference.Application, TypeName.string2TypeName(descr[0])));
 
-        for (Iterator M = klass.getDeclaredMethods().iterator(); M.hasNext();) {
-          methodsToSpecialize.add(((IMethod) M.next()).getReference());
+        for (IMethod M : klass.getDeclaredMethods()) {
+          methodsToSpecialize.add(M.getReference());
         }
 
         break;
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ObjectPropertyCatalogKey.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ObjectPropertyCatalogKey.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ObjectPropertyCatalogKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ObjectPropertyCatalogKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,7 +37,7 @@
 
   @Override
   public String toString() {
-    return "[" + getName() + "]";
+    return '[' + getName() + ']';
   }
 
   public InstanceKey getObject() {
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ReflectedFieldPointerKey.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ReflectedFieldPointerKey.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ReflectedFieldPointerKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ReflectedFieldPointerKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,7 +47,7 @@
   }
 
   @Override
-  public String toString() { return "[" + getInstanceKey() + "; " + getFieldIdentifier() + "]"; }
+  public String toString() { return "[" + getInstanceKey() + "; " + getFieldIdentifier() + ']'; }
   
   public static ReflectedFieldPointerKey literal(final String lit, InstanceKey instance) {
     return new ReflectedFieldPointerKey(instance) {
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScopeMappingInstanceKeys.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScopeMappingInstanceKeys.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScopeMappingInstanceKeys.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScopeMappingInstanceKeys.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,7 +25,6 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.CompoundIterator;
 import com.ibm.wala.util.collections.EmptyIterator;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
 import com.ibm.wala.util.collections.Pair;
@@ -89,8 +88,6 @@
      * get the CGNode representing the lexical parent of {@link #creator} with
      * name definer
      * 
-     * @param definer
-     * @return
      */
     public Iterator<CGNode> getFunargNodes(Pair<String, String> name) {
       Collection<CGNode> constructorCallers = getConstructorCallers(this, name);
@@ -98,12 +95,12 @@
       Iterator<CGNode> result = EmptyIterator.instance();
       for (CGNode callerOfConstructor : constructorCallers) {
         if (callerOfConstructor.getMethod().getReference().getDeclaringClass().getName().toString().equals(name.snd)) {
-          result = new CompoundIterator<CGNode>(result, new NonNullSingletonIterator<CGNode>(callerOfConstructor));
+          result = new CompoundIterator<>(result, new NonNullSingletonIterator<>(callerOfConstructor));
         } else {
           PointerKey funcKey = builder.getPointerKeyForLocal(callerOfConstructor, 1);
           for (InstanceKey funcPtr : builder.getPointerAnalysis().getPointsToSet(funcKey)) {
             if (funcPtr instanceof ScopeMappingInstanceKey) {
-              result = new CompoundIterator<CGNode>(result, ((ScopeMappingInstanceKey) funcPtr).getFunargNodes(name));
+              result = new CompoundIterator<>(result, ((ScopeMappingInstanceKey) funcPtr).getFunargNodes(name));
             }
           }
         }
@@ -138,13 +135,9 @@
 
     @Override
     public Iterator<Pair<CGNode, NewSiteReference>> getCreationSites(CallGraph CG) {
-      return new FilterIterator<Pair<CGNode, NewSiteReference>>(
+      return new FilterIterator<>(
           base.getCreationSites(CG),
-          new Predicate<Pair<CGNode, NewSiteReference>>() {
-            @Override public boolean test(Pair<CGNode, NewSiteReference> o) {
-              return o.fst.equals(creator);
-            }
-          });
+          o -> o.fst.equals(creator));
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScriptEntryPoints.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScriptEntryPoints.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScriptEntryPoints.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/ScriptEntryPoints.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,12 +26,12 @@
 
 public abstract class ScriptEntryPoints implements Iterable<Entrypoint> {
 
-  private final IClassHierarchy cha;
+  protected final IClassHierarchy cha;
 
-  private final IClass scriptType;
+  protected final IClass scriptType;
 
-  private class ScriptEntryPoint extends Entrypoint {
-    ScriptEntryPoint(IMethod scriptCodeBody) {
+  public class ScriptEntryPoint extends Entrypoint {
+    public ScriptEntryPoint(IMethod scriptCodeBody) {
       super(scriptCodeBody);
     }
       
@@ -81,7 +81,7 @@
 
   protected abstract CallSiteReference makeScriptSite(IMethod m, int pc);
 
-  protected boolean keep(IMethod method) {
+  protected boolean keep() {
     return true;
   }
   
@@ -93,7 +93,7 @@
       IClass cls = classes.next();
       if (cha.isSubclassOf(cls, scriptType) && !cls.isAbstract()) {
         for (IMethod method : cls.getDeclaredMethods()) {
-          if (keep(method)) {
+          if (keep()) {
             ES.add(new ScriptEntryPoint(method));
           }
         }
@@ -107,7 +107,7 @@
     IClass cls = cha.lookupClass(TypeReference.findOrCreate(scriptType.getClassLoader().getReference(), scriptName));
     assert cls != null && cha.isSubclassOf(cls, scriptType) && !cls.isAbstract() : String.valueOf(cls) + " for " + scriptName;
     for (IMethod method : cls.getDeclaredMethods()) {
-      if (keep(method)) {
+      if (keep()) {
         return new ScriptEntryPoint(method);
       }
     }
@@ -115,4 +115,4 @@
     assert false;
     return null;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/StandardFunctionTargetSelector.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/StandardFunctionTargetSelector.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/StandardFunctionTargetSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/callgraph/StandardFunctionTargetSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,6 @@
 import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
 
 public class StandardFunctionTargetSelector implements MethodTargetSelector {  
@@ -27,6 +26,7 @@
   private final MethodTargetSelector base;
 
   public StandardFunctionTargetSelector(IClassHierarchy cha, MethodTargetSelector base) {
+    assert cha != null;
     this.cha = cha;
     this.base = base;
   }
@@ -66,11 +66,7 @@
     }
   }
 
-  public boolean mightReturnSyntheticMethod(CGNode caller, CallSiteReference site) {
-    return true;
-  }
-
-  public boolean mightReturnSyntheticMethod(MethodReference declaredTarget) {
+  public boolean mightReturnSyntheticMethod() {
     return true;
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/cha/CrossLanguageClassHierarchy.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/cha/CrossLanguageClassHierarchy.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/cha/CrossLanguageClassHierarchy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/cha/CrossLanguageClassHierarchy.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,8 +22,8 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.FieldReference;
@@ -101,11 +101,11 @@
   @Override
   public IClassLoader[] getLoaders() {
     Set<IClassLoader> loaders = HashSetFactory.make();
-    for (Iterator ldrs = analysisScope.getLoaders().iterator(); ldrs.hasNext();) {
-      loaders.add(getLoader((ClassLoaderReference) ldrs.next()));
+    for (ClassLoaderReference loaderReference : analysisScope.getLoaders()) {
+      loaders.add(getLoader(loaderReference));
     }
 
-    return loaders.toArray(new IClassLoader[loaders.size()]);
+    return loaders.toArray(new IClassLoader[0]);
   }
 
   @Override
@@ -121,8 +121,8 @@
   @Override
   public int getNumberOfClasses() {
     int total = 0;
-    for (Iterator ldrs = analysisScope.getLoaders().iterator(); ldrs.hasNext();) {
-      total += getLoader((ClassLoaderReference) ldrs.next()).getNumberOfClasses();
+    for (ClassLoaderReference loaderReference : analysisScope.getLoaders()) {
+      total += getLoader(loaderReference).getNumberOfClasses();
     }
 
     return total;
@@ -264,17 +264,17 @@
       throws ClassHierarchyException {
     Set<Language> languages = scope.getBaseLanguages();
     Map<Atom, IClassHierarchy> hierarchies = HashMapFactory.make();
-    for (Iterator ls = languages.iterator(); ls.hasNext();) {
-      Language L = (Language) ls.next();
+    for (Language L : languages) {
       Set<Language> ll = HashSetFactory.make(L.getDerivedLanguages());
       ll.add(L);
-      hierarchies.put(L.getName(), ClassHierarchy.make(scope, factory, ll));
+      hierarchies.put(L.getName(), ClassHierarchyFactory.make(scope, factory, ll));
     }
 
     return new CrossLanguageClassHierarchy(scope, factory, hierarchies);
   }
 
 /** BEGIN Custom change: unresolved classes */
+  @Override
   public Set<TypeReference> getUnresolvedClasses() {
     return HashSetFactory.make();
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/lexical/LexicalModRef.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/lexical/LexicalModRef.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/lexical/LexicalModRef.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/lexical/LexicalModRef.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,7 +27,6 @@
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.intset.OrdinalSet;
 
 /**
@@ -56,13 +55,7 @@
    */
   public Map<CGNode, OrdinalSet<Pair<CGNode, String>>> computeLexicalRef() {
     Map<CGNode, Collection<Pair<CGNode, String>>> scan = CallGraphTransitiveClosure.collectNodeResults(cg,
-        new Function<CGNode, Collection<Pair<CGNode, String>>>() {
-
-          @Override
-          public Collection<Pair<CGNode, String>> apply(CGNode n) {
-            return scanNodeForLexReads(n);
-          }
-        });
+        this::scanNodeForLexReads);
     return CallGraphTransitiveClosure.transitiveClosure(cg, scan);
   }
 
@@ -73,13 +66,7 @@
    */
   public Map<CGNode, OrdinalSet<Pair<CGNode, String>>> computeLexicalMod() {
     Map<CGNode, Collection<Pair<CGNode, String>>> scan = CallGraphTransitiveClosure.collectNodeResults(cg,
-        new Function<CGNode, Collection<Pair<CGNode, String>>>() {
-
-          @Override
-          public Collection<Pair<CGNode, String>> apply(CGNode n) {
-            return scanNodeForLexWrites(n);
-          }
-        });
+        this::scanNodeForLexWrites);
     return CallGraphTransitiveClosure.transitiveClosure(cg, scan);
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/modref/AstModRef.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/modref/AstModRef.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/modref/AstModRef.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ipa/modref/AstModRef.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,6 +21,8 @@
 import com.ibm.wala.cast.ir.ssa.AstIsDefinedInstruction;
 import com.ibm.wala.cast.ir.ssa.AstLexicalRead;
 import com.ibm.wala.cast.ir.ssa.AstLexicalWrite;
+import com.ibm.wala.cast.ir.ssa.AstPropertyRead;
+import com.ibm.wala.cast.ir.ssa.AstPropertyWrite;
 import com.ibm.wala.cast.ir.ssa.EachElementGetInstruction;
 import com.ibm.wala.cast.ir.ssa.EachElementHasNextInstruction;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -29,11 +31,12 @@
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.modref.ExtendedHeapModel;
 import com.ibm.wala.ipa.modref.ModRef;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 public class AstModRef<T extends InstanceKey> extends ModRef<T> {
 
   @Override
-  public ExtendedHeapModel makeHeapModel(PointerAnalysis pa) {
+  public ExtendedHeapModel makeHeapModel(PointerAnalysis<T> pa) {
     return (AstHeapModel)pa.getHeapModel();
   }
 
@@ -44,6 +47,25 @@
     }
 
     @Override
+    public void visitPropertyRead(AstPropertyRead instruction) {
+      PointerKey obj = h.getPointerKeyForLocal(n, instruction.getObjectRef());
+      PointerKey prop = h.getPointerKeyForLocal(n, instruction.getMemberRef());
+      for(InstanceKey o : pa.getPointsToSet(obj)) {
+        for(InstanceKey p : pa.getPointsToSet(prop)) {
+          for(PointerKey x : Iterator2Iterable.make(h.getPointerKeysForReflectedFieldRead(o, p))) {
+            assert x != null : instruction;
+            result.add(x);
+          }
+        }
+      }
+    }
+
+    @Override
+    public void visitPropertyWrite(AstPropertyWrite instruction) {
+      // do nothing
+    }
+
+    @Override
     public void visitAstLexicalRead(AstLexicalRead instruction) {
 
     }
@@ -90,8 +112,8 @@
   }
 
   @Override
-  protected RefVisitor makeRefVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h) {
-    return new AstRefVisitor<T>(n, result, pa, (AstHeapModel)h);
+  protected RefVisitor<T, ? extends ExtendedHeapModel> makeRefVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h) {
+    return new AstRefVisitor<>(n, result, pa, (AstHeapModel)h);
   }
 
   protected static class AstModVisitor<T extends InstanceKey> 
@@ -147,11 +169,30 @@
     public void visitEcho(AstEchoInstruction inst) {
 
     }
+    
+    @Override
+    public void visitPropertyRead(AstPropertyRead instruction) {
+      // do nothing
+    }
+
+    @Override
+    public void visitPropertyWrite(AstPropertyWrite instruction) {
+      PointerKey obj = h.getPointerKeyForLocal(n, instruction.getObjectRef());
+      PointerKey prop = h.getPointerKeyForLocal(n, instruction.getMemberRef());
+      for(T o : pa.getPointsToSet(obj)) {
+        for(T p : pa.getPointsToSet(prop)) {
+          for(PointerKey x : Iterator2Iterable.make(h.getPointerKeysForReflectedFieldWrite(o, p))) {
+            assert x != null : instruction;
+            result.add(x);
+          }
+        }
+      }
+    }
   }
 
   @Override
-  protected ModVisitor makeModVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h, boolean ignoreAllocHeapDefs) {
-    return new AstModVisitor(n, result, (AstHeapModel)h, pa);
+  protected ModVisitor<T, ? extends ExtendedHeapModel> makeModVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h, boolean ignoreAllocHeapDefs) {
+    return new AstModVisitor<>(n, result, (AstHeapModel)h, pa);
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/cfg/AstInducedCFG.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/cfg/AstInducedCFG.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/cfg/AstInducedCFG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/cfg/AstInducedCFG.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,6 +18,8 @@
 import com.ibm.wala.cast.ir.ssa.AstIsDefinedInstruction;
 import com.ibm.wala.cast.ir.ssa.AstLexicalRead;
 import com.ibm.wala.cast.ir.ssa.AstLexicalWrite;
+import com.ibm.wala.cast.ir.ssa.AstPropertyRead;
+import com.ibm.wala.cast.ir.ssa.AstPropertyWrite;
 import com.ibm.wala.cast.ir.ssa.EachElementGetInstruction;
 import com.ibm.wala.cast.ir.ssa.EachElementHasNextInstruction;
 import com.ibm.wala.cfg.InducedCFG;
@@ -38,6 +40,14 @@
     }
 
     @Override
+    public void visitPropertyRead(AstPropertyRead inst) {
+    }
+
+    @Override
+    public void visitPropertyWrite(AstPropertyWrite inst) {
+    }
+
+    @Override
     public void visitAstLexicalRead(AstLexicalRead inst) {
     }
 
@@ -86,6 +96,14 @@
     }
 
     @Override
+    public void visitPropertyRead(AstPropertyRead inst) {
+    }
+
+    @Override
+    public void visitPropertyWrite(AstPropertyWrite inst) {
+    }
+
+    @Override
     public void visitAstLexicalRead(AstLexicalRead inst) {
     }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/cfg/Util.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/cfg/Util.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/cfg/Util.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/cfg/Util.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,19 +10,20 @@
  *****************************************************************************/
 package com.ibm.wala.cast.ir.cfg;
 
-import java.util.Iterator;
-
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.cfg.IBasicBlock;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 
 public class Util {
 
   public static <I, T extends IBasicBlock<I>> int whichPred(ControlFlowGraph<I, T> CFG, T Y, T X) {
     int i = 0;
-    for (Iterator<?> N = CFG.getPredNodes(Y); N.hasNext(); i++)
-      if (N.next() == X)
+    for (Object N : Iterator2Iterable.make(CFG.getPredNodes(Y))) {
+      if (N == X)
         return i;
+      ++i;
+    }
 
     Assertions.UNREACHABLE();
     return -1;
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractReflectiveGet.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractReflectiveGet.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractReflectiveGet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractReflectiveGet.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,7 +34,7 @@
   }
 
   /**
-   * @see com.ibm.wala.ssa.Instruction#getDef()
+   * @see com.ibm.wala.ssa.SSAInstruction#getDef()
    */
   @Override
   public boolean hasDef() {
@@ -52,7 +52,7 @@
   }
 
   /**
-   * @see com.ibm.wala.ssa.Instruction#getNumberOfUses()
+   * @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses()
    */
   @Override
   public int getNumberOfUses() {
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractReflectivePut.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractReflectivePut.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractReflectivePut.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractReflectivePut.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,7 +34,7 @@
   }
 
   /**
-   * @see com.ibm.wala.ssa.Instruction#getDef()
+   * @see com.ibm.wala.ssa.SSAInstruction#getDef()
    */
   @Override
   public int getDef() {
@@ -42,7 +42,7 @@
   }
 
   /**
-   * @see com.ibm.wala.ssa.Instruction#getNumberOfUses()
+   * @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses()
    */
   @Override
   public int getNumberOfUses() {
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractSSAConversion.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractSSAConversion.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractSSAConversion.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AbstractSSAConversion.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,11 +10,11 @@
  *****************************************************************************/
 package com.ibm.wala.cast.ir.ssa;
 
-import java.util.EmptyStackException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
-import java.util.Stack;
 
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.ISSABasicBlock;
@@ -27,6 +27,7 @@
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.util.collections.ArrayIterator;
 import com.ibm.wala.util.collections.IntStack;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.dominators.DominanceFrontiers;
 
@@ -38,7 +39,7 @@
  * several integral portions of the traditional algorithm:
  * <UL>
  * <LI> The notion of uses and defs of a given instruction.
- * <LI> Assignments (<def> := <use>) that are be copy-propagated away
+ * <LI> Assignments (&lt;def&gt; := &lt;use&gt;) that are be copy-propagated away
  * <LI> Which values are constants---i.e. have no definition.
  * <LI> Any value numbers to be skipped during SSA construction
  * <LI> Special initialization and exit block processing.
@@ -117,7 +118,7 @@
 
   protected AbstractSSAConversion(IR ir, SSAOptions options) {
     this.CFG = ir.getControlFlowGraph();
-    this.DF = new DominanceFrontiers<ISSABasicBlock>(ir.getControlFlowGraph(), ir.getControlFlowGraph().entry());
+    this.DF = new DominanceFrontiers<>(ir.getControlFlowGraph(), ir.getControlFlowGraph().entry());
     this.dominatorTree = DF.dominatorTree();
     this.flags = new int[2 * ir.getControlFlowGraph().getNumberOfNodes()];
     this.instructions = getInstructions(ir);
@@ -143,7 +144,7 @@
   }
 
   protected final Iterator<SSAInstruction> iterateInstructions(IR ir) {
-    return new ArrayIterator<SSAInstruction>(getInstructions(ir));
+    return new ArrayIterator<>(getInstructions(ir));
   }
   
   protected void init() {
@@ -156,11 +157,10 @@
   @SuppressWarnings("unchecked")
   private void makeAssignmentMap() {
     this.assignmentMap = new Set[getMaxValueNumber() + 1];
-    for (Iterator BBs = CFG.iterator(); BBs.hasNext();) {
-      SSACFG.BasicBlock BB = (SSACFG.BasicBlock) BBs.next();
+    for (ISSABasicBlock issaBasicBlock : CFG) {
+      SSACFG.BasicBlock BB = (SSACFG.BasicBlock) issaBasicBlock;
       if (BB.getFirstInstructionIndex() >= 0) {
-        for (Iterator IS = BB.iterator(); IS.hasNext();) {
-          SSAInstruction inst = (SSAInstruction) IS.next();
+        for (SSAInstruction inst : BB) {
           if (inst != null) {
             for (int j = 0; j < getNumberOfDefs(inst); j++) {
               addDefiningBlock(assignmentMap, BB, getDef(inst, j));
@@ -174,7 +174,7 @@
   private void addDefiningBlock(Set<SSACFG.BasicBlock>[] A, SSACFG.BasicBlock BB, int i) {
     if (!skip(i)) {
       if (A[i] == null) {
-        A[i] = new LinkedHashSet<SSACFG.BasicBlock>(2);
+        A[i] = new LinkedHashSet<>(2);
       }
       A[i].add(BB);
     }
@@ -186,13 +186,13 @@
   protected void placePhiNodes() {
     int IterCount = 0;
 
-    for (Iterator Xs = CFG.iterator(); Xs.hasNext();) {
-      SSACFG.BasicBlock X = (SSACFG.BasicBlock) Xs.next();
+    for (ISSABasicBlock issaBasicBlock : CFG) {
+      SSACFG.BasicBlock X = (SSACFG.BasicBlock) issaBasicBlock;
       setHasAlready(X, 0);
       setWork(X, 0);
     }
 
-    Set<BasicBlock> W = new LinkedHashSet<BasicBlock>();
+    Set<BasicBlock> W = new LinkedHashSet<>();
     for (int V = 0; V < assignmentMap.length; V++) {
 
       // some things (e.g. constants) have no defs at all
@@ -205,8 +205,7 @@
 
       IterCount++;
 
-      for (Iterator XS = assignmentMap[V].iterator(); XS.hasNext();) {
-        SSACFG.BasicBlock X = (SSACFG.BasicBlock) XS.next();
+      for (BasicBlock X : assignmentMap[V]) {
         setWork(X, IterCount);
         W.add(X);
       }
@@ -214,8 +213,8 @@
       while (!W.isEmpty()) {
         SSACFG.BasicBlock X = W.iterator().next();
         W.remove(X);
-        for (Iterator YS = DF.getDominanceFrontier(X); YS.hasNext();) {
-          SSACFG.BasicBlock Y = (SSACFG.BasicBlock) YS.next();
+        for (ISSABasicBlock IY : Iterator2Iterable.make(DF.getDominanceFrontier(X))) {
+          SSACFG.BasicBlock Y = (SSACFG.BasicBlock) IY;
           if (getHasAlready(Y) < IterCount) {
             if (isLive(Y, V)) {
               placeNewPhiAt(V, Y);
@@ -286,27 +285,41 @@
     //     SEARCH(Y)
     //   SearchPostRec(X)
     
-    Stack<Frame> stack = new Stack<Frame>();
+    ArrayList<Frame> stack = new ArrayList<>();
     
     SearchPreRec(X);
-    stack.push(new Frame(X, dominatorTree.getSuccNodes(X)));
+    push(stack, new Frame(X, dominatorTree.getSuccNodes(X)));
     
     // invariant: pre-rec phase was performed for elements in the queue. 
     while (!stack.isEmpty()){
-      Frame f = stack.peek();
+      Frame f = peek(stack);
       if (f.i.hasNext()){
         // iterate next child
         BasicBlock next = (BasicBlock) f.i.next();
         SearchPreRec(next);
-        stack.push(new Frame(next, dominatorTree.getSuccNodes(next)));
+        push(stack, new Frame(next, dominatorTree.getSuccNodes(next)));
       } else {
         // finished iterating children, time to "return"
         SearchPostRec(f.X);
-        stack.pop();
+        pop(stack);
       }
     }
   }
 
+   private static <T> void push(ArrayList<T> stack, T elt) {
+    stack.add(elt);
+  }
+  
+  private static <T> T peek(ArrayList<T> stack) {
+    return stack.get(stack.size()-1); 
+  }
+  
+  private static <T> T pop(ArrayList<T> stack) {
+    T e = stack.get(stack.size()-1);
+    stack.remove(stack.size()-1);
+    return e;
+  }
+
   private void SearchPreRec(SSACFG.BasicBlock X) {
     int id = X.getGraphNodeId();
     int Xf = X.getFirstInstructionIndex();
@@ -342,8 +355,8 @@
       repairExit();
     }
 
-    for (Iterator YS = CFG.getSuccNodes(X); YS.hasNext();) {
-      SSACFG.BasicBlock Y = (SSACFG.BasicBlock) YS.next();
+    for (ISSABasicBlock IY : Iterator2Iterable.make(CFG.getSuccNodes(X))) {
+      SSACFG.BasicBlock Y = (SSACFG.BasicBlock) IY;
       int Y_id = Y.getGraphNodeId();
       int j = com.ibm.wala.cast.ir.cfg.Util.whichPred(CFG, Y, X);
       for (int i = 0; i < phiCounts[Y_id]; i++) {
@@ -401,9 +414,7 @@
         int ii = getNextNewValueNumber();
 
         if (valueMap.length <= ii) {
-          int[] nvm = new int[valueMap.length * 2 + ii + 1];
-          System.arraycopy(valueMap, 0, nvm, 0, valueMap.length);
-          valueMap = nvm;
+          valueMap = Arrays.copyOf(valueMap, valueMap.length * 2 + ii + 1);
         }
 
         valueMap[ii] = getDef(inst, j);
@@ -415,7 +426,7 @@
     return newDefs;
   }
 
-  protected boolean skipRepair(SSAInstruction inst, int index) {
+  protected boolean skipRepair(SSAInstruction inst, @SuppressWarnings("unused") int index) {
     if (inst == null)
       return true;
     for (int i = 0; i < getNumberOfDefs(inst); i++)
@@ -448,11 +459,8 @@
       }
     }
 
-    try {
-      return (isConstant(v)) ? v : S[v].peek();
-    } catch (EmptyStackException e) {
-      throw new RuntimeException("while looking at " + v, e);
-    }
+   
+    return (isConstant(v)) ? v : S[v].peek();
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/analysis/LiveAnalysis.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/analysis/LiveAnalysis.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/analysis/LiveAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/analysis/LiveAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,8 +10,6 @@
  *****************************************************************************/
 package com.ibm.wala.cast.ir.ssa.analysis;
 
-import java.util.Iterator;
-
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.dataflow.graph.AbstractMeetOperator;
 import com.ibm.wala.dataflow.graph.BitVectorSolver;
@@ -27,6 +25,7 @@
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.CancelRuntimeException;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.impl.GraphInverter;
@@ -173,12 +172,11 @@
           bits.addAll(s);
         }
         // Include all uses generated by the current basic block into the successor's Phi instructions todo: rephrase
-        for (Iterator<? extends ISSABasicBlock> succBBs = cfg.getSuccNodes(block); succBBs.hasNext();) {
-          ISSABasicBlock succBB = succBBs.next();
+        for (ISSABasicBlock succBB : Iterator2Iterable.make(cfg.getSuccNodes(block))) {
 
           int rval = com.ibm.wala.cast.ir.cfg.Util.whichPred(cfg, succBB, block);
-          for (Iterator<SSAPhiInstruction> sphis = succBB.iteratePhis(); sphis.hasNext();) {
-            bits.add(sphis.next().getUse(rval));
+          for (SSAPhiInstruction sphi : Iterator2Iterable.make(succBB.iteratePhis())) {
+            bits.add(sphi.getUse(rval));
           }
         }
         // For all instructions, in reverse order, 'kill' variables written to and 'gen' variables read.
@@ -190,8 +188,8 @@
           }
         }
         // 'kill' the variables defined by the Phi instructions in the current block.
-        for (Iterator<? extends SSAInstruction> SS = block.iteratePhis(); SS.hasNext();) {
-          processDefs(SS.next(), bits.getBitVector());
+        for (SSAInstruction S : Iterator2Iterable.make(block.iteratePhis())) {
+          processDefs(S, bits.getBitVector());
         }
 
         BitVectorVariable U = new BitVectorVariable();
@@ -209,7 +207,7 @@
     /**
      * Create the solver
      */
-    final BitVectorSolver<ISSABasicBlock> S = new BitVectorSolver<ISSABasicBlock>(new IKilldallFramework<ISSABasicBlock, BitVectorVariable>() {
+    final BitVectorSolver<ISSABasicBlock> S = new BitVectorSolver<>(new IKilldallFramework<ISSABasicBlock, BitVectorVariable>() {
       private final Graph<ISSABasicBlock> G = GraphInverter.invert(cfg);
 
       @Override
@@ -276,11 +274,11 @@
 
       @Override
       public String toString() {
-        StringBuffer s = new StringBuffer();
+        StringBuilder s = new StringBuilder();
         for (int i = 0; i < cfg.getNumberOfNodes(); i++) {
           ISSABasicBlock bb = cfg.getNode(i);
-          s.append("live entering ").append(bb).append(":").append(S.getOut(bb)).append("\n");
-          s.append("live exiting ").append(bb).append(":").append(S.getIn(bb)).append("\n");
+          s.append("live entering ").append(bb).append(':').append(S.getOut(bb)).append('\n');
+          s.append("live exiting ").append(bb).append(':').append(S.getIn(bb)).append('\n');
         }
 
         return s.toString();
@@ -297,11 +295,10 @@
       }
 
       /**
-       * Calculate set of variables live before instruction
-       * @param instr
+       * Calculate set of variables live before instruction {@code instr}.
        *
        * @see <a href="http://en.wikipedia.org/wiki/Data_flow_analysis#Backward_Analysis">
-       * how the 'in' and 'out' variable sets work</a>
+       * how the "in" and "out" variable sets work</a>
        */
       @Override
       public BitVector getLiveBefore(int instr) {
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AssignInstruction.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AssignInstruction.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AssignInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AssignInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,9 +26,6 @@
 
   /**
    * create the assignment v_result := v_val
-   * 
-   * @param result
-   * @param val
    */
   public AssignInstruction(int iindex, int result, int val) {
     super(iindex, null, result, val);
@@ -62,9 +59,6 @@
     ((AstPreInstructionVisitor) v).visitAssign(this);
   }
 
-  /**
-   * @return
-   */
   public int getVal() {
     return getUse(0);
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstAbstractInstructionVisitor.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstAbstractInstructionVisitor.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstAbstractInstructionVisitor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstAbstractInstructionVisitor.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,6 +18,16 @@
 {
 
   @Override
+  public void visitPropertyRead(AstPropertyRead instruction) {
+    
+  }
+
+  @Override
+  public void visitPropertyWrite(AstPropertyWrite instruction) {
+    
+  }
+
+  @Override
   public void visitAstLexicalRead(AstLexicalRead instruction) {
 
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstAssertInstruction.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstAssertInstruction.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstAssertInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstAssertInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -56,7 +56,7 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return "assert " + getValueString(symbolTable, value) + " (fromSpec: " + fromSpecification + ")";
+    return "assert " + getValueString(symbolTable, value) + " (fromSpec: " + fromSpecification + ')';
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstConsumeInstruction.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstConsumeInstruction.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstConsumeInstruction.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstConsumeInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2013 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.cast.ir.ssa;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.debug.Assertions;
+
+public abstract class AstConsumeInstruction extends SSAInstruction {
+  protected final int[] rvals;
+  
+  public AstConsumeInstruction(int iindex, int[] rvals) {
+    super(iindex);
+    this.rvals = rvals;
+  }
+
+  @Override
+  public int getNumberOfDefs() {
+    return 0;
+  }
+
+  @Override
+  public int getDef(int i) {
+    Assertions.UNREACHABLE();
+    return -1;
+  }
+
+  @Override
+  public int getNumberOfUses() {
+    return rvals.length;
+  }
+
+  @Override
+  public int getUse(int i) {
+    return rvals[i];
+  }
+
+  @Override
+  public int hashCode() {
+    int v = 1;
+    for (int rval : rvals) {
+      v *= rval;
+    }
+
+    return v;
+  }
+
+  @Override
+  public boolean isFallThrough() {
+    return true;
+  }
+
+  @Override
+  public Collection<TypeReference> getExceptionTypes() {
+    return Collections.emptySet();
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstEchoInstruction.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstEchoInstruction.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstEchoInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstEchoInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,21 +10,14 @@
  *******************************************************************************/
 package com.ibm.wala.cast.ir.ssa;
 
-import java.util.Collection;
-import java.util.Collections;
-
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAInstructionFactory;
 import com.ibm.wala.ssa.SymbolTable;
-import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.debug.Assertions;
 
-public class AstEchoInstruction extends SSAInstruction {
-  private final int[] rvals;
+public class AstEchoInstruction extends AstConsumeInstruction {
   
   public AstEchoInstruction(int iindex, int[] rvals) {
-    super(iindex);
-    this.rvals = rvals;
+    super(iindex, rvals);
   }
 
   @Override
@@ -32,42 +25,12 @@
     return ((AstInstructionFactory)insts).EchoInstruction(iindex, uses==null? rvals: uses);
   }
 
-  @Override
-  public int getNumberOfDefs() {
-    return 0;
-  }
-
-  @Override
-  public int getDef(int i) {
-    Assertions.UNREACHABLE();
-    return -1;
-  }
-
-  @Override
-  public int getNumberOfUses() {
-    return rvals.length;
-  }
-
-  @Override
-  public int getUse(int i) {
-    return rvals[i];
-  }
-
-  @Override
-  public int hashCode() {
-    int v = 1;
-    for(int i = 0;i < rvals.length; i++) {
-      v *= rvals[i];
-    }
-
-    return v;
-  }
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    StringBuffer result = new StringBuffer("echo/print ");
-    for(int i = 0; i < rvals.length; i++) {
-      result.append(getValueString(symbolTable, rvals[i])).append(" ");
+    StringBuilder result = new StringBuilder("echo/print ");
+    for (int rval : rvals) {
+      result.append(getValueString(symbolTable, rval)).append(' ');
     }
 
     return result.toString();
@@ -78,14 +41,5 @@
     ((AstInstructionVisitor)v).visitEcho(this);
   }
 
-  @Override
-  public boolean isFallThrough() {
-    return true;
-  }
-
-  @Override
-  public Collection<TypeReference> getExceptionTypes() {
-    return Collections.emptySet();
-  }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstInstructionFactory.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstInstructionFactory.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstInstructionFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstInstructionFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,4 +51,10 @@
   
   EachElementHasNextInstruction EachElementHasNextInstruction(int iindex, int lValue, int objectRef, int previousProp);
   
+  AstPropertyRead PropertyRead(int iindex, int result, int objectRef, int memberRef);
+  
+  AstPropertyWrite PropertyWrite(int iindex, int objectRef, int memberRef, int value);
+  
+  AstYieldInstruction YieldInstruction(int iindex, int[] rvals);
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstInstructionVisitor.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstInstructionVisitor.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstInstructionVisitor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstInstructionVisitor.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,24 +12,32 @@
 
 import com.ibm.wala.ssa.SSAInstruction;
 
+@SuppressWarnings("unused") 
 public interface AstInstructionVisitor extends SSAInstruction.IVisitor {
 
-  public void visitAstLexicalRead(AstLexicalRead instruction);
+  default void visitAstLexicalRead(AstLexicalRead instruction){ }
     
-  public void visitAstLexicalWrite(AstLexicalWrite instruction);
+  default void visitAstLexicalWrite(AstLexicalWrite instruction){ }
     
-  public void visitAstGlobalRead(AstGlobalRead instruction);
+  default void visitAstGlobalRead(AstGlobalRead instruction){ }
     
-  public void visitAstGlobalWrite(AstGlobalWrite instruction);
+  default void visitAstGlobalWrite(AstGlobalWrite instruction){ }
 
-  public void visitAssert(AstAssertInstruction instruction);    
+  default void visitAssert(AstAssertInstruction instruction){ }    
 
-  public void visitEachElementGet(EachElementGetInstruction inst);
+  default void visitEachElementGet(EachElementGetInstruction inst){ }
 
-  public void visitEachElementHasNext(EachElementHasNextInstruction inst);
+  default void visitEachElementHasNext(EachElementHasNextInstruction inst){ }
 
-  public void visitIsDefined(AstIsDefinedInstruction inst);
+  default void visitIsDefined(AstIsDefinedInstruction inst){ }
 
-  public void visitEcho(AstEchoInstruction inst);
+  default void visitEcho(AstEchoInstruction inst){ }
+  
+  default void visitYield(AstYieldInstruction inst){ }
+  
+  default void visitPropertyRead(AstPropertyRead instruction){ }
+  
+  default void visitPropertyWrite(AstPropertyWrite instruction){ }
+  
 }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstIRFactory.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstIRFactory.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstIRFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstIRFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,9 @@
 package com.ibm.wala.cast.ir.ssa;
 
 import java.util.Map;
+import java.util.Map.Entry;
 
+import com.ibm.wala.cast.ir.ssa.SSAConversion.SSAInformation;
 import com.ibm.wala.cast.loader.AstMethod;
 import com.ibm.wala.cast.loader.AstMethod.LexicalInformation;
 import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
@@ -35,18 +37,18 @@
 
 public class AstIRFactory<T extends IMethod> implements IRFactory<T> {
 
-  public ControlFlowGraph makeCFG(final IMethod method, final Context context) {
+  public ControlFlowGraph<?, ?> makeCFG(final IMethod method) {
     return ((AstMethod) method).getControlFlowGraph();
   }
 
-  public static class AstDefaultIRFactory extends DefaultIRFactory {
-    private final AstIRFactory astFactory;
+  public static class AstDefaultIRFactory<T extends IMethod> extends DefaultIRFactory {
+    private final AstIRFactory<T> astFactory;
 
     public AstDefaultIRFactory() {
-      this(new AstIRFactory());
+      this(new AstIRFactory<T>());
     }
     
-    public AstDefaultIRFactory(AstIRFactory astFactory) {
+    public AstDefaultIRFactory(AstIRFactory<T> astFactory) {
       this.astFactory = astFactory;
     }
 
@@ -62,23 +64,23 @@
     @Override
     public ControlFlowGraph makeCFG(IMethod method, Context context) {
       if (method instanceof AstMethod) {
-        return astFactory.makeCFG(method, context);
+        return astFactory.makeCFG(method);
       } else {
         return super.makeCFG(method, context);
       }
     }
   }
 
-  public class AstIR extends IR {
+  public static class AstIR extends IR {
     private final LexicalInformation lexicalInfo;
     
-    private final SSA2LocalMap localMap;
+    private final SSAConversion.SSAInformation localMap;
 
     public LexicalInformation lexicalInfo() {
       return lexicalInfo;
     }
     
-    private void setCatchInstructions(SSACFG ssacfg, AbstractCFG oldcfg) {
+    private void setCatchInstructions(SSACFG ssacfg, AbstractCFG<?, ?> oldcfg) {
       for (int i = 0; i < oldcfg.getNumberOfNodes(); i++)
         if (oldcfg.isCatchBlock(i)) {
           ExceptionHandlerBasicBlock B = (ExceptionHandlerBasicBlock) ssacfg.getNode(i);
@@ -87,8 +89,8 @@
         }
     }
 
-    private void setupCatchTypes(SSACFG cfg, Map<IBasicBlock, TypeReference[]> map) {
-      for(Map.Entry<IBasicBlock,TypeReference[]> e : map.entrySet()) {
+    private static void setupCatchTypes(SSACFG cfg, Map<IBasicBlock<SSAInstruction>, TypeReference[]> map) {
+      for(Entry<IBasicBlock<SSAInstruction>, TypeReference[]> e : map.entrySet()) {
         if (e.getKey().getNumber() != -1) {
           ExceptionHandlerBasicBlock bb = (ExceptionHandlerBasicBlock) cfg.getNode(e.getKey().getNumber());
           for (int j = 0; j < e.getValue().length; j++) {
@@ -99,7 +101,7 @@
     }
 
     @Override
-    protected SSA2LocalMap getLocalMap() {
+    public SSAInformation getLocalMap() {
       return localMap;
     }
 
@@ -143,10 +145,9 @@
   public IR makeIR(final IMethod method, final Context context, final SSAOptions options) {
     assert method instanceof AstMethod : method.toString();
   
-    AbstractCFG oldCfg = ((AstMethod) method).cfg();
+    AbstractCFG<?, ?> oldCfg = ((AstMethod) method).cfg();
     SSAInstruction[] oldInstrs = (SSAInstruction[]) oldCfg.getInstructions();
-    SSAInstruction[] instrs = new SSAInstruction[ oldInstrs.length ];
-    System.arraycopy(oldInstrs, 0, instrs, 0, instrs.length);
+    SSAInstruction[] instrs = oldInstrs.clone();
     
     IR newIR = new AstIR((AstMethod) method, instrs, ((AstMethod) method).symbolTable().copy(), new SSACFG(method, oldCfg, instrs),
         options);
@@ -155,7 +156,7 @@
   }
 
   public static IRFactory<IMethod> makeDefaultFactory() {
-    return new AstDefaultIRFactory();
+    return new AstDefaultIRFactory<>();
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstIsDefinedInstruction.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstIsDefinedInstruction.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstIsDefinedInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstIsDefinedInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -92,13 +92,13 @@
   @Override
   public String toString(SymbolTable symbolTable) {
     if (fieldVal == -1 && fieldRef == null) {
-      return getValueString(symbolTable, lval) + " = isDefined(" + getValueString(symbolTable, rval) + ")";
+      return getValueString(symbolTable, lval) + " = isDefined(" + getValueString(symbolTable, rval) + ')';
     } else if (fieldVal == -1) {
-      return getValueString(symbolTable, lval) + " = isDefined(" + getValueString(symbolTable, rval) + "," + fieldRef.getName()
-          + ")";
+      return getValueString(symbolTable, lval) + " = isDefined(" + getValueString(symbolTable, rval) + ',' + fieldRef.getName()
+          + ')';
     } else if (fieldRef == null) {
-      return getValueString(symbolTable, lval) + " = isDefined(" + getValueString(symbolTable, rval) + ","
-          + getValueString(symbolTable, fieldVal) + ")";
+      return getValueString(symbolTable, lval) + " = isDefined(" + getValueString(symbolTable, rval) + ','
+          + getValueString(symbolTable, fieldVal) + ')';
     } else {
       Assertions.UNREACHABLE();
       return null;
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstLexicalAccess.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstLexicalAccess.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstLexicalAccess.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstLexicalAccess.java	2019-01-29 17:08:39.000000000 +0000
@@ -76,7 +76,7 @@
 
     @Override
     public String toString() {
-      return "Access(" + variableName + "@" + variableDefiner + ":" + valueNumber + ")";
+      return "Access(" + variableName + '@' + variableDefiner + ':' + valueNumber + ')';
     }
   }
 
@@ -116,8 +116,8 @@
   @Override
   public int hashCode() {
     int v = 1;
-    for(int i = 0; i < accesses.length; i++) 
-      v *= accesses[i].variableName.hashCode();
+    for (Access accesse : accesses)
+      v *= accesse.variableName.hashCode();
 
     return v;
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstLexicalRead.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstLexicalRead.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstLexicalRead.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstLexicalRead.java	2019-01-29 17:08:39.000000000 +0000
@@ -74,7 +74,7 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < getAccessCount(); i++) {
       Access A = getAccess(i);
       if (i != 0)
@@ -82,7 +82,7 @@
       sb.append(getValueString(symbolTable, A.valueNumber));
       sb.append(" = lexical:");
       sb.append(A.variableName);
-      sb.append("@");
+      sb.append('@');
       sb.append(A.variableDefiner);
     }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstLexicalWrite.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstLexicalWrite.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstLexicalWrite.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstLexicalWrite.java	2019-01-29 17:08:39.000000000 +0000
@@ -74,14 +74,14 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < getAccessCount(); i++) {
       Access A = getAccess(i);
       if (i != 0)
         sb.append(", ");
       sb.append("lexical:");
       sb.append(A.variableName);
-      sb.append("@");
+      sb.append('@');
       sb.append(A.variableDefiner);
       sb.append(" = ");
       sb.append(getValueString(symbolTable, A.valueNumber));
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstPropertyRead.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstPropertyRead.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstPropertyRead.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstPropertyRead.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,36 @@
+package com.ibm.wala.cast.ir.ssa;
+
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.SSAInstructionFactory;
+
+public abstract class AstPropertyRead extends AbstractReflectiveGet {
+
+  public AstPropertyRead(int iindex, int result, int objectRef, int memberRef) {
+    super(iindex, result, objectRef, memberRef);
+  }
+
+  @Override
+  public SSAInstruction copyForSSA(SSAInstructionFactory insts, int[] defs, int[] uses) {
+    return
+      ((AstInstructionFactory)insts).PropertyRead(iindex,
+        defs==null? getDef(): defs[0],
+        uses==null? getObjectRef(): uses[0],
+        uses==null? getMemberRef(): uses[1]);
+  }
+
+  @Override
+  public boolean isPEI() {
+    return true;
+  }
+
+  /**
+  /* (non-Javadoc)
+   * @see com.ibm.wala.ssa.SSAInstruction#visit(com.ibm.wala.ssa.SSAInstruction.IVisitor)
+   */
+  @Override
+  public void visit(IVisitor v) {
+    assert v instanceof AstInstructionVisitor;
+    ((AstInstructionVisitor)v).visitPropertyRead(this);
+  }
+
+}
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstPropertyWrite.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstPropertyWrite.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstPropertyWrite.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstPropertyWrite.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,38 @@
+package com.ibm.wala.cast.ir.ssa;
+
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.SSAInstructionFactory;
+import com.ibm.wala.ssa.SymbolTable;
+
+public abstract class AstPropertyWrite extends AbstractReflectivePut {
+
+  public AstPropertyWrite(int iindex, int objectRef, int memberRef, int value) {
+    super(iindex, objectRef, memberRef, value);
+  }
+
+  @Override
+  public SSAInstruction copyForSSA(SSAInstructionFactory insts, int[] defs, int[] uses) {
+    return ((AstInstructionFactory)insts).PropertyWrite(iindex, uses == null ? getObjectRef() : uses[0], uses == null ? getMemberRef() : uses[1],
+        uses == null ? getValue() : uses[2]);
+  }
+
+  @Override
+  public String toString(SymbolTable symbolTable) {
+    return super.toString(symbolTable) + " = " + getValueString(symbolTable, getValue());
+  }
+
+  /**
+   * @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
+   */
+  @Override
+  public void visit(IVisitor v) {
+    assert v instanceof AstInstructionVisitor;
+    ((AstInstructionVisitor) v).visitPropertyWrite(this);
+  }
+
+  @Override
+  public boolean isPEI() {
+    return true;
+  }
+
+}
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstYieldInstruction.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstYieldInstruction.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstYieldInstruction.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/AstYieldInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2013 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.cast.ir.ssa;
+
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.SSAInstructionFactory;
+import com.ibm.wala.ssa.SymbolTable;
+
+public class AstYieldInstruction extends AstConsumeInstruction {
+  
+  public AstYieldInstruction(int iindex, int[] rvals) {
+    super(iindex, rvals);
+  }
+
+  @Override
+  public SSAInstruction copyForSSA(SSAInstructionFactory insts, int[] defs, int[] uses) {
+    return ((AstInstructionFactory)insts).EchoInstruction(iindex, uses==null? rvals: uses);
+  }
+
+
+  @Override
+  public String toString(SymbolTable symbolTable) {
+    StringBuilder result = new StringBuilder("echo/print ");
+    for (int rval : rvals) {
+      result.append(getValueString(symbolTable, rval)).append(' ');
+    }
+
+    return result.toString();
+  }
+
+  @Override
+  public void visit(IVisitor v) {
+    ((AstInstructionVisitor)v).visitYield(this);
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/CAstBinaryOp.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/CAstBinaryOp.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/CAstBinaryOp.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/CAstBinaryOp.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,6 @@
 package com.ibm.wala.cast.ir.ssa;
 
 import com.ibm.wala.shrikeBT.IBinaryOpInstruction;
-import com.ibm.wala.shrikeBT.IUnaryOpInstruction;
 
 public enum CAstBinaryOp implements IBinaryOpInstruction.IOperator {
     CONCAT, EQ, NE, LT, GE, GT, LE, STRICT_EQ, STRICT_NE;
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/CAstUnaryOp.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/CAstUnaryOp.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/CAstUnaryOp.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/CAstUnaryOp.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *****************************************************************************/
 package com.ibm.wala.cast.ir.ssa;
 
-import com.ibm.wala.shrikeBT.IBinaryOpInstruction;
 import com.ibm.wala.shrikeBT.IUnaryOpInstruction;
 
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/EachElementGetInstruction.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/EachElementGetInstruction.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/EachElementGetInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/EachElementGetInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -59,4 +59,10 @@
   public boolean isFallThrough() {
     return true;
   }
+
+  @Override
+  public boolean isPEI() {
+    return true;
+  }
+  
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/FixedParametersInvokeInstruction.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/FixedParametersInvokeInstruction.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/FixedParametersInvokeInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/FixedParametersInvokeInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -45,9 +45,6 @@
 
   /**
    * Constructor InvokeInstruction. This case for void return values
-   * @param params
-   * @param exception
-   * @param site
    */
   public FixedParametersInvokeInstruction(int iindex, int[] params, int exception, CallSiteReference site) {
     this(iindex, null, params, exception, site);
@@ -69,8 +66,7 @@
 
     int newLvals[] = null;
     if (getNumberOfReturnValues() > 0) {
-      newLvals = new int[results.length];
-      System.arraycopy(results, 0, newLvals, 0, results.length);
+      newLvals = results.clone();
     }
     int newExp = exception;
 
@@ -89,7 +85,7 @@
   }
 
   @Override
-  public int getNumberOfParameters() {
+  public int getNumberOfPositionalParameters() {
     if (params == null) {
       return 0;
     } else {
@@ -107,7 +103,7 @@
 
   @Override
   public int getNumberOfUses() {
-    return getNumberOfParameters();
+    return getNumberOfPositionalParameters();
   }
 
   @Override
@@ -119,7 +115,7 @@
 
   @Override
   public int getUse(int j) {
-    if (j < getNumberOfParameters())
+    if (j < getNumberOfPositionalParameters())
       return params[j];
     else {
       return super.getUse(j);
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/SSAConversion.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/SSAConversion.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/SSAConversion.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/ssa/SSAConversion.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,20 +10,15 @@
  *****************************************************************************/
 package com.ibm.wala.cast.ir.ssa;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.Stack;
 
-import com.ibm.wala.cast.ir.ssa.AstIRFactory.AstIR;
 import com.ibm.wala.cast.ir.ssa.analysis.LiveAnalysis;
 import com.ibm.wala.cast.loader.AstMethod;
 import com.ibm.wala.cast.loader.AstMethod.DebuggingInformation;
 import com.ibm.wala.cast.loader.AstMethod.LexicalInformation;
-import com.ibm.wala.cast.tree.CAstType.Array;
-import com.ibm.wala.ssa.IR.SSA2LocalMap;
 import com.ibm.wala.ssa.SSACFG;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAOptions;
@@ -31,7 +26,7 @@
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.collections.Pair;
+import com.ibm.wala.util.collections.IteratorUtil;
 import com.ibm.wala.util.intset.BitVector;
 import com.ibm.wala.util.intset.BitVectorIntSet;
 import com.ibm.wala.util.intset.IntSet;
@@ -53,7 +48,7 @@
 
   public static boolean DUMP = false;
 
-  private final AstIR ir;
+  private final AstIRFactory.AstIR ir;
 
   private int nextSSAValue;
 
@@ -65,7 +60,7 @@
 
   private final LiveAnalysis.Result liveness;
 
-  private SSA2LocalMap computedLocalMap;
+  private SSAInformation computedLocalMap;
 
   private Map<Integer,Integer> assignments = HashMapFactory.make();
   
@@ -75,13 +70,21 @@
 
   private final Map<Object, CopyPropagationRecord> copyPropagationMap;
 
-  private final Stack<CopyPropagationRecord> R[];
+  private final ArrayList<CopyPropagationRecord> R[];
 
-  private static class UseRecord {
+  public static class UseRecord {
     final int instructionIndex;
 
     final int useNumber;
 
+    public int getInstructionIndex() {
+      return instructionIndex;
+    }
+
+    public int getUseNumber() {
+      return useNumber;
+    }
+
     private UseRecord(int instructionIndex, int useNumber) {
       this.useNumber = useNumber;
       this.instructionIndex = instructionIndex;
@@ -89,7 +92,7 @@
 
     @Override
     public String toString() {
-      return "[use " + useNumber + " of " + instructionIndex + "]";
+      return "[use " + useNumber + " of " + instructionIndex + ']';
     }
     
     @Override
@@ -104,7 +107,7 @@
     }
   }
 
-  private class PhiUseRecord {
+  public class PhiUseRecord {
     final int BBnumber;
 
     final int phiNumber;
@@ -117,9 +120,21 @@
       this.useNumber = useNumber;
     }
 
+    public int getBBnumber() {
+      return BBnumber;
+    }
+
+    public int getPhiNumber() {
+      return phiNumber;
+    }
+
+    public int getUseNumber() {
+      return useNumber;
+    }
+
     @Override
     public String toString() {
-      return "[use " + useNumber + " of " + phiNumber + " of block " + BBnumber + "]";
+      return "[use " + useNumber + " of " + phiNumber + " of block " + BBnumber + ']';
     }
     
     @Override
@@ -134,24 +149,38 @@
     }
   }
 
-  private class CopyPropagationRecord {
+  public class CopyPropagationRecord {
     final int rhs;
 
-    final int lhs;
-    
     final int instructionIndex;
 
     final Set<Object> renamedUses = HashSetFactory.make(2);
 
     private final Set<CopyPropagationRecord> childRecords = HashSetFactory.make(1);
 
+    public int getRhs() {
+      return rhs;
+    }
+
+    public int getInstructionIndex() {
+      return instructionIndex;
+    }
+
+    public Set<Object> getRenamedUses() {
+      return renamedUses;
+    }
+
+    public Set<CopyPropagationRecord> getChildRecords() {
+      return childRecords;
+    }
+
     @Override
     public String toString() {
-      StringBuffer sb = new StringBuffer("<vn " + rhs + " at " + instructionIndex);
+      StringBuilder sb = new StringBuilder("<vn " + rhs + " at " + instructionIndex);
       for (CopyPropagationRecord c : childRecords) {
-        sb.append("\n " + c.toString());
+        sb.append("\n ").append(c.toString());
       }
-      sb.append(">");
+      sb.append('>');
       return sb.toString();
     }
     
@@ -165,23 +194,22 @@
       return (o instanceof CopyPropagationRecord) && instructionIndex == ((CopyPropagationRecord) o).instructionIndex;
     }
 
-    private CopyPropagationRecord(int instructionIndex, int lhs, int rhs) {
+    private CopyPropagationRecord(int instructionIndex, int rhs) {
       if (DEBUG_UNDO)
         System.err.println(("new copy record for instruction #" + instructionIndex + ", rhs value is " + rhs));
       this.rhs = rhs;
-      this.lhs = lhs;
       this.instructionIndex = instructionIndex;
     }
 
     private void addChild(CopyPropagationRecord rec) {
       if (DEBUG_UNDO)
-        System.err.println(("(" + rec.instructionIndex + "," + rec.rhs + ") is a child of (" + instructionIndex + "," + rhs + ")"));
+        System.err.println(("(" + rec.instructionIndex + ',' + rec.rhs + ") is a child of (" + instructionIndex + ',' + rhs + ')'));
       childRecords.add(rec);
     }
 
     private void addUse(int instructionIndex, int use) {
       if (DEBUG_UNDO)
-        System.err.println(("propagated use of (" + this.instructionIndex + "," + this.rhs + ") at use #" + use + " of instruction #"
+        System.err.println(("propagated use of (" + this.instructionIndex + ',' + this.rhs + ") at use #" + use + " of instruction #"
         + instructionIndex));
       UseRecord rec = new UseRecord(instructionIndex, use);
       copyPropagationMap.put(rec, this);
@@ -215,8 +243,7 @@
       if (DEBUG_UNDO)
         System.err.println(("recreating assignment at " + instructionIndex + " as " + lhs + " = " + rhs));
 
-      for (Iterator<Object> uses = renamedUses.iterator(); uses.hasNext();) {
-        Object x = uses.next();
+      for (Object x : renamedUses) {
         if (x instanceof UseRecord) {
           UseRecord use = (UseRecord) x;
           int idx = use.instructionIndex;
@@ -241,8 +268,8 @@
         }
       }
 
-      for (Iterator<CopyPropagationRecord> cs = childRecords.iterator(); cs.hasNext();) {
-        cs.next().undo(lhs);
+      for (CopyPropagationRecord copyPropagationRecord : childRecords) {
+        copyPropagationRecord.undo(lhs);
       }
     }
 
@@ -252,20 +279,20 @@
     }
   }
 
-  public static void undoCopyPropagation(AstIR ir, int instruction, int use) {
-    SSAInformation info = (SSAInformation) ir.getLocalMap();
+  public static void undoCopyPropagation(AstIRFactory.AstIR ir, int instruction, int use) {
+    SSAInformation info = ir.getLocalMap();
     info.undoCopyPropagation(instruction, use);
   }
 
-  public static void copyUse(AstIR ir, int fromInst, int fromUse, int toInst, int toUse) {
-    SSAInformation info = (SSAInformation) ir.getLocalMap();
+  public static void copyUse(AstIRFactory.AstIR ir, int fromInst, int fromUse, int toInst, int toUse) {
+    SSAInformation info = ir.getLocalMap();
     info.copyUse(fromInst, fromUse, toInst, toUse);
   }
 
   //
   // SSA2LocalMap implementation for SSAConversion
   //
-  private class SSAInformation implements com.ibm.wala.ssa.IR.SSA2LocalMap {
+  public class SSAInformation implements com.ibm.wala.ssa.IR.SSA2LocalMap {
     private final String[][] computedNames = new String[valueMap.length][]; 
     
     @Override
@@ -289,7 +316,7 @@
         x.addAll(Arrays.asList(vNames));        
       }
 
-      return computedNames[vn] = x.toArray(new String[x.size()]);
+      return computedNames[vn] = x.toArray(new String[0]);
     }
 
     private void undoCopyPropagation(int instructionIndex, int useNumber) {
@@ -310,16 +337,16 @@
       }
     }
 
-    private Map<Object, CopyPropagationRecord> getCopyHistory() {
+    public Map<Object, CopyPropagationRecord> getCopyHistory() {
       return copyPropagationMap;
     }
     
     @Override
     public String toString() {
-      StringBuffer sb = new StringBuffer( super.toString() );
+      StringBuilder sb = new StringBuilder( super.toString() );
       
       for(Map.Entry<Object, CopyPropagationRecord> x : copyPropagationMap.entrySet()) {
-        sb.append(x.getKey().toString() + " --> " + x.getValue().toString() + "\n");
+        sb.append(x.getKey().toString()).append(" --> ").append(x.getValue().toString()).append('\n');
       }
       
       return sb.toString();
@@ -328,7 +355,7 @@
 
   private CopyPropagationRecord topR(int v) {
     if (R[v] != null && !R[v].isEmpty()) {
-      CopyPropagationRecord rec = R[v].peek();
+      CopyPropagationRecord rec = peek(R[v]);
       if (top(v) == rec.rhs) {
         return rec;
       }
@@ -337,6 +364,14 @@
     return null;
   }
 
+  private static <T> void push(ArrayList<T> stack, T elt) {
+    stack.add(elt);
+  }
+  
+  private static <T> T peek(ArrayList<T> stack) {
+    return stack.get(stack.size()-1); 
+  }
+
   //
   // implementation of AbstractSSAConversion hooks
   //
@@ -439,8 +474,8 @@
 
     assignments.put(rhs, lhs);
     
-    CopyPropagationRecord rec = new CopyPropagationRecord(index, lhs, newRhs);
-    R[lhs].push(rec);
+    CopyPropagationRecord rec = new CopyPropagationRecord(index, newRhs);
+    push(R[lhs], rec);
     if (topR(rhs) != null) {
       topR(rhs).addChild(rec);
     }
@@ -511,30 +546,21 @@
     return true;
   }
 
-  /**
-   * @param ir
-   * @param options
-   */
   @SuppressWarnings("unchecked")
-  private SSAConversion(AstMethod M, AstIR ir, SSAOptions options) {
+  private SSAConversion(AstMethod M, AstIRFactory.AstIR ir, SSAOptions options) {
     super(ir, options);
-    HashMap<Object, CopyPropagationRecord> m = HashMapFactory.make();
-    this.copyPropagationMap = (ir.getLocalMap() instanceof SSAInformation) ? ((SSAInformation) ir.getLocalMap()).getCopyHistory()
-        : m;
-
+    Map<Object, CopyPropagationRecord> m = HashMapFactory.make();
+    this.copyPropagationMap = (ir.getLocalMap() != null) ? ir.getLocalMap().getCopyHistory() : m;    
     this.ir = ir;
     this.debugInfo = M.debugInfo();
     this.lexicalInfo = ir.lexicalInfo();
     this.symtab = ir.getSymbolTable();
-    this.R = new Stack[ir.getSymbolTable().getMaxValueNumber() + 1];
+    this.R = new ArrayList[ir.getSymbolTable().getMaxValueNumber() + 1];
 
     for (int i = 0; i < CFG.getNumberOfNodes(); i++) {
       SSACFG.BasicBlock bb = CFG.getNode(i);
       if (bb.hasPhi()) {
-        int n = 0;
-        for (Iterator X = bb.iteratePhis(); X.hasNext(); n++)
-          X.next();
-        phiCounts[i] = n;
+        phiCounts[i] = IteratorUtil.count(bb.iteratePhis());
       }
     }
 
@@ -543,9 +569,9 @@
     int[] exitLive = lexicalInfo.getExitExposedUses();
     BitVector v = new BitVector();
     if (exitLive != null) {
-      for (int i = 0; i < exitLive.length; i++) {
-        if (exitLive[i] > -1) {
-          v.set(exitLive[i]);
+      for (int element : exitLive) {
+        if (element > -1) {
+          v.set(element);
         }
       }
     }
@@ -569,7 +595,7 @@
   protected void initializeVariables() {
     for (int V = 1; V <= getMaxValueNumber(); V++) {
       if (!skip(V)) {
-        R[V] = new Stack<CopyPropagationRecord>();
+        R[V] = new ArrayList<>();
       }
     }
 
@@ -607,7 +633,7 @@
     super.fail(v);
   }
 
-  public SSA2LocalMap getComputedLocalMap() {
+  public SSAInformation getComputedLocalMap() {
     return computedLocalMap;
   }
 
@@ -622,10 +648,10 @@
           int[] lexicalUses = lexicalInfo.getExposedUses(i);
           if (lexicalUses != null) {
             System.err.print(("extra uses for " + instructions[i] + ": "));
-            for (int j = 0; j < lexicalUses.length; j++) {
-              System.err.print((new Integer(lexicalUses[j]).toString() + " "));
+            for (int lexicalUse : lexicalUses) {
+              System.err.print((Integer.valueOf(lexicalUse).toString() + ' '));
             }
-            System.err.println("");
+            System.err.println();
           }
         }
       }
@@ -634,12 +660,11 @@
     computedLocalMap = new SSAInformation();
   }
 
-  private static IntSet valuesToConvert(AstIR ir) {
+  private static IntSet valuesToConvert(AstIRFactory.AstIR ir) {
     SSAInstruction[] insts = ir.getInstructions();
     MutableIntSet foundOne = new BitVectorIntSet();
     MutableIntSet foundTwo = new BitVectorIntSet();
-    for (int i = 0; i < insts.length; i++) {
-      SSAInstruction inst = insts[i];
+    for (SSAInstruction inst : insts) {
       if (inst != null) {
         for (int j = 0; j < inst.getNumberOfDefs(); j++) {
           int def = inst.getDef(j);
@@ -658,11 +683,11 @@
     return foundTwo;
   }
 
-  public static SSA2LocalMap convert(AstMethod M, AstIR ir, SSAOptions options) {
+  public static SSAInformation convert(AstMethod M, AstIRFactory.AstIR ir, SSAOptions options) {
     return convert(M, ir, options, valuesToConvert(ir));
   }
 
-  public static SSA2LocalMap convert(AstMethod M, final AstIR ir, SSAOptions options, final IntSet values) {
+  public static SSAInformation convert(AstMethod M, final AstIRFactory.AstIR ir, SSAOptions options, final IntSet values) {
     try {
       if (DEBUG) {
         System.err.println(("starting conversion for " + values));
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractClassEntity.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractClassEntity.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractClassEntity.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractClassEntity.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,7 @@
 import com.ibm.wala.cast.tree.CAstQualifier;
 import com.ibm.wala.cast.tree.CAstType;
 
-public class AbstractClassEntity extends AbstractDataEntity {
+public abstract class AbstractClassEntity extends AbstractDataEntity {
   private final CAstType.Class type;
 
   public AbstractClassEntity(CAstType.Class type) {
@@ -50,4 +50,4 @@
   public Collection<CAstQualifier> getQualifiers() {
     return type.getQualifiers();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractCodeEntity.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractCodeEntity.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractCodeEntity.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractCodeEntity.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,10 +14,7 @@
  */
 package com.ibm.wala.cast.ir.translator;
 
-import com.ibm.wala.cast.tree.CAstControlFlowMap;
 import com.ibm.wala.cast.tree.CAstNode;
-import com.ibm.wala.cast.tree.CAstNodeTypeMap;
-import com.ibm.wala.cast.tree.CAstSourcePositionMap;
 import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
 import com.ibm.wala.cast.tree.CAstType;
 import com.ibm.wala.cast.tree.impl.CAstControlFlowRecorder;
@@ -50,17 +47,17 @@
   }
 
   @Override
-  public CAstControlFlowMap getControlFlow() {
+  public CAstControlFlowRecorder getControlFlow() {
     return cfg;
   }
 
   @Override
-  public CAstSourcePositionMap getSourceMap() {
+  public CAstSourcePositionRecorder getSourceMap() {
     return src;
   }
 
   @Override
-  public CAstNodeTypeMap getNodeTypeMap() {
+  public CAstNodeTypeMapRecorder getNodeTypeMap() {
     return types;
   }
 
@@ -89,4 +86,4 @@
   public void setAst(CAstNode Ast) {
     this.Ast = Ast;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractDataEntity.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractDataEntity.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractDataEntity.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractDataEntity.java	2019-01-29 17:08:39.000000000 +0000
@@ -54,4 +54,4 @@
   public int getArgumentCount() {
     return 0;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractEntity.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractEntity.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractEntity.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractEntity.java	2019-01-29 17:08:39.000000000 +0000
@@ -74,4 +74,4 @@
     }
     scopedEntities.get(construct).add(child);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractFieldEntity.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractFieldEntity.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractFieldEntity.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractFieldEntity.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,7 +23,7 @@
 import com.ibm.wala.cast.tree.CAstType;
 import com.ibm.wala.util.debug.Assertions;
 
-class AbstractFieldEntity extends AbstractDataEntity {
+public abstract class AbstractFieldEntity extends AbstractDataEntity {
   private final String name;
 
   private final Set<CAstQualifier> modifiers;
@@ -34,7 +34,7 @@
     this.name = name;
     this.declaringClass = declaringClass;
 
-    this.modifiers = new HashSet<CAstQualifier>();
+    this.modifiers = new HashSet<>();
     if (modifiers != null) {
       this.modifiers.addAll(modifiers);
     }
@@ -68,4 +68,4 @@
   public Collection<CAstQualifier> getQualifiers() {
     return modifiers;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractGlobalEntity.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractGlobalEntity.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractGlobalEntity.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractGlobalEntity.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,7 +21,7 @@
 import com.ibm.wala.cast.tree.CAstQualifier;
 import com.ibm.wala.cast.tree.CAstType;
 
-public class AbstractGlobalEntity extends AbstractDataEntity {
+public abstract class AbstractGlobalEntity extends AbstractDataEntity {
   private final String name;
 
   private final Set<CAstQualifier> modifiers;
@@ -31,7 +31,7 @@
   public AbstractGlobalEntity(String name, CAstType type, Set<CAstQualifier> modifiers) {
     this.name = name;
     this.type = type;
-    this.modifiers = new HashSet<CAstQualifier>();
+    this.modifiers = new HashSet<>();
     if (modifiers != null) {
       this.modifiers.addAll(modifiers);
     }
@@ -42,7 +42,7 @@
     if (type == null) {
       return "global " + name;
     } else {
-      return "global " + name + ":" + type;
+      return "global " + name + ':' + type;
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractScriptEntity.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractScriptEntity.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractScriptEntity.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AbstractScriptEntity.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,7 +22,7 @@
 import com.ibm.wala.cast.tree.CAstQualifier;
 import com.ibm.wala.cast.tree.CAstType;
 
-public class AbstractScriptEntity extends AbstractCodeEntity {
+public abstract class AbstractScriptEntity extends AbstractCodeEntity {
   private final File file;
 
   public AbstractScriptEntity(File file, CAstType type) {
@@ -76,4 +76,4 @@
   public String getFileName() {
     return file.getAbsolutePath();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/AstTranslator.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.cast.ir.translator;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -30,6 +31,7 @@
 import com.ibm.wala.cast.ir.ssa.AstLexicalAccess.Access;
 import com.ibm.wala.cast.ir.ssa.AstLexicalRead;
 import com.ibm.wala.cast.ir.ssa.AstLexicalWrite;
+import com.ibm.wala.cast.ir.ssa.AstYieldInstruction;
 import com.ibm.wala.cast.ir.ssa.CAstBinaryOp;
 import com.ibm.wala.cast.ir.ssa.CAstUnaryOp;
 import com.ibm.wala.cast.ir.ssa.EachElementGetInstruction;
@@ -81,10 +83,11 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.MapUtil;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.debug.Assertions;
-import com.ibm.wala.util.graph.INodeWithNumber;
+import com.ibm.wala.util.debug.UnimplementedError;
 import com.ibm.wala.util.graph.impl.SparseNumberedGraph;
 import com.ibm.wala.util.graph.traverse.DFS;
 import com.ibm.wala.util.intset.IntSet;
@@ -139,8 +142,8 @@
    * fully define a function. invoked after all the code of the function has
    * been processed
    */
-  protected abstract void defineFunction(CAstEntity N, WalkContext definingContext, AbstractCFG cfg, SymbolTable symtab,
-      boolean hasCatchBlock, Map<IBasicBlock, TypeReference[]> catchTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo,
+  protected abstract void defineFunction(CAstEntity N, WalkContext definingContext, AbstractCFG<SSAInstruction, ? extends IBasicBlock<SSAInstruction>> cfg, SymbolTable symtab,
+      boolean hasCatchBlock, Map<IBasicBlock<SSAInstruction>, TypeReference[]> catchTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo,
       DebuggingInformation debugInfo);
 
   /**
@@ -207,6 +210,13 @@
   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
    */
   private ArrayOpHandler arrayOpHandler;
@@ -246,8 +256,7 @@
    * an object literal (e.g., PHP). This method should be overridden to handle
    * such cases.
    */
-  protected void handleUnspecifiedLiteralKey(WalkContext context, CAstNode objectLiteralNode, int unspecifiedLiteralIndex,
-      CAstVisitor<WalkContext> visitor) {
+  protected void handleUnspecifiedLiteralKey() {
     Assertions.UNREACHABLE();
   }
 
@@ -322,9 +331,6 @@
    * 
    * @param node
    *          the AST node representing the read
-   * @param context
-   * @param name
-   * @return
    */
   protected int doLexicallyScopedRead(CAstNode node, WalkContext context, final String name, TypeReference type) {
     return doLexReadHelper(context, name, type);
@@ -341,9 +347,9 @@
   /**
    * we only have this method to avoid having to pass a node parameter at other
    * call sites, as would be required for
-   * {@link #doLexicallyScopedRead(CAstNode, WalkContext, String)}
+   * {@link #doLexicallyScopedRead(CAstNode, WalkContext, String, TypeReference)}
    */
-  private int doLexReadHelper(WalkContext context, final String name, TypeReference type) {
+  private static int doLexReadHelper(WalkContext context, final String name, TypeReference type) {
     Symbol S = context.currentScope().lookup(name);
     Scope definingScope = S.getDefiningScope();
     CAstEntity E = definingScope.getEntity();
@@ -362,15 +368,8 @@
    * entities up to that of the defining scope, since if the name is updated via
    * a call to a nested function, SSA for these entities may need to be updated
    * with the new definition
-   * 
-   * @param context
-   * @param name
-   * @param definingScope
-   * @param E
-   * @param entityName
-   * @param isWrite
    */
-  private void markExposedInEnclosingEntities(WalkContext context, final String name, Scope definingScope, TypeReference type, CAstEntity E,
+  private static void markExposedInEnclosingEntities(WalkContext context, final String name, Scope definingScope, TypeReference type, CAstEntity E,
       final String entityName, boolean isWrite) {
     Scope curScope = context.currentScope();
     while (!curScope.equals(definingScope)) {
@@ -410,7 +409,7 @@
   /**
    * generate instructions for a read of a global
    */
-  protected int doGlobalRead(CAstNode node, WalkContext context, String name, TypeReference type) {
+  protected int doGlobalRead(@SuppressWarnings("unused") CAstNode node, WalkContext context, String name, TypeReference type) {
     // Global variables can be treated as lexicals defined in the CG root, or
     if (treatGlobalsAsLexicallyScoped()) {
 
@@ -451,6 +450,7 @@
   /**
    * generate instructions to check if ref has field, storing answer in result
    */
+  @SuppressWarnings("unused")
   protected void doIsFieldDefined(WalkContext context, int result, int ref, CAstNode field) {
     Assertions.UNREACHABLE();
   }
@@ -470,18 +470,18 @@
    * for handling languages that let you include other source files named
    * statically (e.g., ABAP)
    */
-  protected final Map namedEntityResolver;
+  protected final Map<Object, CAstEntity> namedEntityResolver;
 
   protected final SSAInstructionFactory insts;
 
-  protected AstTranslator(IClassLoader loader, Map namedEntityResolver, ArrayOpHandler arrayOpHandler) {
+  protected AstTranslator(IClassLoader loader, Map<Object, CAstEntity> namedEntityResolver, ArrayOpHandler arrayOpHandler) {
     this.loader = loader;
     this.namedEntityResolver = namedEntityResolver;
     this.arrayOpHandler = arrayOpHandler!=null? arrayOpHandler: this;
     this.insts = loader.getInstructionFactory();
   }
 
-  protected AstTranslator(IClassLoader loader, Map namedEntityResolver) {
+  protected AstTranslator(IClassLoader loader, Map<Object, CAstEntity> namedEntityResolver) {
     this(loader, namedEntityResolver, null);
   }
   
@@ -496,15 +496,27 @@
   private static class AstDebuggingInformation implements DebuggingInformation {
     private Position codeBodyPosition;
 
+    private Position codeBodyNamePosition;
+    
     private String[][] valueNumberNames;
 
     private Position[] instructionPositions;
 
-    AstDebuggingInformation(Position codeBodyPosition, Position[] instructionPositions, String[] names) {
+    private Position[][] operandPositions;
+
+    private Position[] parameterPositions;
+    
+    AstDebuggingInformation(Position codeBodyNamePosition, Position codeBodyPosition, Position[] instructionPositions, Position[][] operandPositions, Position[] parameterPositions, String[] names) {
+      this.codeBodyNamePosition = codeBodyNamePosition;
+      
       this.codeBodyPosition = codeBodyPosition;
 
       this.instructionPositions = instructionPositions;
 
+      this.operandPositions = operandPositions;
+      
+      this.parameterPositions = parameterPositions;
+      
       valueNumberNames = new String[names.length][];
       for (int i = 0; i < names.length; i++) {
         if (names[i] != null) {
@@ -521,14 +533,33 @@
     }
 
     @Override
+    public Position getCodeNamePosition() {
+      return codeBodyNamePosition;
+    }
+
+    @Override
     public Position getInstructionPosition(int instructionOffset) {
       return instructionPositions[instructionOffset];
     }
 
     @Override
+    public Position getOperandPosition(int instructionOffset, int operand) {
+      if (operandPositions[instructionOffset] != null && operandPositions[instructionOffset].length > operand) {
+        return operandPositions[instructionOffset][operand];
+      } else {
+        return null;
+      }
+    }
+
+    @Override
     public String[][] getSourceNamesForValues() {
       return valueNumberNames;
     }
+
+    @Override
+    public Position getParameterPosition(int param) {
+      return parameterPositions[param];
+    }
   }
 
   public static final boolean DEBUG_ALL = false;
@@ -545,7 +576,7 @@
    * basic block implementation used in the CFGs constructed during the
    * IR-generating AST traversal
    */
-  protected final static class PreBasicBlock implements INodeWithNumber, IBasicBlock<SSAInstruction> {
+  protected final static class PreBasicBlock implements IBasicBlock<SSAInstruction> {
     private static final int NORMAL = 0;
 
     private static final int HANDLER = 1;
@@ -562,7 +593,7 @@
 
     private int lastIndex = -2;
 
-    private final List<SSAInstruction> instructions = new ArrayList<SSAInstruction>();
+    private final List<SSAInstruction> instructions = new ArrayList<>();
 
     @Override
     public int getNumber() {
@@ -625,7 +656,7 @@
 
     @Override
     public String toString() {
-      return "PreBB" + number + ":" + firstIndex + ".." + lastIndex;
+      return "PreBB" + number + ':' + firstIndex + ".." + lastIndex;
     }
 
     private List<SSAInstruction> instructions() {
@@ -700,16 +731,15 @@
    * holds the control-flow graph as it is being constructed. When construction
    * is complete, information is stored in an {@link AstCFG}
    */
-  @SuppressWarnings("javadoc")
   public final class IncipientCFG extends SparseNumberedGraph<PreBasicBlock> {
 
     protected class Unwind {
-      private final Map<PreBasicBlock, UnwindState> unwindData = new LinkedHashMap<PreBasicBlock, UnwindState>();
+      private final Map<PreBasicBlock, UnwindState> unwindData = new LinkedHashMap<>();
 
       /**
        * a cache of generated blocks
        */
-      private final Map<Pair<UnwindState, Pair<PreBasicBlock, Boolean>>, PreBasicBlock> code = new LinkedHashMap<Pair<UnwindState, Pair<PreBasicBlock, Boolean>>, PreBasicBlock>();
+      private final Map<Pair<UnwindState, Pair<PreBasicBlock, Boolean>>, PreBasicBlock> code = new LinkedHashMap<>();
 
       void setUnwindState(PreBasicBlock block, UnwindState context) {
         unwindData.put(block, context);
@@ -777,7 +807,8 @@
                 }
               }
             }).copy(sourceContext.unwindAst, sourceContext.astContext.getControlFlow(), sourceContext.astContext.getSourceMap(),
-                sourceContext.astContext.top().getNodeTypeMap(), sourceContext.astContext.top().getAllScopedEntities());
+                sourceContext.astContext.top().getNodeTypeMap(), sourceContext.astContext.top().getAllScopedEntities(), 
+                sourceContext.astContext.top().getArgumentDefaults());
             sourceContext.astVisitor.visit(ast.newRoot(), new DelegatingContext(sourceContext.astContext) {
               @Override
               public CAstSourcePositionMap getSourceMap() {
@@ -820,24 +851,26 @@
 
     private Unwind unwind = null;
 
-    private final List<PreBasicBlock> blocks = new ArrayList<PreBasicBlock>();
+    private final List<PreBasicBlock> blocks = new ArrayList<>();
 
     private PreBasicBlock entryBlock;
     
-    private final Map<CAstNode, PreBasicBlock> nodeToBlock = new LinkedHashMap<CAstNode, PreBasicBlock>();
+    private final Map<CAstNode, PreBasicBlock> nodeToBlock = new LinkedHashMap<>();
 
-    private final Map<Object, Set<Pair<PreBasicBlock, Boolean>>> delayedEdges = new LinkedHashMap<Object, Set<Pair<PreBasicBlock, Boolean>>>();
+    private final Map<Object, Set<Pair<PreBasicBlock, Boolean>>> delayedEdges = new LinkedHashMap<>();
 
     private final Object exitMarker = new Object();
 
-    private final Set<PreBasicBlock> deadBlocks = new LinkedHashSet<PreBasicBlock>();
+    private final Set<PreBasicBlock> deadBlocks = new LinkedHashSet<>();
 
-    private final Set<PreBasicBlock> normalToExit = new LinkedHashSet<PreBasicBlock>();
+    private final Set<PreBasicBlock> normalToExit = new LinkedHashSet<>();
 
-    private final Set<PreBasicBlock> exceptionalToExit = new LinkedHashSet<PreBasicBlock>();
+    private final Set<PreBasicBlock> exceptionalToExit = new LinkedHashSet<>();
 
     private Position[] linePositions = new Position[10];
 
+    private Position[][] operandPositions = new Position[10][];
+    
     private boolean hasCatchBlock = false;
 
     /**
@@ -924,15 +957,15 @@
     void makeExitBlock(PreBasicBlock bb) {
       bb.makeExitBlock();
 
-      for (Iterator<? extends PreBasicBlock> ps = getPredNodes(bb); ps.hasNext();)
-        normalToExit.add(ps.next());
+      for (PreBasicBlock p : Iterator2Iterable.make(getPredNodes(bb)))
+        normalToExit.add(p);
 
       // now that we have created the exit block, add the delayed edges to the
       // exit
       checkForRealizedExitEdges(bb);
     }
 
-    void setCurrentBlockAsHandler() {
+    public void setCurrentBlockAsHandler() {
       currentBlock.makeHandlerBlock();
     }
 
@@ -946,8 +979,7 @@
      */
     private void checkForRealizedEdges(CAstNode n) {
       if (delayedEdges.containsKey(n)) {
-        for (Iterator<Pair<PreBasicBlock, Boolean>> ss = delayedEdges.get(n).iterator(); ss.hasNext();) {
-          Pair<PreBasicBlock, Boolean> s = ss.next();
+        for (Pair<PreBasicBlock, Boolean> s : delayedEdges.get(n)) {
           PreBasicBlock src = s.fst;
           boolean exception = s.snd;
           if (unwind == null) {
@@ -967,8 +999,7 @@
      */
     private void checkForRealizedExitEdges(PreBasicBlock exitBlock) {
       if (delayedEdges.containsKey(exitMarker)) {
-        for (Iterator<Pair<PreBasicBlock, Boolean>> ss = delayedEdges.get(exitMarker).iterator(); ss.hasNext();) {
-          Pair<PreBasicBlock, Boolean> s = ss.next();
+        for (Pair<PreBasicBlock, Boolean> s : delayedEdges.get(exitMarker)) {
           PreBasicBlock src = s.fst;
           boolean exception = s.snd;
           addEdge(src, exitBlock);
@@ -1070,15 +1101,22 @@
      * mark the current position as the position for the instruction
      */
     private void noteLinePosition(int instruction) {
+      ensurePositionSpace(instruction);
+      linePositions[instruction] = getCurrentPosition();
+    }
+
+    private void ensurePositionSpace(int instruction) {
       if (linePositions.length < (instruction + 1)) {
-        Position[] newData = new Position[instruction * 2 + 1];
-        System.arraycopy(linePositions, 0, newData, 0, linePositions.length);
-        linePositions = newData;
+        linePositions = Arrays.copyOf(linePositions, instruction * 2 + 1);
+        operandPositions = Arrays.copyOf(operandPositions, instruction * 2 + 1);
       }
-
-      linePositions[instruction] = getCurrentPosition();
     }
 
+    public void noteOperands(int instruction, Position... operands) {
+      ensurePositionSpace(instruction);
+      operandPositions[instruction] = operands;
+    }
+    
     public void addInstruction(SSAInstruction n) {
       deadBlocks.remove(currentBlock);
 
@@ -1090,7 +1128,7 @@
         currentBlock.setFirstIndex(inst);
       } else {
         for(SSAInstruction priorInst : currentBlock.instructions()) {
-          assert ! (priorInst instanceof SSAGotoInstruction);
+          assert !(priorInst instanceof SSAGotoInstruction);
         }
         assert !(n instanceof SSAGetCaughtExceptionInstruction);
       }
@@ -1110,17 +1148,21 @@
     
     @Override
     public String toString() { 
-      StringBuffer sb = new StringBuffer(super.toString());
+      StringBuilder sb = new StringBuilder(super.toString());
       for(PreBasicBlock b : blocks) {
         if (b.firstIndex > 0) {
-          sb.append("\n" + b);
+          sb.append('\n').append(b);
           for(int i = 0; i < b.instructions.size(); i++) {
-            sb.append("\n" + b.instructions.get(i));
+            sb.append('\n').append(b.instructions.get(i));
           }
         }
       }
       return sb.toString();
     }
+
+    public Position[][] getOperandPositionMap() {
+      return operandPositions;
+    }
   }
 
   /**
@@ -1128,7 +1170,7 @@
    * an {@link IncipientCFG}
    */
   protected final static class AstCFG extends AbstractCFG<SSAInstruction, PreBasicBlock> {
-    private final SSAInstruction[] instructions;
+    private SSAInstruction[] instructions;
 
     private final int[] instructionToBlockMap;
 
@@ -1147,8 +1189,7 @@
                                       EdgeOperation normal,
                                       EdgeOperation except) {
       for (PreBasicBlock src : blocks) {
-        for (Iterator j = icfg.getSuccNodes(src); j.hasNext();) {
-          PreBasicBlock dst = (PreBasicBlock) j.next();
+        for (PreBasicBlock dst : Iterator2Iterable.make(icfg.getSuccNodes(src))) {
           if (isCatchBlock(dst.getNumber()) || (dst.isExitBlock() && icfg.exceptionalToExit.contains(src))) {
             except.act(src, dst);
           }
@@ -1160,7 +1201,7 @@
       }
     }
     
-    private boolean checkBlockBoundaries(IncipientCFG icfg) {
+    private static boolean checkBlockBoundaries(IncipientCFG icfg) {
       MutableIntSet boundaries = IntSetUtil.make();
       for(PreBasicBlock b : icfg) {
         if (b.getFirstInstructionIndex() >= 0) {
@@ -1198,22 +1239,16 @@
       final Map<PreBasicBlock, Collection<PreBasicBlock>> exceptionalEdges = 
         hasDeadBlocks? HashMapFactory.<PreBasicBlock,Collection<PreBasicBlock>>make() : null;
       if (hasDeadBlocks) {
-        transferEdges(liveBlocks, icfg, new EdgeOperation() {
-          @Override
-          public void act(PreBasicBlock src, PreBasicBlock dst) {
-            if (! normalEdges.containsKey(src)) {
-              normalEdges.put(src, HashSetFactory.<PreBasicBlock>make());
-            }
-            normalEdges.get(src).add(dst);
+        transferEdges(liveBlocks, icfg, (src, dst) -> {
+          if (! normalEdges.containsKey(src)) {
+            normalEdges.put(src, HashSetFactory.<PreBasicBlock>make());
+          }
+          normalEdges.get(src).add(dst);
+        }, (src, dst) -> {
+          if (! exceptionalEdges.containsKey(src)) {
+            exceptionalEdges.put(src, HashSetFactory.<PreBasicBlock>make());
           }
-        }, new EdgeOperation() {
-          @Override
-          public void act(PreBasicBlock src, PreBasicBlock dst) {
-            if (! exceptionalEdges.containsKey(src)) {
-              exceptionalEdges.put(src, HashSetFactory.<PreBasicBlock>make());
-            }
-            exceptionalEdges.get(src).add(dst);
-          }         
+          exceptionalEdges.get(src).add(dst);
         });
       }
       
@@ -1270,17 +1305,7 @@
           }
         }
       } else {
-        transferEdges(liveBlocks, icfg, new EdgeOperation() {
-          @Override
-          public void act(PreBasicBlock src, PreBasicBlock dst) {
-            addNormalEdge(src, dst);
-          }
-        }, new EdgeOperation() {
-          @Override
-          public void act(PreBasicBlock src, PreBasicBlock dst) {
-            addExceptionalEdge(src, dst);
-          }
-        });
+        transferEdges(liveBlocks, icfg, this::addNormalEdge, this::addExceptionalEdge);
       }
       
       int x = 0;
@@ -1328,6 +1353,12 @@
           }
         }
       }
+      
+      if (instructions.length > x) {
+        SSAInstruction[] ni = new SSAInstruction[x];
+        System.arraycopy(instructions, 0, ni, 0, x);
+        instructions = ni;
+      }
     }
 
     @Override
@@ -1362,22 +1393,22 @@
     @Override
     public String toString() {
       SSAInstruction[] insts = getInstructions();
-      StringBuffer s = new StringBuffer("CAst CFG of " + functionName);
+      StringBuilder s = new StringBuilder("CAst CFG of " + functionName);
       int params[] = symtab.getParameterValueNumbers();
-      for (int i = 0; i < params.length; i++)
-        s.append(" ").append(params[i]);
-      s.append("\n");
+      for (int param : params)
+        s.append(' ').append(param);
+      s.append('\n');
 
       for (int i = 0; i < getNumberOfNodes(); i++) {
         PreBasicBlock bb = getNode(i);
-        s.append(bb).append("\n");
+        s.append(bb).append('\n');
 
-        for (Iterator ss = getSuccNodes(bb); ss.hasNext();)
-          s.append("    -->" + ss.next() + "\n");
+        for (PreBasicBlock pbb : Iterator2Iterable.make(getSuccNodes(bb)))
+          s.append("    -->").append(pbb).append('\n');
 
         for (int j = bb.getFirstInstructionIndex(); j <= bb.getLastInstructionIndex(); j++)
           if (insts[j] != null)
-            s.append("  " + insts[j].toString(symtab) + "\n");
+            s.append("  ").append(insts[j].toString(symtab)).append('\n');
       }
 
       s.append("-- END --");
@@ -1387,7 +1418,7 @@
 
   public static enum ScopeType {
     LOCAL, GLOBAL, SCRIPT, FUNCTION, TYPE
-  };
+  }
 
   private static final boolean DEBUG = false;
 
@@ -1395,7 +1426,7 @@
     private final String _name;
     private final CAstType type;
     
-    private FinalCAstSymbol(String _name, CAstType type) {
+    public FinalCAstSymbol(String _name, CAstType type) {
       this._name = _name;
       this.type = type;
       assert _name != null;
@@ -1474,6 +1505,8 @@
 
     boolean isFinal();
 
+    boolean isGlobal();
+    
     boolean isInternalName();
 
     Object defaultInitValue();
@@ -1558,14 +1591,14 @@
     public Scope getDefiningScope() {
       return definingScope;
     }
-  };
+  }
 
   public abstract class AbstractScope implements Scope {
     private final Scope parent;
 
-    private final Map<String, Symbol> values = new LinkedHashMap<String, Symbol>();
+    private final Map<String, Symbol> values = new LinkedHashMap<>();
 
-    private final Map<String, String> caseInsensitiveNames = new LinkedHashMap<String, String>();
+    private final Map<String, String> caseInsensitiveNames = new LinkedHashMap<>();
 
     protected abstract SymbolTable getUnderlyingSymtab();
 
@@ -1633,10 +1666,14 @@
     @Override
     public void declare(CAstSymbol s, int vn) {
       String nm = s.name();
-      assert !contains(nm) : nm;
-      if (s.isCaseInsensitive())
-        caseInsensitiveNames.put(nm.toLowerCase(), nm);
-      values.put(nm, makeSymbol(s, vn));
+      if (!contains(nm)) {
+        if (s.isCaseInsensitive())
+          caseInsensitiveNames.put(nm.toLowerCase(), nm);
+        values.put(nm, makeSymbol(s, vn));
+      } else {
+        assert hasImplicitGlobals();
+        assert isGlobal(lookup(nm));
+      }
     }
 
     @Override
@@ -1713,7 +1750,7 @@
 
     @Override
     public abstract CAstEntity getEntity();
-  };
+  }
 
   protected AbstractScope makeScriptScope(final CAstEntity s, Scope parent) {
     return new AbstractScope(parent) {
@@ -1761,7 +1798,7 @@
         return new AbstractSymbol(definer, isFinal, defaultInitValue) {
           @Override
           public String toString() {
-            return nm + ":" + System.identityHashCode(this);
+            return nm + ':' + System.identityHashCode(this);
           }
 
           @Override 
@@ -1782,7 +1819,13 @@
           public boolean isParameter() {
             return false;
           }
-        };
+
+
+          @Override
+          public boolean isGlobal() {
+            return false;
+          }
+};
       }
     };
   }
@@ -1822,10 +1865,10 @@
                 if (yuck == 0) {
                   return ((CAstType.Method)f.getType()).getDeclaringType();
                 } else {
-                  return (CAstType) ((CAstType.Method)f.getType()).getArgumentTypes().get(yuck-1);
+                  return ((CAstType.Method)f.getType()).getArgumentTypes().get(yuck-1);
                 }
               } else if (f.getType() instanceof CAstType.Function) {
-                return (CAstType) ((CAstType.Function)f.getType()).getArgumentTypes().get(yuck);
+                return ((CAstType.Function)f.getType()).getArgumentTypes().get(yuck);
               } else {
                 return topType();
               }
@@ -1925,7 +1968,7 @@
           
           @Override
           public String toString() {
-            return nm + ":" + System.identityHashCode(this);
+            return nm + ':' + System.identityHashCode(this);
           }
 
           @Override
@@ -1942,12 +1985,17 @@
           public boolean isParameter() {
             return vn <= params.length;
           }
+
+          @Override
+          public boolean isGlobal() {
+            return false;
+          }
         };
       }
     };
   }
 
-  private Scope makeLocalScope(CAstNode s, final Scope parent) {
+  private Scope makeLocalScope(final Scope parent) {
     return new AbstractScope(parent) {
       @Override
       public ScopeType type() {
@@ -1988,7 +2036,7 @@
         return new AbstractSymbol(definer, isFinal, defaultInitValue) {
           @Override
           public String toString() {
-            return nm + ":" + System.identityHashCode(this);
+            return nm + ':' + System.identityHashCode(this);
           }
 
           @Override
@@ -2010,14 +2058,19 @@
           public boolean isParameter() {
             return false;
           }
+
+          @Override
+          public boolean isGlobal() {
+            return false;
+          }
         };
       }
     };
   }
 
   private Scope makeGlobalScope() {
-    final Map<String, AbstractSymbol> globalSymbols = new LinkedHashMap<String, AbstractSymbol>();
-    final Map<String, String> caseInsensitiveNames = new LinkedHashMap<String, String>();
+    final Map<String, AbstractSymbol> globalSymbols = new LinkedHashMap<>();
+    final Map<String, String> caseInsensitiveNames = new LinkedHashMap<>();
     return new Scope() {
       
       @Override
@@ -2133,7 +2186,7 @@
           } else if (hasSpecialUndeclaredVariables()) {
             return null;
           } else {
-            throw new Error("cannot find " + name);
+            throw new UnimplementedError("cannot find " + name);
           }
         }
 
@@ -2155,7 +2208,7 @@
         globalSymbols.put(name, new AbstractSymbol(this, s.isFinal(), s.defaultInitValue()) {
           @Override
           public String toString() {
-            return name + ":" + System.identityHashCode(this);
+            return name + ':' + System.identityHashCode(this);
           }
 
           @Override
@@ -2177,14 +2230,19 @@
           public int valueNumber() {
             throw new UnsupportedOperationException();
           }
+
+          @Override
+          public boolean isGlobal() {
+            return true;
+          }
         });
       }
     };
   }
 
   protected Scope makeTypeScope(final CAstEntity type, final Scope parent) {
-    final Map<String, AbstractSymbol> typeSymbols = new LinkedHashMap<String, AbstractSymbol>();
-    final Map<String, String> caseInsensitiveNames = new LinkedHashMap<String, String>();
+    final Map<String, AbstractSymbol> typeSymbols = new LinkedHashMap<>();
+    final Map<String, String> caseInsensitiveNames = new LinkedHashMap<>();
     return new Scope() {
       private final String mapName(String nm) {
         String mappedName = caseInsensitiveNames.get(nm.toLowerCase());
@@ -2280,7 +2338,7 @@
         typeSymbols.put(name, new AbstractSymbol(this, s.isFinal(), s.defaultInitValue()) {
           @Override
           public String toString() {
-            return name + ":" + System.identityHashCode(this);
+            return name + ':' + System.identityHashCode(this);
           }
 
           @Override
@@ -2302,6 +2360,11 @@
           public int valueNumber() {
             throw new UnsupportedOperationException();
           }
+
+          @Override
+          public boolean isGlobal() {
+            return false;
+          }
         });
       }
     };
@@ -2328,11 +2391,11 @@
 
     UnwindState getUnwindState();
 
-    void setCatchType(IBasicBlock bb, TypeReference catchType);
+    void setCatchType(IBasicBlock<SSAInstruction> bb, TypeReference catchType);
 
     void setCatchType(CAstNode catchNode, TypeReference catchType);
 
-    Map<IBasicBlock,TypeReference[]> getCatchTypes();
+    Map<IBasicBlock<SSAInstruction>, TypeReference[]> getCatchTypes();
 
     void addEntityName(CAstEntity e, String name);
     
@@ -2415,7 +2478,7 @@
     }
 
     @Override
-    public void setCatchType(IBasicBlock bb, TypeReference catchType) {
+    public void setCatchType(IBasicBlock<SSAInstruction> bb, TypeReference catchType) {
       parent.setCatchType(bb, catchType);
     }
 
@@ -2425,7 +2488,7 @@
     }
 
     @Override
-    public Map<IBasicBlock, TypeReference[]> getCatchTypes() {
+    public Map<IBasicBlock<SSAInstruction>, TypeReference[]> getCatchTypes() {
       return parent.getCatchTypes();
     }
 
@@ -2530,7 +2593,7 @@
 
     private final IncipientCFG cfg;
 
-    private final Map<IBasicBlock,TypeReference[]> catchTypes = HashMapFactory.make();
+    private final Map<IBasicBlock<SSAInstruction>, TypeReference[]> catchTypes = HashMapFactory.make();
 
     Set<Pair<Pair<String, String>, Integer>> exposedReads;
     Set<Pair<Pair<String, String>, Integer>> exposedWrites;
@@ -2541,7 +2604,7 @@
      * maps nodes in the current function to the value number holding their value
      * or, for constants, to their constant value.
      */
-    private final Map<CAstNode, Integer> results = new LinkedHashMap<CAstNode, Integer>();
+    private final Map<CAstNode, Integer> results = new LinkedHashMap<>();
 
     public CodeEntityContext(WalkContext parent, Scope entityScope, CAstEntity s) {
       super(parent, s);
@@ -2617,20 +2680,19 @@
     }
 
     @Override
-    public void setCatchType(IBasicBlock bb, TypeReference catchType) {
+    public void setCatchType(IBasicBlock<SSAInstruction> bb, TypeReference catchType) {
       if (! catchTypes.containsKey(bb)) {
         catchTypes.put(bb, new TypeReference[] { catchType });
       } else {
         TypeReference[] data = catchTypes.get(bb);
 
-        for (int i = 0; i < data.length; i++) {
-          if (data[i] == catchType) {
+        for (TypeReference element : data) {
+          if (element == catchType) {
             return;
           }
         }
 
-        TypeReference[] newData = new TypeReference[data.length + 1];
-        System.arraycopy(data, 0, newData, 0, data.length);
+        TypeReference[] newData = Arrays.copyOf(data, data.length + 1);
         newData[data.length] = catchType;
 
         catchTypes.put(bb, newData);
@@ -2638,7 +2700,7 @@
     }
 
     @Override
-    public Map<IBasicBlock,TypeReference[]> getCatchTypes() {
+    public Map<IBasicBlock<SSAInstruction>, TypeReference[]> getCatchTypes() {
       return catchTypes;
     }
     
@@ -2649,7 +2711,7 @@
 
     @Override
     public final int setValue(CAstNode n, int v) {
-      results.put(n, new Integer(v));
+      results.put(n, Integer.valueOf(v));
       return v;
     }
 
@@ -2772,27 +2834,20 @@
       for (int i = 0; i < instructionLexicalUses.length; i++) {
         int[] x = original.instructionLexicalUses[i];
         if (x != null) {
-          instructionLexicalUses[i] = new int[x.length];
-          for (int j = 0; j < x.length; j++) {
-            instructionLexicalUses[i][j] = x[j];
-          }
+          instructionLexicalUses[i] = x.clone();
         }
       }
 
       if (original.exitLexicalUses != null) {
         exitLexicalUses = new int[original.exitLexicalUses.length];
-        for (int i = 0; i < exitLexicalUses.length; i++) {
-          exitLexicalUses[i] = original.exitLexicalUses[i];
-        }
+        System.arraycopy(original.exitLexicalUses, 0, exitLexicalUses, 0, exitLexicalUses.length);
       } else {
         exitLexicalUses = null;
       }
 
       if (original.scopingParents != null) {
         scopingParents = new String[original.scopingParents.length];
-        for (int i = 0; i < scopingParents.length; i++) {
-          scopingParents[i] = original.scopingParents[i];
-        }
+        System.arraycopy(original.scopingParents, 0, scopingParents, 0, scopingParents.length);
       } else {
         scopingParents = null;
       }
@@ -2800,7 +2855,7 @@
       readOnlyNames = original.readOnlyNames;
     }
 
-    private int[] buildLexicalUseArray(Pair<Pair<String, String>, Integer>[] exposedNames, String entityName) {
+    private static int[] buildLexicalUseArray(Pair<Pair<String, String>, Integer>[] exposedNames, String entityName) {
       if (exposedNames != null) {
         int[] lexicalUses = new int[exposedNames.length];
         for (int j = 0; j < exposedNames.length; j++) {
@@ -2817,7 +2872,7 @@
       }
     }
 
-    private Pair<String, String>[] buildLexicalNamesArray(Pair<Pair<String, String>, Integer>[] exposedNames) {
+    private static Pair<String, String>[] buildLexicalNamesArray(Pair<Pair<String, String>, Integer>[] exposedNames) {
       if (exposedNames != null) {
         @SuppressWarnings("unchecked")
         Pair<String, String>[] lexicalNames = new Pair[exposedNames.length];
@@ -2831,7 +2886,6 @@
       }
     }
 
-    @SuppressWarnings("unchecked")
     AstLexicalInformation(String entityName, Scope scope, SSAInstruction[] instrs,
         Set<Pair<Pair<String, String>, Integer>> exposedNamesForReadSet,
         Set<Pair<Pair<String, String>, Integer>> exposedNamesForWriteSet, Set<Access> accesses) {
@@ -2839,18 +2893,18 @@
 
       Pair<Pair<String, String>, Integer>[] EN = null;
       if (exposedNamesForReadSet != null || exposedNamesForWriteSet != null) {
-        Set<Pair<Pair<String, String>, Integer>> exposedNamesSet = new HashSet<Pair<Pair<String, String>, Integer>>();
+        Set<Pair<Pair<String, String>, Integer>> exposedNamesSet = new HashSet<>();
         if (exposedNamesForReadSet != null) {
           exposedNamesSet.addAll(exposedNamesForReadSet);
         }
         if (exposedNamesForWriteSet != null) {
           exposedNamesSet.addAll(exposedNamesForWriteSet);
         }
-        EN = exposedNamesSet.toArray(new Pair[exposedNamesSet.size()]);
+        EN = exposedNamesSet.toArray(new Pair[0]);
       }
 
       if (exposedNamesForReadSet != null) {
-        Set<String> readOnlyNames = new HashSet<String>();
+        Set<String> readOnlyNames = new HashSet<>();
         for (Pair<Pair<String, String>, Integer> v : exposedNamesForReadSet) {
           if (entityName != null && entityName.equals(v.fst.snd)) {
             readOnlyNames.add(v.fst.fst);
@@ -2883,14 +2937,13 @@
       }
 
       if (accesses != null) {
-        Set<String> parents = new LinkedHashSet<String>();
-        for (Iterator<Access> ACS = accesses.iterator(); ACS.hasNext();) {
-          Access AC = ACS.next();
+        Set<String> parents = new LinkedHashSet<>();
+        for (Access AC : accesses) {
           if (AC.variableDefiner != null) {
             parents.add(AC.variableDefiner);
           }
         }
-        scopingParents = parents.toArray(new String[parents.size()]);
+        scopingParents = parents.toArray(new String[0]);
 
         if (DEBUG_LEXICAL) {
           System.err.println(("scoping parents of " + scope.getEntity()));
@@ -2931,18 +2984,18 @@
       if (allExposedUses == null) {
         allExposedUses = IntSetUtil.make();
         if (exitLexicalUses != null) {
-          for (int i = 0; i < exitLexicalUses.length; i++) {
-            if (exitLexicalUses[i] > 0) {
-              allExposedUses.add(exitLexicalUses[i]);
+          for (int exitLexicalUse : exitLexicalUses) {
+            if (exitLexicalUse > 0) {
+              allExposedUses.add(exitLexicalUse);
             }
           }
         }
         if (instructionLexicalUses != null) {
-          for (int i = 0; i < instructionLexicalUses.length; i++) {
-            if (instructionLexicalUses[i] != null) {
-              for (int j = 0; j < instructionLexicalUses[i].length; j++) {
-                if (instructionLexicalUses[i][j] > 0) {
-                  allExposedUses.add(instructionLexicalUses[i][j]);
+          for (int[] instructionLexicalUse : instructionLexicalUses) {
+            if (instructionLexicalUse != null) {
+              for (int element : instructionLexicalUse) {
+                if (element > 0) {
+                  allExposedUses.add(element);
                 }
               }
             }
@@ -2985,18 +3038,12 @@
     
       return false;
     }
-  };
+  }
  
   /**
    * record that in entity e, the access is performed.
-   * 
-   * If {@link #useLocalValuesForLexicalVars()} is true, the access is performed
-   * using a local variable. in
-   * {@link #patchLexicalAccesses(SSAInstruction[], Set)}, this information is
-   * used to update an instruction that performs all the accesses at the
-   * beginning of the method and defines the locals.
    */
-  private void addAccess(WalkContext context, CAstEntity e, Access access) {
+  private static void addAccess(WalkContext context, CAstEntity e, Access access) {
     context.getAccesses(e).add(access);
   }
 
@@ -3011,15 +3058,13 @@
    *          an entity in whose scope name is assigned a value number
    * @param declaration
    *          the declaring entity for name (possibly an enclosing scope of
-   *          entity, in the case where entity
-   *          {@link #useLocalValuesForLexicalVars() accesses the name via a
-   *          local})
+   *          entity)
    * @param name
    *          the accessed name
    * @param valueNumber
    *          the name's value number in the scope of entity
    */
-  private void addExposedName(CAstEntity entity, CAstEntity declaration, String name, int valueNumber, boolean isWrite, WalkContext context) {
+  private static void addExposedName(CAstEntity entity, CAstEntity declaration, String name, int valueNumber, boolean isWrite, WalkContext context) {
     Pair<Pair<String, String>, Integer> newVal = Pair.make(Pair.make(name, context.getEntityName(declaration)), valueNumber);
     context.exposeNameSet(entity, isWrite).add(newVal);
   }
@@ -3109,12 +3154,12 @@
       return ConditionalBranchInstruction.Operator.NE;
 
     else {
-      Assertions.UNREACHABLE("cannot translate " + CAstPrinter.print(op));
+      assert false : "cannot translate " + CAstPrinter.print(op);
       return null;
     }
   }
 
-  protected String[] makeNameMap(CAstEntity n, Set<Scope> scopes, SSAInstruction[] insts) {
+  protected String[] makeNameMap(CAstEntity n, Set<Scope> scopes, @SuppressWarnings("unused") SSAInstruction[] insts) {
     // all scopes share the same underlying symtab, which is what
     // size really refers to.
     String[] map = new String[scopes.iterator().next().size() + 1];
@@ -3123,10 +3168,8 @@
       System.err.println(("names array of size " + map.length));
     }
 
-    for (Iterator<Scope> S = scopes.iterator(); S.hasNext();) {
-      Scope scope = S.next();
-      for (Iterator<String> I = scope.getAllNames(); I.hasNext();) {
-        String nm = I.next();
+    for (Scope scope : scopes) {
+      for (String nm : Iterator2Iterable.make(scope.getAllNames())) {
         
         if (ignoreName(nm)) {
           continue;
@@ -3156,7 +3199,7 @@
     return map;
   }
 
-  protected final CAstType getTypeForNode(WalkContext context, CAstNode node) {
+  protected final static CAstType getTypeForNode(WalkContext context, CAstNode node) {
     if (context.top().getNodeTypeMap() != null) {
       return context.top().getNodeTypeMap().getNodeType(node);
     } else {
@@ -3254,8 +3297,10 @@
   protected boolean visitFunctionEntity(CAstEntity n, WalkContext context, WalkContext codeContext, CAstVisitor<WalkContext> visitor) {
     if (n.getAST() == null) // presumably abstract
       declareFunction(n, context);
-    else
-      initFunctionEntity(n, context, codeContext);
+    else {
+      declareFunction(n, context);
+      initFunctionEntity(n, codeContext);
+    }
     return false;
   }
 
@@ -3273,7 +3318,7 @@
   @Override
   protected boolean visitScriptEntity(CAstEntity n, WalkContext context, WalkContext codeContext, CAstVisitor<WalkContext> visitor) {
     declareFunction(n, codeContext);
-    initFunctionEntity(n, context, codeContext);
+    initFunctionEntity(n, codeContext);
     return false;
   }
 
@@ -3282,7 +3327,15 @@
     closeFunctionEntity(n, context, codeContext);
   }
 
-  public void initFunctionEntity(final CAstEntity n, WalkContext parentContext, 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
@@ -3297,9 +3350,10 @@
 
     // create code entry stuff for this entity
     SymbolTable symtab = ((AbstractScope) functionContext.currentScope()).getUnderlyingSymtab();
-    Map<IBasicBlock,TypeReference[]> catchTypes = functionContext.getCatchTypes();
+    Map<IBasicBlock<SSAInstruction>,TypeReference[]> catchTypes = functionContext.getCatchTypes();
     AstCFG cfg = new AstCFG(n, functionContext.cfg(), symtab, insts);
     Position[] line = functionContext.cfg().getLinePositionMap();
+    Position[][] operand = functionContext.cfg().getOperandPositionMap();
     boolean katch = functionContext.cfg().hasCatchBlock();
     boolean monitor = functionContext.cfg().hasMonitorOp();
     String[] nms = makeNameMap(n, functionContext.entityScopes(), cfg.getInstructions());
@@ -3318,15 +3372,19 @@
         functionContext.exposeNameSet(n, true), 
         functionContext.getAccesses(n));
 
-    DebuggingInformation DBG = new AstDebuggingInformation(n.getPosition(), line, nms);
+    Position[] parameterPositions = getParameterPositions(n);
+    
+    DebuggingInformation DBG = new AstDebuggingInformation(n.getNamePosition(), n.getPosition(), line, operand, parameterPositions, nms);
 
     // actually make code body
     defineFunction(n, parentContext, cfg, symtab, katch, catchTypes, monitor, LI, DBG);
   }
 
+  protected abstract Position[] getParameterPositions(CAstEntity e);
+  
   @Override
   protected WalkContext makeLocalContext(WalkContext context, CAstNode n) {
-    return new LocalContext(context, makeLocalScope(n, context.currentScope()));
+    return new LocalContext(context, makeLocalScope(context.currentScope()));
   }
 
   
@@ -3497,7 +3555,7 @@
         + " of loop " + CAstPrinter.print(n, context.top().getSourceMap());
     context.cfg().addInstruction(
         insts.ConditionalBranchInstruction(context.cfg().currentInstruction, translateConditionOpcode(CAstOperator.OP_EQ), null, c.getValue(n.getChild(0)), context
-            .currentScope().getConstantValue(new Integer(0)), -1));
+            .currentScope().getConstantValue(Integer.valueOf(0)), -1));
     PreBasicBlock branchB = context.cfg().getCurrentBlock();
 
     // loop body
@@ -3627,17 +3685,23 @@
     return false;
   }
 
-  private boolean handleBinaryOpThrow(CAstNode n, CAstNode op, WalkContext context) {
-    // currently, only integer / and % throw exceptions
-    boolean mayBeInteger = false;
-    Collection labels = context.getControlFlow().getTargetLabels(n);
+  private static boolean handleBinaryOpThrow(CAstNode n, CAstNode op, WalkContext context) {
+    boolean mayBeInteger = handlePossibleThrow(n, context);
+    if (mayBeInteger) {
+      // currently, only integer / and % throw exceptions
+      assert op == CAstOperator.OP_DIV || op == CAstOperator.OP_MOD : CAstPrinter.print(n);
+    }
+    return mayBeInteger;
+  }
+  
+  private static boolean handlePossibleThrow(CAstNode n, WalkContext context) {
+    boolean mayThrow = false;
+    Collection<Object> labels = context.getControlFlow().getTargetLabels(n);
     if (!labels.isEmpty()) {
-      context.cfg().addPreNode(n, context.getUnwindState());
+       mayThrow = true;
 
-      mayBeInteger = true;
-      assert op == CAstOperator.OP_DIV || op == CAstOperator.OP_MOD : CAstPrinter.print(n);
-      for (Iterator iter = labels.iterator(); iter.hasNext();) {
-        Object label = iter.next();
+      context.cfg().addPreNode(n, context.getUnwindState());
+      for (Object label : labels) {
         CAstNode target = context.getControlFlow().getTarget(n, label);
         if (target == CAstControlFlowMap.EXCEPTION_TO_EXIT)
           context.cfg().addPreEdgeToExit(n, true);
@@ -3646,7 +3710,7 @@
       }
     }
 
-    return mayBeInteger;
+    return mayThrow;
   }
 
   @Override
@@ -3660,10 +3724,12 @@
 
     boolean mayBeInteger = handleBinaryOpThrow(n, n.getChild(0), context);
 
+    int currentInstruction = context.cfg().currentInstruction;
     context.cfg().addInstruction(
-        insts.BinaryOpInstruction(context.cfg().currentInstruction, translateBinaryOpcode(n.getChild(0)), false, false, result, c.getValue(l), c.getValue(r),
+        insts.BinaryOpInstruction(currentInstruction, translateBinaryOpcode(n.getChild(0)), false, false, result, c.getValue(l), c.getValue(r),
             mayBeInteger));
-
+    context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(l), context.getSourceMap().getPosition(r));
+    
     if (mayBeInteger) {
       context.cfg().newBlock(true);
     }
@@ -3682,7 +3748,9 @@
     WalkContext context = c;
     int result = c.getValue(n);
     CAstNode v = n.getChild(1);
-    context.cfg().addInstruction(insts.UnaryOpInstruction(context.cfg().currentInstruction, translateUnaryOpcode(n.getChild(0)), result, c.getValue(v)));
+    int currentInstruction = context.cfg().currentInstruction;
+    context.cfg().addInstruction(insts.UnaryOpInstruction(currentInstruction, translateUnaryOpcode(n.getChild(0)), result, c.getValue(v)));
+    context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(v));
   }
 
   @Override
@@ -3697,8 +3765,11 @@
   protected void leaveArrayLength(CAstNode n, WalkContext c, CAstVisitor<WalkContext> visitor) {
     WalkContext context = c;
     int result = c.getValue(n);
-    int arrayValue = c.getValue(n.getChild(0));
-    context.cfg().addInstruction(insts.ArrayLengthInstruction(context.cfg().currentInstruction, result, arrayValue));
+    CAstNode arrayExpr = n.getChild(0);
+    int arrayValue = c.getValue(arrayExpr);
+    int currentInstruction = context.cfg().currentInstruction;
+    context.cfg().addInstruction(insts.ArrayLengthInstruction(currentInstruction, result, arrayValue));
+    context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(arrayExpr));
   }
 
   @Override
@@ -3751,10 +3822,13 @@
   @Override
   protected void leaveReturn(CAstNode n, WalkContext c, CAstVisitor<WalkContext> visitor) {
     WalkContext context = c;
+    int currentInstruction = context.cfg().currentInstruction;
     if (n.getChildCount() > 0) {
-      context.cfg().addInstruction(insts.ReturnInstruction(context.cfg().currentInstruction, c.getValue(n.getChild(0)), false));
+      CAstNode returnExpr = n.getChild(0);
+      context.cfg().addInstruction(insts.ReturnInstruction(currentInstruction, c.getValue(returnExpr), false));
+      context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(returnExpr));
     } else {
-      context.cfg().addInstruction(insts.ReturnInstruction(context.cfg().currentInstruction));
+      context.cfg().addInstruction(insts.ReturnInstruction(currentInstruction));
     }
 
     context.cfg().addPreNode(n, context.getUnwindState());
@@ -3770,14 +3844,21 @@
   @Override
   protected void leaveIfgoto(CAstNode n, WalkContext c, CAstVisitor<WalkContext> visitor) {
     WalkContext context = c;
+    int currentInstruction = context.cfg().currentInstruction;
     if (n.getChildCount() == 1) {
+      CAstNode arg = n.getChild(0);
       context.cfg().addInstruction(
-          insts.ConditionalBranchInstruction(context.cfg().currentInstruction, translateConditionOpcode(CAstOperator.OP_NE), null, c.getValue(n.getChild(0)), context
-              .currentScope().getConstantValue(new Integer(0)), -1));
+          insts.ConditionalBranchInstruction(currentInstruction, translateConditionOpcode(CAstOperator.OP_NE), null, c.getValue(arg), context
+              .currentScope().getConstantValue(Integer.valueOf(0)), -1));
+      context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(arg));
     } else if (n.getChildCount() == 3) {
+      CAstNode op = n.getChild(0);
+      CAstNode leftExpr = n.getChild(1);
+      CAstNode rightExpr = n.getChild(2);
       context.cfg().addInstruction(
-          insts.ConditionalBranchInstruction(context.cfg().currentInstruction, translateConditionOpcode(n.getChild(0)), null, c.getValue(n.getChild(1)),
-              c.getValue(n.getChild(2)), -1));
+          insts.ConditionalBranchInstruction(currentInstruction, translateConditionOpcode(op), null, c.getValue(leftExpr),
+              c.getValue(rightExpr), -1));
+      context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(leftExpr), context.getSourceMap().getPosition(rightExpr));
     } else {
       Assertions.UNREACHABLE();
     }
@@ -3798,18 +3879,19 @@
     WalkContext context = c;
     if (!context.cfg().isDeadBlock(context.cfg().getCurrentBlock())) {
       context.cfg().addPreNode(n, context.getUnwindState());
-           context.cfg().addPreEdge(n, context.getControlFlow().getTarget(n, null), false);
+      CAstControlFlowMap controlFlowMap = context.getControlFlow();
+      context.cfg().addPreEdge(n, controlFlowMap.getTarget(n, null), false);
       context.cfg().addInstruction(insts.GotoInstruction(context.cfg().currentInstruction, -1));            
-      if (context.getControlFlow().getTarget(n, null) == null) {
-        assert context.getControlFlow().getTarget(n, null) != null : context.getControlFlow() + " does not map " + n + " ("
-            + context.getSourceMap().getPosition(n) + ")";
+      if (controlFlowMap.getTarget(n, null) == null) {
+        assert controlFlowMap.getTarget(n, null) != null : controlFlowMap + " does not map " + n + " ("
+            + context.getSourceMap().getPosition(n) + ')';
       }
       context.cfg().newBlock(false);
     }
   }
 
   @Override
-  protected boolean visitLabelStmt(CAstNode n, WalkContext c, CAstVisitor<WalkContext> visitor) {
+  protected boolean visitLabelStmt(CAstNode n, WalkContext c, CAstVisitor<WalkContext> visitor) {    
     WalkContext context = c;
     if (!context.getControlFlow().getSourceNodes(n).isEmpty()) {
       context.cfg().newBlock(true);
@@ -3828,16 +3910,21 @@
     // conditional
     CAstNode l = n.getChild(0);
     visitor.visit(l, context, visitor);
+    int currentInstruction = context.cfg().getCurrentInstruction();
     context.cfg().addInstruction(
-        insts.ConditionalBranchInstruction(context.cfg().currentInstruction, translateConditionOpcode(CAstOperator.OP_EQ), null, c.getValue(l), context.currentScope()
-            .getConstantValue(new Integer(0)), -1));
+        insts.ConditionalBranchInstruction(currentInstruction, translateConditionOpcode(CAstOperator.OP_EQ), null, c.getValue(l), context.currentScope()
+            .getConstantValue(Integer.valueOf(0)), -1));
+    context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(l));
     PreBasicBlock srcB = context.cfg().getCurrentBlock();
     // true clause
     context.cfg().newBlock(true);
     CAstNode r = n.getChild(1);
     visitor.visit(r, context, visitor);
-    if (isExpr)
-      context.cfg().addInstruction(new AssignInstruction(context.cfg().currentInstruction, c.getValue(n), c.getValue(r)));
+    if (isExpr) {
+      currentInstruction = context.cfg().getCurrentInstruction();
+      context.cfg().addInstruction(new AssignInstruction(currentInstruction, c.getValue(n), c.getValue(r)));
+      context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(r));
+    }
     if (n.getChildCount() == 3) {
       if (!context.cfg().isDeadBlock(context.cfg().getCurrentBlock())) {
         context.cfg().addInstruction(insts.GotoInstruction(context.cfg().currentInstruction, -1));
@@ -3849,9 +3936,13 @@
 
       falseB = context.cfg().getCurrentBlock();
       CAstNode f = n.getChild(2);
+      context.cfg().deadBlocks.remove(falseB);
       visitor.visit(f, context, visitor);
-      if (isExpr)
-        context.cfg().addInstruction(new AssignInstruction(context.cfg().currentInstruction, c.getValue(n), c.getValue(f)));
+      if (isExpr) {
+        currentInstruction = context.cfg().currentInstruction;
+        context.cfg().addInstruction(new AssignInstruction(currentInstruction, c.getValue(n), c.getValue(f)));
+        context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(f));
+      }
     }
 
     // end
@@ -3938,7 +4029,7 @@
   protected void leaveObjectLiteralFieldInit(CAstNode n, int i, WalkContext c, CAstVisitor<WalkContext> visitor) {
     WalkContext context = c;
     if (n.getChild(i).getKind() == CAstNode.EMPTY) {
-      handleUnspecifiedLiteralKey(context, n, i, visitor);
+      handleUnspecifiedLiteralKey();
     }
     doFieldWrite(context, c.getValue(n.getChild(0)), n.getChild(i), n, c.getValue(n.getChild(i + 1)));
   }
@@ -3962,7 +4053,7 @@
   protected void leaveArrayLiteralInitElement(CAstNode n, int i, WalkContext c, CAstVisitor<WalkContext> visitor) {
     WalkContext context = c;
     arrayOpHandler.doArrayWrite(context, c.getValue(n.getChild(0)), n,
-        new int[] { context.currentScope().getConstantValue(new Integer(i - 1)) }, c.getValue(n.getChild(i)));
+        new int[] { context.currentScope().getConstantValue(Integer.valueOf(i - 1)) }, c.getValue(n.getChild(i)));
   }
 
   @Override
@@ -3999,7 +4090,7 @@
     }
   }
 
-  private int[] gatherArrayDims(WalkContext c, CAstNode n) {
+  private static int[] gatherArrayDims(WalkContext c, CAstNode n) {
     int numDims = n.getChildCount() - 2;
     int[] dims = new int[numDims];
     for (int i = 0; i < numDims; i++)
@@ -4008,7 +4099,7 @@
   }
 
   /* Prereq: a.getKind() == ASSIGN_PRE_OP || a.getKind() == ASSIGN_POST_OP */
-  protected int processAssignOp(CAstNode n, CAstNode v, CAstNode a, int temp, boolean post, WalkContext c) {
+  protected int processAssignOp(CAstNode v, CAstNode a, int temp, WalkContext c) {
     WalkContext context = c;
     int rval = c.getValue(v);
     CAstNode op = a.getChild(2);
@@ -4016,9 +4107,11 @@
 
     boolean mayBeInteger = handleBinaryOpThrow(a, op, context);
 
+    int currentInstruction = context.cfg().getCurrentInstruction();
     context.cfg().addInstruction(
-        insts.BinaryOpInstruction(context.cfg().currentInstruction, translateBinaryOpcode(op), false, false, temp2, temp, rval, mayBeInteger));
-
+        insts.BinaryOpInstruction(currentInstruction, translateBinaryOpcode(op), false, false, temp2, temp, rval, mayBeInteger));
+    context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(a.getChild(0)), context.getSourceMap().getPosition(v));
+    
     if (mayBeInteger) {
       context.cfg().newBlock(true);
     }
@@ -4050,7 +4143,7 @@
     int temp = context.currentScope().allocateTempValue();
     int[] dims = gatherArrayDims(c, n);
     arrayOpHandler.doArrayRead(context, temp, c.getValue(n.getChild(0)), n, dims);
-    int rval = processAssignOp(n, v, a, temp, !pre, c);
+    int rval = processAssignOp(v, a, temp, c);
     c.setValue(n, pre ? rval : temp);
     arrayOpHandler.doArrayWrite(context, c.getValue(n.getChild(0)), n, dims, rval);
   }
@@ -4068,9 +4161,6 @@
     doFieldWrite(context, c.getValue(n.getChild(0)), n.getChild(1), n, rval);
   }
 
-  protected void processObjectRefAssignOp(CAstNode n, CAstNode v, CAstNode a, WalkContext c) {
-  }
-
   @Override
   protected boolean visitObjectRefAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, WalkContext c, CAstVisitor<WalkContext> visitor) { /* empty */
     return false;
@@ -4081,7 +4171,7 @@
     WalkContext context = c;
     int temp = context.currentScope().allocateTempValue();
     doFieldRead(context, temp, c.getValue(n.getChild(0)), n.getChild(1), n);
-    int rval = processAssignOp(n, v, a, temp, !pre, c);
+    int rval = processAssignOp(v, a, temp, c);
     c.setValue(n, pre ? rval : temp);
     doFieldWrite(context, c.getValue(n.getChild(0)), n.getChild(1), n, rval);
   }
@@ -4158,11 +4248,13 @@
 
     if (!pre) {
       int ret = context.currentScope().allocateTempValue();
-      context.cfg().addInstruction(new AssignInstruction(context.cfg().currentInstruction, ret, temp));
+      int currentInstruction = context.cfg().getCurrentInstruction();
+      context.cfg().addInstruction(new AssignInstruction(currentInstruction, ret, temp));
+      context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(n.getChild(0)));
       c.setValue(n, ret);
     }
 
-    int rval = processAssignOp(n, v, a, temp, !pre, c);
+    int rval = processAssignOp(v, a, temp, c);
 
     if (pre) {
       c.setValue(n, rval);
@@ -4177,12 +4269,10 @@
     }
   }
 
-  private boolean isSimpleSwitch(CAstNode n, WalkContext context, CAstVisitor<WalkContext> visitor) {
+  private static boolean isSimpleSwitch(CAstNode n, WalkContext context, CAstVisitor<WalkContext> visitor) {
     CAstControlFlowMap ctrl = context.getControlFlow();
-    Collection caseLabels = ctrl.getTargetLabels(n);
-    for (Iterator kases = caseLabels.iterator(); kases.hasNext();) {
-      Object x = kases.next();
-
+    Collection<Object> caseLabels = ctrl.getTargetLabels(n);
+    for (Object x : caseLabels) {
       if (x == CAstControlFlowMap.SWITCH_DEFAULT)
         continue;
 
@@ -4218,7 +4308,7 @@
 
     boolean hasExplicitDefault = ctrl.getTarget(n, CAstControlFlowMap.SWITCH_DEFAULT) != null;
 
-    Collection caseLabels = ctrl.getTargetLabels(n);
+    Collection<Object> caseLabels = ctrl.getTargetLabels(n);
     int cases = caseLabels.size();
     if (hasExplicitDefault)
       cases--;
@@ -4226,7 +4316,9 @@
 
     int defaultBlock = context.cfg().getCurrentBlock().getGraphNodeId() + 1;
 
-    context.cfg().addInstruction(insts.SwitchInstruction(context.cfg().currentInstruction, v, defaultBlock, casesAndLabels));
+    int currentInstruction = context.cfg().getCurrentInstruction();
+    context.cfg().addInstruction(insts.SwitchInstruction(currentInstruction, v, defaultBlock, casesAndLabels));
+    context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(switchValue));
     context.cfg().addPreNode(n, context.getUnwindState());
     // PreBasicBlock switchB = context.cfg().getCurrentBlock();
     context.cfg().newBlock(true);
@@ -4244,8 +4336,7 @@
     }
 
     int cn = 0;
-    for (Iterator kases = caseLabels.iterator(); kases.hasNext();) {
-      Object x = kases.next();
+    for (Object x : caseLabels) {
       CAstNode target = ctrl.getTarget(n, x);
       if (x == CAstControlFlowMap.SWITCH_DEFAULT) {
         context.cfg().addEdge(defaultHackBlock, context.cfg().getBlock(target));
@@ -4269,13 +4360,14 @@
     int v = context.getValue(switchValue);
 
     Collection<Object> caseLabels = ctrl.getTargetLabels(n);
-    Map<Object, PreBasicBlock> labelToBlock = new LinkedHashMap<Object, PreBasicBlock>();
-    for (Iterator kases = caseLabels.iterator(); kases.hasNext();) {
-      Object x = kases.next();
+    Map<Object, PreBasicBlock> labelToBlock = new LinkedHashMap<>();
+    for (Object x : caseLabels) {
       if (x != CAstControlFlowMap.SWITCH_DEFAULT) {
         visitor.visit((CAstNode) x, context, visitor);
+        int currentInstruction = context.cfg().getCurrentInstruction();
         context.cfg().addInstruction(
-            insts.ConditionalBranchInstruction(context.cfg().currentInstruction, translateConditionOpcode(CAstOperator.OP_EQ), null, v, context.getValue((CAstNode) x), -1));
+            insts.ConditionalBranchInstruction(currentInstruction, translateConditionOpcode(CAstOperator.OP_EQ), null, v, context.getValue((CAstNode) x), -1));
+        context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(switchValue), context.getSourceMap().getPosition((CAstNode)x));
         labelToBlock.put(x, context.cfg().getCurrentBlock());
         context.cfg().newBlock(true);
       }
@@ -4289,8 +4381,7 @@
     visitor.visit(switchBody, context, visitor);
     context.cfg().newBlock(true);
 
-    for (Iterator kases = caseLabels.iterator(); kases.hasNext();) {
-      Object x = kases.next();
+    for (Object x : caseLabels) {
       if (x != CAstControlFlowMap.SWITCH_DEFAULT) {
         CAstNode target = ctrl.getTarget(n, x);
         context.cfg().addEdge(labelToBlock.get(x), context.cfg().getBlock(target));
@@ -4338,9 +4429,8 @@
     context.cfg().addPreNode(n, context.getUnwindState());
     context.cfg().newBlock(false);
 
-    Collection labels = context.getControlFlow().getTargetLabels(n);
-    for (Iterator iter = labels.iterator(); iter.hasNext();) {
-      Object label = iter.next();
+    Collection<Object> labels = context.getControlFlow().getTargetLabels(n);
+    for (Object label : labels) {
       CAstNode target = context.getControlFlow().getTarget(n, label);
       if (target == CAstControlFlowMap.EXCEPTION_TO_EXIT)
         context.cfg().addPreEdgeToExit(n, true);
@@ -4499,13 +4589,16 @@
   protected void leaveAssert(CAstNode n, WalkContext c, CAstVisitor<WalkContext> visitor) {
     WalkContext context = c;
     boolean fromSpec = true;
-    int result = c.getValue(n.getChild(0));
+    CAstNode assertion = n.getChild(0);
+    int result = c.getValue(assertion);
     if (n.getChildCount() == 2) {
       assert n.getChild(1).getKind() == CAstNode.CONSTANT;
       assert n.getChild(1).getValue() instanceof Boolean;
       fromSpec = n.getChild(1).getValue().equals(Boolean.TRUE);
     }
-    context.cfg().addInstruction(new AstAssertInstruction(context.cfg().currentInstruction, result, fromSpec));
+    int currentInstruction = context.cfg().currentInstruction;
+    context.cfg().addInstruction(new AstAssertInstruction(currentInstruction, result, fromSpec));
+    context.cfg().noteOperands(currentInstruction, context.getSourceMap().getPosition(assertion));
   }
 
   @Override
@@ -4517,7 +4610,13 @@
   protected void leaveEachElementGet(CAstNode n, WalkContext c, CAstVisitor<WalkContext> visitor) {
     int result = c.currentScope().allocateTempValue();
     c.setValue(n, result);
-    c.cfg().addInstruction(new EachElementGetInstruction(c.cfg().currentInstruction, result, c.getValue(n.getChild(0)), c.getValue(n.getChild(1))));
+    int currentInstruction = c.cfg().getCurrentInstruction();
+    c.cfg().addInstruction(new EachElementGetInstruction(currentInstruction, result, c.getValue(n.getChild(0)), c.getValue(n.getChild(1))));
+    c.cfg().noteOperands(currentInstruction, c.getSourceMap().getPosition(n.getChild(0)), c.getSourceMap().getPosition(n.getChild(1)));
+
+    if (handlePossibleThrow(n, c)) {
+      c.cfg().newBlock(true);
+    }
   }
 
   @Override
@@ -4529,7 +4628,9 @@
   protected void leaveEachElementHasNext(CAstNode n, WalkContext c, CAstVisitor<WalkContext> visitor) {
     int result = c.currentScope().allocateTempValue();
     c.setValue(n, result);
-    c.cfg().addInstruction(new EachElementHasNextInstruction(c.cfg().currentInstruction, result, c.getValue(n.getChild(0)), c.getValue(n.getChild(1))));
+    int currentInstruction = c.cfg().getCurrentInstruction();
+    c.cfg().addInstruction(new EachElementHasNextInstruction(currentInstruction, result, c.getValue(n.getChild(0)), c.getValue(n.getChild(1))));
+    c.cfg().noteOperands(currentInstruction, c.getSourceMap().getPosition(n.getChild(0)), c.getSourceMap().getPosition(n.getChild(1)));
   }
 
   @Override
@@ -4559,11 +4660,14 @@
   @Override
   protected void leaveIsDefinedExpr(CAstNode n, WalkContext c, CAstVisitor<WalkContext> visitor) {
     WalkContext wc = c;
-    int ref = c.getValue(n.getChild(0));
+    CAstNode refExpr = n.getChild(0);
+    int ref = c.getValue(refExpr);
     int result = wc.currentScope().allocateTempValue();
     c.setValue(n, result);
     if (n.getChildCount() == 1) {
-      wc.cfg().addInstruction(new AstIsDefinedInstruction(wc.cfg().currentInstruction, result, ref));
+      int currentInstruction = wc.cfg().getCurrentInstruction();
+      wc.cfg().addInstruction(new AstIsDefinedInstruction(currentInstruction, result, ref));
+      wc.cfg().noteOperands(currentInstruction, wc.getSourceMap().getPosition(refExpr));
     } else {
       doIsFieldDefined(wc, result, ref, n.getChild(1));
     }
@@ -4579,17 +4683,42 @@
     WalkContext wc = c;
 
     int rvals[] = new int[n.getChildCount()];
+    Position rposs[] = new Position[n.getChildCount()];
     for (int i = 0; i < n.getChildCount(); i++) {
       rvals[i] = c.getValue(n.getChild(i));
+      rposs[i] = c.getSourceMap().getPosition(n.getChild(i));
     }
 
-    wc.cfg().addInstruction(new AstEchoInstruction(wc.cfg().currentInstruction, rvals));
+    int currentInstruction = wc.cfg().getCurrentInstruction();
+    wc.cfg().addInstruction(new AstEchoInstruction(currentInstruction, rvals));
+    wc.cfg().noteOperands(currentInstruction, rposs);
+  }
+
+  @Override
+  protected boolean visitYield(CAstNode n, WalkContext c, CAstVisitor<WalkContext> visitor) {
+    return false;
+  }
+
+  @Override
+  protected void leaveYield(CAstNode n, WalkContext c, CAstVisitor<WalkContext> visitor) {
+    WalkContext wc = c;
+
+    int rvals[] = new int[n.getChildCount()];
+    Position rposs[] = new Position[n.getChildCount()];
+    for (int i = 0; i < n.getChildCount(); i++) {
+      rvals[i] = c.getValue(n.getChild(i));
+      rposs[i] = c.getSourceMap().getPosition(n.getChild(i));
+    }
+
+    int currentInstruction = wc.cfg().getCurrentInstruction();
+    wc.cfg().addInstruction(new AstYieldInstruction(currentInstruction, rvals));
+    wc.cfg().noteOperands(currentInstruction, rposs);
   }
 
   public CAstEntity getIncludedEntity(CAstNode n) {
     if (n.getChild(0).getKind() == CAstNode.NAMED_ENTITY_REF) {
       assert namedEntityResolver != null;
-      return (CAstEntity) namedEntityResolver.get(n.getChild(0).getChild(0).getValue());
+      return namedEntityResolver.get(n.getChild(0).getChild(0).getValue());
     } else {
       return (CAstEntity) n.getChild(0).getValue();
     }
@@ -4635,7 +4764,7 @@
             nodeMap.put(Pair.make(root, c.key()), expr);
             return expr;
           } else {
-            return super.copyNodesHackForEclipse(root, cfg, c, nodeMap);
+            return super.copyNodes(root, cfg, c, nodeMap);
           }
         }
       }).rewrite(included);
@@ -4672,7 +4801,7 @@
 
     private final ModuleEntry module;
 
-    private final Map<CAstEntity, String> entityNames = new LinkedHashMap<CAstEntity, String>();
+    private final Map<CAstEntity, String> entityNames = new LinkedHashMap<>();
 
    public RootContext(CAstEntity N, ModuleEntry module) {
       this.N = N;
@@ -4731,7 +4860,7 @@
     }
 
     @Override
-    public void setCatchType(IBasicBlock bb, TypeReference catchType) {
+    public void setCatchType(IBasicBlock<SSAInstruction> bb, TypeReference catchType) {
     }
 
     @Override
@@ -4739,7 +4868,7 @@
     }
 
     @Override
-    public Map<IBasicBlock, TypeReference[]> getCatchTypes() {
+    public Map<IBasicBlock<SSAInstruction>, TypeReference[]> getCatchTypes() {
       return null;
     }
     
@@ -4754,7 +4883,7 @@
         return null;
       } else {
         assert entityNames.containsKey(e);
-        return "L" + entityNames.get(e);
+        return 'L' + entityNames.get(e);
       }
     }
 
@@ -4793,7 +4922,7 @@
       return globalScope;
     }
     
-  };
+  }
 
   /**
    * translate module, represented by {@link CAstEntity} N
@@ -4805,6 +4934,9 @@
     // 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);
@@ -4814,6 +4946,9 @@
   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);
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/ConstantFoldingRewriter.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/ConstantFoldingRewriter.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/ConstantFoldingRewriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/ConstantFoldingRewriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.cast.ir.translator;
 
+import java.util.Collection;
 import java.util.Map;
 
 import com.ibm.wala.cast.tree.CAst;
@@ -17,12 +18,13 @@
 import com.ibm.wala.cast.tree.CAstNode;
 import com.ibm.wala.cast.tree.impl.CAstOperator;
 import com.ibm.wala.cast.tree.rewrite.CAstBasicRewriter;
+import com.ibm.wala.cast.tree.rewrite.CAstBasicRewriter.NonCopyingContext;
 import com.ibm.wala.util.collections.Pair;
 
-public abstract class ConstantFoldingRewriter extends CAstBasicRewriter {
+public abstract class ConstantFoldingRewriter extends CAstBasicRewriter<NonCopyingContext> {
 
   protected ConstantFoldingRewriter(CAst Ast) {
-    super(Ast, true);
+    super(Ast, new NonCopyingContext(), true);
   }
 
   protected abstract Object eval(CAstOperator op, Object lhs, Object rhs);
@@ -70,11 +72,17 @@
       for (int i = 0; i < children.length; i++) {
         children[i] = copyNodes(root.getChild(i), cfg, context, nodeMap);
       }
-      for(Object label: cfg.getTargetLabels(root)) {
-        if (label instanceof CAstNode) {
-          copyNodes((CAstNode)label, cfg, context, nodeMap);
+      if (cfg != null) {
+        Collection<Object> labels = cfg.getTargetLabels(root);
+        if (labels != null) {
+          for(Object label: labels) {
+            if (label instanceof CAstNode) {
+              copyNodes((CAstNode)label, cfg, context, nodeMap);
+            } 
+          }
         }
       }
+      
       CAstNode copy = Ast.makeNode(root.getKind(), children);
       result = copy;
     }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/ExposedNamesCollector.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/ExposedNamesCollector.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/ExposedNamesCollector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/ExposedNamesCollector.java	2019-01-29 17:08:39.000000000 +0000
@@ -115,7 +115,7 @@
         }
       }
       if (declaringEntity != null) {
-//        System.err.println("marking " + nm + " from entity " + declaringEntity + " as exposed");
+        // System.err.println("marking " + nm + " from entity " + declaringEntity + " as exposed");
         MapUtil.findOrCreateSet(entity2ExposedNames, declaringEntity).add(nm);
       }
     }
@@ -142,6 +142,14 @@
     // assume unknown node types don't do anything relevant to exposed names.  
     // override if this is untrue
     return true;
+  }
+
+  @Override
+  protected boolean doVisitAssignNodes(CAstNode n, EntityContext context, CAstNode v, CAstNode a,
+      CAstVisitor<EntityContext> visitor) {
+    // assume unknown node types don't do anything relevant to exposed names.  
+    // override if this is untrue
+    return true;
   }
 
   
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/NativeBridge.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/NativeBridge.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/NativeBridge.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/NativeBridge.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,27 @@
+/******************************************************************************
+ * Copyright (c) 2002 - 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *****************************************************************************/
+package com.ibm.wala.cast.ir.translator;
+
+import com.ibm.wala.cast.tree.CAst;
+
+/**
+ * superclass for CAst parsers / translators making use of native code. performs
+ * initialization of the core CAst native library.
+ */
+public abstract class NativeBridge {
+
+  protected final CAst Ast;
+
+  protected NativeBridge(CAst Ast) {
+    this.Ast = Ast;
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/NativeTranslatorToCAst.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/NativeTranslatorToCAst.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/NativeTranslatorToCAst.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/NativeTranslatorToCAst.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,103 @@
+package com.ibm.wala.cast.ir.translator;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URL;
+
+import com.ibm.wala.cast.tree.CAst;
+import com.ibm.wala.cast.tree.CAstEntity;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
+import com.ibm.wala.cast.tree.impl.AbstractSourcePosition;
+
+/**
+ * common functionality for any {@link TranslatorToCAst} making use of native code
+ */
+public abstract class NativeTranslatorToCAst 
+  extends NativeBridge 
+  implements TranslatorToCAst
+{
+
+  protected final URL sourceURL;
+
+  protected final String sourceFileName;
+
+  protected NativeTranslatorToCAst(CAst Ast, URL sourceURL, String sourceFileName) {
+    super(Ast);
+    this.sourceURL = sourceURL;
+    this.sourceFileName = sourceFileName;
+  }
+
+  protected String getLocalFile() {
+    return sourceFileName;
+  }
+
+  protected String getFile() {
+    return sourceURL.getFile();
+  }
+
+  protected Position makeLocation(final int fl, final int fc, final int ll, final int lc) {
+    return new AbstractSourcePosition() {
+      @Override
+      public int getFirstLine() {
+        return fl;
+      }
+
+      @Override
+      public int getLastLine() {
+        return ll;
+      }
+
+      @Override
+      public int getFirstCol() {
+        return fc;
+      }
+
+      @Override
+      public int getLastCol() {
+        return lc;
+      }
+
+      @Override
+      public int getFirstOffset() {
+        return -1;
+      }
+
+      @Override
+      public int getLastOffset() {
+        return -1;
+      }
+      
+      @Override
+      public URL getURL() {
+        return sourceURL;
+      }
+
+      public InputStream getInputStream() throws IOException {
+        return new FileInputStream(sourceFileName);
+      }
+
+      @Override
+      public String toString() {
+        String urlString = sourceURL.toString();
+        if (urlString.lastIndexOf(File.separator) == -1)
+          return "[" + fl + ':' + fc + "]->[" + ll + ':' + lc + ']';
+        else
+          return urlString.substring(urlString.lastIndexOf(File.separator) + 1) + "@[" + fl + ':' + fc + "]->[" + ll + ':' + lc
+              + ']';
+      }
+
+      @Override
+      public Reader getReader() throws IOException {
+         return new InputStreamReader(getInputStream());
+      }
+    };
+  }
+
+  @Override
+  public abstract CAstEntity translateToCAst();
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/RewritingTranslatorToCAst.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/RewritingTranslatorToCAst.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/RewritingTranslatorToCAst.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/RewritingTranslatorToCAst.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,41 @@
+package com.ibm.wala.cast.ir.translator;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.ibm.wala.cast.tree.CAstEntity;
+import com.ibm.wala.cast.tree.impl.CAstImpl;
+import com.ibm.wala.cast.tree.rewrite.CAstRewriter.CopyKey;
+import com.ibm.wala.cast.tree.rewrite.CAstRewriter.RewriteContext;
+import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
+import com.ibm.wala.classLoader.ModuleEntry;
+
+public class RewritingTranslatorToCAst implements TranslatorToCAst {
+  private final List<CAstRewriterFactory<?, ?>> rewriters = new LinkedList<>();
+ protected final ModuleEntry M;
+private final TranslatorToCAst base;
+
+  public RewritingTranslatorToCAst(ModuleEntry m2, TranslatorToCAst base) {
+    this.M = m2;
+    this.base = base;
+  }
+
+  @Override
+  public <C extends RewriteContext<K>, K extends CopyKey<K>> void addRewriter(CAstRewriterFactory<C, K> factory, boolean prepend) {
+    if(prepend)
+      rewriters.add(0, factory);
+    else
+      rewriters.add(factory);
+  }  
+
+  @Override
+  public CAstEntity translateToCAst() throws IOException, Error {
+    CAstImpl Ast = new CAstImpl();
+    CAstEntity entity = base.translateToCAst();
+    for(CAstRewriterFactory<?, ?> rwf : rewriters)
+      entity = rwf.createCAstRewriter(Ast).rewrite(entity);
+    return entity;
+  }
+  
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/TranslatorToCAst.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/TranslatorToCAst.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/TranslatorToCAst.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/ir/translator/TranslatorToCAst.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,12 +13,14 @@
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
 import com.ibm.wala.cast.tree.CAst;
 import com.ibm.wala.cast.tree.CAstEntity;
 import com.ibm.wala.cast.tree.CAstNode;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
 import com.ibm.wala.cast.tree.impl.CAstControlFlowRecorder;
 import com.ibm.wala.cast.tree.impl.CAstNodeTypeMapRecorder;
 import com.ibm.wala.cast.tree.impl.CAstSourcePositionRecorder;
@@ -28,12 +30,14 @@
 import com.ibm.wala.cast.tree.rewrite.CAstRewriter.RewriteContext;
 import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
 import com.ibm.wala.util.WalaException;
+import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.warnings.Warning;
 
 public interface TranslatorToCAst {
   public <C extends RewriteContext<K>, K extends CopyKey<K>> void addRewriter(CAstRewriterFactory<C, K> factory, boolean prepend);
 
   public class Error extends WalaException {
+    private static final long serialVersionUID = -8440950320425119751L;
     public final Set<Warning> warning;
     
     public Error(Set<Warning> message) {
@@ -47,42 +51,70 @@
 
   public interface WalkContext<C extends WalkContext<C, T>, T> {
 
+    WalkContext<C, T> getParent();
+    
     /**
      * get a mapping from CAstNodes to the scoped entities (e.g. functions or
-     * local classes) introduced by those nodes. Also maps <code>null</code> to
+     * local classes) introduced by those nodes. Also maps {@code null} to
      * those entities not corresponding to any node (e.g nested classes)
      */
-    Map<CAstNode, Collection<CAstEntity>> getScopedEntities();
+    default Map<CAstNode, Collection<CAstEntity>> getScopedEntities() {
+      return getParent().getScopedEntities();
+    }
+
+    default CAstNode getCatchTarget() {
+      return getParent().getCatchTarget();
+    }
+
+    default CAstNode getCatchTarget(String s) {
+      return getParent().getCatchTarget(s);
+    }
+
+    default T top() {
+      return getParent().top();
+    }
 
     /**
      *   associate a child entity with a given CAstNode, e.g. for a function declaration
      */
-    void addScopedEntity(CAstNode newNode, CAstEntity visit);
+    default void addScopedEntity(CAstNode newNode, CAstEntity visit) {
+      getParent().addScopedEntity(newNode, visit);
+    }
 
     /**
      * for recording control-flow relationships among the CAst nodes
      */
-    CAstControlFlowRecorder cfg();
+    default CAstControlFlowRecorder cfg() {
+      return getParent().cfg();
+    }
 
     /**
      * for recording source positions
      */
-    CAstSourcePositionRecorder pos();
+    default CAstSourcePositionRecorder pos()  {
+      return getParent().pos();
+    }
 
     /**
      * for recording types of nodes
      */
-    CAstNodeTypeMapRecorder getNodeTypeMap();
+    default CAstNodeTypeMapRecorder getNodeTypeMap() {
+      return getParent().getNodeTypeMap();
+    }
 
     /**
      * for a 'continue' style goto, return the control flow target
      */
-    T getContinueFor(String label);
-
+    default T getContinueFor(String label) {
+      return getParent().getContinueFor(label);
+    }
+    
     /**
      * for a 'break' style goto, return the control flow target
      */
-    T getBreakFor(String label);
+    default T getBreakFor(String label) {
+      return getParent().getBreakFor(label);
+    }
 
   }
   
@@ -127,6 +159,18 @@
       assert false;
       return null;
     }
+
+    @Override
+    public T top() {
+      assert false;
+      return null;
+    }
+
+    @Override
+    public WalkContext<C, T> getParent() {
+      assert false;
+      return null;
+    }
    
   }
   
@@ -138,42 +182,106 @@
     }
     
     @Override
-    public CAstControlFlowRecorder cfg() {
-      return parent.cfg();
+    public T top() {
+      return parent.top();
     }
 
     @Override
-    public CAstSourcePositionRecorder pos() {
-      return parent.pos();
+    public WalkContext<C, T> getParent() {
+      return parent;
+    }
+    
+  }
+  
+  class BreakContext<C extends WalkContext<C, T>, T> extends DelegatingContext<C,T> {
+    private final T breakTarget;
+    protected final String label;
+
+    protected BreakContext(C parent, T breakTarget, String label) {
+      super(parent);
+      this.breakTarget = breakTarget;
+      this.label = label;
     }
 
     @Override
-    public CAstNodeTypeMapRecorder getNodeTypeMap() {
-      return parent.getNodeTypeMap();
+    public T getBreakFor(String l) {
+      return (l == null || l.equals(label))? breakTarget: super.getBreakFor(l);
+    }
+  }
+
+  public class LoopContext<C extends WalkContext<C, T>, T> extends BreakContext<C,T> {
+    private final T continueTo;
+
+    protected LoopContext(C parent, T breakTo, T continueTo, String label) {
+      super(parent, breakTo, label);
+      this.continueTo = continueTo;
     }
 
     @Override
-    public T getContinueFor(String label) {
-      return parent.getContinueFor(label);
+    public T getContinueFor(String l) {
+      return (l == null || l.equals(label))? continueTo: super.getContinueFor(l);
+    }
+  }
+  
+  public static class TryCatchContext<C extends WalkContext<C, T>, T> implements WalkContext<C,T> {
+    private final Map<String,CAstNode> catchNode;
+    private final WalkContext<C,T> parent;
+    
+    protected TryCatchContext(C parent, CAstNode catchNode) {
+      this(parent, Collections.singletonMap(null, catchNode));
+    }
+
+    protected TryCatchContext(C parent, Map<String,CAstNode> catchNode) {
+      this.parent = parent;
+      this.catchNode = catchNode;
     }
 
     @Override
-    public T getBreakFor(String label) {
-      return parent.getBreakFor(label);
+    public CAstNode getCatchTarget() { return getCatchTarget(null); }
+
+    @Override
+    public CAstNode getCatchTarget(String s) { return catchNode.get(s); }
+
+    @Override
+    public WalkContext<C, T> getParent() {
+       return parent;
+    }
+  }
+ 
+  public static class FunctionContext<C extends WalkContext<C, T>, T> extends DelegatingContext<C,T> {
+    private final T topNode;
+    private final CAstSourcePositionRecorder pos = new CAstSourcePositionRecorder();
+    private final CAstControlFlowRecorder cfg = new CAstControlFlowRecorder(pos);
+    private final Map<CAstNode, Collection<CAstEntity>> scopedEntities = HashMapFactory.make();
+
+    protected FunctionContext(C parent, T s) {
+      super(parent);
+      this.topNode = s;
     }
 
     @Override
-    public void addScopedEntity(CAstNode newNode, CAstEntity visit) {
-      parent.addScopedEntity(newNode, visit);
+    public T top() { return topNode; }
+
+    @Override
+    public void addScopedEntity(CAstNode construct, CAstEntity e) {
+      if (! scopedEntities.containsKey(construct)) {
+        scopedEntities.put(construct, new HashSet<CAstEntity>(1));
+      }
+      scopedEntities.get(construct).add(e);
     }
 
     @Override
     public Map<CAstNode, Collection<CAstEntity>> getScopedEntities() {
-      return parent.getScopedEntities();
+      return scopedEntities;
     }
-    
+
+    @Override
+    public CAstControlFlowRecorder cfg() { return cfg; }
+
+    @Override
+    public CAstSourcePositionRecorder pos() { return pos; }
   }
-  
+
   public static class DoLoopTranslator {
     private final boolean replicateForDoLoops;
     
@@ -188,7 +296,7 @@
       if (replicateForDoLoops) {
         loopBody = Ast.makeNode(CAstNode.BLOCK_STMT, loopBody, continueNode);
         
-        CAstRewriter.Rewrite x = (new CAstCloner(Ast, false)).copy(loopBody, wc.cfg(), wc.pos(), wc.getNodeTypeMap(), null);
+        CAstRewriter.Rewrite x = (new CAstCloner(Ast, false)).copy(loopBody, wc.cfg(), wc.pos(), wc.getNodeTypeMap(), null, null);
         CAstNode otherBody = x.newRoot();
         
         wc.cfg().addAll(x.newCfg());
@@ -215,6 +323,15 @@
             breakNode);
       }
     }
-    };
+    }
+
+  default <X extends WalkContext<X,Y>, Y> void pushSourcePosition(WalkContext<X, Y> context, CAstNode n, Position p) {
+    if (context.pos().getPosition(n) == null && !(n.getKind()==CAstNode.FUNCTION_EXPR || n.getKind()==CAstNode.FUNCTION_STMT)) {
+        context.pos().setPosition(n, p);
+        for(int i = 0; i < n.getChildCount(); i++) {
+          pushSourcePosition(context, n.getChild(i), p);
+        }
+    }
+  }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstClass.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstClass.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,7 +13,6 @@
 import java.io.Reader;
 import java.net.URL;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -87,6 +86,11 @@
   }
 
   @Override
+  public boolean isSynthetic() {
+    return false;
+  }
+
+  @Override
   public int getModifiers() {
     return modifiers;
   }
@@ -177,15 +181,14 @@
     return getField(name);
   }
   @Override
-  public Collection<IMethod> getDeclaredMethods() {
+  public Collection<? extends IMethod> getDeclaredMethods() {
     return declaredMethods.values();
   }
 
   @Override
   public Collection<IField> getDeclaredInstanceFields() {
     Set<IField> result = HashSetFactory.make();
-    for (Iterator<IField> FS = declaredFields.values().iterator(); FS.hasNext();) {
-      IField F = FS.next();
+    for (IField F : declaredFields.values()) {
       if (!F.isStatic()) {
         result.add(F);
       }
@@ -197,8 +200,7 @@
   @Override
   public Collection<IField> getDeclaredStaticFields() {
     Set<IField> result = HashSetFactory.make();
-    for (Iterator<IField> FS = declaredFields.values().iterator(); FS.hasNext();) {
-      IField F = FS.next();
+    for (IField F : declaredFields.values()) {
       if (F.isStatic()) {
         result.add(F);
       }
@@ -238,11 +240,9 @@
   }
 
   @Override
-  public Collection<IMethod> getAllMethods() {
+  public Collection<? extends IMethod> getAllMethods() {
     Collection<IMethod> result = HashSetFactory.make();
-    for (Iterator<IMethod> ms = getDeclaredMethods().iterator(); ms.hasNext();) {
-      result.add(ms.next());
-    }
+    result.addAll(getDeclaredMethods());
     if (getSuperclass() != null) {
       result.addAll(getSuperclass().getAllMethods());
     }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstDynamicField.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstDynamicField.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstDynamicField.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstDynamicField.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,7 +26,7 @@
 
   @Override
   public String toString() {
-    return "<field " + name + ">";
+    return "<field " + name + '>';
   }
 
   @Override
@@ -88,4 +88,45 @@
   public Collection<Annotation> getAnnotations() {
     return Collections.emptySet();
   }
+
+  @Override
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+    result = prime * result + ((cls == null) ? 0 : cls.hashCode());
+    result = prime * result + ((descriptor == null) ? 0 : descriptor.hashCode());
+    result = prime * result + (isStatic ? 1231 : 1237);
+    result = prime * result + ((name == null) ? 0 : name.hashCode());
+    return result;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    AstDynamicField other = (AstDynamicField) obj;
+    if (cls == null) {
+      if (other.cls != null)
+        return false;
+    } else if (!cls.equals(other.cls))
+      return false;
+    if (descriptor == null) {
+      if (other.descriptor != null)
+        return false;
+    } else if (!descriptor.equals(other.descriptor))
+      return false;
+    if (isStatic != other.isStatic)
+      return false;
+    if (name == null) {
+      if (other.name != null)
+        return false;
+    } else if (!name.equals(other.name))
+      return false;
+    return true;
+  }
+  
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstField.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstField.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstField.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstField.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,14 +23,14 @@
 import com.ibm.wala.util.strings.Atom;
 
 public class AstField implements IField {
-  private final Collection qualifiers;
+  private final Collection<CAstQualifier> qualifiers;
   private final FieldReference ref;
   private final IClass declaringClass;
   private final IClassHierarchy cha;
   private final Collection<Annotation> annotations;
 
   public AstField(FieldReference ref,
-		  Collection qualifiers,
+		  Collection<CAstQualifier> qualifiers,
 		  IClass declaringClass,
 		  IClassHierarchy cha,
 		  Collection<Annotation> annotations)
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstFunctionClass.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstFunctionClass.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstFunctionClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstFunctionClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -32,7 +32,7 @@
   
   private final IClassLoader loader;
 
-  protected IMethod functionBody;
+  protected AstMethod functionBody;
 
   private final CAstSourcePositionMap.Position sourcePosition;
 
@@ -92,6 +92,11 @@
   }
 
   @Override
+  public boolean isSynthetic() {
+    return false;
+  }
+
+  @Override
   public int getModifiers() {
     return ACC_PUBLIC;
   }
@@ -217,7 +222,7 @@
     return true;
   }
   
-  public IMethod getCodeBody() {
+  public AstMethod getCodeBody() {
     return functionBody;
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstMethod.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstMethod.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/AstMethod.java	2019-01-29 17:08:39.000000000 +0000
@@ -24,6 +24,7 @@
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
+import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.types.Descriptor;
 import com.ibm.wala.types.MethodReference;
@@ -45,10 +46,16 @@
 
     Position getCodeBodyPosition();
 
+    Position getCodeNamePosition();
+
     Position getInstructionPosition(int instructionOffset);
 
     String[][] getSourceNamesForValues();
 
+    Position getOperandPosition(int instructionOffset, int operand);
+
+    Position getParameterPosition(int param);
+    
   }
 
   /**
@@ -102,19 +109,19 @@
   }
 
   protected final IClass cls;
-  private final Collection qualifiers;
-  private final AbstractCFG cfg;
+  private final Collection<CAstQualifier> qualifiers;
+  private final AbstractCFG<?, ?> cfg;
   private final SymbolTable symtab;
   private final MethodReference ref;
   private final boolean hasCatchBlock;
   private final boolean hasMonitorOp;
-  private final Map<IBasicBlock, TypeReference[]> catchTypes;
+  private final Map<IBasicBlock<SSAInstruction>, TypeReference[]> catchTypes;
   private final AstLexicalInformation lexicalInfo;
   private final DebuggingInformation debugInfo;
   private final Collection<Annotation> annotations;
 
-  protected AstMethod(IClass cls, Collection qualifiers, AbstractCFG cfg, SymbolTable symtab, MethodReference ref,
-      boolean hasCatchBlock, Map<IBasicBlock, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo,
+  protected AstMethod(IClass cls, Collection<CAstQualifier> qualifiers, AbstractCFG<?, ?> cfg, SymbolTable symtab, MethodReference ref,
+      boolean hasCatchBlock, Map<IBasicBlock<SSAInstruction>, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo,
       DebuggingInformation debugInfo, Collection<Annotation> annotations) {
     this.cls = cls;
     this.cfg = cfg;
@@ -129,7 +136,7 @@
     this.annotations = annotations;
   }
 
-  protected AstMethod(IClass cls, Collection qualifiers, MethodReference ref, Collection<Annotation> annotations) {
+  protected AstMethod(IClass cls, Collection<CAstQualifier> qualifiers, MethodReference ref, Collection<Annotation> annotations) {
     this.cls = cls;
     this.qualifiers = qualifiers;
     this.ref = ref;
@@ -146,7 +153,7 @@
     assert isAbstract();
   }
 
-  public AbstractCFG cfg() {
+  public AbstractCFG<?, ?> cfg() {
     return cfg;
   }
 
@@ -158,7 +165,7 @@
     return symtab;
   }
 
-  public Map<IBasicBlock, TypeReference[]> catchTypes() {
+  public Map<IBasicBlock<SSAInstruction>, TypeReference[]> catchTypes() {
     return catchTypes;
   }
 
@@ -198,7 +205,7 @@
       return (o instanceof LexicalParent) && getName().equals(((LexicalParent) o).getName())
           && getMethod().equals(((LexicalParent) o).getMethod());
     }
-  };
+  }
 
   public abstract LexicalParent[] getParents();
 
@@ -263,6 +270,11 @@
   }
 
   @Override
+  public boolean isWalaSynthetic() {
+    return false;
+  }
+
+  @Override
   public boolean isSynthetic() {
     return false;
   }
@@ -297,7 +309,7 @@
     return qualifiers.contains(CAstQualifier.VOLATILE);
   }
 
-  public ControlFlowGraph getControlFlowGraph() {
+  public ControlFlowGraph<?, ?> getControlFlowGraph() {
     return cfg;
   }
 
@@ -319,6 +331,7 @@
   /*
    * @see com.ibm.wala.classLoader.IMethod#getParameterSourcePosition(int)
    */
+  @Override
   public SourcePosition getParameterSourcePosition(int paramNum) throws InvalidClassFileException {
     return null;
   }
@@ -338,6 +351,11 @@
     return debugInfo.getCodeBodyPosition();
   }
 
+  public Position getParameterPosition(int paramIndex) {
+    return debugInfo.getParameterPosition(paramIndex);
+  }
+
+  @Override
   public Position getSourcePosition(int instructionIndex) {
     return debugInfo.getInstructionPosition(instructionIndex);
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractLoader.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractLoader.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractLoader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractLoader.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 
 import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
@@ -27,12 +26,7 @@
 import com.ibm.wala.classLoader.ModuleEntry;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.TypeName;
-import com.ibm.wala.util.Predicate;
-import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
-import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.collections.MapIterator;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.strings.Atom;
 import com.ibm.wala.util.warnings.Warning;
 
@@ -54,7 +48,7 @@
   /**
    * warnings generated while loading each module
    */
-  private final Map<ModuleEntry, Set<Warning>> errors = new HashMap<ModuleEntry, Set<Warning>>();
+  private final Map<ModuleEntry, Set<Warning>> errors = new HashMap<>();
   
   public CAstAbstractLoader(IClassHierarchy cha, IClassLoader parent) {
     this.cha = cha;
@@ -65,38 +59,24 @@
     this(cha, null);
   }
 
-  public void addMessage(ModuleEntry module, Set<Warning> message) {
-    if (! errors.containsKey(module)) {
-      errors.put(module, new HashSet<Warning>());
-    }
-    
-    errors.get(module).addAll(message);
+  private Set<Warning> messagesFor(ModuleEntry module) {
+    return errors.computeIfAbsent(module, (key) -> new HashSet<>());
+  }
+
+  public void addMessages(ModuleEntry module, Set<Warning> message) {
+    messagesFor(module).addAll(message);
   }
 
   public void addMessage(ModuleEntry module, Warning message) {
-    if (! errors.containsKey(module)) {
-      errors.put(module, new HashSet<Warning>());
-    }
-    
-    errors.get(module).add(message);
+    messagesFor(module).add(message);
   }
 
   private Iterator<ModuleEntry> getMessages(final byte severity) {
-    return new MapIterator<Map.Entry<ModuleEntry,Set<Warning>>, ModuleEntry>(new FilterIterator<Map.Entry<ModuleEntry,Set<Warning>>>(errors.entrySet().iterator(), new Predicate<Map.Entry<ModuleEntry,Set<Warning>>>()  {
-      @Override public boolean test(Entry<ModuleEntry, Set<Warning>> o) {
-         for(Warning w : o.getValue()) {
-           if (w.getLevel() == severity) {
-             return true;
-           }
-         }
-         return false;
-      }
-    }), new Function<Map.Entry<ModuleEntry,Set<Warning>>, ModuleEntry>() {
-      @Override
-      public ModuleEntry apply(Entry<ModuleEntry, Set<Warning>> object) {
-        return object.getKey();
-      }      
-    });
+    return errors.entrySet().stream()
+            .filter(entry -> entry.getValue().stream()
+                    .anyMatch(w -> w.getLevel() == severity))
+            .map(Map.Entry::getKey)
+            .iterator();
   }
   
   public Iterator<ModuleEntry> getModulesWithParseErrors() {
@@ -143,17 +123,9 @@
 
   @Override
   public int getNumberOfMethods() {
-    int i = 0;
-    for (Iterator cls = types.values().iterator(); cls.hasNext();) {
-      for (Iterator ms = ((IClass) cls.next()).getDeclaredMethods().iterator();
-	   ms.hasNext(); )
-      {
-        i++;
-        ms.next();
-      }
-    }
-
-    return i;
+    return types.values().stream()
+            .mapToInt(cls -> cls.getDeclaredMethods().size())
+            .sum();
   }
 
   @Override
@@ -199,18 +171,7 @@
 
   @Override
   public void removeAll(Collection<IClass> toRemove) {
-    Set<TypeName> keys = HashSetFactory.make();
-
-    for (Iterator<Map.Entry<TypeName,IClass>> EE = types.entrySet().iterator(); EE.hasNext();) {
-      Map.Entry<TypeName,IClass> E =  EE.next();
-      if (toRemove.contains(E.getValue())) {
-        keys.add(E.getKey());
-      }
-    }
-
-    for (Iterator KK = keys.iterator(); KK.hasNext();) {
-      types.remove(KK.next());
-    }
+    types.values().removeIf(toRemove::contains);
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractModuleLoader.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractModuleLoader.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractModuleLoader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/CAstAbstractModuleLoader.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,26 +15,44 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.PrintWriter;
-import java.net.MalformedURLException;
-import java.util.Iterator;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
+import com.ibm.wala.cast.ir.translator.AstTranslator;
+import com.ibm.wala.cast.ir.translator.AstTranslator.AstLexicalInformation;
+import com.ibm.wala.cast.ir.translator.AstTranslator.WalkContext;
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
 import com.ibm.wala.cast.ir.translator.TranslatorToIR;
+import com.ibm.wala.cast.loader.AstMethod.Retranslatable;
 import com.ibm.wala.cast.tree.CAst;
 import com.ibm.wala.cast.tree.CAstEntity;
+import com.ibm.wala.cast.tree.CAstQualifier;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap;
 import com.ibm.wala.cast.tree.impl.CAstImpl;
+import com.ibm.wala.cast.types.AstMethodReference;
 import com.ibm.wala.cast.util.CAstPrinter;
+import com.ibm.wala.cfg.AbstractCFG;
+import com.ibm.wala.cfg.IBasicBlock;
+import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IClassLoader;
+import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.Module;
 import com.ibm.wala.classLoader.ModuleEntry;
 import com.ibm.wala.classLoader.SourceFileModule;
 import com.ibm.wala.classLoader.SourceModule;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.types.TypeName;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.types.annotations.Annotation;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.Pair;
+import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.io.TemporaryFile;
 import com.ibm.wala.util.warnings.Warning;
 
@@ -59,7 +77,7 @@
   /**
    * create the appropriate CAst translator for the language and source module
    */
-  protected abstract TranslatorToCAst getTranslatorToCAst(CAst ast, SourceModule M) throws IOException;
+  protected abstract TranslatorToCAst getTranslatorToCAst(CAst ast, ModuleEntry M) throws IOException;
 
   /**
    * should IR be generated for entity?
@@ -96,26 +114,25 @@
     final CAst ast = new CAstImpl();
 
     // convert everything to CAst
-    final Set<Pair<CAstEntity, ModuleEntry>> topLevelEntities = new LinkedHashSet<Pair<CAstEntity, ModuleEntry>>();
-    for (Iterator<Module> mes = modules.iterator(); mes.hasNext();) {
-      translateModuleToCAst(mes.next(), ast, topLevelEntities);
+    final Set<Pair<CAstEntity, ModuleEntry>> topLevelEntities = new LinkedHashSet<>();
+    for (Module module : modules) {
+      translateModuleToCAst(module, ast, topLevelEntities);
     }
 
     // generate IR as needed
     final TranslatorToIR xlatorToIR = initTranslator();
 
-    for (Iterator<Pair<CAstEntity, ModuleEntry>> tles = topLevelEntities.iterator(); tles.hasNext();) {
-      Pair<CAstEntity, ModuleEntry> p = tles.next();
+    for (Pair<CAstEntity, ModuleEntry> p : topLevelEntities) {
       if (shouldTranslate(p.fst)) {
         xlatorToIR.translate(p.fst, p.snd);
       }
     }
 
     if (DEBUG) {
-      for (Iterator ts = types.keySet().iterator(); ts.hasNext();) {
-        TypeName tn = (TypeName) ts.next();
+      for (Map.Entry<TypeName, IClass> entry : types.entrySet()) {
         try {
-          System.err.println(("found type " + tn + " : " + types.get(tn) + " < " + types.get(tn).getSuperclass()));
+          final IClass value = entry.getValue();
+          System.err.println(("found type " + entry.getKey() + " : " + value + " < " + value.getSuperclass()));
         } catch (Exception e) {
           System.err.println(e);
         }
@@ -127,17 +144,14 @@
 
   /**
    * translate moduleEntry to CAst and store result in topLevelEntities
-   * 
-   * @param ast
-   * @param topLevelEntities
    */
   private void translateModuleEntryToCAst(ModuleEntry moduleEntry, CAst ast, Set<Pair<CAstEntity, ModuleEntry>> topLevelEntities) {
     try {
       if (moduleEntry.isModuleFile()) {
         // nested module
         translateModuleToCAst(moduleEntry.asModule(), ast, topLevelEntities);
-      } else if (moduleEntry instanceof SourceModule) {
-        TranslatorToCAst xlatorToCAst = getTranslatorToCAst(ast, (SourceModule) moduleEntry);
+      } else {
+        TranslatorToCAst xlatorToCAst = getTranslatorToCAst(ast, moduleEntry);
 
         CAstEntity fileEntity = null;
         try {
@@ -149,16 +163,9 @@
           topLevelEntities.add(Pair.make(fileEntity, moduleEntry));
 
         } catch (TranslatorToCAst.Error e) {
-          addMessage(moduleEntry, e.warning);
+          addMessages(moduleEntry, e.warning);
         }
       }
-    } catch (final MalformedURLException e) {
-      addMessage(moduleEntry, new Warning(Warning.SEVERE) {
-        @Override
-        public String getMsg() {
-          return "Malformed URL issue: " + e.getMessage();
-        }
-      });
     } catch (final IOException e) {
       addMessage(moduleEntry, new Warning(Warning.SEVERE) {
         @Override
@@ -184,9 +191,180 @@
    * in topLevelEntities
    */
   private void translateModuleToCAst(Module module, CAst ast, Set<Pair<CAstEntity, ModuleEntry>> topLevelEntities) {
-    for (Iterator<? extends ModuleEntry> mes = module.getEntries(); mes.hasNext();) {
-      translateModuleEntryToCAst(mes.next(), ast, topLevelEntities);
+    for (ModuleEntry me : Iterator2Iterable.make(module.getEntries())) {
+      translateModuleEntryToCAst(me, ast, topLevelEntities);
     }
   }
 
+  public class DynamicCodeBody extends AstFunctionClass {
+    private final WalkContext translationContext;
+    private final CAstEntity entity;
+    
+    public DynamicCodeBody(TypeReference codeName, TypeReference parent, IClassLoader loader,
+        CAstSourcePositionMap.Position sourcePosition, CAstEntity entity, WalkContext context) {
+      super(codeName, parent, loader, sourcePosition);
+      types.put(codeName.getName(), this);
+      this.translationContext = context;
+      this.entity = entity;
+    }
+
+    @Override
+    public IClassHierarchy getClassHierarchy() {
+      return cha;
+    }
+    
+    public IMethod setCodeBody(DynamicMethodObject codeBody) {
+      this.functionBody = codeBody;
+      codeBody.entity = entity;
+      codeBody.translationContext = translationContext;
+      return codeBody;
+    }
+    
+    @Override
+    public Collection<Annotation> getAnnotations() {
+      return Collections.emptySet();
+    }
+  }
+
+  public class DynamicMethodObject extends AstMethod implements Retranslatable {
+    private WalkContext translationContext;
+    private CAstEntity entity;
+
+    public DynamicMethodObject(IClass cls, Collection<CAstQualifier> qualifiers, AbstractCFG<?, ?> cfg, SymbolTable symtab, boolean hasCatchBlock,
+        Map<IBasicBlock<SSAInstruction>, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo) {
+      super(cls, qualifiers, cfg, symtab, AstMethodReference.fnReference(cls.getReference()), hasCatchBlock, caughtTypes,
+          hasMonitorOp, lexicalInfo, debugInfo, null);
+
+      // force creation of these constants by calling the getter methods
+      symtab.getNullConstant();
+    }
+
+    
+    @Override
+    public CAstEntity getEntity() {
+      return entity;
+    }
+
+
+    @Override
+    public void retranslate(AstTranslator xlator) {
+      xlator.translate(entity, translationContext);
+    }
+
+    @Override
+    public IClassHierarchy getClassHierarchy() {
+      return cha;
+    }
+
+    @Override
+    public String toString() {
+      return "<Code body of " + cls + '>';
+    }
+
+    @Override
+    public TypeReference[] getDeclaredExceptions() {
+      return null;
+    }
+
+    @Override
+    public LexicalParent[] getParents() {
+      if (lexicalInfo() == null)
+        return new LexicalParent[0];
+
+      final String[] parents = lexicalInfo().getScopingParents();
+
+      if (parents == null)
+        return new LexicalParent[0];
+
+      LexicalParent result[] = new LexicalParent[parents.length];
+
+      for (int i = 0; i < parents.length; i++) {
+        final int hack = i;
+        final AstMethod method = (AstMethod) lookupClass(parents[i], cha).getMethod(AstMethodReference.fnSelector);
+        result[i] = new LexicalParent() {
+          @Override
+          public String getName() {
+            return parents[hack];
+          }
+
+          @Override
+          public AstMethod getMethod() {
+            return method;
+          }
+        };
+
+        if (AstTranslator.DEBUG_LEXICAL) {
+          System.err.println(("parent " + result[i].getName() + " is " + result[i].getMethod()));
+        }
+      }
+
+      return result;
+    }
+
+    @Override
+    public String getLocalVariableName(int bcIndex, int localNumber) {
+      return null;
+    }
+
+    @Override
+    public boolean hasLocalVariableTable() {
+      return false;
+    }
+
+    public int getMaxLocals() {
+      Assertions.UNREACHABLE();
+      return -1;
+    }
+
+    public int getMaxStackHeight() {
+      Assertions.UNREACHABLE();
+      return -1;
+    }
+
+    @Override
+    public TypeReference getParameterType(int i) {
+      if (i == 0) {
+        return getDeclaringClass().getReference();
+      } else {
+        return getDeclaringClass().getClassLoader().getLanguage().getRootType();
+      }
+    }
+  }
+
+  public class CoreClass extends AstDynamicPropertyClass {
+    private final TypeName superName;
+    
+      public CoreClass(TypeName name, TypeName superName, IClassLoader loader, CAstSourcePositionMap.Position sourcePosition) {
+        super(sourcePosition, name, loader, (short) 0, Collections.emptyMap(), CAstAbstractModuleLoader.this.getLanguage().getRootType());
+        types.put(name, this);
+        this.superName = superName;
+      }
+
+      @Override
+      public IClassHierarchy getClassHierarchy() {
+        return cha;
+      }
+
+      @Override
+      public String toString() {
+        return "Core[" + getReference().getName().toString().substring(1) + ']';
+      }
+
+      @Override
+      public Collection<IClass> getDirectInterfaces() {
+        return Collections.emptySet();
+      }
+
+      @Override
+      public IClass getSuperclass() {
+        return superName==null? null: types.get(superName);
+      }
+      
+      @Override
+      public Collection<Annotation> getAnnotations() {
+        return Collections.emptySet();
+      }
+    }
+
+  
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/DynamicCallSiteReference.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/DynamicCallSiteReference.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/DynamicCallSiteReference.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/DynamicCallSiteReference.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,75 @@
+/******************************************************************************
+ * Copyright (c) 2002 - 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *****************************************************************************/
+package com.ibm.wala.cast.loader;
+
+import com.ibm.wala.cast.types.AstMethodReference;
+import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.shrikeBT.IInvokeInstruction;
+import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.types.TypeReference;
+
+public class DynamicCallSiteReference extends CallSiteReference {
+
+  // this must be distinct from java invoke codes.
+  // see com.ibm.shrikeBT.BytecodeConstants
+  public static enum Dispatch implements IInvokeInstruction.IDispatch {
+    JS_CALL;
+
+    @Override
+    public boolean hasImplicitThis() {
+      return false;
+    }
+  }
+
+  public DynamicCallSiteReference(MethodReference ref, int pc) {
+    super(pc, ref);
+  }
+
+  public DynamicCallSiteReference(TypeReference ref, int pc) {
+    this(AstMethodReference.fnReference(ref), pc);
+  }
+
+  @Override
+  public IInvokeInstruction.IDispatch getInvocationCode() {
+    return Dispatch.JS_CALL;
+  }
+
+  @Override
+  protected String getInvocationString(IInvokeInstruction.IDispatch invocationCode) {
+    return "Function";
+  }
+  
+  @Override
+  public String toString() {
+    return "JSCall@" + getProgramCounter();
+  }
+
+  public CallSiteReference cloneReference(int pc) {
+    return new DynamicCallSiteReference(getDeclaredTarget(), pc);
+  }
+
+  @Override
+  public boolean isDispatch() {
+    return true;
+  }
+
+  @Override
+  public boolean isStatic() {
+    return false;
+  }
+
+  @Override
+  public boolean isFixed() {
+    return false;
+  }
+
+  
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/SingleClassLoaderFactory.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/SingleClassLoaderFactory.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/SingleClassLoaderFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/loader/SingleClassLoaderFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,6 +14,7 @@
 import com.ibm.wala.classLoader.IClassLoader;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.ipa.summaries.BypassSyntheticClassLoader;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.util.debug.Assertions;
 
@@ -28,8 +29,13 @@
    */
   private IClassLoader THE_LOADER = null;
 
+  /**
+   * Support synthetic classes
+   */
+  private IClassLoader syntheticLoader;
+  
   @Override
-  public IClassLoader getLoader(ClassLoaderReference classLoaderReference, IClassHierarchy cha, AnalysisScope scope) {
+  public IClassLoader getLoader(ClassLoaderReference classLoaderReference, IClassHierarchy cha, AnalysisScope scope) {    
     if (THE_LOADER == null) {
       THE_LOADER = makeTheLoader(cha);
       try {
@@ -39,9 +45,14 @@
       }
     }
 
-    assert classLoaderReference.equals(getTheReference());
-
-    return THE_LOADER;
+    if (classLoaderReference.equals(scope.getSyntheticLoader())) {
+      syntheticLoader = new BypassSyntheticClassLoader(scope.getSyntheticLoader(), THE_LOADER, scope.getExclusions(), cha);
+      return syntheticLoader;
+      
+    } else {
+      assert classLoaderReference.equals(getTheReference());
+      return THE_LOADER;
+    }
   }
 
   public IClassLoader getTheLoader() {
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstControlFlowMap.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstControlFlowMap.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstControlFlowMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstControlFlowMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -84,7 +84,7 @@
 
   /**
    * Return a collection of all labels for which the control-flow ast node
-   * <code>from</code> has a target.
+   * {@code from} has a target.
    */
   Collection<Object> getTargetLabels(CAstNode from);
 
@@ -92,7 +92,7 @@
    * Return a collection of control-flow ast nodes that have this one as a
    * possible target.
    */
-  Collection getSourceNodes(CAstNode to);
+  Collection<Object> getSourceNodes(CAstNode to);
 
   /**
    * Returns an iterator of all CAstNodes for which this map contains control
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstEntity.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstEntity.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstEntity.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstEntity.java	2019-01-29 17:08:39.000000000 +0000
@@ -162,6 +162,16 @@
   CAstSourcePositionMap.Position getPosition();
 
   /**
+   *  The source position of the token denoting this entity's name.
+   */
+  CAstSourcePositionMap.Position getNamePosition();
+
+  /**
+   *  The source position of argument 'arg' this entity, if any;
+   */
+  CAstSourcePositionMap.Position getPosition(int arg);
+
+  /**
    * The map from CAstNodes to types. Valid for nodes that have an explicitly
    * declared type (e.g. local vars).
    */
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstNode.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstNode.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstNode.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstNode.java	2019-01-29 17:08:39.000000000 +0000
@@ -46,7 +46,7 @@
   // statement kinds
   /**
    * Represents a standard case statement. Children:
-   * </ul>
+   * <ul>
    *   <li>condition expression
    *   <li>BLOCK_STMT containing all the cases
    * </ul>
@@ -113,6 +113,7 @@
   public static final int ECHO = 25;
   public static final int YIELD_STMT = 26;
   public static final int FORIN_LOOP = 27;
+  public static final int GLOBAL_DECL = 28;
 
   // expression kinds
   public static final int FUNCTION_EXPR = 100;
@@ -157,9 +158,10 @@
   public static final int TYPE_LITERAL_EXPR = 127;
   public static final int IS_DEFINED_EXPR = 128;
   public static final int MACRO_VAR = 129;
-
+  public static final int NARY_EXPR = 130;
   // new nodes with an explicit enclosing argument, e.g. "outer.new Inner()". They are mostly treated the same, except in JavaCAst2IRTranslator.doNewObject
-  public static final int NEW_ENCLOSING = 130;
+  public static final int NEW_ENCLOSING = 131;
+  public static final int COMPREHENSION_EXPR = 132;
   
   // explicit lexical scopes
   public static final int LOCAL_SCOPE = 200;
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstReference.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstReference.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstReference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstReference.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,4 +22,4 @@
 
   CAstType type();
 
-};
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstTypeDictionary.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstTypeDictionary.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstTypeDictionary.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstTypeDictionary.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,13 +15,13 @@
 
 import java.util.Iterator;
 
-public interface CAstTypeDictionary/*<ASTType>*/ extends Iterable {
+public interface CAstTypeDictionary/*<ASTType>*/ extends Iterable<CAstType> {
 
   CAstType getCAstTypeFor(Object/*ASTType*/ type);
 
   CAstReference resolveReference(CAstReference ref);
 
   @Override
-  Iterator iterator();
+  Iterator<CAstType> iterator();
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstType.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstType.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstType.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/CAstType.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,7 +23,7 @@
      */
     String getName();
 
-    Collection/*<CAstType>*/ getSupertypes();
+    Collection<CAstType> getSupertypes();
 
     public interface Primitive extends CAstType {
 	// Need anything else? The name pretty much says it all...
@@ -46,14 +46,17 @@
     public interface Function extends Reference {
 	CAstType getReturnType();
 
-	List/*<CAstType>*/ getArgumentTypes();
-	Collection/*<CAstType>*/ getExceptionTypes();
+	List<CAstType> getArgumentTypes();
+	Collection<CAstType> getExceptionTypes();
 
 	int getArgumentCount();
     }
 
     public interface Method extends Function {
 	CAstType getDeclaringType();
+	
+	boolean isStatic();
+	
     }
 
     public interface Complex extends CAstType {
@@ -70,7 +73,7 @@
       }
 
       @Override
-      public Collection/*<CAstType>*/ getSupertypes() {
+      public Collection<CAstType>/*<CAstType>*/ getSupertypes() {
 	return Collections.EMPTY_SET;
       }
  
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/AbstractSourcePosition.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/AbstractSourcePosition.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/AbstractSourcePosition.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/AbstractSourcePosition.java	2019-01-29 17:08:39.000000000 +0000
@@ -66,13 +66,13 @@
     }
     String pos;
     if (getFirstCol() != -1) {
-      pos = "["+getFirstLine()+":"+getFirstCol()+"] -> ["+getLastLine()+":"+getLastCol()+"]";
+      pos = "["+getFirstLine()+ ':' +getFirstCol()+"] -> ["+getLastLine()+ ':' +getLastCol()+ ']';
     } else if (getFirstOffset() != -1) {
-      pos =  "[" + getFirstOffset() + "->" + getLastOffset() + "] (line " + getFirstLine() +")";
+      pos =  "[" + getFirstOffset() + "->" + getLastOffset() + "] (line " + getFirstLine() + ')';
     } else {
-      pos = "(line " + getFirstLine() +")";
+      pos = "(line " + getFirstLine() + ')';
     }
-    return xf + " " + pos;
+    return xf + ' ' + pos;
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstControlFlowRecorder.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstControlFlowRecorder.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstControlFlowRecorder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstControlFlowRecorder.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,6 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
@@ -40,15 +39,15 @@
 public class CAstControlFlowRecorder implements CAstControlFlowMap {
   private final CAstSourcePositionMap src;
 
-  private final Map<CAstNode, Object> CAstToNode = new LinkedHashMap<CAstNode, Object>();
+  private final Map<CAstNode, Object> CAstToNode = new LinkedHashMap<>();
 
-  private final Map<Object, CAstNode> nodeToCAst = new LinkedHashMap<Object, CAstNode>();
+  private final Map<Object, CAstNode> nodeToCAst = new LinkedHashMap<>();
 
-  private final Map<Key, Object> table = new LinkedHashMap<Key, Object>();
+  private final Map<Key, Object> table = new LinkedHashMap<>();
 
-  private final Map<Object, Set<Object>> labelMap = new LinkedHashMap<Object, Set<Object>>();
+  private final Map<Object, Set<Object>> labelMap = new LinkedHashMap<>();
 
-  private final Map<Object, Set<Object>> sourceMap = new LinkedHashMap<Object, Set<Object>>();
+  private final Map<Object, Set<Object>> sourceMap = new LinkedHashMap<>();
 
   /**
    * for optimizing {@link #getMappedNodes()}; methods that change the set of
@@ -83,7 +82,7 @@
 
     @Override
     public String toString() {
-      return "<key " + label + " : " + from + ">";
+      return "<key " + label + " : " + from + '>';
     }
   }
 
@@ -106,15 +105,16 @@
 
   @Override
   public Collection<Object> getTargetLabels(CAstNode from) {
-    if (labelMap.containsKey(CAstToNode.get(from))) {
-      return labelMap.get(CAstToNode.get(from));
+    Object node = CAstToNode.get(from);
+    if (labelMap.containsKey(node)) {
+      return labelMap.get(node);
     } else {
       return Collections.emptySet();
     }
   }
 
   @Override
-  public Collection getSourceNodes(CAstNode to) {
+  public Set<Object> getSourceNodes(CAstNode to) {
     if (sourceMap.containsKey(CAstToNode.get(to))) {
       return sourceMap.get(CAstToNode.get(to));
     } else {
@@ -126,11 +126,10 @@
   public Collection<CAstNode> getMappedNodes() {
     Collection<CAstNode> nodes = cachedMappedNodes;
     if (nodes == null) {
-      nodes = new LinkedHashSet<CAstNode>();
-      for (Iterator<Key> keys = table.keySet().iterator(); keys.hasNext();) {
-        Key key = keys.next();
-        nodes.add(nodeToCAst.get(key.from));
-        nodes.add(nodeToCAst.get(table.get(key)));
+      nodes = new LinkedHashSet<>();
+      for (Map.Entry<Key, Object> entry : table.entrySet()) {
+        nodes.add(nodeToCAst.get(entry.getKey().from));
+        nodes.add(nodeToCAst.get(entry.getValue()));
       }
       cachedMappedNodes = nodes;
     }
@@ -159,12 +158,12 @@
 
     Set<Object> ls = labelMap.get(from);
     if (ls == null)
-      labelMap.put(from, ls = new LinkedHashSet<Object>(2));
+      labelMap.put(from, ls = new LinkedHashSet<>(2));
     ls.add(label);
 
     Set<Object> ss = sourceMap.get(to);
     if (ss == null)
-      sourceMap.put(to, ss = new LinkedHashSet<Object>(2));
+      sourceMap.put(to, ss = new LinkedHashSet<>(2));
     ss.add(from);
   }
 
@@ -201,9 +200,9 @@
 
   @Override
   public String toString() {
-    StringBuffer sb = new StringBuffer("control flow map\n");
-    for (Iterator keys = table.keySet().iterator(); keys.hasNext();) {
-      Key key = (Key) keys.next();
+    StringBuilder sb = new StringBuilder("control flow map\n");
+    for (Map.Entry<Key, Object> entry : table.entrySet()) {
+      final Key key = entry.getKey();
       sb.append(key.from);
       if (src != null && nodeToCAst.get(key.from) != null && src.getPosition(nodeToCAst.get(key.from)) != null) {
         sb.append(" (").append(src.getPosition(nodeToCAst.get(key.from))).append(") ");
@@ -211,10 +210,10 @@
       sb.append(" -- ");
       sb.append(key.label);
       sb.append(" --> ");
-      sb.append(table.get(key));
-      sb.append("\n");
+      sb.append(entry.getValue());
+      sb.append('\n');
     }
-    sb.append("\n");
+    sb.append('\n');
     return sb.toString();
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstImpl.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstImpl.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstImpl.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstImpl.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,7 +43,7 @@
 
       for (int i = 0; i < cs.length; i++)
         assert cs[i] != null : "argument " + i + " is null for node kind " + kind + " [" + CAstPrinter.entityKindAsString(kind)
-            + "]";
+            + ']';
     }
 
     @Override
@@ -79,7 +79,9 @@
     public int hashCode() {
       int code = getKind() * (getChildCount() + 13);
       for (int i = 0; i < getChildCount() && i < 15; i++) {
-        code *= getChild(i).getKind();
+        if (getChild(i) != null) {
+          code *= getChild(i).getKind();
+        }
       }
 
       return code;
@@ -184,32 +186,32 @@
 
   @Override
   public CAstNode makeConstant(char value) {
-    return makeConstant(new Character(value));
+    return makeConstant(Character.valueOf(value));
   }
 
   @Override
   public CAstNode makeConstant(short value) {
-    return makeConstant(new Short(value));
+    return makeConstant(Short.valueOf(value));
   }
 
   @Override
   public CAstNode makeConstant(int value) {
-    return makeConstant(new Integer(value));
+    return makeConstant(Integer.valueOf(value));
   }
 
   @Override
   public CAstNode makeConstant(long value) {
-    return makeConstant(new Long(value));
+    return makeConstant(Long.valueOf(value));
   }
 
   @Override
   public CAstNode makeConstant(float value) {
-    return makeConstant(new Float(value));
+    return makeConstant(Float.valueOf(value));
   }
 
   @Override
   public CAstNode makeConstant(double value) {
-    return makeConstant(new Double(value));
+    return makeConstant(Double.valueOf(value));
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstOperator.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstOperator.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstOperator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstOperator.java	2019-01-29 17:08:39.000000000 +0000
@@ -71,6 +71,7 @@
   public final static CAstOperator OP_LSH = new CAstOperator("<<");
   public final static CAstOperator OP_MOD = new CAstOperator("%");
   public final static CAstOperator OP_MUL = new CAstOperator("*");
+  public final static CAstOperator OP_POW = new CAstOperator("^^^");
   public final static CAstOperator OP_RSH = new CAstOperator(">>");
   public final static CAstOperator OP_URSH = new CAstOperator(">>>");
   public final static CAstOperator OP_SUB = new CAstOperator("-");
@@ -86,5 +87,8 @@
   public final static CAstOperator OP_REL_OR = new CAstOperator("||");
   public final static CAstOperator OP_BIT_XOR = new CAstOperator("^");
   public final static CAstOperator OP_REL_XOR = new CAstOperator("^^");
+  public final static CAstOperator OP_IN = new CAstOperator("in");
+  public final static CAstOperator OP_NOT_IN = new CAstOperator("not in");
+
 }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstSourcePositionRecorder.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstSourcePositionRecorder.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstSourcePositionRecorder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstSourcePositionRecorder.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,6 +21,7 @@
 import com.ibm.wala.cast.tree.CAstNode;
 import com.ibm.wala.cast.tree.CAstSourcePositionMap;
 import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 public class CAstSourcePositionRecorder implements CAstSourcePositionMap {
  
@@ -82,7 +83,7 @@
 	}
 	@Override
   public String toString() {
-	  return "["+fl+":"+fc+"]->["+ll+":"+lc+"]";
+	  return "["+fl+ ':' +fc+"]->["+ll+ ':' +lc+ ']';
 	}
       });
   }
@@ -98,8 +99,7 @@
   }
 
   public void addAll(CAstSourcePositionMap other) {
-    for(Iterator<CAstNode> nodes = other.getMappedNodes(); nodes.hasNext(); ) {
-      CAstNode node = nodes.next();
+    for(CAstNode node : Iterator2Iterable.make(other.getMappedNodes())) {
       setPosition(node, other.getPosition(node));
     }
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstTypeDictionaryImpl.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstTypeDictionaryImpl.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstTypeDictionaryImpl.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstTypeDictionaryImpl.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,21 +21,20 @@
 import com.ibm.wala.cast.tree.CAstTypeDictionary;
 import com.ibm.wala.util.collections.HashMapFactory;
 
-public class CAstTypeDictionaryImpl implements CAstTypeDictionary {
-  protected final Map fMap = HashMapFactory.make();
+public class CAstTypeDictionaryImpl<A> implements CAstTypeDictionary {
+  protected final Map<A, CAstType> fMap = HashMapFactory.make();
 
   @Override
-  public CAstType getCAstTypeFor(Object/*ASTType*/ astType) {
-      return (CAstType) fMap.get(astType);
+  public CAstType getCAstTypeFor(Object astType) {
+      return fMap.get(astType);
   }
 
-  @SuppressWarnings("unchecked")
-  public void map(Object/*ASTType*/ astType, CAstType castType) {
+  public void map(A astType, CAstType castType) {
     fMap.put(astType, castType);
   }
 
   @Override
-  public Iterator iterator() {
+  public Iterator<CAstType> iterator() {
     return fMap.values().iterator();
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstValueImpl.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstValueImpl.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstValueImpl.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/CAstValueImpl.java	2019-01-29 17:08:39.000000000 +0000
@@ -33,8 +33,8 @@
     @Override
     public int hashCode() {
       int value = 1237 * kind;
-      for(int i = 0; i < cs.length; i++) 
-	value *= cs[i].hashCode();
+      for (CAstNode element : cs)
+        value *= element.hashCode();
 
       return value;
     }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/DelegatingEntity.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/DelegatingEntity.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/DelegatingEntity.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/DelegatingEntity.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,6 +21,7 @@
 import com.ibm.wala.cast.tree.CAstNodeTypeMap;
 import com.ibm.wala.cast.tree.CAstQualifier;
 import com.ibm.wala.cast.tree.CAstSourcePositionMap;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
 import com.ibm.wala.cast.tree.CAstType;
 
 public class DelegatingEntity implements CAstEntity {
@@ -110,4 +111,14 @@
       return base.getAnnotations();
     }
 
+    @Override
+    public Position getPosition(int arg) {
+      return base.getPosition(arg);
+    }
+
+    @Override
+    public Position getNamePosition() {
+      return base.getNamePosition();
+    }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/LineNumberPosition.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/LineNumberPosition.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/LineNumberPosition.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/LineNumberPosition.java	2019-01-29 17:08:39.000000000 +0000
@@ -56,6 +56,6 @@
   public String toString() {
     String nm = url.getFile();
     nm = nm.substring(nm.lastIndexOf('/') + 1);
-    return "[" + nm + ":"+lineNumber+"]";
+    return '[' + nm + ':' +lineNumber+ ']';
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/RangePosition.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/RangePosition.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/RangePosition.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/impl/RangePosition.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,7 @@
 
 import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
 
-public class RangePosition extends AbstractSourcePosition implements Position {
+public class RangePosition extends AbstractSourcePosition {
   private final URL url;
   private final int startLine;
   private final int endLine;
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/NodeOfKind.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/NodeOfKind.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/NodeOfKind.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/NodeOfKind.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,9 +26,7 @@
 	
 	public NodeOfKind(int kind, NodePattern... children) {
 		this.kind = kind;
-		this.children = new NodePattern[children.length];
-		for(int i=0;i<children.length;++i)
-			this.children[i] = children[i];
+		this.children = children.clone();
 	}
 	
 	/* (non-Javadoc)
@@ -43,4 +41,4 @@
 				return false;
 		return true;
 	}
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/NodePattern.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/NodePattern.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/NodePattern.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/NodePattern.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,4 +21,4 @@
  */
 public interface NodePattern {
 	public abstract boolean matches(CAstNode node);
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/SomeConstant.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/SomeConstant.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/SomeConstant.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/SomeConstant.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,4 +37,4 @@
 	public Object getLastMatch() {
 		return last_match;
 	}
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/SubtreeOfKind.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/SubtreeOfKind.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/SubtreeOfKind.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/pattern/SubtreeOfKind.java	2019-01-29 17:08:39.000000000 +0000
@@ -28,4 +28,4 @@
 	public boolean matches(CAstNode node) {
 		return node != null && node.getKind() == this.kind;
 	}
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/AstConstantFolder.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/AstConstantFolder.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/AstConstantFolder.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/AstConstantFolder.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,85 @@
+package com.ibm.wala.cast.tree.rewrite;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import com.ibm.wala.cast.tree.CAstControlFlowMap;
+import com.ibm.wala.cast.tree.CAstEntity;
+import com.ibm.wala.cast.tree.CAstNode;
+import com.ibm.wala.cast.tree.CAstNodeTypeMap;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap;
+import com.ibm.wala.cast.tree.impl.CAstImpl;
+import com.ibm.wala.cast.tree.impl.DelegatingEntity;
+import com.ibm.wala.cast.tree.rewrite.CAstBasicRewriter.NonCopyingContext;
+import com.ibm.wala.cast.tree.rewrite.CAstRewriter.Rewrite;
+import com.ibm.wala.cast.util.AstConstantCollector;
+import com.ibm.wala.util.collections.EmptyIterator;
+import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Pair;
+
+public class AstConstantFolder {
+  static class AssignSkipContext extends NonCopyingContext {
+    private Set<CAstNode> skip = HashSetFactory.make();
+  }
+  
+  public static CAstEntity fold(CAstEntity ce) {
+    Map<String,Object> constants = AstConstantCollector.collectConstants(ce);
+    if (constants.isEmpty()) {
+      return ce;
+    } else {
+      Rewrite nce = new CAstCloner(new CAstImpl(), new AssignSkipContext(), true) {
+
+        @Override
+        protected CAstNode copyNodes(CAstNode root, CAstControlFlowMap cfg, NonCopyingContext c,
+            Map<Pair<CAstNode, NoKey>, CAstNode> nodeMap) {
+          
+          if (root.getKind() == CAstNode.ASSIGN) {
+            ((AssignSkipContext)c).skip.add(root.getChild(0));
+          }
+          
+          if (root.getKind() == CAstNode.VAR && constants.containsKey(root.getChild(0).getValue()) && ! ((AssignSkipContext)c).skip.contains(root)) {
+            return Ast.makeConstant(constants.get(root.getChild(0).getValue()));
+          } else {
+            return super.copyNodes(root, cfg, c, nodeMap);
+          }
+        } 
+        
+      }.rewrite(ce.getAST(), ce.getControlFlow(), ce.getSourceMap(), ce.getNodeTypeMap(), ce.getAllScopedEntities(), ce.getArgumentDefaults());
+      return new DelegatingEntity(ce) {
+
+        @Override
+        public CAstNode getAST() {
+           return nce.newRoot();
+        }
+
+        @Override
+        public CAstControlFlowMap getControlFlow() {
+           return nce.newCfg();
+        }
+
+        @Override
+        public CAstSourcePositionMap getSourceMap() {
+          return nce.newPos();
+        }
+
+        @Override
+        public CAstNodeTypeMap getNodeTypeMap() {
+          return nce.newTypes();
+        }
+
+        @Override
+        public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
+          return nce.newChildren();
+        }
+
+        @Override
+        public Iterator<CAstEntity> getScopedEntities(CAstNode construct) {
+          Collection<CAstEntity> children = nce.newChildren().get(construct);
+          return children==null? EmptyIterator.instance(): children.iterator();
+        }
+      };
+    }
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/AstLoopUnwinder.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/AstLoopUnwinder.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/AstLoopUnwinder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/AstLoopUnwinder.java	2019-01-29 17:08:39.000000000 +0000
@@ -98,7 +98,7 @@
   }
 	  
   @Override
-  protected CAstNode flowOutTo(Map nodeMap, 
+  protected CAstNode flowOutTo(Map<Pair<CAstNode, UnwindKey>, CAstNode> nodeMap,
 			       CAstNode oldSource,
 			       Object label,
 			       CAstNode oldTarget,
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/CAstBasicRewriter.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/CAstBasicRewriter.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/CAstBasicRewriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/CAstBasicRewriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,8 +23,8 @@
  * abstract base class for {@link CAstRewriter}s that do no cloning of nodes
  *
  */
-public abstract class CAstBasicRewriter
-  extends CAstRewriter<CAstBasicRewriter.NonCopyingContext, 
+public abstract class CAstBasicRewriter<T extends CAstBasicRewriter.NonCopyingContext>
+  extends CAstRewriter<T, 
 	               CAstBasicRewriter.NoKey> 
 {
 
@@ -32,9 +32,9 @@
    * context indicating that no cloning is being performed
    */
   public static class NonCopyingContext implements CAstRewriter.RewriteContext<NoKey> {
-    private final Map nodeMap = new HashMap();
+    private final Map<Object, Object> nodeMap = new HashMap<>();
 
-    public Map nodeMap() {
+    public Map<Object, Object> nodeMap() {
       return nodeMap;
     }
 
@@ -67,13 +67,13 @@
     public NoKey parent() {
       return null;
     }
-  };
+  }
 
-  protected CAstBasicRewriter(CAst Ast, boolean recursive) {
-    super(Ast, recursive, new NonCopyingContext());
+  protected CAstBasicRewriter(CAst Ast, T context, boolean recursive) {
+    super(Ast, recursive, context);
   }
 
   @Override
-  protected abstract CAstNode copyNodes(CAstNode root, final CAstControlFlowMap cfg, NonCopyingContext context, Map<Pair<CAstNode,NoKey>, CAstNode> nodeMap);
+  protected abstract CAstNode copyNodes(CAstNode root, final CAstControlFlowMap cfg, T context, Map<Pair<CAstNode,NoKey>, CAstNode> nodeMap);
   
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/CAstCloner.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/CAstCloner.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/CAstCloner.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/CAstCloner.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,32 +22,30 @@
 import com.ibm.wala.cast.tree.impl.CAstOperator;
 import com.ibm.wala.util.collections.Pair;
 
-public class CAstCloner extends CAstBasicRewriter {
+public class CAstCloner extends CAstBasicRewriter<CAstBasicRewriter.NonCopyingContext> {
 
   public CAstCloner(CAst Ast, boolean recursive) {
-    super(Ast, recursive);
+    this(Ast, new NonCopyingContext(), recursive);
   }
 
   public CAstCloner(CAst Ast) {
     this(Ast, false);
   }
 
+  protected CAstCloner(CAst Ast, NonCopyingContext context, boolean recursive) {
+    super(Ast, context, recursive);
+  }
+
   @Override
   protected CAstNode copyNodes(CAstNode root, final CAstControlFlowMap cfg, NonCopyingContext c, Map<Pair<CAstNode,NoKey>, CAstNode> nodeMap) {
-    return copyNodesHackForEclipse(root, cfg, c, nodeMap);
-  }
-  
-  /**
-   * what is the hack here?  --MS
-   */
-  protected CAstNode copyNodesHackForEclipse(CAstNode root, final CAstControlFlowMap cfg, NonCopyingContext c, Map<Pair<CAstNode,NoKey>, CAstNode> nodeMap) {
+    final Pair<CAstNode, NoKey> pairKey = Pair.make(root, c.key());
     if (root instanceof CAstOperator) {
-      nodeMap.put(Pair.make(root, c.key()), root);
+      nodeMap.put(pairKey, root);
       return root;
     } else if (root.getValue() != null) {
       CAstNode copy = Ast.makeConstant(root.getValue());
-      assert !nodeMap.containsKey(root);
-      nodeMap.put(Pair.make(root, c.key()), copy);
+      assert !nodeMap.containsKey(pairKey);
+      nodeMap.put(pairKey, copy);
       return copy;
     } else {
       CAstNode newChildren[] = new CAstNode[root.getChildCount()];
@@ -57,14 +55,14 @@
       }
 
       CAstNode copy = Ast.makeNode(root.getKind(), newChildren);
-      assert !nodeMap.containsKey(root);
-      nodeMap.put(Pair.make(root, c.key()), copy);
+      assert !nodeMap.containsKey(pairKey);
+      nodeMap.put(pairKey, copy);
       return copy;
     }
   }
 
   public Rewrite copy(CAstNode root, final CAstControlFlowMap cfg, final CAstSourcePositionMap pos, final CAstNodeTypeMap types,
-      final Map<CAstNode, Collection<CAstEntity>> children) {
-    return rewrite(root, cfg, pos, types, children);
+      final Map<CAstNode, Collection<CAstEntity>> children, CAstNode[] defaults) {
+    return rewrite(root, cfg, pos, types, children, defaults);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/CAstRewriter.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/CAstRewriter.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/CAstRewriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/CAstRewriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,7 +47,7 @@
  *          a key used to ease cloning of partial ASTs. When rewriting an AST,
  *          sub-classes maintain a mapping from (original node, key) pairs
  *          (where key is of type K) to new nodes; see
- *          {@link #copyNodes(CAstNode, RewriteContext, Map)}
+ *          {@link #copyNodes}
  */
 public abstract class CAstRewriter<C extends CAstRewriter.RewriteContext<K>, K extends CAstRewriter.CopyKey<K>> {
 
@@ -57,7 +57,7 @@
    * interface to be implemented by keys used for cloning sub-trees during the
    * rewrite
    */
-  public interface CopyKey<Self extends CopyKey> {
+  public interface CopyKey<Self extends CopyKey<Self>> {
 
     @Override
     int hashCode();
@@ -71,19 +71,19 @@
      */
     Self parent();
 
-  };
+  }
 
   /**
    * interface to be implemented by contexts used while traversing the AST
    */
-  public interface RewriteContext<K extends CopyKey> {
+  public interface RewriteContext<K extends CopyKey<K>> {
 
     /**
      * get the cloning key for this context
      */
     K key();
 
-  };
+  }
 
   /**
    * represents a rewritten CAst
@@ -100,6 +100,7 @@
 
     Map<CAstNode, Collection<CAstEntity>> newChildren();
 
+    CAstNode[] newDefaults();
   }
 
   protected final CAst Ast;
@@ -133,6 +134,7 @@
    * rewritten AST? By default, just uses the original target.
    * 
    */
+  @SuppressWarnings("unused")
   protected CAstNode flowOutTo(Map<Pair<CAstNode, K>, CAstNode> nodeMap, CAstNode oldSource, Object label, CAstNode oldTarget,
       CAstControlFlowMap orig, CAstSourcePositionMap src) {
     return oldTarget;
@@ -158,8 +160,7 @@
     Set<CAstNode> allNewTargetNodes = HashSetFactory.make(1);
     Collection<CAstNode> oldSources = orig.getMappedNodes();
 
-    for (Iterator<Entry<Pair<CAstNode, K>, CAstNode>> NS = nodeMap.entrySet().iterator(); NS.hasNext();) {
-      Entry<Pair<CAstNode, K>, CAstNode> entry = NS.next();
+    for (Entry<Pair<CAstNode, K>, CAstNode> entry : nodeMap.entrySet()) {
       Pair<CAstNode, K> N = entry.getKey();
       CAstNode oldSource = N.fst;
       K key = N.snd;
@@ -170,7 +171,7 @@
       newMap.map(newSource, newSource);
 
       if (DEBUG) {
-        System.err.println(("\n\nlooking at " + key + ":" + CAstPrinter.print(oldSource)));
+        System.err.println(("\n\nlooking at " + key + ':' + CAstPrinter.print(oldSource)));
       }
 
       if (oldSources.contains(oldSource)) {
@@ -190,8 +191,8 @@
 
           // try to find a k in key's parent chain such that (oldTarget, k) is
           // in nodeMap's key set
-          Pair targetKey;
-          CopyKey k = key;
+          Pair<CAstNode,CopyKey<K>> targetKey;
+          CopyKey<K> k = key;
           do {
             targetKey = Pair.make(oldTarget, k);
             if (k != null) {
@@ -271,8 +272,7 @@
 
   protected CAstSourcePositionMap copySource(Map<Pair<CAstNode, K>, CAstNode> nodeMap, CAstSourcePositionMap orig) {
     CAstSourcePositionRecorder newMap = new CAstSourcePositionRecorder();
-    for (Iterator<Map.Entry<Pair<CAstNode, K>, CAstNode>> NS = nodeMap.entrySet().iterator(); NS.hasNext();) {
-      Map.Entry<Pair<CAstNode, K>, CAstNode> entry = NS.next();
+    for (Entry<Pair<CAstNode, K>, CAstNode> entry : nodeMap.entrySet()) {
       Pair<CAstNode, K> N = entry.getKey();
       CAstNode oldNode = N.fst;
 
@@ -289,8 +289,7 @@
   protected CAstNodeTypeMap copyTypes(Map<Pair<CAstNode, K>, CAstNode> nodeMap, CAstNodeTypeMap orig) {
     if (orig != null) {
       CAstNodeTypeMapRecorder newMap = new CAstNodeTypeMapRecorder();
-      for (Iterator<Entry<Pair<CAstNode, K>, CAstNode>> NS = nodeMap.entrySet().iterator(); NS.hasNext();) {
-        Entry<Pair<CAstNode, K>, CAstNode> entry = NS.next();
+      for (Entry<Pair<CAstNode, K>, CAstNode> entry : nodeMap.entrySet()) {
         Pair<CAstNode, K> N = entry.getKey();
         CAstNode oldNode = N.fst;
 
@@ -307,34 +306,32 @@
     }
   }
 
-  protected Map<CAstNode, Collection<CAstEntity>> copyChildren(CAstNode root, Map<Pair<CAstNode, K>, CAstNode> nodeMap,
+  protected Map<CAstNode, Collection<CAstEntity>> copyChildren(@SuppressWarnings("unused") CAstNode root, Map<Pair<CAstNode, K>, CAstNode> nodeMap,
       Map<CAstNode, Collection<CAstEntity>> children) {
-    final Map<CAstNode, Collection<CAstEntity>> newChildren = new LinkedHashMap<CAstNode, Collection<CAstEntity>>();
+    final Map<CAstNode, Collection<CAstEntity>> newChildren = new LinkedHashMap<>();
 
-    for (Iterator<Entry<Pair<CAstNode, K>, CAstNode>> NS = nodeMap.entrySet().iterator(); NS.hasNext();) {
-      Entry<Pair<CAstNode, K>, CAstNode> entry = NS.next();
+    for (Entry<Pair<CAstNode, K>, CAstNode> entry : nodeMap.entrySet()) {
       Pair<CAstNode, K> N = entry.getKey();
       CAstNode oldNode = N.fst;
 
       CAstNode newNode = entry.getValue();
 
       if (children.containsKey(oldNode)) {
-        Set<CAstEntity> newEntities = new LinkedHashSet<CAstEntity>();
+        Set<CAstEntity> newEntities = new LinkedHashSet<>();
         newChildren.put(newNode, newEntities);
-        for (Iterator oldEntities = ((Collection) children.get(oldNode)).iterator(); oldEntities.hasNext();) {
-          newEntities.add(rewrite((CAstEntity) oldEntities.next()));
+        for (CAstEntity cAstEntity : children.get(oldNode)) {
+          newEntities.add(rewrite(cAstEntity));
         }
       }
     }
 
-    for (Iterator<Map.Entry<CAstNode, Collection<CAstEntity>>> keys = children.entrySet().iterator(); keys.hasNext();) {
-      Map.Entry<CAstNode, Collection<CAstEntity>> entry = keys.next();
+    for (Entry<CAstNode, Collection<CAstEntity>> entry : children.entrySet()) {
       CAstNode key = entry.getKey();
       if (key == null) {
-        Set<CAstEntity> newEntities = new LinkedHashSet<CAstEntity>();
+        Set<CAstEntity> newEntities = new LinkedHashSet<>();
         newChildren.put(key, newEntities);
-        for (Iterator oldEntities = ((Collection) entry.getValue()).iterator(); oldEntities.hasNext();) {
-          newEntities.add(rewrite((CAstEntity) oldEntities.next()));
+        for (CAstEntity oldEntity : entry.getValue()) {
+          newEntities.add(rewrite(oldEntity));
         }
       }
     }
@@ -346,9 +343,14 @@
    * rewrite the CAst sub-tree rooted at root
    */
   public Rewrite rewrite(final CAstNode root, final CAstControlFlowMap cfg, final CAstSourcePositionMap pos, final CAstNodeTypeMap types,
-      final Map<CAstNode, Collection<CAstEntity>> children) {
+      final Map<CAstNode, Collection<CAstEntity>> children, final CAstNode[] defaults) {
     final Map<Pair<CAstNode, K>, CAstNode> nodes = HashMapFactory.make();
     final CAstNode newRoot = copyNodes(root, cfg, rootContext, nodes);
+    final CAstNode newDefaults[] = new CAstNode[ defaults==null? 0: defaults.length ];
+    for(int i = 0; i < newDefaults.length; i++) {
+        newDefaults[i] = copyNodes(defaults[i], cfg, rootContext, nodes);
+    }
+
     return new Rewrite() {
       private CAstControlFlowMap theCfg = null;
 
@@ -359,27 +361,32 @@
       private Map<CAstNode, Collection<CAstEntity>> theChildren = null;
 
       @Override
+      public CAstNode[] newDefaults() {
+         return newDefaults;
+      }
+
+      @Override
       public CAstNode newRoot() {
         return newRoot;
       }
 
       @Override
       public CAstControlFlowMap newCfg() {
-        if (theCfg == null)
+        if (theCfg == null && cfg != null)
           theCfg = copyFlow(nodes, cfg, newPos());
         return theCfg;
       }
 
       @Override
       public CAstSourcePositionMap newPos() {
-        if (theSource == null)
+        if (theSource == null && pos != null)
           theSource = copySource(nodes, pos);
         return theSource;
       }
 
       @Override
       public CAstNodeTypeMap newTypes() {
-        if (theTypes == null)
+        if (theTypes == null && types != null)
           theTypes = copyTypes(nodes, types);
         return theTypes;
       }
@@ -401,7 +408,7 @@
 
     if (root.getAST() != null) {
       final Rewrite rewrite = rewrite(root.getAST(), root.getControlFlow(), root.getSourceMap(), root.getNodeTypeMap(),
-          root.getAllScopedEntities());
+          root.getAllScopedEntities(), root.getArgumentDefaults());
 
       return new DelegatingEntity(root) {
         @Override
@@ -443,19 +450,23 @@
         public CAstControlFlowMap getControlFlow() {
           return rewrite.newCfg();
         }
+
+        @Override
+        public CAstNode[] getArgumentDefaults() {
+          return rewrite.newDefaults();
+        }
       };
 
     } else if (recursive) {
 
       Map<CAstNode, Collection<CAstEntity>> children = root.getAllScopedEntities();
-      final Map<CAstNode, Collection<CAstEntity>> newChildren = new LinkedHashMap<CAstNode, Collection<CAstEntity>>();
-      for (Iterator<Map.Entry<CAstNode, Collection<CAstEntity>>> keys = children.entrySet().iterator(); keys.hasNext();) {
-        Map.Entry<CAstNode, Collection<CAstEntity>> entry = keys.next();
+      final Map<CAstNode, Collection<CAstEntity>> newChildren = new LinkedHashMap<>();
+      for (Entry<CAstNode, Collection<CAstEntity>> entry : children.entrySet()) {
         CAstNode key = entry.getKey();
-        Set<CAstEntity> newValues = new LinkedHashSet<CAstEntity>();
+        Set<CAstEntity> newValues = new LinkedHashSet<>();
         newChildren.put(key, newValues);
-        for (Iterator es = entry.getValue().iterator(); es.hasNext();) {
-          newValues.add(rewrite((CAstEntity) es.next()));
+        for (CAstEntity entity : entry.getValue()) {
+          newValues.add(rewrite(entity));
         }
       }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/PatternBasedRewriter.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/PatternBasedRewriter.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/PatternBasedRewriter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/rewrite/PatternBasedRewriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,57 @@
+package com.ibm.wala.cast.tree.rewrite;
+
+import java.util.Map;
+import java.util.function.Function;
+
+import com.ibm.wala.cast.tree.CAst;
+import com.ibm.wala.cast.tree.CAstControlFlowMap;
+import com.ibm.wala.cast.tree.CAstNode;
+import com.ibm.wala.cast.tree.impl.CAstOperator;
+import com.ibm.wala.cast.util.CAstPattern;
+import com.ibm.wala.cast.util.CAstPattern.Segments;
+import com.ibm.wala.util.collections.Pair;
+
+public class PatternBasedRewriter extends CAstBasicRewriter<CAstBasicRewriter.NonCopyingContext> {
+
+  private final CAstPattern pattern;
+  private final Function<Segments,CAstNode> rewrite;
+  
+  public PatternBasedRewriter(CAst ast, CAstPattern pattern, Function<Segments,CAstNode> rewrite) {
+    super(ast, new NonCopyingContext(), true);
+    this.pattern = pattern;
+    this.rewrite = rewrite;
+  }
+
+  @Override
+  protected CAstNode copyNodes(CAstNode root, CAstControlFlowMap cfg, NonCopyingContext context,
+      Map<Pair<CAstNode, NoKey>, CAstNode> nodeMap) {
+    final Pair<CAstNode, NoKey> pairKey = Pair.make(root, context.key());
+    Segments s = CAstPattern.match(pattern, root);
+    if (s != null) {
+      CAstNode replacement = rewrite.apply(s);
+      nodeMap.put(pairKey, replacement);
+      return replacement;
+    } else if (root instanceof CAstOperator) {
+      nodeMap.put(pairKey, root);
+      return root;
+    } else if (root.getValue() != null) {
+      CAstNode copy = Ast.makeConstant(root.getValue());
+      assert !nodeMap.containsKey(pairKey);
+      nodeMap.put(pairKey, copy);
+      return copy;
+    } else {
+      CAstNode newChildren[] = new CAstNode[root.getChildCount()];
+
+      for (int i = 0; i < root.getChildCount(); i++) {
+        newChildren[i] = copyNodes(root.getChild(i), cfg, context, nodeMap);
+      }
+
+      CAstNode copy = Ast.makeNode(root.getKind(), newChildren);
+      assert !nodeMap.containsKey(pairKey);
+      nodeMap.put(pairKey, copy);
+      return copy;
+    }
+  }
+
+  
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/visit/CAstVisitor.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/visit/CAstVisitor.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/visit/CAstVisitor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/visit/CAstVisitor.java	2019-01-29 17:08:39.000000000 +0000
@@ -86,7 +86,7 @@
    * @param context a visitor-specific context in which the unwind was visited
    * @param n the unwind node
    */
-  protected C makeUnwindContext(C context, CAstNode n, CAstVisitor<C> visitor) { return context; }
+  protected C makeUnwindContext(C context, CAstNode n, @SuppressWarnings("unused") CAstVisitor<C> visitor) { return context; }
 
   private final Map<CAstEntity, CAstEntity> entityParents = HashMapFactory.make();
 
@@ -114,6 +114,7 @@
    * Should invoke super.doVisitEntity() for unprocessed entities.
    * @return true if entity was handled
    */
+  @SuppressWarnings("unused")
   protected boolean doVisitEntity(CAstEntity n, C context, CAstVisitor<C> visitor) {
     return false;
   }
@@ -123,18 +124,17 @@
    * Visit scoped entities of an entity using a given iterator.
    * Prerequisite (unchecked): i iterates over entities scoped in n.
    * @param n the parent entity of the entities to process
-   * @param i the iterator over some scoped entities of n
    * @param context a visitor-specific context
    */
-  public final void visitScopedEntities(CAstEntity n, Map allScopedEntities, C context, CAstVisitor<C> visitor) {
-    for(Iterator i = allScopedEntities.values().iterator(); i.hasNext(); ) {
-      visitScopedEntities(n, ((Collection)i.next()).iterator(), context, visitor);
+  public final void visitScopedEntities(CAstEntity n, Map<CAstNode,Collection<CAstEntity>> allScopedEntities, C context, CAstVisitor<C> visitor) {
+    for (Collection<CAstEntity> collection : allScopedEntities.values()) {
+      visitScopedEntities(n, collection.iterator(), context, visitor);
     }
   }
 
-  public final void visitScopedEntities(CAstEntity n, Iterator i, C context, CAstVisitor<C> visitor) {
+  public final void visitScopedEntities(CAstEntity n, Iterator<CAstEntity> i, C context, CAstVisitor<C> visitor) {
     while (i.hasNext()) {
-      CAstEntity child = (CAstEntity) i.next();
+      CAstEntity child = i.next();
       setParent(child, n);
       visitor.visitEntities(child, context, visitor);
     }
@@ -184,6 +184,10 @@
       break;
     }
     case CAstEntity.FUNCTION_ENTITY: {
+      for(CAstNode dflt : n.getArgumentDefaults()) {
+        visitor.visit(dflt, context, visitor);
+        visitor.visitScopedEntities(context.top(), context.top().getScopedEntities(dflt), context, visitor);
+      }
       C codeContext = visitor.makeCodeContext(context, n);
       if (visitor.visitFunctionEntity(n, context, codeContext, visitor))
         break;
@@ -240,13 +244,13 @@
    * @param context a visitor-specific context
    * @return true if no further processing is needed
    */
-  protected boolean enterEntity(CAstEntity n, C context, CAstVisitor<C> visitor) { return false; }
+  protected boolean enterEntity(CAstEntity n, C context, @SuppressWarnings("unused") CAstVisitor<C> visitor) { return false; }
   /**
    * Post-process an entity after visiting it.
    * @param n the entity to process
    * @param context a visitor-specific context
    */
-  protected void postProcessEntity(CAstEntity n, C context, CAstVisitor<C> visitor) { return; }
+  protected void postProcessEntity(CAstEntity n, C context, @SuppressWarnings("unused") CAstVisitor<C> visitor) { return; }
 
   /**
    * Visit any entity.  Override only this to change behavior for all entities.
@@ -254,13 +258,13 @@
    * @param context a visitor-specific context
    * @return true if no further processing is needed
    */
-  public boolean visitEntity(CAstEntity n, C context, CAstVisitor<C> visitor) { return false; }
+  public boolean visitEntity(CAstEntity n, C context, @SuppressWarnings("unused") CAstVisitor<C> visitor) { return false; }
   /**
    * Leave any entity.  Override only this to change behavior for all entities.
    * @param n the entity to process
    * @param context a visitor-specific context
    */
-  public void leaveEntity(CAstEntity n, C context, CAstVisitor<C> visitor) { return; }
+  public void leaveEntity(CAstEntity n, C context, @SuppressWarnings("unused") CAstVisitor<C> visitor) { return; }
 
   /**
    * Visit a File entity.
@@ -372,6 +376,7 @@
    *
    * @return true if node was handled
    */
+  @SuppressWarnings("unused")
   protected boolean doVisit(CAstNode n, C context, CAstVisitor<C> visitor) {
     return false;
   }
@@ -385,6 +390,7 @@
    *
    * @return true if node was handled
    */
+  @SuppressWarnings("unused")
   protected boolean doVisitAssignNodes(CAstNode n, C context, CAstNode v, CAstNode a, CAstVisitor<C> visitor) {
     return false;
   }
@@ -869,9 +875,20 @@
       break;
     }
 
+    case CAstNode.RETURN_WITHOUT_BRANCH: {
+      if (visitor.visitYield(n, context, visitor)) {
+  break;
+      }
+      for(int i = 0; i < n.getChildCount(); i++) {
+  visitor.visit(n.getChild(i), context, visitor);
+      }
+      visitor.leaveYield(n, context, visitor);
+      break;
+    }
+
     default: {
       if (!visitor.doVisit(n, context, visitor)) {
-        System.err.println(("looking at unhandled " + n + "(" + NT + ")" + " of " + n.getClass()));
+        System.err.println(("looking at unhandled " + n + '(' + NT + ')' + " of " + n.getClass()));
         Assertions.UNREACHABLE("cannot handle node of kind " + NT);
       }
     }
@@ -890,7 +907,7 @@
     visitor.leaveNode(n, context, visitor);
   }
 
-  protected C makeSpecialParentContext(C context, CAstNode n) {
+  protected C makeSpecialParentContext(C context, @SuppressWarnings("unused") CAstNode n) {
     return context;
   }
 
@@ -966,8 +983,27 @@
       break;
     }
 
+    case CAstNode.ARRAY_LITERAL: {
+      assert assign;
+      if (visitor.visitArrayLiteralAssign(n, v, a, context, visitor))
+        return true;
+      visitor.leaveArrayLiteralAssign(n, v, a, context, visitor);
+      break;
+    }
+
+    case CAstNode.OBJECT_LITERAL: {
+      assert assign;
+      for(int i = 1; i < n.getChildCount(); i+=2) {
+        visitor.visit(n.getChild(i), context, visitor);
+      }
+      if (visitor.visitObjectLiteralAssign(n, v, a, context, visitor))
+        return true;
+      visitor.leaveObjectLiteralAssign(n, v, a, context, visitor);
+      break;
+    }
+
     default: {
-      if (!visitor.doVisitAssignNodes(n, context, v, a, visitor)) {
+      if (!visitor.doVisitAssignNodes(n, context, a, v, visitor)) {
         if (DEBUG) {
           System.err.println(("cannot handle assign to kind " + n.getKind()));
         }
@@ -984,13 +1020,13 @@
    * @param c a visitor-specific context
    * @return true if no further processing is needed
    */
-  protected boolean enterNode(CAstNode n, C c, CAstVisitor<C> visitor) { return false; }
+  protected boolean enterNode(CAstNode n, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { return false; }
   /**
    * Post-process a node after visiting it.
    * @param n the node to process
    * @param c a visitor-specific context
    */
-  protected void postProcessNode(CAstNode n, C c, CAstVisitor<C> visitor) { return; }
+  protected void postProcessNode(CAstNode n, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { return; }
 
   /**
    * Visit any node.  Override only this to change behavior for all nodes.
@@ -998,13 +1034,13 @@
    * @param c a visitor-specific context
    * @return true if no further processing is needed
    */
-  public boolean visitNode(CAstNode n, C c, CAstVisitor<C> visitor) { return false; }
+  public boolean visitNode(CAstNode n, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { return false; }
   /**
    * Leave any node.  Override only this to change behavior for all nodes.
    * @param n the node to process
    * @param c a visitor-specific context
    */
-  public void leaveNode(CAstNode n, C c, CAstVisitor<C> visitor) { return; }
+  public void leaveNode(CAstNode n, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { return; }
 
   /**
    * Visit a FunctionExpr node.
@@ -1090,7 +1126,7 @@
    * @param n the node to process
    * @param c a visitor-specific context
    */
-  protected void leaveLoopHeader(CAstNode n, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveLoopHeader(CAstNode n, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Leave a Loop node.
    * @param n the node to process
@@ -1260,6 +1296,19 @@
    */
   protected void leaveReturn(CAstNode n, C c, CAstVisitor<C> visitor) { visitor.leaveNode(n, c, visitor); }
   /**
+   * Visit a Return node.
+   * @param n the node to process
+   * @param c a visitor-specific context
+   * @return true if no further processing is needed
+   */
+  protected boolean visitYield(CAstNode n, C c, CAstVisitor<C> visitor) { return visitor.visitNode(n, c, visitor); }
+  /**
+   * Leave a Return node.
+   * @param n the node to process
+   * @param c a visitor-specific context
+   */
+  protected void leaveYield(CAstNode n, C c, CAstVisitor<C> visitor) { visitor.leaveNode(n, c, visitor); }
+  /**
    * Visit an Ifgoto node.
    * @param n the node to process
    * @param c a visitor-specific context
@@ -1310,13 +1359,13 @@
    * @param n the node to process
    * @param c a visitor-specific context
    */
-  protected void leaveIfStmtCondition(CAstNode n, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveIfStmtCondition(CAstNode n, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Visit an IfStmt node after processing the true clause.
    * @param n the node to process
    * @param c a visitor-specific context
    */
-  protected void leaveIfStmtTrueClause(CAstNode n, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveIfStmtTrueClause(CAstNode n, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Leave an IfStmt node.
    * @param n the node to process
@@ -1335,13 +1384,13 @@
    * @param n the node to process
    * @param c a visitor-specific context
    */
-  protected void leaveIfExprCondition(CAstNode n, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveIfExprCondition(CAstNode n, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Visit an IfExpr node after processing the true clause.
    * @param n the node to process
    * @param c a visitor-specific context
    */
-  protected void leaveIfExprTrueClause(CAstNode n, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveIfExprTrueClause(CAstNode n, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Leave an IfExpr node.
    * @param n the node to process
@@ -1374,7 +1423,7 @@
    * @param i the field position that was initialized
    * @param c a visitor-specific context
    */
-  protected void leaveObjectLiteralFieldInit(CAstNode n, int i, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveObjectLiteralFieldInit(CAstNode n, int i, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Leave an ObjectLiteral node.
    * @param n the node to process
@@ -1393,14 +1442,14 @@
    * @param n the node to process
    * @param c a visitor-specific context
    */
-  protected void leaveArrayLiteralObject(CAstNode n, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveArrayLiteralObject(CAstNode n, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Visit an ArrayLiteral node after processing the {i}th element initializer.
    * @param n the node to process
    * @param i the index that was initialized
    * @param c a visitor-specific context
    */
-  protected void leaveArrayLiteralInitElement(CAstNode n, int i, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveArrayLiteralInitElement(CAstNode n, int i, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Leave a ArrayLiteral node.
    * @param n the node to process
@@ -1441,7 +1490,7 @@
    * @param c a visitor-specific context
    * @return true if no further processing is needed
    */
-  protected boolean visitArrayRefAssign(CAstNode n, CAstNode v, CAstNode a, C c, CAstVisitor<C> visitor) { /* empty */ return false; }
+  protected boolean visitArrayRefAssign(CAstNode n, CAstNode v, CAstNode a, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ return false; }
   /**
    * Visit an ArrayRef Assignment node after visiting the LHS.
    * @param n the LHS node to process
@@ -1449,7 +1498,7 @@
    * @param a the assignment node to process
    * @param c a visitor-specific context
    */
-  protected void leaveArrayRefAssign(CAstNode n, CAstNode v, CAstNode a, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveArrayRefAssign(CAstNode n, CAstNode v, CAstNode a, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Visit an ArrayRef Op/Assignment node after visiting the RHS.
    * @param n the LHS node to process
@@ -1459,7 +1508,7 @@
    * @param c a visitor-specific context
    * @return true if no further processing is needed
    */
-  protected boolean visitArrayRefAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, CAstVisitor<C> visitor) { /* empty */ return false; }
+  protected boolean visitArrayRefAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ return false; }
   /**
    * Visit an ArrayRef Op/Assignment node after visiting the LHS.
    * @param n the LHS node to process
@@ -1468,7 +1517,7 @@
    * @param pre whether the value before the operation should be used
    * @param c a visitor-specific context
    */
-  protected void leaveArrayRefAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveArrayRefAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Visit an ObjectRef Assignment node after visiting the RHS.
    * @param n the LHS node to process
@@ -1477,7 +1526,7 @@
    * @param c a visitor-specific context
    * @return true if no further processing is needed
    */
-  protected boolean visitObjectRefAssign(CAstNode n, CAstNode v, CAstNode a, C c, CAstVisitor<C> visitor) { /* empty */ return false; }
+  protected boolean visitObjectRefAssign(CAstNode n, CAstNode v, CAstNode a, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ return false; }
   /**
    * Visit an ObjectRef Assignment node after visiting the LHS.
    * @param n the LHS node to process
@@ -1485,7 +1534,7 @@
    * @param a the assignment node to process
    * @param c a visitor-specific context
    */
-  protected void leaveObjectRefAssign(CAstNode n, CAstNode v, CAstNode a, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveObjectRefAssign(CAstNode n, CAstNode v, CAstNode a, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Visit an ObjectRef Op/Assignment node after visiting the RHS.
    * @param n the LHS node to process
@@ -1495,7 +1544,7 @@
    * @param c a visitor-specific context
    * @return true if no further processing is needed
    */
-  protected boolean visitObjectRefAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, CAstVisitor<C> visitor) { /* empty */ return false; }
+  protected boolean visitObjectRefAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ return false; }
   /**
    * Visit an ObjectRef Op/Assignment node after visiting the LHS.
    * @param n the LHS node to process
@@ -1504,7 +1553,7 @@
    * @param pre whether the value before the operation should be used
    * @param c a visitor-specific context
    */
-  protected void leaveObjectRefAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveObjectRefAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Visit a BlockExpr Assignment node after visiting the RHS.
    * @param n the LHS node to process
@@ -1513,7 +1562,7 @@
    * @param c a visitor-specific context
    * @return true if no further processing is needed
    */
-  protected boolean visitBlockExprAssign(CAstNode n, CAstNode v, CAstNode a, C c, CAstVisitor<C> visitor) { /* empty */ return false; }
+  protected boolean visitBlockExprAssign(CAstNode n, CAstNode v, CAstNode a, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ return false; }
   /**
    * Visit a BlockExpr Assignment node after visiting the LHS.
    * @param n the LHS node to process
@@ -1521,7 +1570,7 @@
    * @param a the assignment node to process
    * @param c a visitor-specific context
    */
-  protected void leaveBlockExprAssign(CAstNode n, CAstNode v, CAstNode a, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveBlockExprAssign(CAstNode n, CAstNode v, CAstNode a, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Visit a BlockExpr Op/Assignment node after visiting the RHS.
    * @param n the LHS node to process
@@ -1531,7 +1580,7 @@
    * @param c a visitor-specific context
    * @return true if no further processing is needed
    */
-  protected boolean visitBlockExprAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, CAstVisitor<C> visitor) { /* empty */ return false; }
+  protected boolean visitBlockExprAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ return false; }
   /**
    * Visit a BlockExpr Op/Assignment node after visiting the LHS.
    * @param n the LHS node to process
@@ -1540,7 +1589,7 @@
    * @param pre whether the value before the operation should be used
    * @param c a visitor-specific context
    */
-  protected void leaveBlockExprAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveBlockExprAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Visit a Var Assignment node after visiting the RHS.
    * @param n the LHS node to process
@@ -1549,7 +1598,7 @@
    * @param c a visitor-specific context
    * @return true if no further processing is needed
    */
-  protected boolean visitVarAssign(CAstNode n, CAstNode v, CAstNode a, C c, CAstVisitor<C> visitor) { /* empty */ return false; }
+  protected boolean visitVarAssign(CAstNode n, CAstNode v, CAstNode a, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ return false; }
   /**
    * Visit a Var Assignment node after visiting the LHS.
    * @param n the LHS node to process
@@ -1557,7 +1606,41 @@
    * @param a the assignment node to process
    * @param c a visitor-specific context
    */
-  protected void leaveVarAssign(CAstNode n, CAstNode v, CAstNode a, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveVarAssign(CAstNode n, CAstNode v, CAstNode a, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
+  /**
+   * Visit an array literal Assignment node after visiting the RHS.
+   * @param n the LHS node to process
+   * @param v the RHS node to process
+   * @param a the assignment node to process
+   * @param c a visitor-specific context
+   * @return true if no further processing is needed
+   */
+  protected boolean visitArrayLiteralAssign(CAstNode n, CAstNode v, CAstNode a, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ return false; }
+  /**
+   * Visit an array literal Assignment node after visiting the LHS.
+   * @param n the LHS node to process
+   * @param v the RHS node to process
+   * @param a the assignment node to process
+   * @param c a visitor-specific context
+   */
+  protected void leaveArrayLiteralAssign(CAstNode n, CAstNode v, CAstNode a, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
+  /**
+   * Visit an array literal Assignment node after visiting the RHS.
+   * @param n the LHS node to process
+   * @param v the RHS node to process
+   * @param a the assignment node to process
+   * @param c a visitor-specific context
+   * @return true if no further processing is needed
+   */
+  protected boolean visitObjectLiteralAssign(CAstNode n, CAstNode v, CAstNode a, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ return false; }
+  /**
+   * Visit an array literal Assignment node after visiting the LHS.
+   * @param n the LHS node to process
+   * @param v the RHS node to process
+   * @param a the assignment node to process
+   * @param c a visitor-specific context
+   */
+  protected void leaveObjectLiteralAssign(CAstNode n, CAstNode v, CAstNode a, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Visit a Var Op/Assignment node after visiting the RHS.
    * @param n the LHS node to process
@@ -1567,7 +1650,7 @@
    * @param c a visitor-specific context
    * @return true if no further processing is needed
    */
-  protected boolean visitVarAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, CAstVisitor<C> visitor) { /* empty */ return false; }
+  protected boolean visitVarAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ return false; }
   /**
    * Visit a Var Op/Assignment node after visiting the LHS.
    * @param n the LHS node to process
@@ -1576,7 +1659,7 @@
    * @param pre whether the value before the operation should be used
    * @param c a visitor-specific context
    */
-  protected void leaveVarAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveVarAssignOp(CAstNode n, CAstNode v, CAstNode a, boolean pre, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Visit a Switch node.
    * @param n the node to process
@@ -1589,7 +1672,7 @@
    * @param n the node to process
    * @param c a visitor-specific context
    */
-  protected void leaveSwitchValue(CAstNode n, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveSwitchValue(CAstNode n, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Leave a Switch node.
    * @param n the node to process
@@ -1647,7 +1730,7 @@
    * @param n the node to process
    * @param c a visitor-specific context
    */
-  protected void leaveTryBlock(CAstNode n, C c, CAstVisitor<C> visitor) { /* empty */ }
+  protected void leaveTryBlock(CAstNode n, C c, @SuppressWarnings("unused") CAstVisitor<C> visitor) { /* empty */ }
   /**
    * Leave a Try node.
    * @param n the node to process
@@ -1723,7 +1806,6 @@
    * Visit an InstanceOf node.
    * @param n the node to process
    * @param c a visitor-specific context
-   * @return true if no further processing is needed
    */
   protected void leaveAssert(CAstNode n, C c, CAstVisitor<C> visitor) { visitor.leaveNode(n, c, visitor); }
   protected boolean visitAssert(CAstNode n, C c, CAstVisitor<C> visitor) { return visitor.visitNode(n, c, visitor); }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/visit/DelegatingCAstVisitor.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/visit/DelegatingCAstVisitor.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/visit/DelegatingCAstVisitor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/tree/visit/DelegatingCAstVisitor.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,10 +14,10 @@
 import com.ibm.wala.cast.tree.CAstNode;
 
 /**
- * @author Igor Peshansky
- * Extend CAstVisitor<C> to delegate unimplemented functionality to another
+ * Extend {@link CAstVisitor}{@code <C>} to delegate unimplemented functionality to another
  * visitor.  Needed to work around Java's retarded multiple inheritance rules.
  * TODO: document me.
+ * @author Igor Peshansky
  */
 public abstract class DelegatingCAstVisitor<C extends CAstVisitor.Context> extends CAstVisitor<C> {
 
@@ -93,7 +93,7 @@
   protected final CAstVisitor<C> delegate() { return delegate; }
 
   /**
-   * Delegating CAstVisitor<C> constructor.
+   * Delegating {@link CAstVisitor}{@code <C>} constructor.
    * Needs to have a valid (non-null) delegate visitor.
    * @param delegate the visitor to delegate to for default implementation
    */
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/types/AstTypeReference.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/types/AstTypeReference.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/types/AstTypeReference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/types/AstTypeReference.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,12 +15,12 @@
 public class AstTypeReference {
 
   public static final String rootTypeSourceStr = "Root";
-  public static final String rootTypeDescStr = "L" + rootTypeSourceStr;
+  public static final String rootTypeDescStr = 'L' + rootTypeSourceStr;
   public static final TypeName rootTypeName = 
     TypeName.string2TypeName(rootTypeDescStr);
 
   public static final String functionTypeSourceStr = "CodeBody";
-  public static final String functionTypeDescStr = "L" + functionTypeSourceStr;
+  public static final String functionTypeDescStr = 'L' + functionTypeSourceStr;
   public static final TypeName functionTypeName = 
     TypeName.string2TypeName(functionTypeDescStr);
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/AstConstantCollector.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/AstConstantCollector.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/AstConstantCollector.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/AstConstantCollector.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,64 @@
+package com.ibm.wala.cast.util;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import com.ibm.wala.cast.tree.CAstEntity;
+import com.ibm.wala.cast.tree.CAstNode;
+import com.ibm.wala.cast.util.CAstPattern.Segments;
+import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.HashSetFactory;
+
+public class AstConstantCollector {
+
+  public static final CAstPattern simplePreUpdatePattern = CAstPattern.parse("ASSIGN_PRE_OP(VAR(<name>CONSTANT()),**)");
+
+  public static final CAstPattern simplePostUpdatePattern = CAstPattern.parse("ASSIGN_POST_OP(VAR(<name>CONSTANT()),**)");
+
+  public static final CAstPattern simpleValuePattern = CAstPattern.parse("ASSIGN(VAR(<name>CONSTANT()),<value>*)");
+ 
+  public static Map<String,Object> collectConstants(CAstEntity function, Map<String,Object> values) {
+    if (function.getAST() != null) {
+    Set<String> bad = HashSetFactory.make();
+    for(Segments s : CAstPattern.findAll(simplePreUpdatePattern, function)) {
+      bad.add((String) s.getSingle("name").getValue());
+    }
+    for(Segments s : CAstPattern.findAll(simplePostUpdatePattern, function)) {
+      bad.add((String) s.getSingle("name").getValue());
+    }
+    for(Segments s : CAstPattern.findAll(simpleValuePattern, function)) {
+      String var = (String) s.getSingle("name").getValue();
+      if (s.getSingle("value").getKind() != CAstNode.CONSTANT) {
+        bad.add(var);
+      } else {
+        Object val = s.getSingle("value").getValue();
+        if (! bad.contains(var)) {
+          if (values.containsKey(var)) {
+            if (val == null? values.get(var) != null: !values.get(var).equals(val)) {
+              values.remove(var);
+              bad.add(var);
+            }
+          } else {
+            values.put(var, val);
+          }
+        }
+      }
+    }
+    }
+    
+    for(Collection<CAstEntity> ces : function.getAllScopedEntities().values()) {
+      for(CAstEntity ce : ces) {
+        collectConstants(ce, values);
+      }
+    }
+
+    return values;
+  }
+
+  public static Map<String,Object> collectConstants(CAstEntity function) {
+    Map<String,Object> values = HashMapFactory.make();
+    collectConstants(function, values);
+    return values;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstFunctions.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstFunctions.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstFunctions.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstFunctions.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,9 +12,9 @@
 
 import java.util.Iterator;
 import java.util.Map;
+import java.util.function.Predicate;
 
 import com.ibm.wala.cast.tree.CAstNode;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.graph.traverse.DFSDiscoverTimeIterator;
@@ -39,6 +39,7 @@
   public static Iterator<CAstNode> iterateNodes(final CAstNode tree) {
     return new DFSDiscoverTimeIterator<CAstNode>() {
 
+      private static final long serialVersionUID = -627203481092871529L;
       private final Map<Object, Iterator<? extends CAstNode>> pendingChildren = HashMapFactory.make();
 
       @Override
@@ -79,8 +80,8 @@
     };
   }
 
-  public static Iterator<CAstNode> findAll(CAstNode tree, Predicate<?> f) {
-    return new FilterIterator<CAstNode>(iterateNodes(tree), f);
+  public static Iterator<CAstNode> findAll(CAstNode tree, Predicate<? super CAstNode> f) {
+    return new FilterIterator<>(iterateNodes(tree), f);
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPattern.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPattern.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPattern.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPattern.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,7 +14,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -60,6 +59,8 @@
 
   public static class Segments extends TreeMap<String,Object> {
 
+    private static final long serialVersionUID = 4119719848336209576L;
+
     public CAstNode getSingle(String name) {
       assert containsKey(name) : name;
       return (CAstNode) get(name);
@@ -81,14 +82,15 @@
     }
 
     private void addAll(Segments other) {
-      for (Iterator xs = other.entrySet().iterator(); xs.hasNext();) {
-        Map.Entry e = (Map.Entry) xs.next();
-        String name = (String) e.getKey();
+      for (Map.Entry<String, Object> e : other.entrySet()) {
+        String name = e.getKey();
         if (e.getValue() instanceof CAstNode) {
           add(name, (CAstNode) e.getValue());
         } else {
-          for (Iterator vs = ((List) e.getValue()).iterator(); vs.hasNext();) {
-            add(name, (CAstNode) vs.next());
+          @SuppressWarnings("unchecked")
+          final List<CAstNode> nodes = (List<CAstNode>) e.getValue();
+          for (CAstNode v : nodes) {
+            add(name, v);
           }
         }
       }
@@ -102,7 +104,7 @@
           ((List<CAstNode>) o).add(result);
         } else {
           assert o instanceof CAstNode;
-          List<Object> x = new ArrayList<Object>();
+          List<Object> x = new ArrayList<>();
           x.add(o);
           x.add(result);
           put(name, x);
@@ -139,42 +141,42 @@
 
   @Override
   public String toString() {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
 
     if (name != null) {
-      sb.append("<").append(name).append(">");
+      sb.append('<').append(name).append('>');
     }
 
     if (value != null) {
       if (kind == REFERENCE_PATTERN_KIND) {
         sb.append("ref:").append(value);
       } else if (value instanceof Pattern) {
-        sb.append("/").append(value).append("/");
+        sb.append('/').append(value).append('/');
       } else {
         sb.append("literal:").append(value);
       }
     } else if (kind == CHILD_KIND) {
-      sb.append("*");
+      sb.append('*');
     } else if (kind == CHILDREN_KIND) {
       sb.append("**");
     } else if (kind == REPEATED_PATTERN_KIND) {
-      sb.append("@");
+      sb.append('@');
     } else if (kind == ALTERNATIVE_PATTERN_KIND) {
-      sb.append("|");
+      sb.append('|');
     } else if (kind == OPTIONAL_PATTERN_KIND) {
-      sb.append("?");
+      sb.append('?');
     } else {
       sb.append(CAstPrinter.kindAsString(kind));
     }
 
     if (children != null) {
-      sb.append("(");
+      sb.append('(');
       for (int i = 0; i < children.length; i++) {
         sb.append(children[i].toString());
         if (i == children.length - 1) {
-          sb.append(")");
+          sb.append(')');
         } else {
-          sb.append(",");
+          sb.append(',');
         }
       }
     }
@@ -290,8 +292,8 @@
       return references.get(value).match(tree, s);
 
     } else if (kind == ALTERNATIVE_PATTERN_KIND) {
-      for (int i = 0; i < children.length; i++) {
-        if (children[i].tryMatch(tree, s)) {
+      for (CAstPattern element : children) {
+        if (element.tryMatch(tree, s)) {
 
           if (s != null && name != null)
             s.add(name, tree);
@@ -395,7 +397,7 @@
     private final Collection<Segments> result = HashSetFactory.make();
     
     @Override
-    public void leaveNode(CAstNode n, Context c, CAstVisitor visitor) {
+    public void leaveNode(CAstNode n, Context c, CAstVisitor<Context> visitor) {
       Segments s = match(CAstPattern.this, n);
       if (s != null) {
         result.add(s);
@@ -406,6 +408,17 @@
       visit(top, c, this);   
       return result;
     }
+
+    @Override
+    protected boolean doVisit(CAstNode n, Context context, CAstVisitor<Context> visitor) {
+      return true;
+    }
+
+    @Override
+    protected boolean doVisitAssignNodes(CAstNode n, Context context, CAstNode v, CAstNode a, CAstVisitor<Context> visitor) {
+      return true;
+    }
+        
   }
     
   private static class Parser {
@@ -472,7 +485,7 @@
         result = new CAstPattern(name, CHILD_KIND, null);
 
       } else if (patternString.startsWith("|(", start)) {
-        List<CAstPattern> alternatives = new ArrayList<CAstPattern>();
+        List<CAstPattern> alternatives = new ArrayList<>();
         start += 2;
         do {
           alternatives.add(parse());
@@ -480,7 +493,7 @@
         } while (patternString.startsWith("||", end));
         assert patternString.startsWith(")|", end) : patternString;
         end += 2;
-        result = new CAstPattern(name, ALTERNATIVE_PATTERN_KIND, alternatives.toArray(new CAstPattern[alternatives.size()]));
+        result = new CAstPattern(name, ALTERNATIVE_PATTERN_KIND, alternatives.toArray(new CAstPattern[0]));
 
       } else if (patternString.startsWith("@(", start)) {
         start += 2;
@@ -517,7 +530,7 @@
           result = new CAstPattern(name, kind, null);
 
         } else {
-          List<CAstPattern> children = new ArrayList<CAstPattern>();
+          List<CAstPattern> children = new ArrayList<>();
           start = patternString.indexOf('(', start) + 1;
           do {
             children.add(parse());
@@ -532,7 +545,7 @@
           assert patternString.charAt(end) == ')';
           end++;
 
-          result = new CAstPattern(name, kind, children.toArray(new CAstPattern[children.size()]));
+          result = new CAstPattern(name, kind, children.toArray(new CAstPattern[0]));
         }
       }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPrinter.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPrinter.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPrinter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/CAstPrinter.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,16 +11,37 @@
 package com.ibm.wala.cast.util;
 
 import java.io.IOException;
-import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Collection;
-import java.util.Iterator;
 
 import com.ibm.wala.cast.tree.CAstEntity;
 import com.ibm.wala.cast.tree.CAstNode;
 import com.ibm.wala.cast.tree.CAstSourcePositionMap;
 
 public class CAstPrinter {
+  private static final class StringWriter extends Writer {
+    private final StringBuilder sb;
+
+    private StringWriter(StringBuilder sb) {
+      this.sb = sb;
+    }
+
+    @Override
+    public void write(char[] cbuf, int off, int len) {
+      sb.append(new String(cbuf, off, len));
+    }
+
+    @Override
+    public void flush() {
+      // do nothing 
+    }
+
+    @Override
+    public void close() {
+      // do nothing
+    }
+  }
+
   private static CAstPrinter instance= new CAstPrinter();
 
   public static void setPrinter(CAstPrinter printer) {
@@ -91,6 +112,7 @@
     case CAstNode.LIST_EXPR: return "LIST_EXPR";
     case CAstNode.EMPTY_LIST_EXPR: return "EMPTY_LIST_EXPR";
     case CAstNode.IS_DEFINED_EXPR: return "IS_DEFINED_EXPR";
+    case CAstNode.NARY_EXPR: return "NARY_EXPR";
 
     // explicit lexical scopes
     case CAstNode.LOCAL_SCOPE: return "SCOPE";
@@ -106,7 +128,7 @@
     case CAstNode.ERROR: return "ERROR";
     case CAstNode.ASSERT: return "ASSERT";
     
-    default: return "UNKNOWN(" + kind + ")";
+    default: return "UNKNOWN(" + kind + ')';
     }
   }
 
@@ -117,21 +139,24 @@
   public String doPrint(CAstNode top) {
     return print(top, null);
   }
-
   public static String print(CAstNode top, CAstSourcePositionMap pos) {
       return instance.doPrint(top, pos);
   }
 
   public String doPrint(CAstNode top, CAstSourcePositionMap pos) {
-    StringWriter writer = new StringWriter();
-    printTo(top, pos, writer);
-    return writer.toString();
+    final StringBuilder sb = new StringBuilder();
+    try (final StringWriter writer = new StringWriter(sb)) {
+      printTo(top, pos, writer);
+    }
+    return sb.toString();
   }
 
   public String doPrint(CAstEntity ce) {
-    StringWriter writer = new StringWriter();
-    printTo(ce, writer);
-    return writer.toString();
+    final StringBuilder sb = new StringBuilder();
+    try (final StringWriter writer = new StringWriter(sb)) {
+      printTo(ce, writer);
+    }
+    return sb.toString();
   }
 
   public static String print(CAstEntity ce) {
@@ -163,10 +188,10 @@
   }
 
   public static void xmlTo(CAstNode top, CAstSourcePositionMap pos, Writer w) {
-      instance.doXmlTo(top, pos, w);
+      doXmlTo(top, pos, w);
   }
 
-  private void doXmlTo(CAstNode top, CAstSourcePositionMap pos, Writer w) {
+  private static void doXmlTo(CAstNode top, CAstSourcePositionMap pos, Writer w) {
     printTo(top, pos, w, 0, true);
   }
 
@@ -209,7 +234,7 @@
 	}
 	if (p != null) {
 	  if (uglyBrackets) 
-	    w.write(" lineNumber=\"" + p + "\"");
+	    w.write(" lineNumber=\"" + p + '"');
 	  else
 	    w.write( " at " + p );
 	}
@@ -220,7 +245,7 @@
 	w.write( kindAsString( top.getKind() ) );
 	if (p != null)
 	  if (uglyBrackets)
-	    w.write( " position=\"" + p + "\"");
+	    w.write( " position=\"" + p + '"');
 	  else
 	    w.write( " at " + p );
 	if (uglyBrackets) w.write(">");
@@ -269,8 +294,8 @@
 	if (e.getArgumentNames().length > 0) {
 	  w.write("(");
 	  String[] names = e.getArgumentNames();
-	  for(int i = 0; i < names.length; i++) {
-	    w.write("  " + names[i]);
+	  for (String name : names) {
+	    w.write("  " + name);
 	  }
 	  w.write("  )\n");
 	}
@@ -278,11 +303,9 @@
 	    doPrintTo(e.getAST(), e.getSourceMap(), w);
 	    w.write('\n');
 	}
-	for(Iterator i= e.getAllScopedEntities().values().iterator();
-	    i.hasNext(); ) 
-	{
-	  for(Iterator j = ((Collection) i.next()).iterator(); j.hasNext(); ) {
-	    doPrintTo((CAstEntity) j.next(), w);
+	for (Collection<CAstEntity> collection : e.getAllScopedEntities().values()) {
+	  for (CAstEntity entity : collection) {
+	    doPrintTo(entity, w);
 	  }
 	}
 	w.flush();
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/SourceBuffer.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/SourceBuffer.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/SourceBuffer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/SourceBuffer.java	2019-01-29 17:08:39.000000000 +0000
@@ -30,7 +30,7 @@
     BufferedReader reader = new BufferedReader(p.getReader());
     
     String currentLine = null;
-    List<String> lines = new ArrayList<String>();
+    List<String> lines = new ArrayList<>();
     int offset = 0, line = 0;
     do { 
       currentLine = reader.readLine();
@@ -84,18 +84,18 @@
       }
     }
 
-    this.lines = lines.toArray(new String[ lines.size() ]);
+    this.lines = lines.toArray(new String[0]);
   }
   
      
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     for(int i = 0; i < lines.length; i++) {
       if (i == lines.length - 1) {
         result.append(lines[i]);
       } else {
-        result.append(lines[i]).append("\n");
+        result.append(lines[i]).append('\n');
       }
     }
     
diff -Nru wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/Util.java wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/Util.java
--- wala-1.3.9/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/Util.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast/source/java/com/ibm/wala/cast/util/Util.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,41 @@
+package com.ibm.wala.cast.util;
+
+import java.util.Iterator;
+
+import com.ibm.wala.cast.loader.CAstAbstractLoader;
+import com.ibm.wala.classLoader.IClassLoader;
+import com.ibm.wala.classLoader.ModuleEntry;
+import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.util.WalaException;
+import com.ibm.wala.util.warnings.Warning;
+
+public class Util {
+
+  public static void checkForFrontEndErrors(IClassHierarchy cha) throws WalaException {
+    StringBuilder message = null;
+    for(IClassLoader loader : cha.getLoaders()) {
+      if (loader instanceof CAstAbstractLoader) {
+        Iterator<ModuleEntry> errors = ((CAstAbstractLoader)loader).getModulesWithParseErrors();
+        if (errors.hasNext()) {
+          if (message == null) {
+            message = new StringBuilder("front end errors:\n");
+          }
+          while (errors.hasNext()) {
+            ModuleEntry errorModule = errors.next();
+            for(Warning w : (((CAstAbstractLoader)loader).getMessages(errorModule))) {
+              message.append("error in ").append(errorModule.getName()).append(":\n");
+              message.append(w.toString()).append('\n');
+            }
+          }
+        }
+        // clear out the errors to free some memory
+        ((CAstAbstractLoader)loader).clearMessages();
+      }
+    }
+    if (message != null) {
+      message.append("end of front end errors\n");
+      throw new WalaException(String.valueOf(message));
+    }
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/build.gradle wala-1.5.1/com.ibm.wala.cast.java/build.gradle
--- wala-1.3.9/com.ibm.wala.cast.java/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,16 @@
+plugins {
+	id 'eclipse'
+}
+
+eclipse.project.natures 'org.eclipse.pde.PluginNature'
+
+sourceSets.main.java.srcDirs = ['src']
+
+dependencies {
+	compile(
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.shrike'),
+		project(':com.ibm.wala.util'),
+		)
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/build.properties wala-1.5.1/com.ibm.wala.cast.java/build.properties
--- wala-1.3.9/com.ibm.wala.cast.java/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,7 @@
 source.. = src/
-output.. = bin/
+output.. = bin/main
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/.classpath wala-1.5.1/com.ibm.wala.cast.java/.classpath
--- wala-1.3.9/com.ibm.wala.cast.java/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/.cvsignore wala-1.5.1/com.ibm.wala.cast.java/.cvsignore
--- wala-1.3.9/com.ibm.wala.cast.java/.cvsignore	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/.cvsignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-bin
-domo-trace.txt*
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.java/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.java/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,17 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Java Source WALA Front End
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.java
-Bundle-Version: 1.3.9
-Bundle-Activator: com.ibm.wala.cast.java.JavaSourcePlugin
-Bundle-Vendor: rfuhrer@watson.ibm.com
+Bundle-Version: 1.5.1
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.cast,
  com.ibm.wala.core,
- com.ibm.wala.shrike,
- org.eclipse.core.runtime
+ com.ibm.wala.shrike
 Bundle-ActivationPolicy: lazy
-Export-Package: com.ibm.wala.cast.java,
- com.ibm.wala.cast.java.analysis.typeInference,
+Export-Package: com.ibm.wala.cast.java.analysis.typeInference,
  com.ibm.wala.cast.java.client,
  com.ibm.wala.cast.java.client.impl,
  com.ibm.wala.cast.java.examples.ast,
@@ -23,4 +20,5 @@
  com.ibm.wala.cast.java.translator,
  com.ibm.wala.cast.java.types
 Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: com.ibm.wala.cast.java
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/mvncentral.xml wala-1.5.1/com.ibm.wala.cast.java/mvncentral.xml
--- wala-1.3.9/com.ibm.wala.cast.java/mvncentral.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/mvncentral.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.ibm.wala</groupId>
+  <artifactId>com.ibm.wala.cast.java</artifactId>
+  <version>1.5.1</version>
+  <packaging>jar</packaging>
+  <name>WALA CAst</name>
+  <description>WALA Common AST core Java front-end functionality</description>
+  <url>http://wala.sourceforge.net</url>
+  <licenses>
+    <license>
+      <name>Eclipse Public License, Version 1.0</name>
+      <url>https://www.eclipse.org/legal/epl-v10.html</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>Manu Sridharan</name>
+      <email>m.sridharan@samsung.com</email>
+      <organization>Samsung Research America</organization>
+      <organizationUrl>http://www.sisa.samsung.com/</organizationUrl>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git@github.com:wala/WALA.git</connection>
+    <developerConnection>scm:git:git@github.com:example/example-application.git</developerConnection>
+    <url>git@github.com:example/example-application.git</url>
+  </scm>
+
+  <properties>
+    <src.dir>src</src.dir>
+  </properties>
+
+  <distributionManagement>
+    <snapshotRepository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.util</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.cast</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.core</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.shrike</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+  </dependencies>
+
+  <repositories>
+    <repository>
+      <id>sonatype-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>  
+
+  <profiles>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
+  
+  <build>
+    <sourceDirectory>${src.dir}</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.2</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.3</version>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>ossrh</serverId>
+          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.2.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <additionalparam>${javadoc.options}</additionalparam>
+        </configuration>        
+        <version>2.9.1</version>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+    <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-gpg-plugin</artifactId>
+      <version>1.5</version>
+      <executions>
+        <execution>
+          <id>sign-artifacts</id>
+          <phase>verify</phase>
+          <goals>
+            <goal>sign</goal>
+          </goals>
+        </execution>
+      </executions>
+    </plugin>
+    
+    </plugins>
+  </build>  
+</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast.java/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast.java/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.java
+Bundle-Vendor = rfuhrer@watson.ibm.com
+Bundle-Name = Java Source WALA Front End
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/pom.xml wala-1.5.1/com.ibm.wala.cast.java/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.java/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
   <artifactId>com.ibm.wala.cast.java</artifactId>
   <packaging>eclipse-plugin</packaging>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/.project wala-1.5.1/com.ibm.wala.cast.java/.project
--- wala-1.3.9/com.ibm.wala.cast.java/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.cast.java</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.java/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.java/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,78 +1,128 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.APILeak=error
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=error
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=error
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast.java/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast.java/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.cast.java/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.cast.java/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/analysis/typeInference/AstJavaTypeInference.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/analysis/typeInference/AstJavaTypeInference.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/analysis/typeInference/AstJavaTypeInference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/analysis/typeInference/AstJavaTypeInference.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,7 +23,6 @@
 import com.ibm.wala.cast.java.ssa.EnclosingObjectReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.fixpoint.IVariable;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeBT.IBinaryOpInstruction;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSABinaryOpInstruction;
@@ -98,8 +97,8 @@
 
   }
 
-  public AstJavaTypeInference(IR ir, IClassHierarchy cha, boolean doPrimitives) {
-    super(ir, cha, JavaPrimitiveType.BOOLEAN, doPrimitives);
+  public AstJavaTypeInference(IR ir, boolean doPrimitives) {
+    super(ir, JavaPrimitiveType.BOOLEAN, doPrimitives);
   }
 
   IClass getStringClass() {
@@ -133,9 +132,8 @@
     public byte evaluate(TypeVariable lhs, TypeVariable[] rhs) {
       TypeAbstraction meet = null;
 
-      for (int i = 0; i < rhs.length; i++) {
-        if (rhs[i] != null) {
-          TypeVariable r = rhs[i];
+      for (TypeVariable r : rhs) {
+        if (r != null) {
           TypeAbstraction ta = r.getType();
           if (ta instanceof PointType) {
             if (ta.getType().equals(getStringClass())) {
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/impl/ZeroCFABuilderFactory.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/impl/ZeroCFABuilderFactory.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/impl/ZeroCFABuilderFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/impl/ZeroCFABuilderFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,11 +11,12 @@
 package com.ibm.wala.cast.java.client.impl;
 
 import com.ibm.wala.cast.java.ipa.callgraph.AstJavaZeroXCFABuilder;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 
@@ -26,7 +27,7 @@
  */
 public class ZeroCFABuilderFactory  {
 
-  public CallGraphBuilder make(AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha, AnalysisScope scope, boolean keepPointsTo) {
+  public CallGraphBuilder<InstanceKey> make(AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha, AnalysisScope scope) {
     Util.addDefaultSelectors(options, cha);
     Util.addDefaultBypassLogic(options, scope, Util.class.getClassLoader(), cha);
     return new AstJavaZeroXCFABuilder(cha, options, cache, null, null, ZeroXInstanceKeys.NONE);
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/impl/ZeroOneContainerCFABuilderFactory.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/impl/ZeroOneContainerCFABuilderFactory.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/impl/ZeroOneContainerCFABuilderFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/impl/ZeroOneContainerCFABuilderFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,11 +11,12 @@
 package com.ibm.wala.cast.java.client.impl;
 
 import com.ibm.wala.cast.java.ipa.callgraph.AstJavaZeroOneContainerCFABuilder;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 
 /**
@@ -25,7 +26,7 @@
  */
 public class ZeroOneContainerCFABuilderFactory  {
 
-  public CallGraphBuilder make(AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha, AnalysisScope scope, boolean keepPointsTo) {
+  public CallGraphBuilder<InstanceKey> make(AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha, AnalysisScope scope) {
     Util.addDefaultSelectors(options, cha);
     Util.addDefaultBypassLogic(options, scope, Util.class.getClassLoader(), cha);
     return new AstJavaZeroOneContainerCFABuilder(cha, options, cache, null, null);
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/JavaSourceAnalysisEngine.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/JavaSourceAnalysisEngine.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/JavaSourceAnalysisEngine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/client/JavaSourceAnalysisEngine.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,14 +22,16 @@
 import com.ibm.wala.classLoader.ClassLoaderFactory;
 import com.ibm.wala.classLoader.Module;
 import com.ibm.wala.client.AbstractAnalysisEngine;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Util;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.SSAOptions;
 import com.ibm.wala.ssa.SymbolTable;
@@ -41,7 +43,7 @@
 
 /**
  */
-public abstract class JavaSourceAnalysisEngine extends AbstractAnalysisEngine {
+public abstract class JavaSourceAnalysisEngine<I extends InstanceKey> extends AbstractAnalysisEngine<I, CallGraphBuilder<I>, Void> {
 
   /**
    * Modules which are user-space code
@@ -108,8 +110,9 @@
     scope = makeSourceAnalysisScope();
 
     if (getExclusionsFile() != null) {
-      InputStream is = new File(getExclusionsFile()).exists()? new FileInputStream(getExclusionsFile()): FileProvider.class.getClassLoader().getResourceAsStream(getExclusionsFile());
-      scope.setExclusions(new FileOfClasses(is));
+      try (final InputStream is = new File(getExclusionsFile()).exists()? new FileInputStream(getExclusionsFile()): FileProvider.class.getClassLoader().getResourceAsStream(getExclusionsFile())) {
+        scope.setExclusions(new FileOfClasses(is));
+      }
     }
 
     for (Module M : this.systemEntries) {
@@ -132,7 +135,7 @@
     ClassLoaderFactory factory = getClassLoaderFactory(scope.getExclusions());
 
     try {
-      cha = ClassHierarchy.make(getScope(), factory);
+      cha = ClassHierarchyFactory.make(getScope(), factory);
     } catch (ClassHierarchyException e) {
       System.err.println("Class Hierarchy construction failed");
       System.err.println(e.toString());
@@ -147,8 +150,8 @@
   }
 
   @Override
-  public AnalysisCache makeDefaultCache() {
-    return new AnalysisCache(AstIRFactory.makeDefaultFactory());
+  public IAnalysisCacheView makeDefaultCache() {
+    return new AnalysisCacheImpl(AstIRFactory.makeDefaultFactory());
   }
 
   @Override
@@ -156,12 +159,7 @@
     AnalysisOptions options = new AnalysisOptions(getScope(), entrypoints);
 
     SSAOptions ssaOptions = new SSAOptions();
-    ssaOptions.setDefaultValues(new SSAOptions.DefaultValues() {
-      @Override
-      public int getDefaultValue(SymbolTable symtab, int valueNumber) {
-        return symtab.getDefaultValue(valueNumber);
-      }
-    });
+    ssaOptions.setDefaultValues(SymbolTable::getDefaultValue);
 
     options.setSSAOptions(ssaOptions);
 
@@ -169,7 +167,7 @@
   }
 
   @Override
-  protected CallGraphBuilder getCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-    return new ZeroCFABuilderFactory().make(options, cache, cha, scope, false);
+  protected CallGraphBuilder<? super I> getCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
+    return new ZeroCFABuilderFactory().make(options, cache, cha, scope);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/examples/ast/SynchronizedBlockDuplicator.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/examples/ast/SynchronizedBlockDuplicator.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/examples/ast/SynchronizedBlockDuplicator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/examples/ast/SynchronizedBlockDuplicator.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,8 +51,8 @@
     private CAstNode syncNode;
 
     /**
-     * key associated with the {@link RewriteContext context} of the parent AST
-     * node of the synchronized block
+     * key associated with the {@link com.ibm.wala.cast.tree.rewrite.CAstRewriter.RewriteContext context} of the parent
+     * AST node of the synchronized block
      */
     private UnwindKey rest;
 
@@ -158,13 +158,13 @@
   }
 
   @Override
-  protected CAstNode flowOutTo(Map nodeMap, CAstNode oldSource, Object label, CAstNode oldTarget, CAstControlFlowMap orig,
+  protected CAstNode flowOutTo(Map<Pair<CAstNode, UnwindKey>, CAstNode> nodeMap, CAstNode oldSource, Object label, CAstNode oldTarget, CAstControlFlowMap orig,
       CAstSourcePositionMap src) {
     assert oldTarget == CAstControlFlowMap.EXCEPTION_TO_EXIT;
     return oldTarget;
   }
 
-  private boolean contains(RewriteContext<UnwindKey> c, CAstNode n) {
+  private static boolean contains(RewriteContext<UnwindKey> c, CAstNode n) {
     if (c instanceof SyncContext) {
       return ((SyncContext) c).containsNode(n);
     } else {
@@ -174,9 +174,9 @@
 
   /**
    * does root represent a synchronized block? if so, return the variable whose
-   * lock is acquired. otherwise, return <code>null</code>
+   * lock is acquired. otherwise, return {@code null}
    */
-  private String isSynchronizedOnVar(CAstNode root) {
+  private static String isSynchronizedOnVar(CAstNode root) {
     if (root.getKind() == CAstNode.UNWIND) {
       CAstNode unwindBody = root.getChild(0);
       if (unwindBody.getKind() == CAstNode.BLOCK_STMT) {
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaCFABuilder.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaCFABuilder.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaCFABuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaCFABuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,8 +10,9 @@
  *****************************************************************************/
 package com.ibm.wala.cast.java.ipa.callgraph;
 
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.DefaultPointerKeyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 
@@ -20,8 +21,8 @@
  */
 public class AstJavaCFABuilder extends AstJavaSSAPropagationCallGraphBuilder {
 
-  public AstJavaCFABuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-    super(cha, options, cache, new DefaultPointerKeyFactory());
+  public AstJavaCFABuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
+    super(Language.JAVA.getFakeRootMethod(cha, options, cache), options, cache, new DefaultPointerKeyFactory());
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaSSAPropagationCallGraphBuilder.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaSSAPropagationCallGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaSSAPropagationCallGraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaSSAPropagationCallGraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,31 +20,30 @@
 import com.ibm.wala.cast.java.ssa.AstJavaNewEnclosingInstruction;
 import com.ibm.wala.cast.java.ssa.EnclosingObjectReference;
 import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.fixpoint.IntSetVariable;
 import com.ibm.wala.fixpoint.UnaryOperator;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.AbstractFieldPointerKey;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.LocalPointerKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerKeyFactory;
 import com.ibm.wala.ipa.callgraph.propagation.PointsToSetVariable;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSANewInstruction;
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.util.debug.Assertions;
-import com.ibm.wala.util.intset.IntSetAction;
 import com.ibm.wala.util.strings.Atom;
 
 public class AstJavaSSAPropagationCallGraphBuilder extends AstSSAPropagationCallGraphBuilder {
 
-  protected AstJavaSSAPropagationCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache,
+  protected AstJavaSSAPropagationCallGraphBuilder(IMethod fakeRootClass, AnalysisOptions options, IAnalysisCacheView cache,
       PointerKeyFactory pointerKeyFactory) {
-    super(cha, options, cache, pointerKeyFactory);
+    super(fakeRootClass, options, cache, pointerKeyFactory);
   }
 
   // ///////////////////////////////////////////////////////////////////////////
@@ -96,8 +95,8 @@
   //
   // ///////////////////////////////////////////////////////////////////////////
 
-  protected TypeInference makeTypeInference(IR ir, IClassHierarchy cha) {
-    TypeInference ti = new AstJavaTypeInference(ir, cha, false);
+  protected TypeInference makeTypeInference(IR ir) {
+    TypeInference ti = new AstJavaTypeInference(ir, false);
 
     if (DEBUG_TYPE_INFERENCE) {
       System.err.println(("IR of " + ir.getMethod()));
@@ -155,9 +154,6 @@
      * For each of objKey's instance keys ik, adds the constraint lvalKey = EORK(ik,cls),
      * where EORK(ik,cls) will be made equivalent to the actual enclosing class by
      * the handleNew() function below.
-     * @param lvalKey
-     * @param cls
-     * @param objKey
      */
     private void handleEnclosingObject(final PointerKey lvalKey, final IClass cls, final PointerKey objKey) {
       SymbolTable symtab = ir.getSymbolTable();
@@ -173,8 +169,8 @@
 
         InstanceKey[] objs = getInvariantContents(objVal);
 
-        for (int i = 0; i < objs.length; i++) {
-          PointerKey enclosing = new EnclosingObjectReferenceKey(objs[i], cls);
+        for (InstanceKey obj : objs) {
+          PointerKey enclosing = new EnclosingObjectReferenceKey(obj, cls);
           system.newConstraint(lvalKey, assignOperator, enclosing);
         }
 
@@ -182,15 +178,12 @@
         system.newSideEffect(new UnaryOperator<PointsToSetVariable>() {
           @Override
           public byte evaluate(PointsToSetVariable lhs, PointsToSetVariable rhs) {
-            IntSetVariable tv = rhs;
+            IntSetVariable<?> tv = rhs;
             if (tv.getValue() != null) {
-              tv.getValue().foreach(new IntSetAction() {
-                @Override
-                public void act(int ptr) {
-                  InstanceKey iKey = system.getInstanceKey(ptr);
-                  PointerKey enclosing = new EnclosingObjectReferenceKey(iKey, cls);
-                  system.newConstraint(lvalKey, assignOperator, enclosing);
-                }
+              tv.getValue().foreach(ptr -> {
+                InstanceKey iKey = system.getInstanceKey(ptr);
+                PointerKey enclosing = new EnclosingObjectReferenceKey(iKey, cls);
+                system.newConstraint(lvalKey, assignOperator, enclosing);
               });
             }
             return NOT_CHANGED;
@@ -260,7 +253,7 @@
 
             System.err.println(("class is " + klass + ", enclosing is " + enclosingClass + ", method is " + node.getMethod()));
 
-            if (node.getMethod().isSynthetic()) {
+            if (node.getMethod().isWalaSynthetic()) {
               return;
             }
 
@@ -309,7 +302,7 @@
     MethodReference reference = opNode.getMethod().getReference();
     String selector = reference.getSelector().toString();
     String containingClass = reference.getDeclaringClass().getName().toString();
-    return definingMethod.equals(containingClass + "/" + selector);
+    return definingMethod.equals(containingClass + '/' + selector);
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaZeroOneContainerCFABuilder.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaZeroOneContainerCFABuilder.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaZeroOneContainerCFABuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaZeroOneContainerCFABuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,9 +10,9 @@
  *******************************************************************************/
 package com.ibm.wala.cast.java.ipa.callgraph;
 
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.DefaultContextSelector;
 import com.ibm.wala.ipa.callgraph.impl.DelegatingContextSelector;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
@@ -35,7 +35,7 @@
    * @param appContextSelector application-specific logic to choose contexts
    * @param appContextInterpreter application-specific logic to interpret a method in context
    */
-  public AstJavaZeroOneContainerCFABuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache,
+  public AstJavaZeroOneContainerCFABuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache,
       ContextSelector appContextSelector, SSAContextInterpreter appContextInterpreter) {
     super(cha, options, cache);
 
@@ -46,7 +46,7 @@
     setContextInterpreter(contextInterpreter);
 
     ZeroXInstanceKeys zik = makeInstanceKeys(cha, options, contextInterpreter);
-    setInstanceKeys(new JavaScopeMappingInstanceKeys(cha, this, zik));
+    setInstanceKeys(new JavaScopeMappingInstanceKeys(this, zik));
 
     ContextSelector CCS = makeContainerContextSelector(cha, zik);
     DelegatingContextSelector DCS = new DelegatingContextSelector(CCS, contextSelector);
@@ -62,8 +62,6 @@
   }
 
   /**
-   * @param cha
-   * @param keys
    * @return an object which creates contexts for call graph nodes based on the container disambiguation policy
    */
   protected ContextSelector makeContainerContextSelector(IClassHierarchy cha, ZeroXInstanceKeys keys) {
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaZeroXCFABuilder.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaZeroXCFABuilder.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaZeroXCFABuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/AstJavaZeroXCFABuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,10 +10,10 @@
  *****************************************************************************/
 package com.ibm.wala.cast.java.ipa.callgraph;
 
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.DefaultContextSelector;
 import com.ibm.wala.ipa.callgraph.impl.DelegatingContextSelector;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
@@ -25,7 +25,7 @@
  */
 public class AstJavaZeroXCFABuilder extends AstJavaCFABuilder {
 
-  public AstJavaZeroXCFABuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache,
+  public AstJavaZeroXCFABuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache,
       ContextSelector appContextSelector, SSAContextInterpreter appContextInterpreter, int instancePolicy) {
     super(cha, options, cache);
 
@@ -37,7 +37,7 @@
 
     setContextSelector(contextSelector);
 
-    setInstanceKeys(new JavaScopeMappingInstanceKeys(cha, this, new ZeroXInstanceKeys(options, cha, contextInterpreter,
+    setInstanceKeys(new JavaScopeMappingInstanceKeys(this, new ZeroXInstanceKeys(options, cha, contextInterpreter,
         instancePolicy)));
   }
 
@@ -49,12 +49,12 @@
    * @param xmlFiles set of Strings that are names of XML files holding bypass logic specifications.
    * @return a 0-1-Opt-CFA Call Graph Builder.
    */
-  public static AstJavaCFABuilder make(AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha, ClassLoader cl,
+  public static AstJavaCFABuilder make(AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha, ClassLoader cl,
       AnalysisScope scope, String[] xmlFiles, byte instancePolicy) {
 
     com.ibm.wala.ipa.callgraph.impl.Util.addDefaultSelectors(options, cha);
-    for (int i = 0; i < xmlFiles.length; i++) {
-      com.ibm.wala.ipa.callgraph.impl.Util.addBypassLogic(options, scope, cl, xmlFiles[i], cha);
+    for (String xmlFile : xmlFiles) {
+      com.ibm.wala.ipa.callgraph.impl.Util.addBypassLogic(options, scope, cl, xmlFile, cha);
     }
 
     return new AstJavaZeroXCFABuilder(cha, options, cache, null, null, instancePolicy);
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/JavaScopeMappingInstanceKeys.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/JavaScopeMappingInstanceKeys.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/JavaScopeMappingInstanceKeys.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/callgraph/JavaScopeMappingInstanceKeys.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,9 +10,9 @@
  *****************************************************************************/
 package com.ibm.wala.cast.java.ipa.callgraph;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.Set;
 
 import com.ibm.wala.cast.ipa.callgraph.ScopeMappingInstanceKeys;
@@ -26,13 +26,12 @@
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKeyFactory;
 import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Pair;
 
 public class JavaScopeMappingInstanceKeys extends ScopeMappingInstanceKeys {
 
-  public JavaScopeMappingInstanceKeys(IClassHierarchy cha, PropagationCallGraphBuilder builder, InstanceKeyFactory basic) {
+  public JavaScopeMappingInstanceKeys(PropagationCallGraphBuilder builder, InstanceKeyFactory basic) {
     super(builder, basic);
 
   }
@@ -42,14 +41,11 @@
     if (isPossiblyLexicalClass(cls)) {
       Set<LexicalParent> result = HashSetFactory.make();
 
-      for (Iterator MS = cls.getAllMethods().iterator(); MS.hasNext();) {
-        IMethod m = (IMethod) MS.next();
+      for (IMethod m : cls.getAllMethods()) {
         if ((m instanceof AstMethod) && !m.isStatic()) {
           AstMethod M = (AstMethod) m;
           LexicalParent[] parents = M.getParents();
-          for (int i = 0; i < parents.length; i++) {
-            result.add(parents[i]);
-          }
+            result.addAll(Arrays.asList(parents));
         }
       }
 
@@ -57,7 +53,7 @@
         if (AstTranslator.DEBUG_LEXICAL)
           System.err.println((base + " has parents: " + result));
 
-        return result.toArray(new LexicalParent[result.size()]);
+        return result.toArray(new LexicalParent[0]);
       }
 
     }
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/modref/AstJavaModRef.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/modref/AstJavaModRef.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/modref/AstJavaModRef.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/modref/AstJavaModRef.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,8 +47,8 @@
   }
 
   @Override
-  protected RefVisitor makeRefVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h) {
-    return new AstJavaRefVisitor(n, result, pa, h);
+  protected RefVisitor<T, ? extends ExtendedHeapModel> makeRefVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h) {
+    return new AstJavaRefVisitor<>(n, result, pa, h);
   }
 
   protected static class AstJavaModVisitor<T extends InstanceKey> 
@@ -73,8 +73,8 @@
   }
  
   @Override
-  protected ModVisitor makeModVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h, boolean ignoreAllocHeapDefs) {
-    return new AstJavaModVisitor<T>(n, result, h, pa);
+  protected ModVisitor<T, ? extends ExtendedHeapModel> makeModVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h, boolean ignoreAllocHeapDefs) {
+    return new AstJavaModVisitor<>(n, result, h, pa);
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/slicer/AstJavaSlicer.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/slicer/AstJavaSlicer.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/slicer/AstJavaSlicer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/ipa/slicer/AstJavaSlicer.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,9 +12,9 @@
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
+import java.util.function.Predicate;
 
 import com.ibm.wala.cast.ir.ssa.AstAssertInstruction;
 import com.ibm.wala.cast.java.ipa.modref.AstJavaModRef;
@@ -35,11 +35,9 @@
 import com.ibm.wala.ssa.SSAMonitorInstruction;
 import com.ibm.wala.ssa.SSAPutInstruction;
 import com.ibm.wala.util.CancelException;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.graph.traverse.DFS;
 
-@SuppressWarnings("deprecation")
 public class AstJavaSlicer extends Slicer {
 
   /*
@@ -52,16 +50,14 @@
 
   /**
    * @param ss a collection of statements of interest
-   * @throws CancelException
    */
   public static Collection<Statement> computeSlice(SDG sdg, Collection<Statement> ss, boolean backward) throws CancelException {
     return new AstJavaSlicer().slice(sdg, ss, backward);
   }
 
   public static Set<Statement> gatherStatements(CallGraph CG, Collection<CGNode> partialRoots, Predicate<SSAInstruction> filter) {
-    Set<Statement> result = new HashSet<Statement>();
-    for (Iterator<CGNode> ns = DFS.getReachableNodes(CG, partialRoots).iterator(); ns.hasNext();) {
-      CGNode n = ns.next();
+    Set<Statement> result = new HashSet<>();
+    for (CGNode n : DFS.getReachableNodes(CG, partialRoots)) {
       IR nir = n.getIR();
       if (nir != null) {
 	SSAInstruction insts[] = nir.getInstructions();
@@ -77,41 +73,25 @@
   }
 
   public static Set<Statement> gatherAssertions(CallGraph CG, Collection<CGNode> partialRoots) {
-    return gatherStatements(CG, partialRoots, new Predicate<SSAInstruction>() {
-      @Override public boolean test(SSAInstruction o) {
-        return o instanceof AstAssertInstruction;
-      }
-    });
+    return gatherStatements(CG, partialRoots, AstAssertInstruction.class::isInstance);
   }
 
   public static Set<Statement> gatherMonitors(CallGraph CG, Collection<CGNode> partialRoots) {
-    return gatherStatements(CG, partialRoots, new Predicate<SSAInstruction>() {
-      @Override public boolean test(SSAInstruction o) {
-        return o instanceof SSAMonitorInstruction;
-      }
-    });
+    return gatherStatements(CG, partialRoots, SSAMonitorInstruction.class::isInstance);
   }
 
   public static Set<Statement> gatherWrites(CallGraph CG, Collection<CGNode> partialRoots) {
-    return gatherStatements(CG, partialRoots, new Predicate<SSAInstruction>() {
-      @Override public boolean test(SSAInstruction o) {
-        return (o instanceof SSAPutInstruction) || (o instanceof SSAArrayStoreInstruction);
-      }
-    });
+    return gatherStatements(CG, partialRoots, o -> (o instanceof SSAPutInstruction) || (o instanceof SSAArrayStoreInstruction));
   }
 
   public static Set<Statement> gatherReads(CallGraph CG, Collection<CGNode> partialRoots) {
-    return gatherStatements(CG, partialRoots, new Predicate<SSAInstruction>() {
-      @Override public boolean test(SSAInstruction o) {
-        return (o instanceof SSAGetInstruction) || (o instanceof SSAArrayLoadInstruction);
-      }
-    });
+    return gatherStatements(CG, partialRoots, o -> (o instanceof SSAGetInstruction) || (o instanceof SSAArrayLoadInstruction));
   }
 
-  public static Pair<Collection<Statement>, SDG> computeAssertionSlice(CallGraph CG, PointerAnalysis<InstanceKey> pa,
+  public static Pair<Collection<Statement>, SDG<? extends InstanceKey>> computeAssertionSlice(CallGraph CG, PointerAnalysis<? extends InstanceKey> pa,
       Collection<CGNode> partialRoots, boolean multiThreadedCode) throws IllegalArgumentException, CancelException {
-    CallGraph pcg = PartialCallGraph.make(CG, new LinkedHashSet<CGNode>(partialRoots));
-    SDG sdg = new SDG(pcg, pa, new AstJavaModRef(), DataDependenceOptions.FULL, ControlDependenceOptions.FULL);
+    CallGraph pcg = PartialCallGraph.make(CG, new LinkedHashSet<>(partialRoots));
+    SDG<? extends InstanceKey> sdg = new SDG<>(pcg, pa, new AstJavaModRef<>(), DataDependenceOptions.FULL, ControlDependenceOptions.FULL);
     //System.err.println(("SDG:\n" + sdg));
     Set<Statement> stmts = gatherAssertions(CG, partialRoots);
     if (multiThreadedCode) {
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/JavaSourcePlugin.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/JavaSourcePlugin.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/JavaSourcePlugin.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/JavaSourcePlugin.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-package com.ibm.wala.cast.java;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JavaSourcePlugin extends Plugin {
-
-	//The shared instance.
-	private static JavaSourcePlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public JavaSourcePlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	@Override
-  public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	@Override
-  public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static JavaSourcePlugin getDefault() {
-		return plugin;
-	}
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/loader/JavaSourceLoaderImpl.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/loader/JavaSourceLoaderImpl.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/loader/JavaSourceLoaderImpl.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/loader/JavaSourceLoaderImpl.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -31,6 +30,9 @@
 import com.ibm.wala.cast.ir.ssa.AstLexicalAccess.Access;
 import com.ibm.wala.cast.ir.ssa.AstLexicalRead;
 import com.ibm.wala.cast.ir.ssa.AstLexicalWrite;
+import com.ibm.wala.cast.ir.ssa.AstPropertyRead;
+import com.ibm.wala.cast.ir.ssa.AstPropertyWrite;
+import com.ibm.wala.cast.ir.ssa.AstYieldInstruction;
 import com.ibm.wala.cast.ir.translator.AstTranslator;
 import com.ibm.wala.cast.ir.translator.AstTranslator.AstLexicalInformation;
 import com.ibm.wala.cast.java.ssa.AstJavaInstructionFactory;
@@ -65,7 +67,7 @@
 import com.ibm.wala.shrikeCT.AnnotationsReader.ConstantElementValue;
 import com.ibm.wala.shrikeCT.AnnotationsReader.ElementValue;
 import com.ibm.wala.shrikeCT.ClassConstants;
-import com.ibm.wala.ssa.SSAThrowInstruction;
+import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.Descriptor;
@@ -77,7 +79,6 @@
 import com.ibm.wala.types.annotations.Annotation;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.config.SetOfClasses;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.strings.Atom;
 
@@ -93,17 +94,17 @@
 
   /**
    * WALA representation of a Java class residing in a source file
-   * 
+   *
    * @author rfuhrer
    */
   public class JavaClass extends AstClass {
     protected final IClass enclosingClass;
 
-    protected final Collection superTypeNames;
+    protected final Collection<TypeName> superTypeNames;
 
     private final Collection<Annotation> annotations;
-    
-    public JavaClass(String typeName, Collection superTypeNames, CAstSourcePositionMap.Position position, Collection qualifiers,
+
+    public JavaClass(String typeName, Collection<TypeName> superTypeNames, CAstSourcePositionMap.Position position, Collection<CAstQualifier> qualifiers,
         JavaSourceLoaderImpl loader, IClass enclosingClass, Collection<Annotation> annotations) {
       super(position, TypeName.string2TypeName(typeName), loader, (short) mapToInt(qualifiers), new HashMap<Atom, IField>(), new HashMap<Selector, IMethod>());
       this.superTypeNames = superTypeNames;
@@ -124,8 +125,7 @@
     @Override
     public IClass getSuperclass() {
       boolean excludedSupertype=false;
-      for (Iterator iter = superTypeNames.iterator(); iter.hasNext();) {
-        TypeName name = (TypeName) iter.next();
+      for (TypeName name : superTypeNames) {
         IClass domoType = lookupClass(name);
         if (domoType != null && !domoType.isInterface()) {
           return domoType;
@@ -144,19 +144,18 @@
 /** END Custom change: Common superclass is optional */
         Assertions.UNREACHABLE("Cannot find super class for " + this + " in " + superTypeNames);
       }
-      
+
       if (excludedSupertype){
         System.err.println("Not tracking calls through excluded superclass of " + getName() + " extends " + superTypeNames);
       }
-      
+
       return null;
     }
 
     @Override
     public Collection<IClass> getDirectInterfaces() {
-      List<IClass> result = new ArrayList<IClass>();
-      for (Iterator iter = superTypeNames.iterator(); iter.hasNext();) {
-        TypeName name = (TypeName) iter.next();
+      List<IClass> result = new ArrayList<>();
+      for (TypeName name : superTypeNames) {
         IClass domoType = lookupClass(name);
         if (domoType != null && domoType.isInterface()) {
             result.add(domoType);
@@ -169,17 +168,17 @@
       return result;
     }
 
-    private void addMethod(CAstEntity methodEntity, IClass owner, AbstractCFG cfg, SymbolTable symtab, boolean hasCatchBlock,
-        Map<IBasicBlock, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo) {
+    protected void addMethod(CAstEntity methodEntity, IClass owner, AbstractCFG<?, ?> cfg, SymbolTable symtab, boolean hasCatchBlock,
+        Map<IBasicBlock<SSAInstruction>, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo) {
       declaredMethods.put(Util.methodEntityToSelector(methodEntity), new ConcreteJavaMethod(methodEntity, owner, cfg, symtab,
           hasCatchBlock, caughtTypes, hasMonitorOp, lexicalInfo, debugInfo));
     }
 
-    private void addMethod(CAstEntity methodEntity, IClass owner) {
+    protected void addMethod(CAstEntity methodEntity, IClass owner) {
       declaredMethods.put(Util.methodEntityToSelector(methodEntity), new AbstractJavaMethod(methodEntity, owner));
     }
 
-    private void addField(CAstEntity fieldEntity) {
+    protected void addField(CAstEntity fieldEntity) {
       declaredFields.put(Util.fieldEntityToAtom(fieldEntity), new JavaField(fieldEntity, JavaSourceLoaderImpl.this, this, JavaSourceLoaderImpl.this.getAnnotations(fieldEntity)));
     }
 
@@ -189,21 +188,21 @@
 
     @Override
     public String toString() {
-      StringBuffer sb = new StringBuffer("<src-class: " );
+      StringBuilder sb = new StringBuilder("<src-class: " );
       sb.append(getName().toString());
       if (enclosingClass != null) {
-        sb.append(" (within " + enclosingClass.getName() + ")");
+        sb.append(" (within ").append(enclosingClass.getName()).append(')');
       }
       if (annotations != null && !annotations.isEmpty()) {
         for(Annotation a : annotations) {
-          sb.append("[" + a.getType().getName().getClassName() + "]");
+          sb.append('[').append(a.getType().getName().getClassName()).append(']');
         }
       }
       return sb.toString();
     }
   }
 
-  private Collection<Annotation> getAnnotations(CAstEntity e) {
+  protected Collection<Annotation> getAnnotations(CAstEntity e) {
     Collection<CAstAnnotation> annotations = e.getAnnotations();
     if (annotations == null || annotations.isEmpty()) {
       return null;
@@ -225,14 +224,14 @@
       return result;
     }
   }
-  
+
   /**
    * WALA representation of a field on a Java type that resides in a source file
-   * 
+   *
    * @author rfuhrer
    */
-  private class JavaField extends AstField {
-    private JavaField(CAstEntity fieldEntity, IClassLoader loader, IClass declaringClass, Collection<Annotation> annotations) {
+  protected class JavaField extends AstField {
+    protected JavaField(CAstEntity fieldEntity, IClassLoader loader, IClass declaringClass, Collection<Annotation> annotations) {
       super(FieldReference.findOrCreate(declaringClass.getReference(), Atom.findOrCreateUnicodeAtom(fieldEntity.getName()),
           TypeReference.findOrCreate(loader.getReference(), TypeName.string2TypeName(fieldEntity.getType().getName()))),
           fieldEntity.getQualifiers(), declaringClass, declaringClass.getClassHierarchy(), annotations);
@@ -242,16 +241,16 @@
   /**
    * Generic DOMO representation of a method on a Java type that resides in a
    * source file
-   * 
+   *
    * @author rfuhrer
    */
-  private abstract class JavaEntityMethod extends AstMethod {
+  protected abstract class JavaEntityMethod extends AstMethod {
     private final TypeReference[] parameterTypes;
 
     private final TypeReference[] exceptionTypes;
 
-    public JavaEntityMethod(CAstEntity methodEntity, IClass owner, AbstractCFG cfg, SymbolTable symtab, boolean hasCatchBlock,
-        Map<IBasicBlock, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo) {
+    public JavaEntityMethod(CAstEntity methodEntity, IClass owner, AbstractCFG<?, ?> cfg, SymbolTable symtab, boolean hasCatchBlock,
+        Map<IBasicBlock<SSAInstruction>, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo) {
       super(owner, methodEntity.getQualifiers(), cfg, symtab, MethodReference.findOrCreate(owner.getReference(), Util
           .methodEntityToSelector(methodEntity)), hasCatchBlock, caughtTypes, hasMonitorOp, lexicalInfo, debugInfo, JavaSourceLoaderImpl.this.getAnnotations(methodEntity));
       this.parameterTypes = computeParameterTypes(methodEntity);
@@ -280,22 +279,22 @@
       return parameterTypes[i];
     }
 
-    private TypeReference[] computeParameterTypes(CAstEntity methodEntity) {
+    protected TypeReference[] computeParameterTypes(CAstEntity methodEntity) {
       TypeReference[] types;
       CAstType.Function type = (Function) methodEntity.getType();
       int argCount = type.getArgumentTypes().size();
       if (isStatic()) {
         types = new TypeReference[argCount];
         for (int i = 0; i < argCount; i++) {
-          types[i] = TypeReference.findOrCreate(JavaSourceLoaderImpl.this.getReference(), ((CAstType) type.getArgumentTypes()
-              .get(i)).getName());
+          types[i] = TypeReference.findOrCreate(JavaSourceLoaderImpl.this.getReference(), type.getArgumentTypes()
+              .get(i).getName());
         }
       } else {
         types = new TypeReference[argCount + 1];
         types[0] = cls.getReference();
         for (int i = 0; i < argCount; i++) {
-          types[i + 1] = TypeReference.findOrCreate(JavaSourceLoaderImpl.this.getReference(), ((CAstType) type.getArgumentTypes()
-              .get(i)).getName());
+          types[i + 1] = TypeReference.findOrCreate(JavaSourceLoaderImpl.this.getReference(), type.getArgumentTypes()
+              .get(i).getName());
         }
       }
 
@@ -307,15 +306,15 @@
       return exceptionTypes;
     }
 
-    private TypeReference[] computeExceptionTypes(CAstEntity methodEntity) {
+    protected TypeReference[] computeExceptionTypes(CAstEntity methodEntity) {
       CAstType.Function fType = (Function) methodEntity.getType();
-      Collection exceptionTypes = fType.getExceptionTypes();
+      Collection<CAstType> exceptionTypes = fType.getExceptionTypes();
 
       TypeReference[] result = new TypeReference[exceptionTypes.size()];
       int i = 0;
-      for (Iterator iter = exceptionTypes.iterator(); iter.hasNext(); i++) {
-        CAstType type = (CAstType) iter.next();
+      for (CAstType type : exceptionTypes) {
         result[i] = TypeReference.findOrCreate(JavaSourceLoaderImpl.this.getReference(), type.getName());
+        ++i;
       }
 
       return result;
@@ -323,17 +322,17 @@
 
     @Override
     public String toString() {
-      return "<src-method: " + this.getReference() + ">";
+      return "<src-method: " + this.getReference() + '>';
     }
   }
 
   /**
    * DOMO representation of an abstract (body-less) method on a Java type that
    * resides in a source file
-   * 
+   *
    * @author rfuhrer
    */
-  private class AbstractJavaMethod extends JavaEntityMethod {
+  protected class AbstractJavaMethod extends JavaEntityMethod {
     public AbstractJavaMethod(CAstEntity methodEntity, IClass owner) {
       super(methodEntity, owner);
     }
@@ -364,12 +363,12 @@
   /**
    * DOMO representation of a concrete method (which has a body) on a Java type
    * that resides in a source file
-   * 
+   *
    * @author rfuhrer
    */
   public class ConcreteJavaMethod extends JavaEntityMethod {
-    public ConcreteJavaMethod(CAstEntity methodEntity, IClass owner, AbstractCFG cfg, SymbolTable symtab, boolean hasCatchBlock,
-        Map<IBasicBlock, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo) {
+    public ConcreteJavaMethod(CAstEntity methodEntity, IClass owner, AbstractCFG<?, ?> cfg, SymbolTable symtab, boolean hasCatchBlock,
+        Map<IBasicBlock<SSAInstruction>, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo) {
       super(methodEntity, owner, cfg, symtab, hasCatchBlock, caughtTypes, hasMonitorOp, lexicalInfo, debugInfo);
     }
 
@@ -450,11 +449,9 @@
     }
   }
 
-  public static int mapToInt(Collection/* <CAstQualifier> */qualifiers) {
+  public static int mapToInt(Collection<CAstQualifier> qualifiers) {
     int result = 0;
-    for (Iterator iter = qualifiers.iterator(); iter.hasNext();) {
-      CAstQualifier q = (CAstQualifier) iter.next();
-
+    for (CAstQualifier q : qualifiers) {
       if (q == CAstQualifier.PUBLIC)
         result |= ClassConstants.ACC_PUBLIC;
       if (q == CAstQualifier.PROTECTED)
@@ -485,14 +482,14 @@
 
 /** BEGIN Custom change: Common superclass is optional */
   public JavaSourceLoaderImpl(boolean existsCommonSuperClass, ClassLoaderReference loaderRef, IClassLoader parent,
-      SetOfClasses exclusions, IClassHierarchy cha) throws IOException {
+      IClassHierarchy cha) {
     super(loaderRef, cha.getScope().getArrayClassLoader(), parent, cha.getScope().getExclusions(), cha);
     this.existsCommonSuperclass = existsCommonSuperClass;
   }
-  
-  public JavaSourceLoaderImpl(ClassLoaderReference loaderRef, IClassLoader parent, SetOfClasses exclusions, IClassHierarchy cha) throws IOException {
+
+  public JavaSourceLoaderImpl(ClassLoaderReference loaderRef, IClassLoader parent, IClassHierarchy cha) {
     // standard case: we have a common super class
-    this(true, loaderRef, parent, exclusions, cha);
+    this(true, loaderRef, parent, cha);
   }
 /** END Custom change: Common superclass is optional */
 
@@ -509,7 +506,7 @@
 /** BEGIN Custom change: Optional deletion of fTypeMap */
   public static volatile boolean deleteTypeMapAfterInit = true;
 /** END Custom change: Optional deletion of fTypeMap */
-  
+
 
   @Override
   public void init(List<Module> modules) throws IOException {
@@ -521,8 +518,8 @@
 /** END Custom change: Optional deletion of fTypeMap */
   }
 
-  public void defineFunction(CAstEntity n, IClass owner, AbstractCFG cfg, SymbolTable symtab, boolean hasCatchBlock,
-      Map<IBasicBlock, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo) {
+  public void defineFunction(CAstEntity n, IClass owner, AbstractCFG<?, ?> cfg, SymbolTable symtab, boolean hasCatchBlock,
+      Map<IBasicBlock<SSAInstruction>, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo) {
     ((JavaClass) owner).addMethod(n, owner, cfg, symtab, hasCatchBlock, caughtTypes, hasMonitorOp, lexicalInfo, debugInfo);
   }
 
@@ -534,14 +531,14 @@
     ((JavaClass) owner).addField(n);
   }
 
-  private TypeName toWALATypeName(CAstType type) {
+  protected static TypeName toWALATypeName(CAstType type) {
     return TypeName.string2TypeName(type.getName());
   }
-  
+
   public IClass defineType(CAstEntity type, String typeName, CAstEntity owner) {
-    Collection<TypeName> superTypeNames = new ArrayList<TypeName>();
-    for (Iterator superTypes = type.getType().getSupertypes().iterator(); superTypes.hasNext();) {
-      superTypeNames.add(toWALATypeName(((CAstType) superTypes.next())));
+    Collection<TypeName> superTypeNames = new ArrayList<>();
+    for (CAstType superType : type.getType().getSupertypes()) {
+      superTypeNames.add(toWALATypeName(superType));
     }
 
     JavaClass javaClass = new JavaClass(typeName, superTypeNames, type.getPosition(), type.getQualifiers(), this,
@@ -550,7 +547,7 @@
     if (getParent().lookupClass(javaClass.getName()) != null) {
       return null;
     }
-    
+
     fTypeMap.put(type, javaClass);
     loadedClasses.put(javaClass.getName(), javaClass);
     return javaClass;
@@ -558,9 +555,9 @@
 
   @Override
   public String toString() {
-    return "Java Source Loader (classes " + loadedClasses.values() + ")";
+    return "Java Source Loader (classes " + loadedClasses.values() + ')';
   }
-  
+
   public static class InstructionFactory extends JavaInstructionFactory implements AstJavaInstructionFactory {
 
     @Override
@@ -664,13 +661,26 @@
        return new AstLexicalWrite(iindex, definer, globalName, type, rhs);
     }
 
-    public SSAThrowInstruction NonExceptingThrowInstruction(int iindex, int exception) {
-      throw new UnsupportedOperationException();
-   }    
+    @Override
+    public AstYieldInstruction YieldInstruction(int iindex, int[] rvals) {
+      return new AstYieldInstruction(iindex, rvals);
+    }
+    
+    @Override
+    public AstPropertyRead PropertyRead(int iindex, int result, int objectRef, int memberRef) {
+      assert false;
+      return null;
+    }
+
+    @Override
+    public AstPropertyWrite PropertyWrite(int iindex, int objectRef, int memberRef, int value) {
+      assert false;
+      return null;
+    }
   }
-  
-  private static final InstructionFactory insts = new InstructionFactory();
-  
+
+  protected static final InstructionFactory insts = new InstructionFactory();
+
   @Override
   public InstructionFactory getInstructionFactory() {
     return insts;
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/loader/Util.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/loader/Util.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/loader/Util.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/loader/Util.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,8 +11,6 @@
 package com.ibm.wala.cast.java.loader;
 
 
-import java.util.Iterator;
-
 import com.ibm.wala.cast.tree.CAstEntity;
 import com.ibm.wala.cast.tree.CAstType;
 import com.ibm.wala.types.Descriptor;
@@ -34,11 +32,9 @@
       new TypeName[signature.getArgumentCount()];
 
     int i= 0;
-    for(Iterator iter= signature.getArgumentTypes().iterator(); 
-	iter.hasNext(); i++)
-    {
-      CAstType argType= (CAstType) iter.next();
+    for (CAstType argType : signature.getArgumentTypes()) {
       argTypeNames[i]= TypeName.string2TypeName(argType.getName());
+      ++i;
     }
 
     Descriptor desc= Descriptor.findOrCreate(argTypeNames, retTypeName);
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/Java2IRTranslator.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/Java2IRTranslator.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/Java2IRTranslator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/Java2IRTranslator.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,32 +23,33 @@
 import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
 import com.ibm.wala.cast.util.CAstPrinter;
 import com.ibm.wala.classLoader.ModuleEntry;
+import com.ibm.wala.util.config.SetOfClasses;
 
 public class Java2IRTranslator {
   private final boolean DEBUG;
 
   protected final JavaSourceLoaderImpl fLoader;
 
-  CAstRewriterFactory castRewriterFactory = null;
+  protected final SetOfClasses exclusions;
+  
+  CAstRewriterFactory<?, ?> castRewriterFactory = null;
 
-  public Java2IRTranslator(JavaSourceLoaderImpl srcLoader) {
-    this(srcLoader, false);
-  }
 
-  public Java2IRTranslator(JavaSourceLoaderImpl srcLoader, boolean debug) {
-    this(srcLoader, null, debug);
+  public Java2IRTranslator(JavaSourceLoaderImpl srcLoader, SetOfClasses exclusions) {
+    this(srcLoader, null, exclusions);
   }
 
   public Java2IRTranslator(JavaSourceLoaderImpl srcLoader,
-      CAstRewriterFactory castRewriterFactory) {
-    this(srcLoader, castRewriterFactory, false);
+      CAstRewriterFactory<?, ?> castRewriterFactory, SetOfClasses exclusions) {
+    this(srcLoader, castRewriterFactory, false, exclusions);
   }
 
   public Java2IRTranslator(JavaSourceLoaderImpl srcLoader,
-      CAstRewriterFactory castRewriterFactory, boolean debug) {
+      CAstRewriterFactory<?, ?> castRewriterFactory, boolean debug, SetOfClasses exclusions) {
     DEBUG = debug;
     fLoader = srcLoader;
     this.castRewriterFactory = castRewriterFactory;
+    this.exclusions = exclusions;
   }
 
   public void translate(ModuleEntry module, CAstEntity ce) {
@@ -60,7 +61,7 @@
 
     if (castRewriterFactory != null) {
       CAst cast = new CAstImpl();
-      CAstRewriter rw = castRewriterFactory.createCAstRewriter(cast);
+      CAstRewriter<?, ?> rw = castRewriterFactory.createCAstRewriter(cast);
       ce = rw.rewrite(ce);
       if (DEBUG) {
         PrintWriter printWriter = new PrintWriter(System.out);
@@ -69,6 +70,6 @@
       }
     }
 
-    new JavaCAst2IRTranslator(module, ce, fLoader).translate();
+    new JavaCAst2IRTranslator(module, ce, fLoader, exclusions).translate();
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/JavaCAst2IRTranslator.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/JavaCAst2IRTranslator.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/JavaCAst2IRTranslator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/translator/JavaCAst2IRTranslator.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,7 +15,6 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.Map;
 
 import com.ibm.wala.cast.ir.translator.AstTranslator;
@@ -28,6 +27,7 @@
 import com.ibm.wala.cast.tree.CAstEntity;
 import com.ibm.wala.cast.tree.CAstNode;
 import com.ibm.wala.cast.tree.CAstQualifier;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
 import com.ibm.wala.cast.tree.CAstType;
 import com.ibm.wala.cast.tree.CAstType.Method;
 import com.ibm.wala.cast.tree.visit.CAstVisitor;
@@ -37,20 +37,24 @@
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.ModuleEntry;
 import com.ibm.wala.classLoader.NewSiteReference;
+import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.config.SetOfClasses;
 import com.ibm.wala.util.debug.Assertions;
 
 public class JavaCAst2IRTranslator extends AstTranslator {
   private final CAstEntity fSourceEntity;
   private final ModuleEntry module;
+  private final SetOfClasses exclusions;
 
-  public JavaCAst2IRTranslator(ModuleEntry module, CAstEntity sourceFileEntity, JavaSourceLoaderImpl loader) {
+  public JavaCAst2IRTranslator(ModuleEntry module, CAstEntity sourceFileEntity, JavaSourceLoaderImpl loader, SetOfClasses exclusions) {
     super(loader);
     fSourceEntity = sourceFileEntity;
     this.module = module;
+    this.exclusions = exclusions;
   }
 
   public void translate() {
@@ -166,14 +170,13 @@
     processExceptions(newNode, context);
   }
 
-  private void processExceptions(CAstNode n, WalkContext context) {
+  private static void processExceptions(CAstNode n, WalkContext context) {
     context.cfg().addPreNode(n, context.getUnwindState());
     context.cfg().newBlock(true);
 
-    Collection labels = context.getControlFlow().getTargetLabels(n);
+    Collection<Object> labels = context.getControlFlow().getTargetLabels(n);
 
-    for (Iterator iter = labels.iterator(); iter.hasNext();) {
-      Object label = iter.next();
+    for (Object label : labels) {
       CAstNode target = context.getControlFlow().getTarget(n, label);
       if (target == CAstControlFlowMap.EXCEPTION_TO_EXIT)
         context.cfg().addPreEdgeToExit(n, true);
@@ -203,10 +206,6 @@
     processExceptions(call, context);
   }
 
-  protected void doGlobalRead(WalkContext context, int result, String name) {
-    Assertions.UNREACHABLE("doGlobalRead() called for Java code???");
-  }
-
   @Override
   protected void doGlobalWrite(WalkContext context, String name, TypeReference type, int rval) {
     Assertions.UNREACHABLE("doGlobalWrite() called for Java code???");
@@ -219,13 +218,15 @@
 
     // N.B.: base class may actually ask to create a synthetic type to wrap
     // code bodies, so we may see other things than TYPE_ENTITY here.
-    IClass owner = loader.lookupClass(makeType(topEntity.getType()).getName());
+    TypeName ownerName = makeType(topEntity.getType()).getName();
+    IClass owner = loader.lookupClass(ownerName);
 
-    if (owner == null) {
-      assert owner != null : makeType(topEntity.getType()).getName() + " not found in " + loader;
-    }
+    assert owner != null || exclusions.contains(ownerName.toString())
+        : ownerName + " not found in " + loader;
 
-    ((JavaSourceLoaderImpl) loader).defineField(n, owner);
+    if (owner != null) {
+      ((JavaSourceLoaderImpl) loader).defineField(n, owner);
+    }
   }
 
   // handles abstract method declarations, which do not get defineFunction
@@ -234,18 +235,20 @@
   protected void declareFunction(CAstEntity N, WalkContext definingContext) {
     CAstType.Method methodType = (Method) N.getType();
     CAstType owningType = methodType.getDeclaringType();
+    
     IClass owner = loader.lookupClass(makeType(owningType).getName());
 
-    if (owner == null) {
-      assert owner != null : makeType(owningType).getName().toString() + " not found in " + loader;
-    }
+    assert owner != null || exclusions.contains(owningType.getName())
+      : makeType(owningType).getName().toString() + " not found in " + loader;
 
-    ((JavaSourceLoaderImpl) loader).defineAbstractFunction(N, owner);
+    if (owner != null && N.getQualifiers().contains(CAstQualifier.ABSTRACT)) {
+      ((JavaSourceLoaderImpl) loader).defineAbstractFunction(N, owner);
+    }
   }
 
   @Override
-  protected void defineFunction(CAstEntity N, WalkContext definingContext, AbstractCFG cfg, SymbolTable symtab,
-      boolean hasCatchBlock, Map<IBasicBlock,TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo,
+  protected void defineFunction(CAstEntity N, WalkContext definingContext, AbstractCFG<SSAInstruction, ? extends IBasicBlock<SSAInstruction>> cfg, SymbolTable symtab,
+      boolean hasCatchBlock, Map<IBasicBlock<SSAInstruction>,TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo,
       DebuggingInformation debugInfo) {
     // N.B.: base class may actually ask to create a synthetic type to wrap
     // code bodies, so we may see other things than TYPE_ENTITY here.
@@ -254,15 +257,16 @@
     TypeName typeName = makeType(owningType).getName();
     IClass owner = loader.lookupClass(typeName);
 
-    if (owner == null) {
-      assert owner != null : typeName.toString() + " not found in " + loader;
-    }
+    assert owner != null || exclusions.contains(owningType.getName())
+        : typeName.toString() + " not found in " + loader;
 
-    symtab.getConstant(0);
-    symtab.getNullConstant();
+    if (owner != null) {
+      symtab.getConstant(0);
+      symtab.getNullConstant();
 
-    ((JavaSourceLoaderImpl) loader).defineFunction(N, owner, cfg, symtab, hasCatchBlock, caughtTypes, hasMonitorOp, lexicalInfo,
+      ((JavaSourceLoaderImpl) loader).defineFunction(N, owner, cfg, symtab, hasCatchBlock, caughtTypes, hasMonitorOp, lexicalInfo,
         debugInfo);
+    }
   }
 
   @Override
@@ -275,12 +279,12 @@
   protected String composeEntityName(WalkContext parent, CAstEntity f) {
     switch (f.getKind()) {
     case CAstEntity.TYPE_ENTITY: {
-      return (parent.getName().length() == 0) ? f.getName() : parent.getName() + "/" + f.getName();
+      return (parent.getName().length() == 0) ? f.getName() : parent.getName() + '/' + f.getName();
     }
     case CAstEntity.FUNCTION_ENTITY: {
       // TODO properly handle types with clashing names/signatures within a
       // given method
-      return parent.getName() + "/" + f.getSignature();
+      return parent.getName() + '/' + f.getSignature();
     }
     default: {
       return parent.getName();
@@ -320,7 +324,11 @@
     CAstEntity parentType = getEnclosingType(type);
     // ((JavaSourceLoaderImpl)loader).defineType(type,
     // composeEntityName(wc,type), parentType);
-    return ((JavaSourceLoaderImpl) loader).defineType(type, type.getType().getName(), parentType) != null;
+    if (exclusions != null && exclusions.contains(type.getType().getName().substring(1))) {
+      return false;
+    } else {
+      return ((JavaSourceLoaderImpl) loader).defineType(type, type.getType().getName(), parentType) != null;
+    }
   }
 
   @Override
@@ -411,11 +419,11 @@
     }
   }
 
-  private CAstType getType(final String name) {
+  private static CAstType getType(final String name) {
     return new CAstType.Class() {
       
       @Override
-      public Collection getSupertypes() {
+      public Collection<CAstType> getSupertypes() {
         return Collections.emptySet();
       }
       
@@ -445,6 +453,16 @@
     return getType("java.lang.Exception");
   }
 
-
-
+  @Override
+  protected Position[] getParameterPositions(CAstEntity n) {
+    int offset = 0;
+    Position[] parameterPositions = new Position[ n.getArgumentCount() ];
+    if ((n.getType() instanceof CAstType.Method) && !((CAstType.Method)n.getType()).isStatic()) {
+      offset = 1;
+    }
+    for(int i = 0; i < n.getArgumentCount() - offset; i++) {
+      parameterPositions[i+offset] = n.getPosition(i);
+    }
+    return parameterPositions;
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/types/JavaPrimitiveTypeMap.java wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/types/JavaPrimitiveTypeMap.java
--- wala-1.3.9/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/types/JavaPrimitiveTypeMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java/src/com/ibm/wala/cast/java/types/JavaPrimitiveTypeMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,7 +43,7 @@
     }
 
     @Override
-    public Collection getSupertypes() {
+    public Collection<CAstType> getSupertypes() {
       return Collections.EMPTY_LIST;
     }
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/build.gradle wala-1.5.1/com.ibm.wala.cast.java.ecj/build.gradle
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,15 @@
+sourceSets.main.java.srcDirs = ['src']
+
+dependencies {
+	compile(
+		'eclipse-deps:org.eclipse.core.runtime:+',
+		'eclipse-deps:org.eclipse.equinox.common:+',
+		'eclipse-deps:org.eclipse.jdt.core:+',
+		'org.osgi:org.osgi.core:4.2.0',
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.cast.java'),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.shrike'),
+		project(':com.ibm.wala.util'),
+		)
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/build.properties wala-1.5.1/com.ibm.wala.cast.java.ecj/build.properties
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/build.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: com.ibm.wala.cast.java.ecj
+Bundle-Version: 1.5.1
+Bundle-Vendor: %Bundle-Vendor
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: com.ibm.wala.cast.java,
+ com.ibm.wala.core,
+ org.eclipse.core.runtime,
+ org.eclipse.jdt.core,
+ com.ibm.wala.cast,
+ com.ibm.wala.shrike
+Export-Package: com.ibm.wala.cast.java.client,
+ com.ibm.wala.cast.java.ecj.util,
+ com.ibm.wala.cast.java.translator.jdt,
+ com.ibm.wala.cast.java.translator.jdt.ecj
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/mvncentral.xml wala-1.5.1/com.ibm.wala.cast.java.ecj/mvncentral.xml
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/mvncentral.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/mvncentral.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.ibm.wala</groupId>
+  <artifactId>com.ibm.wala.cast.java.ecj</artifactId>
+  <version>1.5.1</version>
+  <packaging>jar</packaging>
+  <name>WALA CAst Java ECJ</name>
+  <description>WALA Common AST Java ECJ front-end</description>
+  <url>http://wala.sourceforge.net</url>
+  <licenses>
+    <license>
+      <name>Eclipse Public License, Version 1.0</name>
+      <url>https://www.eclipse.org/legal/epl-v10.html</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>Manu Sridharan</name>
+      <email>m.sridharan@samsung.com</email>
+      <organization>Samsung Research America</organization>
+      <organizationUrl>http://www.sisa.samsung.com/</organizationUrl>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git@github.com:wala/WALA.git</connection>
+    <developerConnection>scm:git:git@github.com:example/example-application.git</developerConnection>
+    <url>git@github.com:example/example-application.git</url>
+  </scm>
+
+  <properties>
+    <src.dir>src</src.dir>
+  </properties>
+
+  <distributionManagement>
+    <snapshotRepository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <dependencies>
+   <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.util</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.cast</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.cast.java</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.core</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.shrike</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.core</groupId>
+      <artifactId>org.eclipse.core.runtime</artifactId>
+      <version>3.7.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>org.eclipse.jdt.core</artifactId>
+      <version>3.10.0</version>
+    </dependency>
+  </dependencies>
+
+  <repositories>
+    <repository>
+      <id>sonatype-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+  </repositories>  
+
+  <profiles>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
+  
+  <build>
+    <sourceDirectory>${src.dir}</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.2</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.3</version>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>ossrh</serverId>
+          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.2.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <additionalparam>${javadoc.options}</additionalparam>
+        </configuration>        
+        <version>2.9.1</version>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+    <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-gpg-plugin</artifactId>
+      <version>1.5</version>
+      <executions>
+        <execution>
+          <id>sign-artifacts</id>
+          <phase>verify</phase>
+          <goals>
+            <goal>sign</goal>
+          </goals>
+        </execution>
+      </executions>
+    </plugin>
+    
+    </plugins>
+  </build>  
+</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast.java.ecj/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.java.ecj
+Bundle-Name = WALA CAst Java ECJ frontend
+Bundle-Vendor = IBM
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/pom.xml wala-1.5.1/com.ibm.wala.cast.java.ecj/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/pom.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>WALA</artifactId>
+        <groupId>com.ibm.wala</groupId>
+        <version>1.5.1</version>
+    </parent>
+  <artifactId>com.ibm.wala.cast.java.ecj</artifactId>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.jdt.core.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,115 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=error
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=ignore
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/client/ECJJavaSourceAnalysisEngine.java wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/client/ECJJavaSourceAnalysisEngine.java
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/client/ECJJavaSourceAnalysisEngine.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/client/ECJJavaSourceAnalysisEngine.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2013 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.cast.java.client;
+
+import com.ibm.wala.cast.java.translator.jdt.ecj.ECJClassLoaderFactory;
+import com.ibm.wala.classLoader.ClassLoaderFactory;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.util.config.SetOfClasses;
+
+public class ECJJavaSourceAnalysisEngine<I extends InstanceKey> extends JavaSourceAnalysisEngine<I> {
+
+  @Override
+  protected ClassLoaderFactory getClassLoaderFactory(SetOfClasses exclusions) {
+    return new ECJClassLoaderFactory(exclusions);
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/ecj/util/SourceDirCallGraph.java wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/ecj/util/SourceDirCallGraph.java
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/ecj/util/SourceDirCallGraph.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/ecj/util/SourceDirCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,82 @@
+package com.ibm.wala.cast.java.ecj.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.jar.JarFile;
+
+import com.ibm.wala.cast.ir.ssa.AstIRFactory;
+import com.ibm.wala.cast.java.client.impl.ZeroOneContainerCFABuilderFactory;
+import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
+import com.ibm.wala.cast.java.translator.jdt.ecj.ECJClassLoaderFactory;
+import com.ibm.wala.classLoader.SourceDirectoryTreeModule;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
+import com.ibm.wala.ipa.callgraph.CallGraphStats;
+import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.properties.WalaProperties;
+import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.util.io.CommandLine;
+import com.ibm.wala.util.warnings.Warnings;
+
+/**
+ * Driver that constructs a call graph for an application specified as a directory of source code.
+ * Example of using the JDT front-end based on ECJ.    
+ * Useful for getting some code to copy-paste.    
+ */
+public class SourceDirCallGraph {
+
+  /**
+   * Usage: ScopeFileCallGraph -sourceDir file_path -mainClass class_name
+   * 
+   * If given -mainClass, uses main() method of class_name as entrypoint.  Class
+   * name should start with an 'L'.
+   * 
+   * Example args: -sourceDir /tmp/srcTest -mainClass LFoo
+   * 
+   */
+  public static void main(String[] args) throws ClassHierarchyException, IllegalArgumentException, CallGraphBuilderCancelException, IOException {
+    long start = System.currentTimeMillis();
+    Properties p = CommandLine.parse(args);
+    String sourceDir = p.getProperty("sourceDir");
+    String mainClass = p.getProperty("mainClass");
+    AnalysisScope scope = new JavaSourceAnalysisScope();
+    // add standard libraries to scope
+    String[] stdlibs = WalaProperties.getJ2SEJarFiles();
+    for (String stdlib : stdlibs) {
+      scope.addToScope(ClassLoaderReference.Primordial, new JarFile(stdlib));
+    }
+    // add the source directory
+    scope.addToScope(JavaSourceAnalysisScope.SOURCE, new SourceDirectoryTreeModule(new File(sourceDir)));
+    
+    // build the class hierarchy
+    IClassHierarchy cha = ClassHierarchyFactory.make(scope, new ECJClassLoaderFactory(scope.getExclusions()));
+    System.out.println(cha.getNumberOfClasses() + " classes");
+    System.out.println(Warnings.asString());
+    Warnings.clear();
+    AnalysisOptions options = new AnalysisOptions();
+    Iterable<Entrypoint> entrypoints = Util.makeMainEntrypoints(JavaSourceAnalysisScope.SOURCE, cha, new String[] { mainClass } );
+    options.setEntrypoints(entrypoints);
+    // you can dial down reflection handling if you like
+//    options.setReflectionOptions(ReflectionOptions.NONE);
+    IAnalysisCacheView cache = new AnalysisCacheImpl(AstIRFactory.makeDefaultFactory());
+    //CallGraphBuilder builder = new ZeroCFABuilderFactory().make(options, cache, cha, scope, false);
+    CallGraphBuilder<?> builder = new ZeroOneContainerCFABuilderFactory().make(options, cache, cha, scope);
+    System.out.println("building call graph...");
+    CallGraph cg = builder.makeCallGraph(options, null);
+    long end = System.currentTimeMillis();
+    System.out.println("done");
+    System.out.println("took " + (end-start) + "ms");
+    System.out.println(CallGraphStats.getStats(cg));    
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJClassLoaderFactory.java wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJClassLoaderFactory.java
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJClassLoaderFactory.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJClassLoaderFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,39 @@
+package com.ibm.wala.cast.java.translator.jdt.ecj;
+
+import java.io.IOException;
+
+import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
+import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl;
+import com.ibm.wala.classLoader.ClassLoaderFactoryImpl;
+import com.ibm.wala.classLoader.ClassLoaderImpl;
+import com.ibm.wala.classLoader.IClassLoader;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.util.config.SetOfClasses;
+
+public class ECJClassLoaderFactory extends ClassLoaderFactoryImpl {
+
+  public ECJClassLoaderFactory(SetOfClasses exclusions) {
+    super(exclusions);
+  }
+
+  // TODO remove code duplication with JDTClassLoaderFactory
+  
+  @Override
+  protected IClassLoader makeNewClassLoader(ClassLoaderReference classLoaderReference, IClassHierarchy cha, IClassLoader parent,
+      AnalysisScope scope) throws IOException {
+    if (classLoaderReference.equals(JavaSourceAnalysisScope.SOURCE)) {
+      ClassLoaderImpl cl = makeSourceLoader(classLoaderReference, cha, parent);
+      cl.init(scope.getModules(classLoaderReference));
+      return cl;
+    } else {
+      return super.makeNewClassLoader(classLoaderReference, cha, parent, scope);
+    }
+  }
+  
+  protected JavaSourceLoaderImpl makeSourceLoader(ClassLoaderReference classLoaderReference, IClassHierarchy cha, IClassLoader parent) {
+    return new ECJSourceLoaderImpl(classLoaderReference, parent, cha, false);
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJSourceLoaderImpl.java wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJSourceLoaderImpl.java
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJSourceLoaderImpl.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJSourceLoaderImpl.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * This file is a derivative of code released by the University of
+ * California under the terms listed below.  
+ *
+ * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
+ * University of California (Regents). Provided that this notice and
+ * the following two paragraphs are included in any distribution of
+ * Refinement Analysis Tools or its derivative work, Regents agrees
+ * not to assert any of Regents' copyright rights in Refinement
+ * Analysis Tools against recipient for recipient's reproduction,
+ * preparation of derivative works, public display, public
+ * performance, distribution or sublicensing of Refinement Analysis
+ * Tools and derivative works, in source code and object code form.
+ * This agreement not to assert does not confer, by implication,
+ * estoppel, or otherwise any license or rights in any intellectual
+ * property of Regents, including, but not limited to, any patents
+ * of Regents or Regents' employees.
+ * 
+ * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
+ * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
+ * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *   
+ * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
+ * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
+ * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
+ * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
+ * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+package com.ibm.wala.cast.java.translator.jdt.ecj;
+
+import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl;
+import com.ibm.wala.cast.java.translator.SourceModuleTranslator;
+import com.ibm.wala.classLoader.IClassLoader;
+import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.types.ClassLoaderReference;
+
+public class ECJSourceLoaderImpl extends JavaSourceLoaderImpl {
+  private final boolean dump;
+
+  public ECJSourceLoaderImpl(ClassLoaderReference loaderRef, IClassLoader parent, IClassHierarchy cha) {
+    this(loaderRef, parent, cha, false);
+  }
+  
+  public ECJSourceLoaderImpl(ClassLoaderReference loaderRef, IClassLoader parent, IClassHierarchy cha, boolean dump) {
+    super(loaderRef, parent, cha);
+    this.dump = dump;
+  }
+
+  @Override
+  protected SourceModuleTranslator getTranslator() {
+    return new ECJSourceModuleTranslator(cha.getScope(), this, dump);
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJSourceModuleTranslator.java wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJSourceModuleTranslator.java
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJSourceModuleTranslator.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/ecj/ECJSourceModuleTranslator.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,214 @@
+/*
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * This file is a derivative of code released by the University of
+ * California under the terms listed below.  
+ *
+ * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
+ * University of California (Regents). Provided that this notice and
+ * the following two paragraphs are included in any distribution of
+ * Refinement Analysis Tools or its derivative work, Regents agrees
+ * not to assert any of Regents' copyright rights in Refinement
+ * Analysis Tools against recipient for recipient's reproduction,
+ * preparation of derivative works, public display, public
+ * performance, distribution or sublicensing of Refinement Analysis
+ * Tools and derivative works, in source code and object code form.
+ * This agreement not to assert does not confer, by implication,
+ * estoppel, or otherwise any license or rights in any intellectual
+ * property of Regents, including, but not limited to, any patents
+ * of Regents or Regents' employees.
+ * 
+ * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
+ * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
+ * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *   
+ * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
+ * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
+ * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
+ * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
+ * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+package com.ibm.wala.cast.java.translator.jdt.ecj;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.compiler.IProblem;
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.core.dom.ASTParser;
+import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.FileASTRequestor;
+
+import com.ibm.wala.cast.java.translator.Java2IRTranslator;
+import com.ibm.wala.cast.java.translator.SourceModuleTranslator;
+import com.ibm.wala.cast.java.translator.jdt.JDTJava2CAstTranslator;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
+import com.ibm.wala.cast.tree.impl.RangePosition;
+import com.ibm.wala.classLoader.DirectoryTreeModule;
+import com.ibm.wala.classLoader.JarFileModule;
+import com.ibm.wala.classLoader.JarStreamModule;
+import com.ibm.wala.classLoader.Module;
+import com.ibm.wala.classLoader.ModuleEntry;
+import com.ibm.wala.classLoader.SourceFileModule;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.Pair;
+import com.ibm.wala.util.config.SetOfClasses;
+import com.ibm.wala.util.io.TemporaryFile;
+
+/**
+ * A SourceModuleTranslator whose implementation of loadAllSources() uses the PolyglotFrontEnd pseudo-compiler to generate DOMO IR
+ * for the sources in the compile-time classpath.
+ * 
+ * @author rfuhrer
+ */
+// remove me comment: Jdt little-case = not OK, upper case = OK
+public class ECJSourceModuleTranslator implements SourceModuleTranslator {
+  private final class ECJAstToIR extends FileASTRequestor {
+    private final Map<String, ModuleEntry> sourceMap;
+    
+    public ECJAstToIR(Map<String, ModuleEntry> sourceMap) {
+     this.sourceMap = sourceMap;
+    }
+
+    @Override
+    public void acceptAST(String source, CompilationUnit ast) {
+      JDTJava2CAstTranslator<Position> jdt2cast = makeCAstTranslator(ast, source);
+      final Java2IRTranslator java2ir = makeIRTranslator();
+      java2ir.translate(sourceMap.get(source), jdt2cast.translateToCAst());
+ 
+      if (! "true".equals(System.getProperty("wala.jdt.quiet"))) {
+        IProblem[] problems = ast.getProblems();
+        int length = problems.length;
+        if (length > 0) {
+          StringBuilder buffer = new StringBuilder();
+          for (int i = 0; i < length; i++) {
+            buffer.append(problems[i].getMessage());
+            buffer.append('\n');
+          }
+          if (length != 0)
+            System.err.println("Unexpected problems in " + source + "\n " + buffer);
+        }
+      }
+    }
+  }
+
+  protected boolean dump;
+  protected ECJSourceLoaderImpl sourceLoader;
+  private final String[] sources;
+  private final String[] libs;
+  private final SetOfClasses exclusions;
+  
+  public ECJSourceModuleTranslator(AnalysisScope scope, ECJSourceLoaderImpl sourceLoader) {
+    this(scope, sourceLoader, false);
+  }
+
+  public ECJSourceModuleTranslator(AnalysisScope scope, ECJSourceLoaderImpl sourceLoader, boolean dump) {
+    this.sourceLoader = sourceLoader;
+    this.dump = dump;
+    
+    Pair<String[], String[]> paths = computeClassPath(scope);
+    sources = paths.fst;
+    libs = paths.snd;
+    
+    this.exclusions = scope.getExclusions();
+  }
+
+  private static Pair<String[],String[]> computeClassPath(AnalysisScope scope) {
+    List<String> sources = new LinkedList<>();
+    List<String> libs = new LinkedList<>();
+    for (ClassLoaderReference cl : scope.getLoaders()) {
+
+    while (cl != null) {
+      List<Module> modules = scope.getModules(cl);
+
+      for (Module m : modules) {
+        if (m instanceof JarFileModule) {
+          JarFileModule jarFileModule = (JarFileModule) m;
+
+          libs.add(jarFileModule.getAbsolutePath());
+        } else if (m instanceof JarStreamModule) {
+        	try  {
+        		File F = File.createTempFile("tmp", "jar");
+        		F.deleteOnExit();
+        		TemporaryFile.streamToFile(F, ((JarStreamModule)m));
+        		libs.add(F.getAbsolutePath());
+        	} catch (IOException e) {
+        		assert false : e;
+        	}
+        } else if (m instanceof DirectoryTreeModule) {
+          DirectoryTreeModule directoryTreeModule = (DirectoryTreeModule) m;
+
+          sources.add(directoryTreeModule.getPath());
+        } else {
+          //Assertions.UNREACHABLE("Module entry is neither jar file nor directory");
+        }
+      }
+      cl = cl.getParent();
+    }
+    }
+    
+    return Pair.make(sources.toArray(new String[0]),  libs.toArray(new String[0]));
+  }
+  
+  /*
+   * Project -> AST code from org.eclipse.jdt.core.tests.performance
+   */
+
+  @Override
+  public void loadAllSources(Set<ModuleEntry> modules) {
+    List<String> sources = new LinkedList<>();
+    Map<String, ModuleEntry> sourceMap = HashMapFactory.make();
+    for(ModuleEntry m : modules) {
+      if (m.isSourceFile()) { 
+        SourceFileModule s = (SourceFileModule)m;
+        sourceMap.put(s.getAbsolutePath(), s);
+        sources.add(s.getAbsolutePath());
+      }
+    }
+    
+    String[] sourceFiles = sources.toArray(new String[0]);
+    @SuppressWarnings("deprecation") final ASTParser parser = ASTParser.newParser(AST.JLS8);
+    parser.setResolveBindings(true);
+    parser.setEnvironment(libs, this.sources, null, false);
+    Hashtable<String, String> options = JavaCore.getOptions();
+    options.put(JavaCore.COMPILER_SOURCE, "1.8");
+    parser.setCompilerOptions(options);
+    parser.createASTs(sourceFiles, null, new String[0], new ECJAstToIR(sourceMap), new NullProgressMonitor());
+  }
+
+  protected Java2IRTranslator makeIRTranslator() {
+    return new Java2IRTranslator(sourceLoader, exclusions);
+  }
+
+  protected JDTJava2CAstTranslator<Position> makeCAstTranslator(CompilationUnit cu, String fullPath) {
+    return new JDTJava2CAstTranslator<Position>(sourceLoader, cu, fullPath, false, dump) {
+      @Override
+      public Position makePosition(int start, int end) {
+        try {
+          return new RangePosition(new URL("file://" + fullPath), this.cu.getLineNumber(start), start, end);
+        } catch (MalformedURLException e) {
+          throw new RuntimeException("bad file: " + fullPath, e);
+        }
+      }
+    };
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/FakeExceptionTypeBinding.java wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/FakeExceptionTypeBinding.java
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/FakeExceptionTypeBinding.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/FakeExceptionTypeBinding.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,475 @@
+/*
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * This file is a derivative of code released by the University of
+ * California under the terms listed below.  
+ *
+ * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
+ * University of California (Regents). Provided that this notice and
+ * the following two paragraphs are included in any distribution of
+ * Refinement Analysis Tools or its derivative work, Regents agrees
+ * not to assert any of Regents' copyright rights in Refinement
+ * Analysis Tools against recipient for recipient's reproduction,
+ * preparation of derivative works, public display, public
+ * performance, distribution or sublicensing of Refinement Analysis
+ * Tools and derivative works, in source code and object code form.
+ * This agreement not to assert does not confer, by implication,
+ * estoppel, or otherwise any license or rights in any intellectual
+ * property of Regents, including, but not limited to, any patents
+ * of Regents or Regents' employees.
+ * 
+ * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
+ * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
+ * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *   
+ * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
+ * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
+ * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
+ * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
+ * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+package com.ibm.wala.cast.java.translator.jdt;
+
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.dom.IAnnotationBinding;
+import org.eclipse.jdt.core.dom.IBinding;
+import org.eclipse.jdt.core.dom.IMethodBinding;
+import org.eclipse.jdt.core.dom.IPackageBinding;
+import org.eclipse.jdt.core.dom.ITypeBinding;
+import org.eclipse.jdt.core.dom.IVariableBinding;
+
+import com.ibm.wala.util.debug.Assertions;
+
+/**
+ * This is a hack to get around the fact that AST.resolveWellKnownTypes() doesn't know about some implicitly declared exceptions,
+ * such as ArithmeticException (implicitly thrown in a division operation) and NullPointerException (implicitly thrown in a field
+ * access). We need to know the lineage of these types to determine possible catch targets.
+ * 
+ * @author evan
+ * 
+ */
+public class FakeExceptionTypeBinding implements ITypeBinding {
+
+  static public final FakeExceptionTypeBinding arithmetic = new FakeExceptionTypeBinding("Ljava/lang/ArithmeticException;");
+
+  static public final FakeExceptionTypeBinding nullPointer = new FakeExceptionTypeBinding("Ljava/lang/NullPointerException;");
+
+  static public final FakeExceptionTypeBinding classCast = new FakeExceptionTypeBinding("Ljava/lang/ClassCastException;");
+
+  static public final FakeExceptionTypeBinding noClassDef = new FakeExceptionTypeBinding("Ljava/lang/NoClassDefFoundError;");
+
+  static public final FakeExceptionTypeBinding initException = new FakeExceptionTypeBinding(
+      "Ljava/lang/ExceptionInInitializerError;");
+
+  static public final FakeExceptionTypeBinding outOfMemory = new FakeExceptionTypeBinding("Ljava/lang/OutOfMemoryError;");
+
+  private final String exceptionBinaryName;
+
+  private FakeExceptionTypeBinding(String exceptionBinaryName) {
+    this.exceptionBinaryName = exceptionBinaryName;
+  }
+
+  @Override
+  public boolean isAssignmentCompatible(ITypeBinding variableType) {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o instanceof FakeExceptionTypeBinding)
+      return this == o;
+    if (o instanceof ITypeBinding)
+      return ((ITypeBinding) o).getBinaryName().equals(exceptionBinaryName);
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+	return exceptionBinaryName.hashCode();
+  }
+
+  // --- rest not needed
+
+  @Override
+  public ITypeBinding createArrayType(int dimension) {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding createArrayType");
+    return null;
+  }
+
+  @Override
+  public String getBinaryName() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public ITypeBinding getBound() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public ITypeBinding getComponentType() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public IVariableBinding[] getDeclaredFields() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public IMethodBinding[] getDeclaredMethods() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @SuppressWarnings("deprecation")
+  @Override
+  public int getDeclaredModifiers() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return 0;
+  }
+
+  @Override
+  public ITypeBinding[] getDeclaredTypes() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public ITypeBinding getDeclaringClass() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public IMethodBinding getDeclaringMethod() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public int getDimensions() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return 0;
+  }
+
+  @Override
+  public ITypeBinding getElementType() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public ITypeBinding getErasure() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public ITypeBinding[] getInterfaces() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public int getModifiers() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return 0;
+  }
+
+  @Override
+  public String getName() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public IPackageBinding getPackage() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public String getQualifiedName() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public ITypeBinding getSuperclass() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public ITypeBinding[] getTypeArguments() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public ITypeBinding[] getTypeBounds() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public ITypeBinding getTypeDeclaration() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public ITypeBinding[] getTypeParameters() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public ITypeBinding getWildcard() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public boolean isAnnotation() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isAnonymous() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isArray() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isCapture() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isCastCompatible(ITypeBinding type) {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isClass() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isEnum() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isFromSource() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isGenericType() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isInterface() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  // add @Override here once Eclipse Mars is no longer supported
+  public boolean isIntersectionType() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isLocal() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isMember() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isNested() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isNullType() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isParameterizedType() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isPrimitive() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isRawType() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isSubTypeCompatible(ITypeBinding type) {
+    String name = type.getBinaryName();
+    if (exceptionBinaryName.endsWith("Error;")) {
+      if (name.equals("Ljava/lang/Throwable;") || name.equals("Ljava/lang/Error;") || name.equals(exceptionBinaryName)) {
+        return true;
+      }
+
+    } else {
+      if (name.equals("Ljava/lang/Throwable;") || name.equals("Ljava/lang/Exception;")
+          || name.equals("Ljava/lang/RuntimeException;") || name.equals(exceptionBinaryName)) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  @Override
+  public boolean isTopLevel() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isTypeVariable() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isUpperbound() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isWildcardType() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public IAnnotationBinding[] getAnnotations() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public IJavaElement getJavaElement() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public String getKey() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public int getKind() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return 0;
+  }
+
+  @Override
+  public boolean isDeprecated() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isEqualTo(IBinding binding) {
+    return this.equals(binding);
+  }
+
+  @Override
+  public boolean isRecovered() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public boolean isSynthetic() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return false;
+  }
+
+  @Override
+  public ITypeBinding getGenericTypeOfWildcardType() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  @Override
+  public int getRank() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return 0;
+  }
+
+  // do not put @Override here, to avoid breaking compilation on Juno
+  @Override
+  public IMethodBinding getFunctionalInterfaceMethod() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  // do not put @Override here, to avoid breaking compilation on Juno
+  @Override
+  public IAnnotationBinding[] getTypeAnnotations() {
+    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
+    return null;
+  }
+
+  // do not put @Override here, to avoid breaking compilation on older Eclipse versions
+  public IBinding getDeclaringMember() {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDT2CAstUtils.java wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDT2CAstUtils.java
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDT2CAstUtils.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDT2CAstUtils.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,317 @@
+/*
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * This file is a derivative of code released by the University of
+ * California under the terms listed below.  
+ *
+ * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
+ * University of California (Regents). Provided that this notice and
+ * the following two paragraphs are included in any distribution of
+ * Refinement Analysis Tools or its derivative work, Regents agrees
+ * not to assert any of Regents' copyright rights in Refinement
+ * Analysis Tools against recipient for recipient's reproduction,
+ * preparation of derivative works, public display, public
+ * performance, distribution or sublicensing of Refinement Analysis
+ * Tools and derivative works, in source code and object code form.
+ * This agreement not to assert does not confer, by implication,
+ * estoppel, or otherwise any license or rights in any intellectual
+ * property of Regents, including, but not limited to, any patents
+ * of Regents or Regents' employees.
+ * 
+ * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
+ * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
+ * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *   
+ * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
+ * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
+ * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
+ * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
+ * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+package com.ibm.wala.cast.java.translator.jdt;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
+import org.eclipse.jdt.core.dom.Assignment;
+import org.eclipse.jdt.core.dom.Assignment.Operator;
+import org.eclipse.jdt.core.dom.EnumDeclaration;
+import org.eclipse.jdt.core.dom.IMethodBinding;
+import org.eclipse.jdt.core.dom.ITypeBinding;
+import org.eclipse.jdt.core.dom.InfixExpression;
+import org.eclipse.jdt.core.dom.Modifier;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
+
+import com.ibm.wala.cast.tree.CAstQualifier;
+import com.ibm.wala.cast.tree.CAstSymbol;
+import com.ibm.wala.cast.tree.impl.CAstOperator;
+import com.ibm.wala.util.debug.Assertions;
+
+public class JDT2CAstUtils {
+  public static Collection<CAstQualifier> mapModifiersToQualifiers(int modifiers, boolean isInterface, boolean isAnnotation) {
+    Set<CAstQualifier> quals = new LinkedHashSet<>();
+
+    if (isInterface)
+      quals.add(CAstQualifier.INTERFACE);
+
+    if (isAnnotation)
+      quals.add(CAstQualifier.ANNOTATION);
+    
+    if ((modifiers & Modifier.ABSTRACT) != 0)
+      quals.add(CAstQualifier.ABSTRACT);
+    if ((modifiers & Modifier.FINAL) != 0)
+      quals.add(CAstQualifier.FINAL);
+    if ((modifiers & Modifier.NATIVE) != 0)
+      quals.add(CAstQualifier.NATIVE);
+    // if (flags.isPackage()) quals.add(CAstQualifier.PACKAGE);
+    if ((modifiers & Modifier.PRIVATE) != 0)
+      quals.add(CAstQualifier.PRIVATE);
+    if ((modifiers & Modifier.PROTECTED) != 0)
+      quals.add(CAstQualifier.PROTECTED);
+    if ((modifiers & Modifier.PUBLIC) != 0)
+      quals.add(CAstQualifier.PUBLIC);
+    if ((modifiers & Modifier.STATIC) != 0)
+      quals.add(CAstQualifier.STATIC);
+    if ((modifiers & Modifier.STRICTFP) != 0)
+      quals.add(CAstQualifier.STRICTFP);
+    if ((modifiers & Modifier.SYNCHRONIZED) != 0)
+      quals.add(CAstQualifier.SYNCHRONIZED);
+    if ((modifiers & Modifier.TRANSIENT) != 0)
+      quals.add(CAstQualifier.TRANSIENT);
+    if ((modifiers & Modifier.VOLATILE) != 0)
+      quals.add(CAstQualifier.VOLATILE);
+
+    return quals;
+  }
+
+  public static CAstOperator mapAssignOperator(Operator op) {
+    if (op == Assignment.Operator.PLUS_ASSIGN)
+      return CAstOperator.OP_ADD;
+    else if (op == Assignment.Operator.BIT_AND_ASSIGN)
+      return CAstOperator.OP_BIT_AND;
+    else if (op == Assignment.Operator.BIT_OR_ASSIGN)
+      return CAstOperator.OP_BIT_OR;
+    else if (op == Assignment.Operator.BIT_XOR_ASSIGN)
+      return CAstOperator.OP_BIT_XOR;
+    else if (op == Assignment.Operator.DIVIDE_ASSIGN)
+      return CAstOperator.OP_DIV;
+    else if (op == Assignment.Operator.REMAINDER_ASSIGN)
+      return CAstOperator.OP_MOD;
+    else if (op == Assignment.Operator.TIMES_ASSIGN)
+      return CAstOperator.OP_MUL;
+    else if (op == Assignment.Operator.LEFT_SHIFT_ASSIGN)
+      return CAstOperator.OP_LSH;
+    else if (op == Assignment.Operator.RIGHT_SHIFT_SIGNED_ASSIGN)
+      return CAstOperator.OP_RSH;
+    else if (op == Assignment.Operator.MINUS_ASSIGN)
+      return CAstOperator.OP_SUB;
+    else if (op == Assignment.Operator.RIGHT_SHIFT_UNSIGNED_ASSIGN)
+      return CAstOperator.OP_URSH;
+    Assertions.UNREACHABLE("Unknown assignment operator");
+    return null;
+  }
+
+  protected static CAstOperator mapBinaryOpcode(InfixExpression.Operator operator) {
+    if (operator == InfixExpression.Operator.PLUS)
+      return CAstOperator.OP_ADD;
+    // separate bitwise and logical AND / OR ? '&' / '|' ?
+    if (operator == InfixExpression.Operator.AND)
+      return CAstOperator.OP_BIT_AND;
+    if (operator == InfixExpression.Operator.OR)
+      return CAstOperator.OP_BIT_OR;
+    if (operator == InfixExpression.Operator.XOR)
+      return CAstOperator.OP_BIT_XOR;
+
+    // TODO: shouldn't get here (conditional and handled differently); however should separate bitwise & logical '&' / '|', maybe.
+    if (operator == InfixExpression.Operator.CONDITIONAL_AND)
+      return CAstOperator.OP_REL_AND;
+    if (operator == InfixExpression.Operator.CONDITIONAL_OR)
+      return CAstOperator.OP_REL_OR;
+
+    if (operator == InfixExpression.Operator.DIVIDE)
+      return CAstOperator.OP_DIV;
+    if (operator == InfixExpression.Operator.EQUALS)
+      return CAstOperator.OP_EQ;
+    if (operator == InfixExpression.Operator.GREATER_EQUALS)
+      return CAstOperator.OP_GE;
+    if (operator == InfixExpression.Operator.GREATER)
+      return CAstOperator.OP_GT;
+    if (operator == InfixExpression.Operator.LESS_EQUALS)
+      return CAstOperator.OP_LE;
+    if (operator == InfixExpression.Operator.LESS)
+      return CAstOperator.OP_LT;
+    if (operator == InfixExpression.Operator.REMAINDER)
+      return CAstOperator.OP_MOD;
+    if (operator == InfixExpression.Operator.TIMES)
+      return CAstOperator.OP_MUL;
+    if (operator == InfixExpression.Operator.NOT_EQUALS)
+      return CAstOperator.OP_NE;
+    if (operator == InfixExpression.Operator.LEFT_SHIFT)
+      return CAstOperator.OP_LSH;
+    if (operator == InfixExpression.Operator.RIGHT_SHIFT_SIGNED)
+      return CAstOperator.OP_RSH;
+    if (operator == InfixExpression.Operator.MINUS)
+      return CAstOperator.OP_SUB;
+    if (operator == InfixExpression.Operator.RIGHT_SHIFT_UNSIGNED)
+      return CAstOperator.OP_URSH;
+    Assertions.UNREACHABLE("Java2CAstTranslator.JavaTranslatingVisitorImpl.mapBinaryOpcode(): unrecognized binary operator.");
+    return null;
+  }
+
+  /**
+   * Returns true if type is char, byte, short, int, or long. Return false otherwise (including boolean!)
+   */
+  public static boolean isLongOrLess(ITypeBinding type) {
+    String t = type.getBinaryName();
+    return t.equals("C") || t.equals("B") || t.equals("S") || t.equals("I") || t.equals("J");
+  }
+
+  /**
+   * If isLongOrLess(type), returns Integer(0). If a float or double, returns Double(0.0) Otherwise (including boolean), returns
+   * CAstSymbol.NULL_DEFAULT_VALUE.
+   */
+  public static Object defaultValueForType(ITypeBinding type) {
+    if (isLongOrLess(type))
+      return Integer.valueOf(0);
+    else if (type.getBinaryName().equals("D") || type.getBinaryName().equals("F"))
+      return new Double(0.0);
+    else
+      return CAstSymbol.NULL_DEFAULT_VALUE;
+  }
+
+  public static ITypeBinding promoteTypes(ITypeBinding t1, ITypeBinding t2, AST ast) {
+    // JLS 5.6.2
+    ITypeBinding doble = ast.resolveWellKnownType("double");
+    if (t1.equals(doble) || t2.equals(doble))
+      return doble;
+    ITypeBinding flotando = ast.resolveWellKnownType("float");
+    if (t1.equals(flotando) || t2.equals(flotando))
+      return flotando;
+    ITypeBinding largo = ast.resolveWellKnownType("long");
+    if (t1.equals(largo) || t2.equals(largo))
+      return largo;
+    return ast.resolveWellKnownType("int");
+  }
+
+  public static ITypeBinding getDeclaringClassOfNode(ASTNode n) {
+    ASTNode current = n;
+    while (current != null) {
+      if (current instanceof TypeDeclaration)
+        return ((TypeDeclaration) current).resolveBinding();
+      else if (current instanceof AnonymousClassDeclaration)
+        return ((AnonymousClassDeclaration) current).resolveBinding();
+      else if (current instanceof EnumDeclaration)
+        return ((EnumDeclaration) current).resolveBinding();
+      current = current.getParent();
+    }
+    Assertions.UNREACHABLE("Couldn't find declaring class of node");
+    return null;
+  }
+
+  static String anonTypeName(ITypeBinding ct) {
+    String binName = ct.getBinaryName();
+    String dollarSignNumber = binName.substring(binName.indexOf('$'));
+    return "<anonymous subclass of " + ct.getSuperclass().getBinaryName() + '>' + dollarSignNumber;
+  }
+
+  /**
+   * If a type variable, return the bound (getTypeVariablesBase()). If a parameterized type, return the generic type.
+   */
+  public static ITypeBinding getErasedType(ITypeBinding returnType, AST ast) {
+    if (returnType.isTypeVariable() || returnType.isCapture())
+      return getTypesVariablesBase(returnType, ast);
+    return returnType.getTypeDeclaration(); // Things like "Collection<? extends Bla>" are parameterized types...
+  }
+
+  public static ITypeBinding getTypesVariablesBase(ITypeBinding returnType, AST ast) {
+    assert returnType.isTypeVariable() || returnType.isCapture();
+    if (returnType.getTypeBounds().length > 0)
+      return returnType.getTypeBounds()[0]; // TODO: why is there more than one bound?
+    else
+      return ast.resolveWellKnownType("java.lang.Object");
+  }
+
+  public static InfixExpression.Operator mapAssignOperatorToInfixOperator(Assignment.Operator op) {
+    if (op == Assignment.Operator.PLUS_ASSIGN)
+      return InfixExpression.Operator.PLUS;
+    else if (op == Assignment.Operator.BIT_AND_ASSIGN)
+      return InfixExpression.Operator.AND;
+    else if (op == Assignment.Operator.BIT_OR_ASSIGN)
+      return InfixExpression.Operator.OR;
+    else if (op == Assignment.Operator.BIT_XOR_ASSIGN)
+      return InfixExpression.Operator.XOR;
+    else if (op == Assignment.Operator.DIVIDE_ASSIGN)
+      return InfixExpression.Operator.DIVIDE;
+    else if (op == Assignment.Operator.REMAINDER_ASSIGN)
+      return InfixExpression.Operator.REMAINDER;
+    else if (op == Assignment.Operator.TIMES_ASSIGN)
+      return InfixExpression.Operator.TIMES;
+    else if (op == Assignment.Operator.LEFT_SHIFT_ASSIGN)
+      return InfixExpression.Operator.LEFT_SHIFT;
+    else if (op == Assignment.Operator.RIGHT_SHIFT_SIGNED_ASSIGN)
+      return InfixExpression.Operator.RIGHT_SHIFT_SIGNED;
+    else if (op == Assignment.Operator.MINUS_ASSIGN)
+      return InfixExpression.Operator.MINUS;
+    else if (op == Assignment.Operator.RIGHT_SHIFT_UNSIGNED_ASSIGN)
+      return InfixExpression.Operator.RIGHT_SHIFT_UNSIGNED;
+    Assertions.UNREACHABLE("Unknown assignment operator");
+    return null;
+  }
+
+  private static void getMethodInClassOrSuperclass(IMethodBinding met, ITypeBinding klass, boolean superclassonly,
+      HashMap<ITypeBinding, IMethodBinding> overridden) {
+    if (!superclassonly) {
+      for (IMethodBinding ourmet : klass.getDeclaredMethods())
+        if (met.overrides(ourmet)) {
+          overridden.put(ourmet.getMethodDeclaration().getReturnType(), ourmet.getMethodDeclaration());
+          break; // there can only be one per class so don't bother looking for more
+        }
+    }
+
+    for (ITypeBinding iface : klass.getInterfaces())
+      getMethodInClassOrSuperclass(met, iface, false, overridden);
+
+    ITypeBinding superclass = klass.getSuperclass();
+    if (superclass != null)
+      getMethodInClassOrSuperclass(met, superclass, false, overridden);
+  }
+
+  public static Collection<IMethodBinding> getOverriddenMethod(IMethodBinding met) {
+    HashMap<ITypeBinding, IMethodBinding> overridden = new HashMap<>();
+    if (met == null)
+      return null;
+    getMethodInClassOrSuperclass(met, met.getDeclaringClass(), true, overridden);
+    if (overridden.size() == 0)
+      return null;
+    return overridden.values();
+  }
+
+  public static boolean sameErasedSignatureAndReturnType(IMethodBinding met1, IMethodBinding met2) {
+    if (!met1.getReturnType().getErasure().isEqualTo(met2.getReturnType().getErasure()))
+      return false;
+
+    ITypeBinding[] params1 = met1.getParameterTypes();
+    ITypeBinding[] params2 = met2.getParameterTypes();
+    if (params1.length != params2.length)
+      return false;
+
+    for (int i = 0; i < params1.length; i++)
+      if (!params1[i].getErasure().isEqualTo(params2[i].getErasure()))
+        return false;
+
+    return true;
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTIdentityMapper.java wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTIdentityMapper.java
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTIdentityMapper.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTIdentityMapper.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,224 @@
+/*
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * This file is a derivative of code released by the University of
+ * California under the terms listed below.  
+ *
+ * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
+ * University of California (Regents). Provided that this notice and
+ * the following two paragraphs are included in any distribution of
+ * Refinement Analysis Tools or its derivative work, Regents agrees
+ * not to assert any of Regents' copyright rights in Refinement
+ * Analysis Tools against recipient for recipient's reproduction,
+ * preparation of derivative works, public display, public
+ * performance, distribution or sublicensing of Refinement Analysis
+ * Tools and derivative works, in source code and object code form.
+ * This agreement not to assert does not confer, by implication,
+ * estoppel, or otherwise any license or rights in any intellectual
+ * property of Regents, including, but not limited to, any patents
+ * of Regents or Regents' employees.
+ * 
+ * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
+ * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
+ * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *   
+ * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
+ * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
+ * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
+ * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
+ * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+package com.ibm.wala.cast.java.translator.jdt;
+
+import java.util.Map;
+
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.core.dom.IMethodBinding;
+import org.eclipse.jdt.core.dom.ITypeBinding;
+import org.eclipse.jdt.core.dom.IVariableBinding;
+
+import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.types.Descriptor;
+import com.ibm.wala.types.FieldReference;
+import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.types.Selector;
+import com.ibm.wala.types.TypeName;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.strings.Atom;
+
+/**
+ * Class responsible for mapping JDT type system objects representing types, methods and fields to the corresponding WALA
+ * TypeReferences, MethodReferences and FieldReferences. Used during translation and by clients to help correlate WALA analysis
+ * results to the various AST nodes.
+ * 
+ * In English: keeps a hashtable of WALA "type references", "field references", etc. which describe types, fields, etc. Creates
+ * these from their JDT equivalents and keeps the hashtable linking the two representations.
+ * 
+ * @author rfuhrer
+ */
+public class JDTIdentityMapper {
+  private final Map<String, TypeReference> fTypeMap = HashMapFactory.make();
+
+  private final Map<String, FieldReference> fFieldMap = HashMapFactory.make();
+
+  private final Map<String, MethodReference> fMethodMap = HashMapFactory.make();
+
+  private final ClassLoaderReference fClassLoaderRef; // TAGALONG
+
+  private final AST fAst;
+
+  public JDTIdentityMapper(ClassLoaderReference clr, AST ast) {
+    fClassLoaderRef = clr;
+    fAst = ast;
+  }
+
+  // TYPES
+
+  /**
+   * Create (or reuse) a TypeReference for the given JDT Type Binding.<br>
+   * This method canonicalizes the TypeReferences
+   */
+  public TypeReference getTypeRef(ITypeBinding type) {
+    type = JDT2CAstUtils.getErasedType(type, fAst); // GENERICS: erasure...
+
+    if (!fTypeMap.containsKey(type.getKey())) {
+      TypeName typeName = TypeName.string2TypeName(typeToTypeID(type));
+      TypeReference ref = TypeReference.findOrCreate(fClassLoaderRef, typeName);
+
+      fTypeMap.put(type.getKey(), ref);
+      return ref;
+    }
+    return fTypeMap.get(type.getKey());
+  }
+
+  /**
+   * Translates the given Polyglot type to a name suitable for use in a DOMO TypeReference (i.e. a bytecode-compliant type name).
+   */
+  public String typeToTypeID(ITypeBinding type) {
+    if (type.isPrimitive())
+      return type.getBinaryName();
+    else if (type.isArray())
+      // arrays' binary names in JDT are like "[Ljava.lang.String;"
+      return type.getBinaryName().replace('.', '/').replace(";", "");
+    else if (type.isLocal() || type.isAnonymous())
+      return anonLocalTypeToTypeID(type);
+    else if (type.isClass() || type.isEnum() || type.isInterface()) // in polyglot interfaces are classes too. not in JDT
+      // class binary names in JDT are like "java.lang.String"
+      return 'L' + type.getBinaryName().replace('.', '/'); // TODO:
+    else if (type.isTypeVariable()) {
+      return typeToTypeID(JDT2CAstUtils.getTypesVariablesBase(type, fAst));
+    }
+    Assertions.UNREACHABLE("typeToTypeID() encountered the type " + type + " that is neither primitive, array, nor class!");
+    return null;
+  }
+
+  public String anonLocalTypeToTypeID(ITypeBinding type) {
+    String outerTypeID = typeToTypeID(type.getDeclaringClass());
+
+    String metSelectorName;
+    IMethodBinding metBinding = type.getDeclaringMethod();
+    if (metBinding == null) // anonymous class declared in initializer or static initializer (rare case...)
+      metSelectorName = "<init>";
+    else
+      metSelectorName = getMethodRef(metBinding).getSelector().toString();
+
+    String shortName = (type.isAnonymous()) ? JDT2CAstUtils.anonTypeName(type) : type.getName();
+
+    return outerTypeID + '/' + metSelectorName + '/' + shortName;
+  }
+
+  // FIELDS
+
+  public FieldReference getFieldRef(IVariableBinding field) {
+    if (!fFieldMap.containsKey(field.getKey())) {
+      // create one
+      ITypeBinding targetType = field.getDeclaringClass();
+      TypeReference targetTypeRef = TypeReference.findOrCreate(fClassLoaderRef, typeToTypeID(targetType));
+      ITypeBinding fieldType = field.getType();
+      TypeReference fieldTypeRef = TypeReference.findOrCreate(fClassLoaderRef, typeToTypeID(fieldType));
+      Atom fieldName = Atom.findOrCreateUnicodeAtom(field.getName());
+      FieldReference ref = FieldReference.findOrCreate(targetTypeRef, fieldName, fieldTypeRef);
+
+      fFieldMap.put(field.getKey(), ref);
+      return ref;
+    }
+    return fFieldMap.get(field.getKey());
+  }
+
+  public MethodReference fakeMethodRefNoArgs(String key, String typeID, String metName, String returnTypeID) {
+    if (!fMethodMap.containsKey(key)) {
+      // create one
+      TypeName ownerType = TypeName.string2TypeName(typeID);
+      TypeReference ownerTypeRef = TypeReference.findOrCreate(fClassLoaderRef, ownerType);
+
+      // FAKE SELECTOR
+      Atom name = Atom.findOrCreateUnicodeAtom(metName);
+      TypeName[] argTypeNames = null;
+      TypeName retTypeName = TypeName.string2TypeName(returnTypeID);
+      Descriptor desc = Descriptor.findOrCreate(argTypeNames, retTypeName);
+      Selector selector = new Selector(name, desc);
+
+      MethodReference ref = MethodReference.findOrCreate(ownerTypeRef, selector);
+
+      fMethodMap.put(key, ref);
+      return ref;
+    }
+    return fMethodMap.get(key);
+  }
+
+  // METHODS
+  public MethodReference getMethodRef(IMethodBinding met) {
+    if (!fMethodMap.containsKey(met.getKey())) {
+      // create one
+      TypeName ownerType = TypeName.string2TypeName(typeToTypeID(met.getDeclaringClass()));
+      TypeReference ownerTypeRef = TypeReference.findOrCreate(fClassLoaderRef, ownerType);
+      MethodReference ref = MethodReference.findOrCreate(ownerTypeRef, selectorForMethod(met));
+
+      fMethodMap.put(met.getKey(), ref);
+      return ref;
+    }
+    return fMethodMap.get(met.getKey());
+  }
+
+  private Selector selectorForMethod(IMethodBinding met) {
+    // TODO: have to handle default constructors?
+    // TODO: generics...
+    Atom name = (met.isConstructor()) ? MethodReference.initAtom : Atom.findOrCreateUnicodeAtom(met.getName());
+
+    TypeName[] argTypeNames = null;
+    ITypeBinding[] formalTypes = met.getParameterTypes();
+
+    int length = formalTypes.length;
+
+    // ENUMS: hidden name and ID in constructor
+    if (met.isConstructor() && met.getDeclaringClass().isEnum())
+      length += 2;
+
+    // Descriptor prefers null to an empty array
+    if (length > 0) {
+      argTypeNames = new TypeName[length];
+      int i = 0;
+      if (met.isConstructor() && met.getDeclaringClass().isEnum()) {
+        argTypeNames[0] = TypeName.string2TypeName(typeToTypeID(fAst.resolveWellKnownType("java.lang.String")));
+        argTypeNames[1] = TypeName.string2TypeName(typeToTypeID(fAst.resolveWellKnownType("int")));
+        i = 2;
+      }
+      for (ITypeBinding argType : formalTypes)
+        argTypeNames[i++] = TypeName.string2TypeName(typeToTypeID(argType));
+    }
+
+    TypeName retTypeName = TypeName.string2TypeName(typeToTypeID(met.getReturnType()));
+    Descriptor desc = Descriptor.findOrCreate(argTypeNames, retTypeName);
+
+    return new Selector(name, desc);
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3590 @@
+/*
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * This file is a derivative of code released by the University of
+ * California under the terms listed below.  
+ *
+ * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
+ * University of California (Regents). Provided that this notice and
+ * the following two paragraphs are included in any distribution of
+ * Refinement Analysis Tools or its derivative work, Regents agrees
+ * not to assert any of Regents' copyright rights in Refinement
+ * Analysis Tools against recipient for recipient's reproduction,
+ * preparation of derivative works, public display, public
+ * performance, distribution or sublicensing of Refinement Analysis
+ * Tools and derivative works, in source code and object code form.
+ * This agreement not to assert does not confer, by implication,
+ * estoppel, or otherwise any license or rights in any intellectual
+ * property of Regents, including, but not limited to, any patents
+ * of Regents or Regents' employees.
+ * 
+ * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
+ * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
+ * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *   
+ * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
+ * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
+ * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
+ * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
+ * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+package com.ibm.wala.cast.java.translator.jdt;
+
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
+import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
+import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration;
+import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
+import org.eclipse.jdt.core.dom.ArrayAccess;
+import org.eclipse.jdt.core.dom.ArrayCreation;
+import org.eclipse.jdt.core.dom.ArrayInitializer;
+import org.eclipse.jdt.core.dom.AssertStatement;
+import org.eclipse.jdt.core.dom.Assignment;
+import org.eclipse.jdt.core.dom.Block;
+import org.eclipse.jdt.core.dom.BodyDeclaration;
+import org.eclipse.jdt.core.dom.BooleanLiteral;
+import org.eclipse.jdt.core.dom.BreakStatement;
+import org.eclipse.jdt.core.dom.CastExpression;
+import org.eclipse.jdt.core.dom.CatchClause;
+import org.eclipse.jdt.core.dom.CharacterLiteral;
+import org.eclipse.jdt.core.dom.ClassInstanceCreation;
+import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.ConditionalExpression;
+import org.eclipse.jdt.core.dom.ConstructorInvocation;
+import org.eclipse.jdt.core.dom.ContinueStatement;
+import org.eclipse.jdt.core.dom.DoStatement;
+import org.eclipse.jdt.core.dom.EmptyStatement;
+import org.eclipse.jdt.core.dom.EnhancedForStatement;
+import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
+import org.eclipse.jdt.core.dom.EnumDeclaration;
+import org.eclipse.jdt.core.dom.Expression;
+import org.eclipse.jdt.core.dom.ExpressionStatement;
+import org.eclipse.jdt.core.dom.FieldAccess;
+import org.eclipse.jdt.core.dom.FieldDeclaration;
+import org.eclipse.jdt.core.dom.ForStatement;
+import org.eclipse.jdt.core.dom.IAnnotationBinding;
+import org.eclipse.jdt.core.dom.IBinding;
+import org.eclipse.jdt.core.dom.IMemberValuePairBinding;
+import org.eclipse.jdt.core.dom.IMethodBinding;
+import org.eclipse.jdt.core.dom.ITypeBinding;
+import org.eclipse.jdt.core.dom.IVariableBinding;
+import org.eclipse.jdt.core.dom.IfStatement;
+import org.eclipse.jdt.core.dom.InfixExpression;
+import org.eclipse.jdt.core.dom.Initializer;
+import org.eclipse.jdt.core.dom.InstanceofExpression;
+import org.eclipse.jdt.core.dom.LabeledStatement;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
+import org.eclipse.jdt.core.dom.MethodInvocation;
+import org.eclipse.jdt.core.dom.Modifier;
+import org.eclipse.jdt.core.dom.NullLiteral;
+import org.eclipse.jdt.core.dom.NumberLiteral;
+import org.eclipse.jdt.core.dom.PackageDeclaration;
+import org.eclipse.jdt.core.dom.ParenthesizedExpression;
+import org.eclipse.jdt.core.dom.PostfixExpression;
+import org.eclipse.jdt.core.dom.PrefixExpression;
+import org.eclipse.jdt.core.dom.QualifiedName;
+import org.eclipse.jdt.core.dom.ReturnStatement;
+import org.eclipse.jdt.core.dom.SimpleName;
+import org.eclipse.jdt.core.dom.SimpleType;
+import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
+import org.eclipse.jdt.core.dom.Statement;
+import org.eclipse.jdt.core.dom.StringLiteral;
+import org.eclipse.jdt.core.dom.SuperConstructorInvocation;
+import org.eclipse.jdt.core.dom.SuperFieldAccess;
+import org.eclipse.jdt.core.dom.SuperMethodInvocation;
+import org.eclipse.jdt.core.dom.SwitchCase;
+import org.eclipse.jdt.core.dom.SwitchStatement;
+import org.eclipse.jdt.core.dom.SynchronizedStatement;
+import org.eclipse.jdt.core.dom.ThisExpression;
+import org.eclipse.jdt.core.dom.ThrowStatement;
+import org.eclipse.jdt.core.dom.TryStatement;
+import org.eclipse.jdt.core.dom.Type;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
+import org.eclipse.jdt.core.dom.TypeDeclarationStatement;
+import org.eclipse.jdt.core.dom.TypeLiteral;
+import org.eclipse.jdt.core.dom.VariableDeclarationExpression;
+import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
+import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
+import org.eclipse.jdt.core.dom.WhileStatement;
+
+import com.ibm.wala.analysis.typeInference.JavaPrimitiveType;
+import com.ibm.wala.cast.ir.translator.AstTranslator.InternalCAstSymbol;
+import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
+import com.ibm.wala.cast.ir.translator.TranslatorToCAst.DoLoopTranslator;
+import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl;
+import com.ibm.wala.cast.java.loader.Util;
+import com.ibm.wala.cast.java.translator.JavaProcedureEntity;
+import com.ibm.wala.cast.tree.CAst;
+import com.ibm.wala.cast.tree.CAstAnnotation;
+import com.ibm.wala.cast.tree.CAstControlFlowMap;
+import com.ibm.wala.cast.tree.CAstEntity;
+import com.ibm.wala.cast.tree.CAstNode;
+import com.ibm.wala.cast.tree.CAstNodeTypeMap;
+import com.ibm.wala.cast.tree.CAstQualifier;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
+import com.ibm.wala.cast.tree.CAstType;
+import com.ibm.wala.cast.tree.impl.CAstControlFlowRecorder;
+import com.ibm.wala.cast.tree.impl.CAstImpl;
+import com.ibm.wala.cast.tree.impl.CAstNodeTypeMapRecorder;
+import com.ibm.wala.cast.tree.impl.CAstOperator;
+import com.ibm.wala.cast.tree.impl.CAstSourcePositionRecorder;
+import com.ibm.wala.cast.tree.impl.CAstSymbolImpl;
+import com.ibm.wala.cast.util.CAstPrinter;
+import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.shrikeBT.IInvokeInstruction;
+import com.ibm.wala.types.FieldReference;
+import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.collections.EmptyIterator;
+import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Pair;
+import com.ibm.wala.util.debug.Assertions;
+
+// TOTEST:
+// "1/0" surrounded by catch ArithmeticException & RunTimeException (TryCatchContext.getCatchTypes"
+// another subtype of ArithmeticException surrounded by catch ArithmeticException
+// binary ops with all kinds of type conversions
+// simplenames: fields of this, fields of an enclosing class, fields of an enclosing method, static fields, fully qualified fields w/ package stuff
+// exceptional CFG edges, somehow. call nodes, new nodes, division by zero in binary ops, null pointer in field accesses, etc.   
+// implicit constructors
+
+// FIXME 1.4: thing about / ask agout TAGALONG (JDT stuff tagging along in memory cos we keep it).
+// FIXME 1.4: find LEFTOUT and find out why polyglot has extra code / infrastructure, if it's used and what for, etc.
+
+// Java 1.6:
+// * type parameters/generics: see getArgumentTypes in ProcedureEntity$anon. also anywhere we use ITypeBinding.equals() may be affected
+//   see anywhere in code labeled GENERICS for present "treat as raw types"/"pretend it's 1.4 and casts" solution.
+// * boxing (YUCK). see resolveBoxing()
+// * enums (probably in simplename or something. but using resolveConstantExpressionValue() possible)
+
+public abstract class JDTJava2CAstTranslator<T extends Position> {
+  protected boolean dump = false;
+  
+  protected final CAst fFactory = new CAstImpl();
+
+  // ///////////////////////////////////////////
+  // / HANDLINGS OF VARIOUS THINGS //
+  // ///////////////////////////////////////////
+  protected final AST ast; // TAGALONG
+
+  protected final JDTIdentityMapper fIdentityMapper; // TAGALONG
+
+  protected final JDTTypeDictionary fTypeDict;
+
+  protected final JavaSourceLoaderImpl fSourceLoader;
+
+  protected final ITypeBinding fDivByZeroExcType;
+
+  protected final ITypeBinding fNullPointerExcType;
+
+  protected final ITypeBinding fClassCastExcType;
+
+  protected final ITypeBinding fRuntimeExcType;
+
+  protected final ITypeBinding NoClassDefFoundError;
+
+  protected final ITypeBinding ExceptionInInitializerError;
+
+  protected final ITypeBinding OutOfMemoryError;
+
+  protected final DoLoopTranslator doLoopTranslator;
+  
+  protected final String fullPath;
+  
+  protected final CompilationUnit cu;
+
+  //
+  // COMPILATION UNITS & TYPES
+  //
+
+  public JDTJava2CAstTranslator(JavaSourceLoaderImpl sourceLoader, CompilationUnit astRoot, String fullPath, boolean replicateForDoLoops) {
+    this(sourceLoader, astRoot, fullPath, replicateForDoLoops, false);
+  }
+
+  public JDTJava2CAstTranslator(JavaSourceLoaderImpl sourceLoader, CompilationUnit astRoot, String fullPath, boolean replicateForDoLoops, boolean dump) {
+    fDivByZeroExcType = FakeExceptionTypeBinding.arithmetic;
+    fNullPointerExcType = FakeExceptionTypeBinding.nullPointer;
+    fClassCastExcType = FakeExceptionTypeBinding.classCast;
+    NoClassDefFoundError = FakeExceptionTypeBinding.noClassDef;
+    ExceptionInInitializerError = FakeExceptionTypeBinding.initException;
+    OutOfMemoryError = FakeExceptionTypeBinding.outOfMemory;
+
+    this.fSourceLoader = sourceLoader;
+    this.cu = astRoot;
+
+    this.fullPath = fullPath;
+    this.ast = astRoot.getAST();
+
+    this.doLoopTranslator = new DoLoopTranslator(replicateForDoLoops, fFactory);
+
+    this.dump = dump;
+    
+    // FIXME: we might need one AST (-> "Object" class) for all files.
+    fIdentityMapper = new JDTIdentityMapper(fSourceLoader.getReference(), ast);
+    fTypeDict = new JDTTypeDictionary(ast, fIdentityMapper);
+
+    fRuntimeExcType = ast.resolveWellKnownType("java.lang.RuntimeException");
+    assert fRuntimeExcType != null;
+  }
+
+  public CAstEntity translateToCAst() {
+
+    List<CAstEntity> declEntities = new ArrayList<>();
+
+    for (AbstractTypeDeclaration decl : (Iterable<AbstractTypeDeclaration>) cu.types()) {
+      // can be of type AnnotationTypeDeclaration, EnumDeclaration, TypeDeclaration
+      declEntities.add(visit(decl, new RootContext()));
+    }
+
+    if (dump) {
+      for(CAstEntity d : declEntities) {
+        CAstPrinter.printTo(d, new PrintWriter(System.err));
+      }
+    }
+    
+    return new CompilationUnitEntity(cu.getPackage(), declEntities);
+  }
+
+  //
+  // TYPES
+  //
+
+  protected final class ClassEntity implements CAstEntity {
+    // TAGALONG (not static, will keep reference to ast, fIdentityMapper, etc)
+
+    @Override
+	public Position getPosition(int arg) {
+		return null;
+	}
+
+	private final String fName;
+
+    private final Collection<CAstQualifier> fQuals;
+
+    private final Collection<CAstEntity> fEntities;
+
+    private final ITypeBinding fJdtType; // TAGALONG
+
+    private final T fSourcePosition;
+
+    private final T fNamePos;
+
+    public ClassEntity(ITypeBinding jdtType, String name, Collection<CAstQualifier> quals, Collection<CAstEntity> entities,
+        T pos, T namePos) {
+      fNamePos = namePos;
+      fName = name;
+      fQuals = quals;
+      fEntities = entities;
+      fJdtType = jdtType;
+      fSourcePosition = pos;
+    }
+
+    @Override
+	public Collection<CAstAnnotation> getAnnotations() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+	@Override
+  public int getKind() {
+      return TYPE_ENTITY;
+    }
+
+    @Override
+    public String getName() {
+      return fName; // unqualified?
+    }
+
+    @Override
+    public String getSignature() {
+      return 'L' + fName.replace('.', '/') + ';';
+    }
+
+    @Override
+    public String[] getArgumentNames() {
+      return new String[0];
+    }
+
+    @Override
+    public CAstNode[] getArgumentDefaults() {
+      return new CAstNode[0];
+    }
+
+    @Override
+    public int getArgumentCount() {
+      return 0;
+    }
+
+    @Override
+    public CAstNode getAST() {
+      // This entity has no AST nodes, really.
+      return null;
+    }
+
+    @Override
+    public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
+      return Collections.singletonMap(null, fEntities);
+    }
+
+    @Override
+    public Iterator<CAstEntity> getScopedEntities(CAstNode construct) {
+      Assertions.UNREACHABLE("Non-AST-bearing entity (ClassEntity) asked for scoped entities related to a given AST node");
+      return null;
+    }
+
+    @Override
+    public CAstControlFlowMap getControlFlow() {
+      // This entity has no AST nodes, really.
+      return null;
+    }
+
+    @Override
+    public CAstSourcePositionMap getSourceMap() {
+      // This entity has no AST nodes, really.
+      return null;
+    }
+
+    @Override
+    public CAstSourcePositionMap.Position getPosition() {
+      return fSourcePosition;
+    }
+
+    @Override
+    public CAstNodeTypeMap getNodeTypeMap() {
+      // This entity has no AST nodes, really.
+      return new CAstNodeTypeMap() {
+        @Override
+        public CAstType getNodeType(CAstNode node) {
+          throw new UnsupportedOperationException();
+        }
+
+		@Override
+    public Collection<CAstNode> getMappedNodes() {
+			throw new UnsupportedOperationException();
+		}
+      };
+    }
+
+    @Override
+    public Collection<CAstQualifier> getQualifiers() {
+      return fQuals;
+    }
+
+    @Override
+    public CAstType getType() {
+      // return new JdtJavaType(fCT, getTypeDict(), fTypeSystem);
+      return fTypeDict.new JdtJavaType(fJdtType);
+    }
+
+	@Override
+	public Position getNamePosition() {
+		return fNamePos;
+	}
+
+  }
+
+  private static boolean isInterface(AbstractTypeDeclaration decl) {
+    return decl instanceof AnnotationTypeDeclaration ||
+      (decl instanceof TypeDeclaration && ((TypeDeclaration)decl).isInterface());
+  }
+  
+  private CAstEntity visitTypeDecl(AbstractTypeDeclaration n, WalkContext context) {
+    return createClassDeclaration(n, n.bodyDeclarations(), null, n.resolveBinding(), n.getName().getIdentifier(), n.getModifiers(),
+        isInterface(n), n instanceof AnnotationTypeDeclaration, context, makePosition(n.getName()));
+  }
+
+  /**
+   * @param name Used in creating default constructor, and passed into new ClassEntity()
+   */
+  private CAstEntity createClassDeclaration(ASTNode n, List<BodyDeclaration> bodyDecls,
+      List<EnumConstantDeclaration> enumConstants, ITypeBinding typeBinding, String name, int modifiers, 
+      boolean isInterface, boolean isAnnotation, WalkContext context, T namePos) {
+    final List<CAstEntity> memberEntities = new ArrayList<>();
+
+    // find and collect all initializers (type Initializer) and field initializers (type VariableDeclarationFragment).
+    // instance initializer code will be inserted into each constructors.
+    // all static initializer code will be grouped together in its own entity.
+    ArrayList<ASTNode> inits = new ArrayList<>();
+    ArrayList<ASTNode> staticInits = new ArrayList<>();
+
+    if (enumConstants != null) {
+      // always (implicitly) static,final (actually, no modifiers allowed)
+      staticInits.addAll(enumConstants);
+    }
+
+    for (BodyDeclaration decl : bodyDecls) {
+      if (decl instanceof Initializer) {
+        Initializer initializer = (Initializer) decl;
+        boolean isStatic = ((initializer.getModifiers() & Modifier.STATIC) != 0);
+        (isStatic ? staticInits : inits).add(initializer);
+      } else if (decl instanceof FieldDeclaration) {
+        FieldDeclaration fd = (FieldDeclaration) decl;
+
+        for (VariableDeclarationFragment frag : (Iterable<VariableDeclarationFragment>) fd.fragments()) {
+          if (frag.getInitializer() != null) {
+            boolean isStatic = ((fd.getModifiers() & Modifier.STATIC) != 0);
+            (isStatic ? staticInits : inits).add(frag);
+          }
+        }
+      }
+    }
+
+    // process entities. initializers will be folded in here.
+    if (enumConstants != null) {
+      for (EnumConstantDeclaration decl : enumConstants) {
+        memberEntities.add(visit(decl));
+      }
+    }
+
+    for (BodyDeclaration decl : bodyDecls) {
+      if (decl instanceof FieldDeclaration) {
+        FieldDeclaration fieldDecl = (FieldDeclaration) decl;
+        Collection<CAstQualifier> quals = JDT2CAstUtils.mapModifiersToQualifiers(fieldDecl.getModifiers(), false, false);
+        for (VariableDeclarationFragment fieldFrag : (Iterable<VariableDeclarationFragment>) fieldDecl.fragments()) {
+          IVariableBinding fieldBinding = fieldFrag.resolveBinding();
+		memberEntities.add(new FieldEntity(fieldFrag.getName().getIdentifier(), fieldBinding.getType(), quals,
+              makePosition(fieldFrag.getStartPosition(), fieldFrag.getStartPosition() + fieldFrag.getLength()),
+              handleAnnotations(fieldBinding), makePosition(fieldFrag.getName())));
+        }
+      } else if (decl instanceof Initializer) {
+        // Initializers are inserted into constructors when making constructors.
+      } else if (decl instanceof MethodDeclaration) {
+        MethodDeclaration metDecl = (MethodDeclaration) decl;
+
+        if (typeBinding.isEnum() && metDecl.isConstructor())
+          memberEntities.add(createEnumConstructorWithParameters(metDecl.resolveBinding(), metDecl, context, inits, metDecl));
+        else {
+          memberEntities.add(visit(metDecl, typeBinding, context, inits));
+
+          // /////////////// Java 1.5 "overridden with subtype" thing (covariant return type) ///////////
+          Collection<IMethodBinding> overriddenMets = JDT2CAstUtils.getOverriddenMethod(metDecl.resolveBinding());
+          if (overriddenMets != null) {
+            for (IMethodBinding overridden : overriddenMets)
+              if (!JDT2CAstUtils.sameErasedSignatureAndReturnType(metDecl.resolveBinding(), overridden))
+                memberEntities.add(makeSyntheticCovariantRedirect(metDecl, metDecl.resolveBinding(), overridden, context));
+          }
+        }
+      } else if (decl instanceof AbstractTypeDeclaration) {
+        memberEntities.add(visit((AbstractTypeDeclaration) decl, context));
+      } else if (decl instanceof AnnotationTypeMemberDeclaration) {
+        // TODO: need to decide what to do with these
+      } else {
+        Assertions.UNREACHABLE("BodyDeclaration not Field, Initializer, or Method");
+      }
+    }
+
+    // add default constructor(s) if necessary
+    // most default constructors have no parameters; however, those created by anonymous classes will have parameters
+    // (they just call super with those parameters)
+    for (IMethodBinding met : typeBinding.getDeclaredMethods()) {
+      if (met.isDefaultConstructor()) {
+        if (typeBinding.isEnum())
+          memberEntities.add(createEnumConstructorWithParameters(met, n, context, inits, null));
+        else if (met.getParameterTypes().length > 0)
+          memberEntities.add(createDefaultConstructorWithParameters(met, n, context, inits));
+        else
+          memberEntities.add(createDefaultConstructor(typeBinding, context, inits, n));
+      }
+    }
+
+    if (typeBinding.isEnum() && !typeBinding.isAnonymous())
+      doEnumHiddenEntities(typeBinding, memberEntities, context);
+
+    // collect static inits
+    if (!staticInits.isEmpty()) {
+      Map<CAstNode, CAstEntity> childEntities = HashMapFactory.make();
+      final MethodContext newContext = new MethodContext(context, childEntities);
+      // childEntities is the same one as in the ProcedureEntity. later visit(New), etc. may add to this.
+
+      CAstNode[] bodyNodes = new CAstNode[staticInits.size()];
+      for (int i = 0; i < staticInits.size(); i++)
+        bodyNodes[i] = visitFieldInitNode(staticInits.get(i), newContext);
+      CAstNode staticInitAst = makeNode(newContext, fFactory, n, CAstNode.BLOCK_STMT, bodyNodes);
+      memberEntities.add(new ProcedureEntity(staticInitAst, typeBinding, childEntities, newContext, null));
+    }
+
+    Collection<CAstQualifier> quals = JDT2CAstUtils.mapModifiersToQualifiers(modifiers, isInterface, isAnnotation);
+
+    return new ClassEntity(typeBinding, name, quals, memberEntities, makePosition(n), namePos);
+  }
+
+  private CAstEntity visit(AnonymousClassDeclaration n, WalkContext context) {
+    return createClassDeclaration(n, n.bodyDeclarations(), null, n.resolveBinding(),
+        JDT2CAstUtils.anonTypeName(n.resolveBinding()), 0 /* no modifiers */, false, false, context, null);
+  }
+
+  private CAstNode visit(TypeDeclarationStatement n, WalkContext context) {
+    // TODO 1.6: enums of course...
+    AbstractTypeDeclaration decl = n.getDeclaration();
+    assert decl instanceof TypeDeclaration : "Local enum declaration not yet supported";
+    CAstEntity classEntity = visitTypeDecl(decl, context);
+
+    // these statements doin't actually do anything, just define a type
+    final CAstNode lcdNode = makeNode(context, fFactory, n, CAstNode.EMPTY);
+
+    // so define it!
+    context.addScopedEntity(lcdNode, classEntity);
+    return lcdNode;
+  }
+
+  // ////////////////////////////////
+  // METHODS
+  // ////////////////////////////////
+
+  /**
+   * @param n for positioning.
+   *
+   * Make a constructor with parameters that calls super(...) with parameters. Used for anonymous classes with arguments to a
+   * constructor, like new Foo(arg1,arg2) { }
+   */
+  private CAstEntity createDefaultConstructorWithParameters(IMethodBinding ctor, ASTNode n, WalkContext oldContext,
+      ArrayList<ASTNode> inits) {
+    // PART I: find super ctor to call
+    ITypeBinding newType = ctor.getDeclaringClass();
+    ITypeBinding superType = newType.getSuperclass();
+    IMethodBinding superCtor = null;
+
+    for (IMethodBinding m : superType.getDeclaredMethods())
+      if (m.isConstructor() && Arrays.equals(m.getParameterTypes(), ctor.getParameterTypes()))
+        superCtor = m;
+
+    assert superCtor != null : "couldn't find constructor for anonymous class";
+
+    // PART II: make ctor with simply "super(a,b,c...)"
+    final Map<CAstNode, CAstEntity> memberEntities = new LinkedHashMap<>();
+    final MethodContext context = new MethodContext(oldContext, memberEntities);
+    MethodDeclaration fakeCtor = ast.newMethodDeclaration();
+    fakeCtor.setConstructor(true);
+    fakeCtor.setSourceRange(n.getStartPosition(), n.getLength());
+    fakeCtor.setBody(ast.newBlock());
+
+    // PART IIa: make a fake JDT constructor method with the proper number of args
+    // Make fake args that will be passed
+    String[] fakeArguments = new String[superCtor.getParameterTypes().length + 1];
+    ArrayList<CAstType> paramTypes = new ArrayList<>(superCtor.getParameterTypes().length);
+    for (int i = 0; i < fakeArguments.length; i++)
+      fakeArguments[i] = (i == 0) ? "this" : ("argument" + i); // TODO: change to invalid name and don't use
+                                                               // singlevariabledeclaration below
+    for (int i = 1; i < fakeArguments.length; i++) {
+      // the name
+      SingleVariableDeclaration svd = ast.newSingleVariableDeclaration();
+      svd.setName(ast.newSimpleName(fakeArguments[i]));
+      fakeCtor.parameters().add(svd);
+
+      // the type
+      paramTypes.add(fTypeDict.getCAstTypeFor(ctor.getParameterTypes()[i - 1]));
+    }
+
+    // PART IIb: create the statements in the constructor
+    // one super() call plus the inits
+    CAstNode[] bodyNodes = new CAstNode[inits.size() + 1];
+
+    // make super(...) call
+    // this, call ref, args
+    CAstNode[] children = new CAstNode[fakeArguments.length + 1];
+    children[0] = makeNode(context, fFactory, n, CAstNode.SUPER);
+    CallSiteReference callSiteRef = CallSiteReference.make(0, fIdentityMapper.getMethodRef(superCtor),
+        IInvokeInstruction.Dispatch.SPECIAL);
+    children[1] = fFactory.makeConstant(callSiteRef);
+    for (int i = 1; i < fakeArguments.length; i++) {
+      CAstNode argName = fFactory.makeConstant(fakeArguments[i]);
+      CAstNode argType = fFactory.makeConstant(paramTypes.get(i-1));
+      children[i + 1] = makeNode(context, fFactory, n, CAstNode.VAR, argName, argType);
+    }
+    bodyNodes[0] = makeNode(context, fFactory, n, CAstNode.CALL, children);
+    // QUESTION: no handleExceptions?
+
+    for (int i = 0; i < inits.size(); i++)
+      bodyNodes[i + 1] = visitFieldInitNode(inits.get(i), context);
+
+    // finally, make the procedure entity
+    CAstNode ast = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, bodyNodes);
+    return new ProcedureEntity(ast, fakeCtor, newType, memberEntities, context, paramTypes, null, null);
+
+  }
+
+  private CAstEntity createDefaultConstructor(ITypeBinding classBinding, WalkContext oldContext, ArrayList<ASTNode> inits,
+      ASTNode positioningNode) {
+    MethodDeclaration fakeCtor = ast.newMethodDeclaration();
+    fakeCtor.setConstructor(true);
+    // fakeCtor.setName(ast.newSimpleName(className)); will crash on anonymous types...
+    fakeCtor.setSourceRange(positioningNode.getStartPosition(), positioningNode.getLength());
+    fakeCtor.setBody(ast.newBlock());
+
+    return visit(fakeCtor, classBinding, oldContext, inits);
+  }
+
+  private static IMethodBinding findDefaultCtor(ITypeBinding superClass) {
+    for (IMethodBinding met : superClass.getDeclaredMethods()) {
+      if (met.isConstructor() && met.getParameterTypes().length == 0)
+        return met;
+    }
+    Assertions.UNREACHABLE("Couldn't find default ctor");
+    return null;
+  }
+
+  /**
+   * Setup constructor body. Here we add the initializer code (both initalizer blocks and initializers in field declarations). We
+   * may also need to add an implicit super() call.
+   * 
+   * @param classBinding Used so we can use this with fake MethodDeclaration nodes, as in the case of creating a default
+   *          constructor.
+   */
+  private CAstNode createConstructorBody(MethodDeclaration n, ITypeBinding classBinding, WalkContext context,
+      ArrayList<ASTNode> inits) {
+    // three possibilites: has super(), has this(), has neither.
+
+    Statement firstStatement = null;
+    if (!n.getBody().statements().isEmpty())
+      firstStatement = (Statement) n.getBody().statements().get(0);
+    if (firstStatement instanceof SuperConstructorInvocation) {
+      // Split at call to super:
+      // super();
+      // field initializer code
+      // remainder of ctor body
+      ArrayList<CAstNode> origStatements = createBlock(n.getBody(), context);
+      CAstNode[] bodyNodes = new CAstNode[inits.size() + origStatements.size()];
+      int idx = 0;
+      bodyNodes[idx++] = origStatements.get(0);
+      for (ASTNode init : inits)
+        bodyNodes[idx++] = visitFieldInitNode(init, context); // visit each in this constructor's context, ensuring
+      // proper handling of exceptions (we can't just reuse the
+      // CAstNodes)
+      for (int i = 1; i < origStatements.size(); i++)
+        bodyNodes[idx++] = origStatements.get(i);
+
+      return makeNode(context, fFactory, n.getBody(), CAstNode.BLOCK_STMT, bodyNodes); // QUESTION: why no LOCAL_SCOPE?
+      // that's the way it is in
+      // polyglot.
+    } else if (firstStatement instanceof ConstructorInvocation) {
+      return visitNode(n.getBody(), context); // has this(...) call; initializers will be set somewhere else.
+    } else {
+      // add explicit call to default super()
+      // QUESTION their todo: following superClass lookup of default ctor won't work if we
+      // process Object in source...
+
+      ITypeBinding superType = classBinding.getSuperclass();
+      
+      // find default constructor. IT is an error to have a constructor
+      // without super() when the default constructor of the superclass does not exist.
+      IMethodBinding defaultSuperCtor = findDefaultCtor(superType);
+      CallSiteReference callSiteRef = CallSiteReference.make(0, fIdentityMapper.getMethodRef(defaultSuperCtor),
+          IInvokeInstruction.Dispatch.SPECIAL);
+
+      // QUESTION: why isn't first arg this like in visit(ConstructorInvocation) ?
+      // why don't we handle exceptions like in visit(ConstructorInvocation) ? (these two things are same in polyglot
+      // implementation)
+
+      CAstNode superCall = makeNode(context, fFactory, n.getBody(), CAstNode.CALL, makeNode(context, fFactory, n.getBody(),
+          CAstNode.SUPER), fFactory.makeConstant(callSiteRef));
+      Object mapper = new Object(); // dummy used for mapping this node in CFG
+      handleThrowsFromCall(defaultSuperCtor, mapper, context);
+      context.cfg().map(mapper, superCall);
+
+      ArrayList<CAstNode> origStatements = createBlock(n.getBody(), context);
+      CAstNode[] bodyNodes = new CAstNode[inits.size() + origStatements.size() + 1];
+      // superCall, inits, ctor body
+      int idx = 0;
+      bodyNodes[idx++] = superCall;
+      for (ASTNode init : inits)
+        bodyNodes[idx++] = visitFieldInitNode(init, context);
+      for (int i = 0; i < origStatements.size(); i++)
+        bodyNodes[idx++] = origStatements.get(i);
+      return makeNode(context, fFactory, n.getBody(), CAstNode.BLOCK_STMT, bodyNodes);
+    }
+  }
+
+  /**
+   * Make a "fake" function (it doesn't exist in source code but it does in bytecode) for covariant return types.
+   * 
+   * @param overriding Declaration of the overriding method.
+   * @param overridden Binding of the overridden method, in a a superclass or implemented interface.
+   */
+  private CAstEntity makeSyntheticCovariantRedirect(MethodDeclaration overriding, IMethodBinding overridingBinding,
+      IMethodBinding overridden, WalkContext oldContext) {
+    // SuperClass foo(A, B, C...)
+    // SubClass foo(A,B,C...)
+    //
+    // add a method exactly like overridden that calls overriding
+
+    final Map<CAstNode, CAstEntity> memberEntities = new LinkedHashMap<>();
+    final MethodContext context = new MethodContext(oldContext, memberEntities);
+
+    CAstNode calltarget;
+    if ((overridingBinding.getModifiers() & Modifier.STATIC) == 0)
+      calltarget = makeNode(context, fFactory, null, CAstNode.SUPER);
+    else
+      calltarget = makeNode(context, fFactory, null, CAstNode.VOID);
+
+    ITypeBinding paramTypes[] = overridden.getParameterTypes();
+
+    ArrayList<CAstNode> arguments = new ArrayList<>();
+    int i = 0;
+    for (SingleVariableDeclaration svd : (Iterable<SingleVariableDeclaration>) overriding.parameters()) {
+      CAstNode varNode = makeNode(context, fFactory, null, CAstNode.VAR, fFactory.makeConstant(svd.getName().getIdentifier()));
+      ITypeBinding fromType = JDT2CAstUtils.getErasedType(paramTypes[i], ast);
+      ITypeBinding toType = JDT2CAstUtils.getErasedType(overridingBinding.getParameterTypes()[i], ast);
+      if (fromType.equals(toType)) {
+        arguments.add(varNode);
+      } else {
+        arguments.add(createCast(null, varNode, fromType, toType, context));
+      }
+      i++;
+    }
+    CAstNode callnode = createMethodInvocation(null, overridingBinding, calltarget, arguments, context);
+    CAstNode mdast = makeNode(context, fFactory, null, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, null, CAstNode.BLOCK_STMT,
+        makeNode(context, fFactory, null, CAstNode.RETURN, callnode)));
+
+    // make parameters to new synthetic method
+    // use RETURN TYPE of overridden, everything else from overriding (including parameter names)
+    ArrayList<CAstType> paramCAstTypes = new ArrayList<>(overridden.getParameterTypes().length);
+    for (ITypeBinding paramType : overridden.getParameterTypes())
+      paramCAstTypes.add(fTypeDict.getCAstTypeFor(paramType));
+    return new ProcedureEntity(mdast, overriding, overridingBinding.getDeclaringClass(), memberEntities, context, paramCAstTypes,
+        overridden.getReturnType(), null);
+  }
+
+  /**
+   * @param inits Instance intializers & field initializers. Only used if method is a constructor, in which case the initializers
+   *          will be inserted in.
+   */
+  private CAstEntity visit(MethodDeclaration n, ITypeBinding classBinding, WalkContext oldContext, ArrayList<ASTNode> inits) {
+
+    // pass in memberEntities to the context, later visit(New) etc. may add classes
+    final Map<CAstNode, CAstEntity> memberEntities = new LinkedHashMap<>();
+    final MethodContext context = new MethodContext(oldContext, memberEntities); // LEFTOUT: in polyglot there is a
+    // class context in between method and
+    // root
+
+    CAstNode mdast;
+
+    if (n.isConstructor())
+      mdast = createConstructorBody(n, classBinding, context, inits);
+    else if ((n.getModifiers() & Modifier.ABSTRACT) != 0) // abstract
+      mdast = null;
+    else if (n.getBody() == null || n.getBody().statements().size() == 0) // empty
+      mdast = makeNode(context, fFactory, n, CAstNode.RETURN);
+    else
+      mdast = visitNode(n.getBody(), context);
+    // Polyglot comment: Presumably the MethodContext's parent is a ClassContext,
+    // and he has the list of initializers. Hopefully the following
+    // will glue that stuff in the right place in any constructor body.
+    
+    Set<CAstAnnotation> annotations = null;
+    if (n.resolveBinding() != null) {
+    	annotations = handleAnnotations(n.resolveBinding());
+    }
+    
+    return new ProcedureEntity(mdast, n, classBinding, memberEntities, context, annotations);
+  }
+
+  private Set<CAstAnnotation> handleAnnotations(IBinding binding) {
+    IAnnotationBinding[] annotations = binding.getAnnotations();
+    
+    if(annotations == null || annotations.length == 0) {
+    	return null;
+    }
+    
+    Set<CAstAnnotation> castAnnotations = HashSetFactory.make();
+    for(IAnnotationBinding annotation : annotations) {
+    	ITypeBinding annotationTypeBinding = annotation.getAnnotationType();
+    	final CAstType annotationType = fTypeDict.getCAstTypeFor(annotationTypeBinding);
+    	final Map<String,Object> args = HashMapFactory.make();
+    	for(IMemberValuePairBinding mvpb : annotation.getAllMemberValuePairs()) {
+    		String name = mvpb.getName();
+    		Object value = mvpb.getValue();
+    		args.put(name, value);
+    	}
+    	castAnnotations.add(new CAstAnnotation() {
+			@Override
+			public CAstType getType() {
+				return annotationType;
+			}
+			@Override
+			public Map<String, Object> getArguments() {
+				return args;
+			}
+			@Override
+			public String toString() {
+				return annotationType.getName() + args;
+			}
+    	});
+    }
+    
+    return castAnnotations;
+}
+
+  protected final class ProcedureEntity implements JavaProcedureEntity { // TAGALONG (make static, access ast)
+
+    // From Code Body Entity
+    private final Map<CAstNode, Collection<CAstEntity>> fEntities;
+
+    @Override
+    public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
+      return Collections.unmodifiableMap(fEntities);
+    }
+
+    @Override
+    public Iterator<CAstEntity> getScopedEntities(CAstNode construct) {
+      if (fEntities.containsKey(construct)) {
+        return (fEntities.get(construct)).iterator();
+      } else {
+        return EmptyIterator.instance();
+      }
+    }
+
+    @Override
+    public String getSignature() {
+      return Util.methodEntityToSelector(this).toString();
+    }
+
+    private final CAstNode fAst;
+
+    MethodDeclaration fDecl; // TAGALONG serious tagalong...
+
+    private String[] fParameterNames; // INCLUDING this
+
+    private ArrayList<CAstType> fParameterTypes;
+
+    private MethodContext fContext; // possibly TAGALONG, maybe not
+
+    private ITypeBinding fType; // TAGALONG
+
+    protected ITypeBinding fReturnType;
+
+    private int fModifiers;
+
+    private final Set<CAstAnnotation> annotations;
+
+    // can be method, constructor, "fake" default constructor, or null decl = static initializer
+    /**
+     * For a static initializer, pass a null decl.
+     */
+    // FIXME: get rid of decl and pass in everything instead of having to do two different things with parameters
+    // regular case
+    private ProcedureEntity(CAstNode mdast, MethodDeclaration decl, ITypeBinding type, Map<CAstNode, CAstEntity> entities,
+        MethodContext context, Set<CAstAnnotation> annotations) {
+      this(mdast, decl, type, entities, context, null, null, decl.getModifiers(), annotations);
+    }
+
+    // static init
+    private ProcedureEntity(CAstNode mdast, ITypeBinding type, Map<CAstNode, CAstEntity> entities, MethodContext context, Set<CAstAnnotation> annotations) {
+      this(mdast, null, type, entities, context, null, null, 0, annotations);
+    }
+
+    private ProcedureEntity(CAstNode mdast, MethodDeclaration decl, ITypeBinding type, Map<CAstNode, CAstEntity> entities,
+        MethodContext context, ArrayList<CAstType> parameterTypes, ITypeBinding returnType, Set<CAstAnnotation> annotations) {
+      this(mdast, decl, type, entities, context, parameterTypes, returnType, decl.getModifiers(), annotations);
+    }
+
+    private ProcedureEntity(CAstNode mdast, MethodDeclaration decl, ITypeBinding type, Map<CAstNode, CAstEntity> entities,
+        MethodContext context, ArrayList<CAstType> parameterTypes, ITypeBinding returnType, int modifiers, Set<CAstAnnotation> annotations) {
+      // TypeSystem system, CodeInstance pd, String[] argumentNames,
+      // }
+      // Map<CAstNode, CAstEntity> entities, MethodContext mc) {
+      fDecl = decl;
+      fAst = mdast; // "procedure decl ast"
+      fContext = context;
+      fType = type;
+      fReturnType = returnType;
+      fModifiers = modifiers;
+      this.annotations = annotations;
+
+      // from CodeBodyEntity
+      fEntities = new LinkedHashMap<>();
+      for (Map.Entry<CAstNode, CAstEntity> entry : entities.entrySet()) {
+        fEntities.put(entry.getKey(), Collections.singleton(entry.getValue()));
+      }
+
+      if (fDecl != null) {
+        int i = 0; // index to start filling up with real params
+        if ((fModifiers & Modifier.STATIC) != 0) {
+          fParameterNames = new String[fDecl.parameters().size()];
+          i = 0;
+        } else {
+          fParameterNames = new String[fDecl.parameters().size() + 1];
+          fParameterNames[0] = "this";
+          i = 1;
+        }
+
+        if (parameterTypes == null) {
+          fParameterTypes = new ArrayList<>(fDecl.parameters().size());
+          for (SingleVariableDeclaration p : (Iterable<SingleVariableDeclaration>) fDecl.parameters()) {
+            fParameterNames[i++] = p.getName().getIdentifier();
+            fParameterTypes.add(fTypeDict.getCAstTypeFor(p.resolveBinding().getType()));
+          }
+        } else {
+          // currently this is only used in making a default constructor with arguments (anonymous classes).
+          // this is because we cannot synthesize bindings.
+          fParameterTypes = parameterTypes;
+          for (SingleVariableDeclaration p : (Iterable<SingleVariableDeclaration>) fDecl.parameters()) {
+            fParameterNames[i++] = p.getName().getIdentifier();
+          }
+        }
+      } else {
+        fParameterNames = new String[0];
+        fParameterTypes = new ArrayList<>(0); // static initializer
+      }
+    }
+
+    @Override
+	public Collection<CAstAnnotation> getAnnotations() {
+		return annotations;
+	}
+
+	@Override
+  public String toString() {
+      return fDecl == null ? "<clinit>" : fDecl.toString();
+    }
+
+    @Override
+    public int getKind() {
+      return CAstEntity.FUNCTION_ENTITY;
+    }
+
+    @Override
+    public String getName() {
+      if (fDecl == null)
+        return MethodReference.clinitName.toString();
+      else if (fDecl.isConstructor())
+        return MethodReference.initAtom.toString();
+      else
+        return fDecl.getName().getIdentifier();
+    }
+
+    /**
+     * INCLUDING first parameter 'this' (for non-static methods)
+     */
+    @Override
+    public String[] getArgumentNames() {
+      return fParameterNames;
+    }
+
+    @Override
+    public CAstNode[] getArgumentDefaults() {
+      return new CAstNode[0];
+    }
+
+    /**
+     * INCLUDING first parameter 'this' (for non-static methods)
+     */
+    @Override
+    public int getArgumentCount() {
+      return fParameterNames.length;
+    }
+
+    @Override
+    public CAstNode getAST() {
+      return fAst;
+    }
+
+    @Override
+    public CAstControlFlowMap getControlFlow() {
+      return fContext.cfg();
+    }
+
+    @Override
+    public CAstSourcePositionMap getSourceMap() {
+      return fContext.pos();
+    }
+
+    @Override
+    public CAstSourcePositionMap.Position getPosition() {
+      return fDecl==null? getSourceMap().getPosition(fAst): makePosition(fDecl);
+    }
+
+    @Override
+    public CAstNodeTypeMap getNodeTypeMap() {
+      return fContext.getNodeTypeMap();
+    }
+
+    @Override
+    public Collection<CAstQualifier> getQualifiers() {
+      if (fDecl == null)
+        return JDT2CAstUtils.mapModifiersToQualifiers(Modifier.STATIC, false, false); // static init
+      else
+        return JDT2CAstUtils.mapModifiersToQualifiers(fModifiers, false, false);
+    }
+
+    @Override
+    public CAstType getType() {
+      return new CAstType.Method() {
+        private Collection<CAstType> fExceptionTypes = null;
+
+        
+        @Override
+		public boolean isStatic() {
+			return getQualifiers().contains(CAstQualifier.STATIC);
+		}
+
+		@Override
+        public CAstType getReturnType() {
+          if (fReturnType != null)
+            return fTypeDict.getCAstTypeFor(fReturnType);
+          @SuppressWarnings("deprecation") Type type = fDecl == null ? null : (ast.apiLevel() == 2 ? fDecl.getReturnType() : fDecl.getReturnType2());
+          if (type == null)
+            return fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("void"));
+          else
+            return fTypeDict.getCAstTypeFor(type.resolveBinding());
+        }
+
+        /**
+         * NOT INCLUDING first parameter 'this' (for non-static methods)
+         */
+        @Override
+        public List<CAstType> getArgumentTypes() {
+          return fParameterTypes;
+        }
+
+        /**
+         * NOT INCLUDING first parameter 'this' (for non-static methods)
+         */
+        @Override
+        public int getArgumentCount() {
+          return fDecl == null ? 0 : fParameterTypes.size();
+        }
+
+        @Override
+        public String getName() {
+          Assertions.UNREACHABLE("CAstType.FunctionImpl#getName() called???");
+          return "?";
+        }
+
+        @Override
+        public Collection<CAstType> getSupertypes() {
+          Assertions.UNREACHABLE("CAstType.FunctionImpl#getSupertypes() called???");
+          return null;
+        }
+
+        @Override
+        public Collection<CAstType>/* <CAstType> */getExceptionTypes() {
+          if (fExceptionTypes == null) {
+            fExceptionTypes = new LinkedHashSet<>();
+            if (fDecl != null)
+              for (SimpleType exception : (Iterable<SimpleType>) fDecl.thrownExceptionTypes())
+                
+                fExceptionTypes.add(fTypeDict.getCAstTypeFor(exception.resolveBinding()));
+          }
+          return fExceptionTypes;
+        }
+
+        @Override
+        public CAstType getDeclaringType() {
+          return fTypeDict.getCAstTypeFor(fType);
+        }
+      };
+    }
+
+	@Override
+	public Position getPosition(int arg) {
+		// TODO Auto-generated method stub
+		SingleVariableDeclaration p = (SingleVariableDeclaration) fDecl.parameters().get(arg);
+		return makePosition(p);
+	}
+
+	@Override
+	public Position getNamePosition() {
+		if (fDecl == null) {
+			return null;
+		} else {
+			return makePosition(fDecl);
+		}
+	}
+  }
+
+  // ////////////////////////////////////
+  // FIELDS ////////////////////////////
+  // ////////////////////////////////////
+
+  // FIELDS ADDED DIRECTLY IN visit(TypeDeclaration,WalkContext)
+
+  private CAstNode visitFieldInitNode(ASTNode node, WalkContext context) {
+    // there are gathered by createClassDeclaration and can only be of two types:
+    if (node instanceof Initializer) {
+      return visitNode(((Initializer) node).getBody(), context);
+    } else if (node instanceof VariableDeclarationFragment) {
+      VariableDeclarationFragment f = (VariableDeclarationFragment) node; // this is guaranteed to have an initializer
+
+      // Generate CAST node for the initializer (init())
+      // Type targetType = f.memberInstance().container();
+      // Type fieldType = f.type().type();
+      FieldReference fieldRef = fIdentityMapper.getFieldRef(f.resolveBinding());
+      // We use null to indicate an OBJECT_REF to a static field, as the
+      // FieldReference doesn't
+      // hold enough info to determine this. In this case, (unlike field ref)
+      // we don't have a
+      // target expr to evaluate.
+      boolean isStatic = ((f.resolveBinding().getModifiers() & Modifier.STATIC) != 0);
+      CAstNode thisNode = isStatic ? makeNode(context, fFactory, null, CAstNode.VOID) : makeNode(context, fFactory, f,
+          CAstNode.THIS);
+      CAstNode lhsNode = makeNode(context, fFactory, f, CAstNode.OBJECT_REF, thisNode, fFactory.makeConstant(fieldRef));
+
+      Expression init = f.getInitializer();
+      CAstNode rhsNode = visitNode(init, context);
+      CAstNode assNode = makeNode(context, fFactory, f, CAstNode.ASSIGN, lhsNode, rhsNode);
+
+      return assNode; // their naming, not mine
+
+    } else if (node instanceof EnumConstantDeclaration) {
+      return createEnumConstantDeclarationInit((EnumConstantDeclaration) node, context);
+    } else {
+      Assertions.UNREACHABLE("invalid init node gathered by createClassDeclaration");
+      return null;
+    }
+  }
+
+  protected final class FieldEntity implements CAstEntity {
+    private final ITypeBinding type;
+
+    private final String name;
+
+    private final Collection<CAstQualifier> quals;
+
+    private final T position;
+
+    private final T namePos;
+
+    private final Set<CAstAnnotation> annotations;
+
+    private FieldEntity(String name, ITypeBinding type, Collection<CAstQualifier> quals, T position, Set<CAstAnnotation> annotations, T namePos) {
+      super();
+      this.type = type;
+      this.quals = quals;
+      this.name = name;
+      this.namePos = namePos;
+      this.position = position;
+      this.annotations = annotations;
+    }
+
+    
+    @Override
+	public Collection<CAstAnnotation> getAnnotations() {
+		return annotations;
+	}
+
+	@Override
+  public int getKind() {
+      return CAstEntity.FIELD_ENTITY;
+    }
+
+    @Override
+    public String getName() {
+      return name;
+    }
+
+    @Override
+    public String getSignature() {
+      return name + fIdentityMapper.typeToTypeID(type);
+    }
+
+    @Override
+    public String[] getArgumentNames() {
+      return new String[0];
+    }
+
+    @Override
+    public CAstNode[] getArgumentDefaults() {
+      return new CAstNode[0];
+    }
+
+    @Override
+    public int getArgumentCount() {
+      return 0;
+    }
+
+    @Override
+    public Iterator<CAstEntity> getScopedEntities(CAstNode construct) {
+      return EmptyIterator.instance();
+    }
+
+    @Override
+    public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
+      return Collections.emptyMap();
+    }
+
+    @Override
+    public CAstNode getAST() {
+      // No AST for a field decl; initializers folded into
+      // constructor processing...
+      return null;
+    }
+
+    @Override
+    public CAstControlFlowMap getControlFlow() {
+      // No AST for a field decl; initializers folded into
+      // constructor processing...
+      return null;
+    }
+
+    @Override
+    public CAstSourcePositionMap getSourceMap() {
+      // No AST for a field decl; initializers folded into
+      // constructor processing...
+      return null;
+    }
+
+    @Override
+    public CAstSourcePositionMap.Position getPosition() {
+      return position;
+    }
+
+    @Override
+    public CAstNodeTypeMap getNodeTypeMap() {
+      // No AST for a field decl; initializers folded into
+      // constructor processing...
+      return null;
+    }
+
+    @Override
+    public Collection<CAstQualifier> getQualifiers() {
+      return quals;
+    }
+
+    @Override
+    public CAstType getType() {
+      return fTypeDict.getCAstTypeFor(type);
+    }
+
+
+	@Override
+	public Position getPosition(int arg) {
+		return namePos;
+	}
+
+
+	@Override
+	public Position getNamePosition() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+  }
+
+  // /////////////////////////////////////
+  // / NODES /////////////////////////////
+  // /////////////////////////////////////
+
+  /**
+   * Visit all the statements in the block and return an arraylist of the statements. Some statements
+   * (VariableDeclarationStatements) may expand to more than one CAstNode.
+   */
+  private ArrayList<CAstNode> createBlock(Block n, WalkContext context) {
+    ArrayList<CAstNode> stmtNodes = new ArrayList<>();
+    for (ASTNode s : (Iterable<ASTNode>) n.statements())
+      visitNodeOrNodes(s, context, stmtNodes);
+    return stmtNodes;
+  }
+
+  private CAstNode visit(Block n, WalkContext context) {
+    ArrayList<CAstNode> stmtNodes = createBlock(n, context);
+    CAstNode stmtNodesArray[] = stmtNodes.toArray(new CAstNode[0]);
+    return makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, stmtNodesArray));
+  }
+
+  private CAstNode visit(VariableDeclarationFragment n, WalkContext context) {
+    int modifiers;
+    if (n.getParent() instanceof VariableDeclarationStatement)
+      modifiers = ((VariableDeclarationStatement) n.getParent()).getModifiers();
+    else if (n.getParent() instanceof VariableDeclarationExpression)
+      modifiers = ((VariableDeclarationExpression) n.getParent()).getModifiers();
+    else
+      modifiers = ((FieldDeclaration) n.getParent()).getModifiers();
+    boolean isFinal = (modifiers & Modifier.FINAL) != 0;
+    assert n.resolveBinding() != null : n;
+    ITypeBinding type = n.resolveBinding().getType();
+    Expression init = n.getInitializer();
+    CAstNode initNode;
+
+    String t = type.getBinaryName();
+    if (init == null) {
+      if (JDT2CAstUtils.isLongOrLess(type)) // doesn't include boolean
+        initNode = fFactory.makeConstant(0);
+      else if (t.equals("D") || t.equals("F"))
+        initNode = fFactory.makeConstant(0.0);
+      else
+        initNode = fFactory.makeConstant(null);
+    } else
+      initNode = visitNode(init, context);
+
+    Object defaultValue = JDT2CAstUtils.defaultValueForType(type);
+    return makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory.makeConstant(new CAstSymbolImpl(n.getName().getIdentifier(), fTypeDict.getCAstTypeFor(type),
+        isFinal, defaultValue)), initNode);
+  }
+
+  /*
+   * One VariableDeclarationStatement represents more than one CAstNode statement.
+   */
+  private ArrayList<CAstNode> visit(VariableDeclarationStatement n, WalkContext context) {
+    ArrayList<CAstNode> result = new ArrayList<>();
+
+    for (VariableDeclarationFragment o : (Iterable<VariableDeclarationFragment>) n.fragments())
+      result.add(visit(o, context));
+    return result;
+  }
+
+  private CAstNode visit(ArrayInitializer n, WalkContext context) {
+    ITypeBinding type = n.resolveTypeBinding();
+    assert type != null : "Could not determine type of ArrayInitializer";
+    TypeReference newTypeRef = fIdentityMapper.getTypeRef(type);
+    CAstNode[] eltNodes = new CAstNode[n.expressions().size() + 1];
+    int idx = 0;
+
+    eltNodes[idx++] = makeNode(context, fFactory, n, CAstNode.NEW, fFactory.makeConstant(newTypeRef), fFactory.makeConstant(n
+        .expressions().size()));
+    for (Expression element : (Iterable<Expression>) n.expressions()) {
+      eltNodes[idx] = visitNode(element, context);
+      if (eltNodes[idx] == null)
+        assert eltNodes[idx] != null : element.toString();
+      ++idx;
+    }
+
+    return makeNode(context, fFactory, n, CAstNode.ARRAY_LITERAL, eltNodes);
+  }
+
+  private CAstNode visit(ClassInstanceCreation n, WalkContext context) {
+    return createClassInstanceCreation(n, n.arguments(), n.resolveConstructorBinding(), n.getExpression(), n
+        .getAnonymousClassDeclaration(), context);
+  }
+
+  private CAstNode createClassInstanceCreation(ASTNode nn, List<?> arguments, IMethodBinding ctorBinding,
+      Expression qual, AnonymousClassDeclaration anonDecl, WalkContext context) {
+    // a new instruction is actually two things: a NEW object and a CALL to a constructor
+    CAstNode newNode;
+    CAstNode callNode;
+    final String tmpName = "ctor temp";
+    // this name is an illegal Java identifier. this var will hold the new object so we can call the constructor on it
+
+    // GENERICS getMethodDeclaration()
+    ctorBinding = ctorBinding.getMethodDeclaration(); // unlike polyglot, this will
+    // point to a default
+    // constructor in the anon class
+    MethodReference ctorRef = fIdentityMapper.getMethodRef(ctorBinding);
+
+    // ////////////// PART I: make the NEW expression ///////////////////////////////////////////////////////
+
+    ITypeBinding newType = ctorBinding.getDeclaringClass();
+    TypeReference newTypeRef = fIdentityMapper.getTypeRef(newType);
+
+    // new nodes with an explicit enclosing argument, e.g. "outer.new Inner()". They are mostly treated the same, except
+    // in JavaCAst2IRTranslator.doNewObject
+    CAstNode qualNode = null;
+
+    if (qual == null && newType.getDeclaringClass() != null && ((newType.getModifiers() & Modifier.STATIC) == 0)
+        && !newType.isLocal()) {
+      // "new X()" expanded into "new this.X()" or "new MyClass.this.X"
+      // check isLocal because anonymous classes and local classes are not included.
+      ITypeBinding plainThisType = JDT2CAstUtils.getDeclaringClassOfNode(nn); // type of "this"
+      ITypeBinding implicitThisType = findClosestEnclosingClassSubclassOf(plainThisType, newType.getDeclaringClass(), ((newType
+          .getModifiers() & Modifier.PRIVATE) != 0));
+      if (implicitThisType.isEqualTo(plainThisType))
+        qualNode = makeNode(context, fFactory, nn, CAstNode.THIS); // "new this.X()"
+      else
+        qualNode = makeNode(context, fFactory, nn, CAstNode.THIS, fFactory.makeConstant(fIdentityMapper
+            .getTypeRef(implicitThisType))); // "new Bla.this.X()"
+    } else if (qual != null)
+      qualNode = visitNode(qual, context);
+
+    if (qualNode != null)
+      newNode = makeNode(context, fFactory, nn, CAstNode.NEW_ENCLOSING, fFactory.makeConstant(newTypeRef), qualNode);
+    else
+      newNode = makeNode(context, fFactory, nn, CAstNode.NEW, fFactory.makeConstant(newTypeRef));
+
+    ITypeBinding[] newExceptions = new ITypeBinding[] { NoClassDefFoundError, ExceptionInInitializerError, OutOfMemoryError };
+    context.cfg().map(newNode, newNode);
+    for (ITypeBinding exp : newExceptions) {
+      for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(exp)) {
+        context.cfg().add(newNode, catchTarget.snd, catchTarget.fst);
+      }
+    }
+
+    // ANONYMOUS CLASSES
+    // ctor already points to right place, so should type ref, so all we have to do is make the entity
+    if (anonDecl != null)
+      context.addScopedEntity(newNode, visit(anonDecl, context));
+
+    // ////////////// PART II: make the CALL expression ///////////////////////////////////////////////////////
+    // setup args & handle exceptions
+
+    CAstNode[] argNodes = new CAstNode[arguments.size() + 2];
+    int idx = 0; // args: [ this, callsiteref, <actual args> ]
+
+    // arg 0: this
+    argNodes[idx++] = makeNode(context, fFactory, nn, CAstNode.VAR, fFactory.makeConstant(tmpName), fFactory.makeConstant(fTypeDict.getCAstTypeFor(newType)));
+    // contains output from newNode (see part III)
+
+    // arg 1: call site ref (WHY?)
+    int dummyPC = 0; // Just want to wrap the kind of call; the "rear end" won't care about anything else
+    CallSiteReference callSiteRef = CallSiteReference.make(dummyPC, ctorRef, IInvokeInstruction.Dispatch.SPECIAL);
+    argNodes[idx++] = fFactory.makeConstant(callSiteRef);
+
+    // rest of args
+    for (Object arg : arguments) {
+      argNodes[idx++] = (arg instanceof CAstNode) ? ((CAstNode) arg) : visitNode((Expression) arg, context);
+    }
+    callNode = makeNode(context, fFactory, nn, CAstNode.CALL, argNodes);
+    context.cfg().map(nn, callNode);
+
+    handleThrowsFromCall(ctorBinding, nn, context);
+
+    // PART III: make a node with both NEW and CALL
+    // Make a LOCAL_SCOPE with a BLOCK_EXPR node child which does three things:
+    // 1) declare a temporary variable and assign the new object to it (LOCAL_SCOPE is needed to chain this new variable
+    // to this block)
+    // 2) CALL the constructor on the new variable
+    // 3) access this temporary variable. Since the value of the block is the last thing in the block, the resultant
+    // value will be the variable
+    return makeNode(context, fFactory, nn, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, nn, CAstNode.BLOCK_EXPR, makeNode(
+        context, fFactory, nn, CAstNode.DECL_STMT, fFactory.makeConstant(new InternalCAstSymbol(tmpName, fTypeDict.getCAstTypeFor(newType), true)), newNode),
+        callNode, makeNode(context, fFactory, nn, CAstNode.VAR, fFactory.makeConstant(tmpName))));
+  }
+
+  /**
+   * @param mappedAstNode An AST node or object mapped in the CFG: we will call context.cfg().add() on it. Caller must worry about
+   *          mapping it with context.cfg().map().
+   */
+  private void handleThrowsFromCall(IMethodBinding met, Object mappedAstNode, WalkContext context) {
+    ITypeBinding[] throwTypes = met.getExceptionTypes();
+    for (ITypeBinding thrownType : throwTypes) {
+      Collection<Pair<ITypeBinding, Object>> catchTargets = context.getCatchTargets(thrownType);
+      for (Pair<ITypeBinding, Object> catchTarget : catchTargets)
+        context.cfg().add(mappedAstNode, catchTarget.snd, catchTarget.fst);
+    }
+    // can also throw runtime exception
+    for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(fRuntimeExcType))
+      context.cfg().add(mappedAstNode, catchTarget.snd, catchTarget.fst);
+  }
+
+  private CAstNode visit(ExpressionStatement n, WalkContext context) {
+    return visitNode(n.getExpression(), context);
+  }
+
+  private CAstNode visit(SuperMethodInvocation n, WalkContext context) {
+    CAstNode target;
+    if (n.getQualifier() == null)
+      target = makeNode(context, fFactory, n, CAstNode.SUPER);
+    else {
+      TypeReference owningTypeRef = fIdentityMapper.getTypeRef(n.getQualifier().resolveTypeBinding());
+      target = makeNode(context, fFactory, n, CAstNode.SUPER, fFactory.makeConstant(owningTypeRef));
+    }
+    // GENERICS getMethodDeclaration()
+    return createMethodInvocation(n, n.resolveMethodBinding().getMethodDeclaration(), target, n.arguments(), context);
+  }
+
+  // FIXME: implicit this
+  private CAstNode visit(MethodInvocation n, WalkContext context) {
+    // GENERICS getMethodDeclaration()
+    IMethodBinding binding = n.resolveMethodBinding().getMethodDeclaration();
+    if ((binding.getModifiers() & Modifier.STATIC) != 0) {
+      CAstNode target;
+
+      // JLS says: evaluate qualifier & throw away unless of course it's just a class name (or null),
+      // in which case we replace the EMPTY with a VOID
+      // of course, "this" has no side effects either.
+      target = visitNode(n.getExpression(), context);
+      if (target.getKind() == CAstNode.EMPTY || target.getKind() == CAstNode.THIS)
+        return createMethodInvocation(n, binding, makeNode(context, fFactory, null, CAstNode.VOID), n.arguments(), context);
+      else
+        return makeNode(context, fFactory, n, CAstNode.BLOCK_EXPR, target, createMethodInvocation(n, binding, makeNode(context,
+            fFactory, null, CAstNode.VOID), n.arguments(), context));
+      // target is evaluated but thrown away, and only result of method invocation is kept
+
+    } else {
+      CAstNode target;
+      if (n.getExpression() != null) {
+        target = visitNode(n.getExpression(), context);
+      } else {
+        ITypeBinding typeOfThis = JDT2CAstUtils.getDeclaringClassOfNode(n);
+
+        boolean methodIsPrivate = (binding.getModifiers() & Modifier.PRIVATE) != 0;
+
+        // how could it be in the subtype and private? this only happens the supertype is also an
+        // enclosing type. in that case the variable refers to the field in the enclosing instance.
+        // NOTE: method may be defined in MyClass's superclass, but we still want to expand
+        // this into MyClass, so we have to find the enclosing class which defines this function.
+
+        ITypeBinding implicitThisClass = findClosestEnclosingClassSubclassOf(typeOfThis, binding.getDeclaringClass(),
+            methodIsPrivate);
+        if (typeOfThis.isEqualTo(implicitThisClass))
+          // "foo = 5" -> "this.foo = 5": expand into THIS + class
+          target = makeNode(context, fFactory, n, CAstNode.THIS);
+        else
+          // "foo = 5" -> "MyClass.this.foo = 5" -- inner class: expand into THIS + class
+          target = makeNode(context, fFactory, n, CAstNode.THIS, fFactory.makeConstant(fIdentityMapper
+              .getTypeRef(implicitThisClass)));
+        // NOTE: method may be defined in MyClass's superclass, but we still want to expand
+        // this into MyClass, so we have to find the enclosing class which defines this function.
+      }
+      CAstNode node = createMethodInvocation(n, binding, target, n.arguments(), context);
+      // TODO: maybe not exactly right... what if it's a capture? we may have to cast it down a little bit.
+      if (binding.getReturnType().isTypeVariable()) {
+        // GENERICS: add a cast
+        ITypeBinding realtype = JDT2CAstUtils.getErasedType(n.resolveMethodBinding().getReturnType(), ast);
+        ITypeBinding fromtype = JDT2CAstUtils.getTypesVariablesBase(binding.getReturnType(), ast);
+        if (!realtype.isEqualTo(fromtype))
+          return createCast(n, node, fromtype, realtype, context);
+      }
+      return node;
+    }
+  }
+
+  private CAstNode createMethodInvocation(ASTNode pos, IMethodBinding methodBinding, CAstNode target,
+      List<?> arguments, WalkContext context) {
+    // MethodMethodInstance methodInstance = n.methodInstance();
+    boolean isStatic = (methodBinding.getModifiers() & Modifier.STATIC) != 0;
+    ITypeBinding methodOwner = methodBinding.getDeclaringClass();
+
+    if (!(methodOwner.isInterface() || methodOwner.isClass() || methodOwner.isEnum())) {
+      assert false : "owner " + methodOwner + " of " + methodBinding + " is not a class";
+    }
+
+    // POPULATE PARAMETERS
+    // this (or void for static), method reference, rest of args
+    int nFormals = methodBinding.getParameterTypes().length;
+    CAstNode[] children = new CAstNode[2 + nFormals];
+
+    // this (or void for static)
+    assert target != null : "no receiver for " + methodBinding;
+    children[0] = target;
+
+    // method reference
+    // unlike polyglot, expression will never be super here. this is handled in SuperMethodInvocation.
+    IInvokeInstruction.IDispatch dispatchType;
+    if (isStatic)
+      dispatchType = IInvokeInstruction.Dispatch.STATIC;
+    else if (methodOwner.isInterface())
+      dispatchType = IInvokeInstruction.Dispatch.INTERFACE;
+    else if ((methodBinding.getModifiers() & Modifier.PRIVATE) != 0 || target.getKind() == CAstNode.SUPER)
+      // only one possibility, not a virtual call (I guess?)
+      dispatchType = IInvokeInstruction.Dispatch.SPECIAL;
+    else
+      dispatchType = IInvokeInstruction.Dispatch.VIRTUAL;
+    // pass 0 for dummyPC: Just want to wrap the kind of call; the "rear end" won't care about anything else...
+    CallSiteReference callSiteRef = CallSiteReference.make(0, fIdentityMapper.getMethodRef(methodBinding), dispatchType);
+
+    children[1] = fFactory.makeConstant(callSiteRef);
+
+    populateArguments(children, methodBinding, arguments, context);
+
+    Object fakeCfgMap = new Object();
+
+    handleThrowsFromCall(methodBinding, fakeCfgMap, context);
+
+    CAstNode result = makeNode(context, fFactory, pos, CAstNode.CALL, children);
+    context.cfg().map(fakeCfgMap, result);
+    return result;
+  }
+
+  /**
+   * Populate children, starting at index 2, for the invocation of methodBinding. If varargs are used this function will collapse
+   * the proper arguments into an array.
+   * 
+   * If the number of actuals equals the number of formals and the function is varargs, we have to check the type of the last
+   * argument to see if we should "box" it in an array. If the arguments[arguments.length-1] is not an Expression, we cannot get the
+   * type, so we do not box it. (Making covariant varargs functions require this behavior)
+   */
+  private void populateArguments(CAstNode[] children, IMethodBinding methodBinding, List<?/* CAstNode or Expression */> arguments,
+      WalkContext context) {
+    int nFormals = methodBinding.getParameterTypes().length;
+    assert children.length == nFormals + 2;
+    int nActuals = arguments.size();
+
+    ITypeBinding lastArgType = null;
+    if (nActuals > 0 && arguments.get(nActuals - 1) instanceof Expression)
+      lastArgType = ((Expression) arguments.get(nActuals - 1)).resolveTypeBinding();
+    // if the # of actuals equals the # of formals, AND the function is varargs, we have to check
+    // to see if the lastArgType is subtype compatible with the type of last parameter (which will be an array).
+    // If it is, we pass this array in directly. Otherwise this it is wrapped in an array init.
+    // Example: 'void foo(int... x)' can be run via 'foo(5)' or 'foo(new int[] { 5, 6 })' -- both have one argument so we must check
+    // the type
+
+    if (nActuals == nFormals
+        && (!methodBinding.isVarargs() || lastArgType == null || lastArgType
+            .isSubTypeCompatible(methodBinding.getParameterTypes()[nFormals - 1]))) {
+      int i = 2;
+      for (Object arg : arguments)
+        children[i++] = (arg instanceof CAstNode) ? ((CAstNode) arg) : visitNode((Expression) arg, context);
+    } else {
+      assert nActuals >= (nFormals - 1) && methodBinding.isVarargs() : "Invalid number of parameters for constructor call";
+      for (int i = 0; i < nFormals - 1; i++) {
+        Object arg = arguments.get(i);
+        children[i + 2] = (arg instanceof CAstNode) ? ((CAstNode) arg) : visitNode((Expression) arg, context);
+      }
+
+      CAstNode subargs[] = new CAstNode[nActuals - nFormals + 2];
+      // nodes for args and one extra for NEW expression
+      TypeReference newTypeRef = fIdentityMapper.getTypeRef(methodBinding.getParameterTypes()[nFormals - 1]);
+      subargs[0] = makeNode(context, fFactory, null, CAstNode.NEW, fFactory.makeConstant(newTypeRef), fFactory
+          .makeConstant(subargs.length - 1));
+      for (int j = 1; j < subargs.length; j++) {
+        Object arg = arguments.get(j + nFormals - 2);
+        subargs[j] = (arg instanceof CAstNode) ? ((CAstNode) arg) : visitNode((Expression) arg, context);
+      }
+      children[nFormals + 1] = makeNode(context, fFactory, (ASTNode) null, CAstNode.ARRAY_LITERAL, subargs);
+    }
+  }
+
+  private CAstNode visit(ReturnStatement r, WalkContext context) {
+    Expression retExpr = r.getExpression();
+    if (retExpr == null)
+      return makeNode(context, fFactory, r, CAstNode.RETURN);
+    else
+      return makeNode(context, fFactory, r, CAstNode.RETURN, visitNode(retExpr, context));
+  }
+
+  private CAstNode visit(Assignment n, WalkContext context) {
+    if (n.getOperator() == Assignment.Operator.ASSIGN)
+      return makeNode(context, fFactory, n, CAstNode.ASSIGN, visitNode(n.getLeftHandSide(), new AssignmentContext(context)),
+          visitNode(n.getRightHandSide(), context));
+    else {
+      CAstNode left = visitNode(n.getLeftHandSide(), context);
+      // GENERICs lvalue for pre op hack
+      if (left.getKind() == CAstNode.CAST) {
+        return doFunkyGenericAssignPreOpHack(n, context);
+      }
+
+      // +=, %=, &=, etc.
+      CAstNode result = makeNode(context, fFactory, n, CAstNode.ASSIGN_PRE_OP, left, visitNode(n.getRightHandSide(), context),
+          JDT2CAstUtils.mapAssignOperator(n.getOperator()));
+
+      // integer division by zero
+      if (JDT2CAstUtils.isLongOrLess(n.resolveTypeBinding())
+          && (n.getOperator() == Assignment.Operator.DIVIDE_ASSIGN || n.getOperator() == Assignment.Operator.REMAINDER_ASSIGN)) {
+        Collection<Pair<ITypeBinding, Object>> excTargets = context.getCatchTargets(fDivByZeroExcType);
+        if (!excTargets.isEmpty()) {
+          for (Pair<ITypeBinding, Object> catchPair : excTargets)
+            context.cfg().add(result, catchPair.snd, fDivByZeroExcType);
+        } else {
+          context.cfg().add(result, CAstControlFlowMap.EXCEPTION_TO_EXIT, fDivByZeroExcType);
+        }
+      }
+
+      return result;
+    }
+  }
+
+  /**
+   * Consider the case:
+   * 
+   * <pre>
+   * String real_oneheyya = (((returnObjectWithSideEffects().y))+=&quot;hey&quot;)+&quot;ya&quot;
+   * </pre>
+   * 
+   * where field 'y' is parameterized to type string. then += is not defined for type 'object'. This function is a hack that expands
+   * the code into an assignment and binary operation.
+   */
+  private CAstNode doFunkyGenericAssignPreOpHack(Assignment assign, WalkContext context) {
+    Expression left = assign.getLeftHandSide();
+    Expression right = assign.getRightHandSide();
+
+    // consider the case:
+    // String real_oneheyya = (((returnObjectWithSideEffects().y))+="hey")+"ya"; // this is going to be a MAJOR pain...
+    // where field 'y' is parameterized to type string. then += is not defined for type 'object'. we want to transform
+    // it kind of like this, except we have to define temp.
+    // String real_oneheyya = (String)((temp=cg2WithSideEffects()).y = (String)temp.y + "hey")+"ya";
+    // ----------------------------------------------------------------
+    //
+    // we are responsible for underlined portion
+    // CAST(LOCAL SCOPE(BLOCK EXPR(DECL STMT(temp,
+    // left.target),ASSIGN(OBJECT_REF(temp,y),BINARY_EXPR(CAST(OBJECT_REF(Temp,y)),RIGHT)))))
+    // yeah, I know, it's cheating, LOCAL SCOPE / DECL STMT inside an expression ... will it work?
+
+    while (left instanceof ParenthesizedExpression)
+      left = ((ParenthesizedExpression) left).getExpression();
+    assert left instanceof FieldAccess : "Cast in assign pre-op but no field access?!";
+
+    FieldAccess field = (FieldAccess) left;
+    InfixExpression.Operator infixop = JDT2CAstUtils.mapAssignOperatorToInfixOperator(assign.getOperator());
+
+    // DECL_STMT: temp = ...;
+    final String tmpName = "temp generic preop hack"; // illegal Java identifier
+    CAstNode exprNode = visitNode(field.getExpression(), context);
+    CAstNode tmpDeclNode = makeNode(context, fFactory, left, CAstNode.DECL_STMT, fFactory.makeConstant(new InternalCAstSymbol(
+        tmpName, fTypeDict.getCAstTypeFor(field.getExpression().resolveTypeBinding()), true)), exprNode);
+
+    // need two object refndoes "temp.y"
+    CAstNode obref1 = createFieldAccess(makeNode(context, fFactory, left, CAstNode.VAR, fFactory.makeConstant(tmpName), fFactory.makeConstant(fTypeDict.getCAstTypeFor(field.resolveFieldBinding().getType()))), field
+        .getName().getIdentifier(), field.resolveFieldBinding(), left, new AssignmentContext(context));
+
+    CAstNode obref2 = createFieldAccess(makeNode(context, fFactory, left, CAstNode.VAR, fFactory.makeConstant(tmpName), fFactory.makeConstant(fTypeDict.getCAstTypeFor(field.resolveFieldBinding().getType()))), field
+        .getName().getIdentifier(), field.resolveFieldBinding(), left, context);
+    ITypeBinding realtype = JDT2CAstUtils.getErasedType(field.resolveFieldBinding().getType(), ast);
+    ITypeBinding fromtype = JDT2CAstUtils
+        .getTypesVariablesBase(field.resolveFieldBinding().getVariableDeclaration().getType(), ast);
+    CAstNode castedObref = obref2;// createCast(left, obref2, fromtype, realtype, context);
+
+    // put it all together
+    // CAST(LOCAL SCOPE(BLOCK EXPR(DECL STMT(temp,
+    // left.target),ASSIGN(OBJECT_REF(temp,y),BINARY_EXPR(CAST(OBJECT_REF(Temp,y)),RIGHT)))))
+    CAstNode result = makeNode(context, fFactory, assign, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, assign,
+        CAstNode.BLOCK_EXPR, tmpDeclNode, makeNode(context, fFactory, assign, CAstNode.ASSIGN, obref1, createInfixExpression(
+            infixop, realtype, left.getStartPosition(), left.getLength(), castedObref, right, context))));
+
+    return createCast(assign, result, fromtype, realtype, context);
+  }
+
+  private CAstNode visit(ParenthesizedExpression n, WalkContext context) {
+    return visitNode(n.getExpression(), context);
+  }
+
+  private CAstNode visit(BooleanLiteral n) {
+    return fFactory.makeConstant(n.booleanValue());
+  }
+
+  private CAstNode visit(CharacterLiteral n) {
+    return fFactory.makeConstant(n.charValue());
+  }
+
+  private CAstNode visit() {
+    return fFactory.makeConstant(null);
+  }
+
+  private CAstNode visit(StringLiteral n) {
+    return fFactory.makeConstant(n.getLiteralValue());
+  }
+
+  private CAstNode visit(TypeLiteral n, WalkContext context) {
+    String typeName = fIdentityMapper.typeToTypeID(n.resolveTypeBinding());
+    return makeNode(context, fFactory, n, CAstNode.TYPE_LITERAL_EXPR, fFactory.makeConstant(typeName));
+  }
+
+  private CAstNode visit(NumberLiteral n) {
+    return fFactory.makeConstant(n.resolveConstantExpressionValue());
+  }
+
+  /**
+   * SimpleName can be a field access, local, or class name (do nothing case)
+   */
+  private CAstNode visit(SimpleName n, WalkContext context) {
+    // class name, handled above in either method invocation, qualified name, or qualified this
+    if (n.resolveBinding() instanceof ITypeBinding)
+      return makeNode(context, fFactory, null, CAstNode.EMPTY);
+
+    assert n.resolveBinding() instanceof IVariableBinding : "SimpleName's binding, " + n.resolveBinding() + ", is not a variable or a type binding!";
+
+    IVariableBinding binding = (IVariableBinding) n.resolveBinding();
+    binding = binding.getVariableDeclaration(); // ignore weird generic stuff
+
+    // TODO: enum constants
+    if (binding.isField()) {
+      // enum constants ...
+
+      // implicit field access -- implicit this or class
+      CAstNode targetNode;
+
+      if ((binding.getModifiers() & Modifier.STATIC) != 0) {
+        // "foo = 5" -> "MyClass.foo = 5" or "SomeEnclosingClass.foo" = 5
+        targetNode = makeNode(context, fFactory, null, CAstNode.EMPTY); // we will get type from binding. no side
+        // effects in evaluating a class name, so NOP
+        // here.
+      } else {
+        ITypeBinding typeOfThis = JDT2CAstUtils.getDeclaringClassOfNode(n);
+
+        boolean fieldIsPrivate = (binding.getModifiers() & Modifier.PRIVATE) != 0;
+
+        // how could it be in the subtype and private? this only happens the supertype is also an
+        // enclosing type. in that case the variable refers to the field in the enclosing instance.
+        // NOTE: method may be defined in MyClass's superclass, but we still want to expand
+        // this into MyClass, so we have to find the enclosing class which defines this function.
+
+        ITypeBinding implicitThisClass = findClosestEnclosingClassSubclassOf(typeOfThis, binding.getDeclaringClass(),
+            fieldIsPrivate);
+        if (typeOfThis.isEqualTo(implicitThisClass))
+          // "foo = 5" -> "this.foo = 5": expand into THIS + class
+          targetNode = makeNode(context, fFactory, n, CAstNode.THIS);
+        else
+          // "foo = 5" -> "MyClass.this.foo = 5" -- inner class: expand into THIS + class
+          targetNode = makeNode(context, fFactory, n, CAstNode.THIS, fFactory.makeConstant(fIdentityMapper
+              .getTypeRef(implicitThisClass)));
+        // NOTE: method may be defined in MyClass's superclass, but we still want to expand
+        // this into MyClass, so we have to find the enclosing class which defines this function.
+        // fFactory.makeConstant(owningTypeRef));
+      }
+      return createFieldAccess(targetNode, n.getIdentifier(), binding, n, context);
+
+    } else {
+      // local
+      CAstType t = fTypeDict.getCAstTypeFor(((IVariableBinding)n.resolveBinding()).getType());
+      return makeNode(context, fFactory, n, CAstNode.VAR, fFactory.makeConstant(n.getIdentifier()), fFactory.makeConstant(t));
+    }
+
+  }
+
+  /**
+   * Sees if a field defined in owningTypeRef is contained & accessible to a type of typeOfThis. That is, if owningTypeRef ==
+   * typeOfThis or typeOfThis is a subtype and isPrivate is false. If this is not that case, looks in the enclosing class of
+   * typeOfThis and tries again, and its enclosing class, ...
+   * 
+   * Essentially if we have a field/method referenced only by name and we know its type (owningTypeRef), this function will return
+   * owningTypeRef or the subtype that the field is accessed thru, for expanding "f = 5" into "TheClass.this.f = 5".
+   */
+  private static ITypeBinding findClosestEnclosingClassSubclassOf(ITypeBinding typeOfThis, ITypeBinding owningType, boolean isPrivate) {
+    // GENERICS
+//    if (owningType.isParameterizedType())
+//      owningType = owningType.getTypeDeclaration();
+//    if (typeOfThis.isParameterizedType())
+//      typeOfThis = typeOfThis.getTypeDeclaration();
+//    // typeOfThis.getTypeDeclaration()
+    owningType = owningType.getErasure();
+
+    ITypeBinding current = typeOfThis;
+    while (current != null) {
+      current = current.getErasure();
+      // Walk the hierarchy rather than using isSubTypeCompatible to handle
+      // generics -- we need to perform erasure of super types
+      boolean isInSubtype = false;//current.isSubTypeCompatible(owningType);
+      ITypeBinding supertp = current;
+      while (supertp != null){
+        supertp = supertp.getErasure();
+        // Use isSubTypeCompatible even though we are manually walking type hierarchy --
+        // that way interfaces are handled without us having to do it manually.
+        if (supertp.isSubTypeCompatible(owningType)){
+          isInSubtype = true;
+          break;
+        }
+        supertp = supertp.getSuperclass();
+      }
+
+      // how could it be in the subtype and private? this only happens the supertype is also an
+      // enclosing type. in that case the variable refers to the field in the enclosing instance.
+
+      if (current.isEqualTo(owningType) || (isInSubtype && !isPrivate))
+        return current;
+
+      current = current.getDeclaringClass();
+    }
+
+    Assertions.UNREACHABLE("Couldn't find field in class or enclosing class or superclasses of these");
+    return null;
+  }
+
+  /**
+   * Process a field access. Semantics differ for static and instance fields. Fields can throw null pointer exceptions so we must
+   * connect proper exceptional edges in the CFG.
+   */
+  private CAstNode visit(FieldAccess n, WalkContext context) {
+    CAstNode targetNode = visitNode(n.getExpression(), context);
+    return createFieldAccess(targetNode, n.getName().getIdentifier(), n.resolveFieldBinding(), n, context);
+  }
+
+  /**
+   * Used by visit(FieldAccess) and visit(SimpleName) -- implicit "this" / static field access. things from 'this' cannot throw an
+   * exception. maybe handle this in here as a special case? i don't know... or check if targetNode is THIS, that should even work
+   * for this.x = 5 and (this).x = 5
+   * 
+   * @param targetNode Used to evaluate the field access. In the case of static field accesses, this is included in the first part of a
+   *          block -- thus it is evaluated for any side effects but thrown away.
+   * @param fieldName Name of the field.
+   * @param positioningNode Used only for making a JdtPosition.
+   */
+  private CAstNode createFieldAccess(CAstNode targetNode, String fieldName, IVariableBinding possiblyParameterizedBinding,
+      ASTNode positioningNode, WalkContext context) {
+
+    IVariableBinding fieldBinding = possiblyParameterizedBinding.getVariableDeclaration();
+
+    ITypeBinding targetType = fieldBinding.getDeclaringClass();
+
+    if (targetType == null) { // array
+      assert fieldName.equals("length") : "null targetType but not aray length access";
+      return makeNode(context, fFactory, positioningNode, CAstNode.ARRAY_LENGTH, targetNode);
+    }
+
+    assert fieldBinding.isField() : "Field binding is not a field?!"; // we can probably safely delete this
+    // check
+
+    // translate JDT field ref to WALA field ref
+    FieldReference fieldRef = fIdentityMapper.getFieldRef(fieldBinding);
+
+    if ((fieldBinding.getModifiers() & Modifier.STATIC) != 0) {
+      // JLS says: evaluate the target of the field ref and throw it away.
+      // Hence the following block expr, whose 2 children are the target
+      // evaluation
+      // followed by the OBJECT_REF with a null target child (which the
+      // "back-end"
+      // CAst -> IR translator interprets as a static ref).
+      // TODO: enum constants
+
+      // don't worry about generics (can't declare static fields with type variables)
+      if (fieldBinding.getConstantValue() != null) {
+        return makeNode(context, fFactory, positioningNode, CAstNode.BLOCK_EXPR, targetNode, fFactory.makeConstant(fieldBinding
+            .getConstantValue()));
+      } else {
+        return makeNode(context, fFactory, positioningNode, CAstNode.BLOCK_EXPR, targetNode,
+            makeNode(context, fFactory, positioningNode, CAstNode.OBJECT_REF, makeNode(context, fFactory, null, CAstNode.VOID),
+                fFactory.makeConstant(fieldRef)));
+      }
+    } else {
+      CAstNode refNode = makeNode(context, fFactory, positioningNode, CAstNode.OBJECT_REF, targetNode, fFactory
+          .makeConstant(fieldRef));
+
+      if (targetNode.getKind() != CAstNode.THIS) { // this.x will never throw a null pointer exception, because this
+        // can never be null
+        Collection<Pair<ITypeBinding, Object>> excTargets = context.getCatchTargets(fNullPointerExcType);
+        if (!excTargets.isEmpty()) {
+          // connect NPE exception edge to relevant catch targets
+          // (presumably only one)
+          for (Pair<ITypeBinding, Object> catchPair : excTargets) {
+            context.cfg().add(refNode, catchPair.snd, fNullPointerExcType);
+          }
+        } else {
+          // connect exception edge to exit
+          context.cfg().add(refNode, CAstControlFlowMap.EXCEPTION_TO_EXIT, fNullPointerExcType);
+        }
+
+        context.cfg().map(refNode, refNode);
+      }
+
+      if (fieldBinding.getConstantValue() != null) {
+        // don't have to worry about generics, a constant of generic type can only be null
+        return makeNode(context, fFactory, positioningNode, CAstNode.BLOCK_EXPR, refNode,
+        // evaluating 'refNode' can have side effects, so we must still evaluate it!
+            fFactory.makeConstant(fieldBinding.getConstantValue()));
+      } else {
+        if (fieldBinding.getType().isTypeVariable() && !context.needLValue()) {
+          // GENERICS: add a cast
+          ITypeBinding realtype = JDT2CAstUtils.getErasedType(possiblyParameterizedBinding.getType(), ast);
+          ITypeBinding fromtype = JDT2CAstUtils.getTypesVariablesBase(fieldBinding.getType(), ast);
+          if (!realtype.isEqualTo(fromtype))
+            return createCast(positioningNode, refNode, fromtype, realtype, context);
+        }
+        return refNode;
+      }
+    }
+
+  }
+
+  private CAstNode visit(ThisExpression n, WalkContext context) {
+    if (n.getQualifier() != null) {
+      ITypeBinding owningType = n.getQualifier().resolveTypeBinding();
+      TypeReference owningTypeRef = fIdentityMapper.getTypeRef(owningType);
+      return makeNode(context, fFactory, n, CAstNode.THIS, fFactory.makeConstant(owningTypeRef));
+    } else
+      return makeNode(context, fFactory, n, CAstNode.THIS);
+  }
+
+  /**
+   * QualifiedNames may be: 1) static of non-static field accesses -- we handle this case here 2) type names used in the context of:
+   * a) field access (QualifiedName) b) method invocation c) qualifier of "this" in these cases we get the binding info in each of
+   * these three functions and use them there, thus we return an EMPTY (no-op) here. 3) package names used in the context of a
+   * QualifiedName class we return a EMPTY (no-op) here.
+   */
+  private CAstNode visit(QualifiedName n, WalkContext context) {
+    // "package.Class" is a QualifiedName, but also is "Class.staticField"
+    // only handle if it's a "Class.staticField" ("Field" in polyglot AST)
+
+    if (n.resolveBinding() instanceof IVariableBinding) {
+      IVariableBinding binding = (IVariableBinding) n.resolveBinding();
+      assert binding.isField() : "Non-field variable QualifiedName!";
+
+      // if field access is static, visitNode(n.getQualifier()) will come back here
+      // and we will return an EMPTY node
+      return createFieldAccess(visitNode(n.getQualifier(), context), n.getName().getIdentifier(), binding, n, context);
+    } else
+      return makeNode(context, fFactory, null, CAstNode.EMPTY);
+    // type name, handled in surrounding context
+  }
+
+  private CAstNode visit(InfixExpression n, WalkContext context) {
+    Expression left = n.getLeftOperand();
+    ITypeBinding leftType = left.resolveTypeBinding();
+    int leftStartPosition = left.getStartPosition();
+
+    CAstNode leftNode = visitNode(left, context);
+
+    int leftLength = n.getLeftOperand().getLength();
+    CAstNode result = createInfixExpression(n.getOperator(), leftType, leftStartPosition, leftLength, leftNode,
+        n.getRightOperand(), context);
+
+    if (n.hasExtendedOperands()) {
+      // keep on adding operands on the right side
+
+      leftLength = n.getRightOperand().getStartPosition() + n.getRightOperand().getLength() - leftStartPosition;
+      for (Expression operand : (Iterable<Expression>) n.extendedOperands()) {
+        result = createInfixExpression(n.getOperator(), leftType, leftStartPosition, leftLength, result, operand, context);
+
+        if (leftType.isPrimitive() && operand.resolveTypeBinding().isPrimitive())
+          leftType = JDT2CAstUtils.promoteTypes(leftType, operand.resolveTypeBinding(), ast); // TODO: boxing
+        else
+          leftType = operand.resolveTypeBinding();
+
+        // leftStartPosition doesn't change, beginning is always the first operand
+        leftLength = operand.getStartPosition() + operand.getLength() - leftStartPosition;
+      }
+    }
+
+    return result;
+  }
+
+  private CAstNode createInfixExpression(InfixExpression.Operator op, ITypeBinding leftType, int leftStartPosition, int leftLength,
+      CAstNode leftNode, Expression right, WalkContext context) {
+    CAstNode rightNode = visitNode(right, context);
+
+    int start = leftStartPosition;
+    int end = right.getStartPosition() + right.getLength();
+    T pos = makePosition(start, end);
+    T rightPos = makePosition(leftStartPosition, leftStartPosition + leftLength);
+    T leftPos = makePosition(right.getStartPosition(), right.getStartPosition() + right.getLength());
+
+    if (op == InfixExpression.Operator.CONDITIONAL_AND) {
+      return makeNode(context, fFactory, pos, CAstNode.IF_EXPR, leftNode, rightNode, fFactory.makeConstant(false));
+    } else if (op == InfixExpression.Operator.CONDITIONAL_OR) {
+      return makeNode(context, fFactory, pos, CAstNode.IF_EXPR, leftNode, fFactory.makeConstant(true), rightNode);
+    } else {
+      ITypeBinding rightType = right.resolveTypeBinding();
+      if (leftType.isPrimitive() && rightType.isPrimitive()) {
+        // TODO: boxing
+        ITypeBinding result = JDT2CAstUtils.promoteTypes(leftType, rightType, ast);
+
+        // cast to proper type
+        if (!result.isEqualTo(leftType))
+          leftNode = makeNode(context, fFactory, leftPos, CAstNode.CAST, fFactory.makeConstant(fTypeDict.getCAstTypeFor(result)),
+              leftNode, fFactory.makeConstant(fTypeDict.getCAstTypeFor(leftType)));
+        if (!result.isEqualTo(rightType))
+          rightNode = makeNode(context, fFactory, rightPos, CAstNode.CAST, fFactory.makeConstant(fTypeDict.getCAstTypeFor(result)),
+              rightNode, fFactory.makeConstant(fTypeDict.getCAstTypeFor(rightType)));
+
+        CAstNode opNode = makeNode(context, fFactory, pos, CAstNode.BINARY_EXPR, JDT2CAstUtils.mapBinaryOpcode(op), leftNode,
+            rightNode);
+
+        // divide by zero exception implicitly thrown
+        if (JDT2CAstUtils.isLongOrLess(leftType)
+            && JDT2CAstUtils.isLongOrLess(rightType)
+            && (JDT2CAstUtils.mapBinaryOpcode(op) == CAstOperator.OP_DIV || JDT2CAstUtils.mapBinaryOpcode(op) == CAstOperator.OP_MOD)) {
+          Collection<Pair<ITypeBinding, Object>> excTargets = context.getCatchTargets(fDivByZeroExcType);
+          if (!excTargets.isEmpty()) {
+            for (Pair<ITypeBinding, Object> catchPair : excTargets) {
+              context.cfg().add(op, catchPair.snd, fDivByZeroExcType);
+            }
+          } else {
+            context.cfg().add(op, CAstControlFlowMap.EXCEPTION_TO_EXIT, fDivByZeroExcType);
+          }
+        }
+
+        return opNode;
+
+      } else {
+        return makeNode(context, fFactory, pos, CAstNode.BINARY_EXPR, JDT2CAstUtils.mapBinaryOpcode(op), leftNode, rightNode);
+      }
+    }
+  }
+
+  private CAstNode visit(ConstructorInvocation n, WalkContext context) {
+    // GENERICS getMethodDeclaration()
+    return createConstructorInvocation(n.resolveConstructorBinding().getMethodDeclaration(), n.arguments(), n, context, false);
+  }
+
+  private CAstNode visit(SuperConstructorInvocation n, WalkContext context) {
+    // FIXME: use expression?! polyglot doesn't handle it and it seems to be a very rare case.
+    // class E { class X {} }
+    // class Y extends E.X { Y(E e) { e.super(); } }
+    // GENERICS getMethodDeclaration()
+    return createConstructorInvocation(n.resolveConstructorBinding().getMethodDeclaration(), n.arguments(), n, context, true);
+  }
+
+  private CAstNode visit(SuperFieldAccess n, WalkContext context) {
+    CAstNode targetNode;
+    if (n.getQualifier() == null)
+      targetNode = makeNode(context, fFactory, n, CAstNode.SUPER);
+    else {
+      TypeReference owningTypeRef = fIdentityMapper.getTypeRef(n.getQualifier().resolveTypeBinding());
+      targetNode = makeNode(context, fFactory, n, CAstNode.SUPER, fFactory.makeConstant(owningTypeRef));
+    }
+    return createFieldAccess(targetNode, n.getName().getIdentifier(), n.resolveFieldBinding(), n, context);
+  }
+
+  /**
+   * callerNode: used for positioning and also in CFG (handleThrowsFrom Call)
+   */
+  private CAstNode createConstructorInvocation(IMethodBinding ctorBinding, List<Expression> arguments, ASTNode callerNode,
+      WalkContext context, boolean isSuper) {
+    ITypeBinding ctorType = ctorBinding.getDeclaringClass();
+    assert ctorType.isClass();
+
+    // dummy PC = 0 -- Just want to wrap the kind of call; the "rear end"
+    // won't care about anything else...
+    CallSiteReference callSiteRef = CallSiteReference.make(0, fIdentityMapper.getMethodRef(ctorBinding),
+        IInvokeInstruction.Dispatch.SPECIAL);
+
+    int nFormals = ctorBinding.getParameterTypes().length;
+    CAstNode[] children = new CAstNode[2 + nFormals];
+    // this, call site ref, args
+
+    CAstNode targetNode = makeNode(context, fFactory, callerNode, isSuper ? CAstNode.SUPER : CAstNode.THIS);
+
+    children[0] = targetNode;
+    children[1] = fFactory.makeConstant(callSiteRef);
+
+    populateArguments(children, ctorBinding, arguments, context);
+
+    handleThrowsFromCall(ctorBinding, callerNode, context);
+
+    CAstNode result = makeNode(context, fFactory, callerNode, CAstNode.CALL, children);
+    context.cfg().map(context, result);
+    return result;
+
+  }
+
+  private CAstNode visit(IfStatement n, WalkContext context) {
+    return makeNode(context, fFactory, n, CAstNode.IF_STMT, visitNode(n.getExpression(), context), visitNode(n.getThenStatement(),
+        context), visitNode(n.getElseStatement(), context));
+  }
+
+  private CAstNode visit(InstanceofExpression n, WalkContext context) {
+    return makeNode(context, fFactory, n, CAstNode.INSTANCEOF, fFactory.makeConstant(fTypeDict.getCAstTypeFor(n.getRightOperand()
+        .resolveBinding())), visitNode(n.getLeftOperand(), context));
+  }
+
+  private CAstNode visit(CastExpression n, WalkContext context) {
+    Expression arg = n.getExpression();
+    ITypeBinding castedFrom = arg.resolveTypeBinding();
+    ITypeBinding castedTo = n.getType().resolveBinding();
+    return createCast(n, visitNode(arg, context), castedFrom, castedTo, context);
+  }
+
+  private CAstNode createCast(ASTNode pos, CAstNode argNode, ITypeBinding castedFrom, ITypeBinding castedTo, WalkContext context) {
+    Object cfgMapDummy = new Object(); // safer as 'pos' may be used for another purpose (i.e., this could be an implicit cast)
+
+    // null can go into anything (e.g. in "((Foobar) null)" null can be assumed to be of type Foobar already)
+    if (castedFrom.isNullType())
+      castedFrom = castedTo;
+
+    CAstNode ast = makeNode(context, fFactory, pos, CAstNode.CAST, fFactory.makeConstant(fTypeDict.getCAstTypeFor(castedTo)),
+        argNode, fFactory.makeConstant(fTypeDict.getCAstTypeFor(castedFrom)));
+
+    Collection<Pair<ITypeBinding, Object>> excTargets = context.getCatchTargets(fClassCastExcType);
+    if (!excTargets.isEmpty()) {
+      // connect ClassCastException exception edge to relevant catch targets
+      // (presumably only one)
+      for (Pair<ITypeBinding, Object> catchPair : excTargets) {
+        context.cfg().add(cfgMapDummy, catchPair.snd, fClassCastExcType);
+      }
+    } else {
+      // connect exception edge to exit
+      context.cfg().add(cfgMapDummy, CAstControlFlowMap.EXCEPTION_TO_EXIT, fClassCastExcType);
+    }
+
+    context.cfg().map(cfgMapDummy, ast);
+    return ast;
+  }
+
+  private CAstNode visit(ConditionalExpression n, WalkContext context) {
+    return makeNode(context, fFactory, n, CAstNode.IF_EXPR, visitNode(n.getExpression(), context), visitNode(n.getThenExpression(),
+        context), visitNode(n.getElseExpression(), context));
+  }
+
+  private CAstNode visit(PostfixExpression n, WalkContext context) {
+    CAstOperator op = (n.getOperator() == PostfixExpression.Operator.DECREMENT) ? CAstOperator.OP_SUB : CAstOperator.OP_ADD;
+    return makeNode(context, fFactory, n, CAstNode.ASSIGN_POST_OP, visitNode(n.getOperand(), context), fFactory.makeConstant(1), op);
+  }
+
+  private CAstNode visit(PrefixExpression n, WalkContext context) {
+    PrefixExpression.Operator op = n.getOperator();
+
+    if (op == PrefixExpression.Operator.DECREMENT || op == PrefixExpression.Operator.INCREMENT) {
+      CAstOperator castOp = (n.getOperator() == PrefixExpression.Operator.DECREMENT) ? CAstOperator.OP_SUB : CAstOperator.OP_ADD;
+      return makeNode(context, fFactory, n, CAstNode.ASSIGN_PRE_OP, visitNode(n.getOperand(), context), fFactory.makeConstant(1),
+          castOp);
+    } else if (op == PrefixExpression.Operator.PLUS) {
+      return visitNode(n.getOperand(), context); // drop useless unary plus operator
+    } else if (op == PrefixExpression.Operator.MINUS) {
+      CAstNode zero;
+      if (JDT2CAstUtils.isLongOrLess(n.getOperand().resolveTypeBinding()))
+        zero = fFactory.makeConstant(0L);
+      else
+        zero = fFactory.makeConstant(0.0);
+      return makeNode(context, fFactory, n, CAstNode.BINARY_EXPR, CAstOperator.OP_SUB, zero, visitNode(n.getOperand(), context));
+    } else { // ! and ~
+      CAstOperator castOp = (n.getOperator() == PrefixExpression.Operator.NOT) ? CAstOperator.OP_NOT : CAstOperator.OP_BITNOT;
+      return makeNode(context, fFactory, n, CAstNode.UNARY_EXPR, castOp, visitNode(n.getOperand(), context));
+    }
+  }
+
+  private CAstNode visit(EmptyStatement n, WalkContext context) {
+    CAstNode result = makeNode(context, fFactory, n, CAstNode.EMPTY);
+    context.cfg().map(n, result); // why is this necessary? for break / continue targets? (they use an empty statement)
+    return result;
+  }
+
+  private CAstNode visit(AssertStatement n, WalkContext context) {
+    return makeNode(context, fFactory, n, CAstNode.ASSERT, visitNode(n.getExpression(), context));
+  }
+
+  // ////////////////
+  // LOOPS -- special handling of for and continue
+  // ////////////////
+
+  private CAstNode visit(LabeledStatement n, WalkContext context) {
+
+    // find the first non-block statement ant set-up the label map (useful for breaking many fors)
+    ASTNode stmt = n.getBody();
+    while (stmt instanceof Block)
+      stmt = (ASTNode) ((Block) stmt).statements().iterator().next();
+
+    if (n.getParent() != null)
+      // if not a synthetic node from a break/continue -- don't pollute namespace with label, we get it thru the context
+      context.getLabelMap().put(stmt, n.getLabel().getIdentifier());
+
+    CAstNode result;
+    if (!(n.getBody() instanceof EmptyStatement)) {
+      ASTNode breakTarget = makeBreakOrContinueTarget(n, n.getLabel().getIdentifier());
+      CAstNode breakNode = visitNode(breakTarget, context);
+      WalkContext child = new BreakContext(context, n.getLabel().getIdentifier(), breakTarget);
+
+      result = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, makeNode(context, fFactory, n, CAstNode.LABEL_STMT, fFactory
+          .makeConstant(n.getLabel().getIdentifier()), visitNode(n.getBody(), child)), breakNode);
+    } else {
+      result = makeNode(context, fFactory, n, CAstNode.LABEL_STMT, fFactory.makeConstant(n.getLabel().getIdentifier()), visitNode(n
+          .getBody(), context));
+    }
+
+    context.cfg().map(n, result);
+
+    if (n.getParent() != null)
+      // if not a synthetic node from a break/continue -- don't pollute namespace with label, we get it thru the context
+      context.getLabelMap().remove(stmt);
+
+    return result;
+  }
+
+  /**
+   * Make a fake labeled node with no body, as an anchor to go to
+   */
+  private ASTNode makeBreakOrContinueTarget(ASTNode loop, String name) {
+    LabeledStatement labeled = ast.newLabeledStatement();
+    labeled.setBody(ast.newEmptyStatement());
+    labeled.setSourceRange(loop.getStartPosition(), loop.getLength());
+    labeled.setLabel(ast.newSimpleName(name)); // we don't have to worry about namespace conflicts as it is only
+    // definedwithin
+    return labeled;
+  }
+
+  private CAstNode visit(BreakStatement n, WalkContext context) {
+    String label = n.getLabel() == null ? null : n.getLabel().getIdentifier();
+    ASTNode target = context.getBreakFor(label);
+    assert target != null;
+    CAstNode result = makeNode(context, fFactory, n, CAstNode.GOTO);
+    context.cfg().map(n, result);
+    context.cfg().add(n, target, null);
+    return result;
+  }
+
+  private CAstNode visit(ContinueStatement n, WalkContext context) {
+    String label = n.getLabel() == null ? null : n.getLabel().getIdentifier();
+    ASTNode target = context.getContinueFor(label);
+    assert target != null;
+    CAstNode result = makeNode(context, fFactory, n, CAstNode.GOTO);
+    context.cfg().map(n, result);
+    context.cfg().add(n, target, null);
+    return result;
+  }
+
+  private CAstNode visit(WhileStatement n, WalkContext context) {
+    Expression cond = n.getExpression();
+    Statement body = n.getBody();
+
+    ASTNode breakTarget = makeBreakOrContinueTarget(n, "breakLabel" + n.getStartPosition());
+    CAstNode breakNode = visitNode(breakTarget, context);
+
+    ASTNode continueTarget = makeBreakOrContinueTarget(n, "continueLabel" + n.getStartPosition());
+    CAstNode continueNode = visitNode(continueTarget, context);
+
+    String loopLabel = context.getLabelMap().get(n);
+    LoopContext lc = new LoopContext(context, loopLabel, breakTarget, continueTarget);
+
+    /*
+     * The following loop is created sligtly differently than in jscore. It doesn't have a specific target for continue.
+     */
+    return makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, makeNode(context, fFactory, n, CAstNode.LOOP, visitNode(cond,
+        context), makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, visitNode(body, lc), continueNode)),
+        breakNode);
+  }
+
+  private CAstNode getSwitchCaseConstant(SwitchCase n, WalkContext context) {
+    // TODO: enums
+    Expression expr = n.getExpression();
+    Object constant = (expr == null) ? Integer.valueOf(0) : expr.resolveConstantExpressionValue(); // default case label of
+    // "0" (what polyglot
+    // does). we also set
+    // SWITCH_DEFAULT
+    // somewhere else
+    // polyglot converts all labels to longs. why? who knows...
+    if (constant instanceof Character)
+      constant = new Long(((Character) constant).charValue());
+    else if (constant instanceof Byte)
+      constant = new Long(((Byte) constant).longValue());
+    else if (constant instanceof Integer)
+      constant = new Long(((Integer) constant).longValue());
+    else if (constant instanceof Short)
+      constant = new Long(((Short) constant).longValue());
+
+    if (constant != null) {
+      return fFactory.makeConstant(constant);
+    } else if (expr instanceof SimpleName) {
+      // enum constant
+      return visit((SimpleName) expr, context);
+    } else {
+      Assertions.UNREACHABLE("null constant for non-enum switch case!");
+      return null;
+    }
+  }
+
+  private CAstNode visit(SwitchCase n, WalkContext context) {
+    CAstNode label = makeNode(context, fFactory, n, CAstNode.LABEL_STMT, getSwitchCaseConstant(n, context));
+
+    context.cfg().map(n, label);
+    return label;
+  }
+
+  private CAstNode visit(SwitchStatement n, WalkContext context) {
+    ASTNode breakTarget = makeBreakOrContinueTarget(n, "breakLabel" + n.getStartPosition());
+    CAstNode breakAst = visitNode(breakTarget, context);
+    String loopLabel = context.getLabelMap().get(n); // set by labeled statement (if there is one before this
+    // switch statement)
+    WalkContext childContext = new BreakContext(context, loopLabel, breakTarget);
+    Expression cond = n.getExpression();
+    List<Statement> cases = n.statements();
+
+    // First compute the control flow edges for the various case labels
+    for (int i = 0; i < cases.size(); i++) {
+      Statement se = cases.get(i);
+      if (se instanceof SwitchCase) {
+        SwitchCase c = (SwitchCase) se;
+
+        if (c.isDefault())
+          context.cfg().add(n, c, CAstControlFlowMap.SWITCH_DEFAULT);
+        else
+          context.cfg().add(n, c, getSwitchCaseConstant(c, context));
+        // if we don't do this, we may not get a constant but a
+        // block expression or something else
+      }
+    }
+
+    ArrayList<CAstNode> caseNodes = new ArrayList<>();
+
+    // polyglot bundles all statements in between two statements into a block.
+    // this is temporary place to hold current bundle of nodes.
+    ArrayList<CAstNode> currentBlock = new ArrayList<>();
+
+    // Now produce the CAst representation for each case
+    for (Statement s : cases) {
+      if (s instanceof SwitchCase) {
+        if (!currentBlock.isEmpty()) {
+          // bundle up statements before this case
+          CAstNode stmtNodes[] = currentBlock.toArray(new CAstNode[0]);
+          // make position from start of first statement to end of last statement
+          T positionOfAll = makePosition(childContext.pos().getPosition(stmtNodes[0]).getFirstOffset(), childContext
+              .pos().getPosition(stmtNodes[stmtNodes.length - 1]).getLastOffset());
+          caseNodes.add(makeNode(childContext, fFactory, positionOfAll, CAstNode.BLOCK_STMT, stmtNodes));
+          currentBlock.clear();
+        }
+        caseNodes.add(visitNode(s, childContext));
+      } else {
+        visitNodeOrNodes(s, childContext, currentBlock);
+      }
+    }
+    if (!currentBlock.isEmpty()) {
+      // bundle up statements before this case
+      CAstNode stmtNodes[] = currentBlock.toArray(new CAstNode[0]);
+      // make position from start of first statement to end of last statement
+      T positionOfAll = makePosition(childContext.pos().getPosition(stmtNodes[0]).getFirstOffset(), childContext.pos()
+          .getPosition(stmtNodes[stmtNodes.length - 1]).getLastOffset());
+      caseNodes.add(makeNode(childContext, fFactory, positionOfAll, CAstNode.BLOCK_STMT, stmtNodes));
+    }
+
+    // Now produce the switch stmt itself
+    CAstNode switchAst = makeNode(context, fFactory, n, CAstNode.SWITCH, visitNode(cond, context), makeNode(context, fFactory, n,
+        CAstNode.BLOCK_STMT, caseNodes.toArray(new CAstNode[0])));
+
+    context.cfg().map(n, switchAst);
+
+    // Finally, wrap the entire switch in a block so that we have a
+    // well-defined place to 'break' to.
+    return makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, switchAst, breakAst);
+
+  }
+
+  private CAstNode visit(DoStatement n, WalkContext context) {
+    String loopLabel = context.getLabelMap().get(n); // set by visit(LabeledStatement)
+    String token = loopLabel==null? "at_" + n.getStartPosition(): loopLabel;
+    
+    ASTNode breakTarget = makeBreakOrContinueTarget(n, "breakLabel_" + token);
+    CAstNode breakNode = visitNode(breakTarget, context);
+
+    ASTNode continueTarget = makeBreakOrContinueTarget(n, "continueLabel_" + token);
+    CAstNode continueNode = visitNode(continueTarget, context);
+ 
+    CAstNode loopTest = visitNode(n.getExpression(), context);
+
+    WalkContext loopContext = new LoopContext(context, loopLabel, breakTarget, continueTarget);
+    CAstNode loopBody = visitNode(n.getBody(), loopContext);
+
+    CAstNode madeNode = doLoopTranslator.translateDoLoop(loopTest, loopBody, continueNode, breakNode, context);
+    context.pos().setPosition(madeNode, makePosition(n));
+    return madeNode;
+  }
+
+  /**
+   * Expands the form: for ( [final] Type var: iterable ) { ... } Into something equivalent to: for ( Iterator iter =
+   * iterable.iter(); iter.hasNext(); ) { [final] Type var = (Type) iter.next(); ... } Or, in the case of an array: for ( int idx =
+   * 0; i &lt; iterable.length; i++ ) { [final] Type var = iterable[idx]; ... } Except that the expression "iterable" is only evaluate
+   * once (or is it?)
+   */
+  private CAstNode visit(EnhancedForStatement n, WalkContext context) {
+    if (n.getExpression().resolveTypeBinding().isArray())
+      return makeArrayEnhancedForLoop(n, context);
+    else
+      return makeIteratorEnhancedForLoop(n, context);
+  }
+
+  private CAstNode makeIteratorEnhancedForLoop(EnhancedForStatement n, WalkContext context) {
+    // case 1: iterator
+    CAstNode exprNode = visitNode(n.getExpression(), context);
+    SingleVariableDeclaration svd = n.getParameter();
+    Statement body = n.getBody();
+
+    // expand into:
+
+    // typical for loop:
+    // { [inits]; while (cond) { [body]; [label continueTarget]; iters } [label breakTarget]
+    // BLOCK(BLOCK(init1,init2,...),LOOP(cond,BLOCK(bodyblock,continuetarget,BLOCK(iter1,iter2,...))),breaktarget
+
+    // in our case:
+    // the only init is "Iterator iter = iterable.iter()"
+    // cond is "iter.hasNext()"
+    // bodyblock should be prepended with "[final] Type var = iter.next()" (put in the block that body belongs to)
+    // iter is null
+    // continuetarget and breaktarget are the same as in a regular for loop
+    // BLOCK(iterassign,LOOP(cond,BLOCK(paramassign,bodyblock,continuetarget)),breaktarget)
+
+    final String tmpName = "iter tmp"; // this is an illegal Java identifier, we will use this variable to hold the "invisible"
+                                       // iterator
+
+    /*-------- make "iter = iterator.iter()" ---------*/
+    // make a fake method ref
+    MethodReference iterMethodRef = fIdentityMapper.fakeMethodRefNoArgs("Ljava/lang/Iterable;.iterator()Ljava/util/Iterator<TT;>;",
+        "Ljava/lang/Iterable", "iterator", "Ljava/util/Iterator");
+    CAstNode iterCallSiteRef = fFactory.makeConstant(CallSiteReference
+        .make(0, iterMethodRef, IInvokeInstruction.Dispatch.INTERFACE));
+    // Iterable.iter() throws no exceptions.
+
+    CAstNode iterCallNode = makeNode(context, fFactory, n, CAstNode.CALL, exprNode, iterCallSiteRef);
+    // handle runtimeexception
+    Object o1 = new Object(); // dummy object used for mapping / exceptions
+    for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(fRuntimeExcType))
+      context.cfg().add(o1, catchTarget.snd, catchTarget.fst);
+    context.cfg().map(o1, iterCallNode); // TODO: this might not work, lots of calls in this one statement.
+
+    CAstNode iterAssignNode = makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory.makeConstant(new InternalCAstSymbol(
+        tmpName, fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("int")), true)), iterCallNode);
+
+    // MATCHUP: wrap in a block
+    iterAssignNode = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, iterAssignNode);
+
+    // TODO: TOTEST: using this and Iterable.hasNext() explicitly in same file.
+
+    /*---------- cond: iter.hasNext(); -----------*/
+    MethodReference hasNextMethodRef = fIdentityMapper.fakeMethodRefNoArgs("Ljava/util/Iterator;.hasNext()Z",
+        "Ljava/util/Iterator", "hasNext", "Z");
+    CAstNode iterVar = makeNode(context, fFactory, n, CAstNode.VAR, fFactory.makeConstant(tmpName));
+    CAstNode hasNextCallSiteRef = fFactory.makeConstant(CallSiteReference.make(0, hasNextMethodRef,
+        IInvokeInstruction.Dispatch.INTERFACE));
+
+    // throws no exceptions.
+    CAstNode hasNextCallNode = makeNode(context, fFactory, n, CAstNode.CALL, iterVar, hasNextCallSiteRef);
+    // handle runtimeexception
+    Object o2 = new Object(); // dummy object used for mapping / exceptions
+    for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(fRuntimeExcType))
+      context.cfg().add(o2, catchTarget.snd, catchTarget.fst);
+    context.cfg().map(o2, hasNextCallNode); // TODO: this might not work, lots of calls in this one statement.
+
+    /*---------- paramassign: var = (Type) iter.next() ---------*/
+    MethodReference nextMethodRef = fIdentityMapper.fakeMethodRefNoArgs("Ljava/util/Iterator;.next()TE;", "Ljava/util/Iterator",
+        "next", "Ljava/lang/Object");
+    CAstNode nextCallSiteRef = fFactory.makeConstant(CallSiteReference
+        .make(0, nextMethodRef, IInvokeInstruction.Dispatch.INTERFACE));
+    // throws no exceptions.
+    CAstNode iterVar2 = makeNode(context, fFactory, n, CAstNode.VAR, fFactory.makeConstant(tmpName));
+    CAstNode nextCallNode = makeNode(context, fFactory, n, CAstNode.CALL, iterVar2, nextCallSiteRef);
+    for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(fRuntimeExcType))
+      context.cfg().add(svd, catchTarget.snd, catchTarget.fst);
+    context.cfg().map(svd, nextCallNode);
+
+    // TODO: another cfg edge associated with svd! is this okay? prolly not... associate it with the cast, somehow...
+    CAstNode castedNode = createCast(svd, nextCallNode, ast.resolveWellKnownType("java.lang.Object"), svd.resolveBinding()
+        .getType(), context);
+
+    Object defaultValue = JDT2CAstUtils.defaultValueForType(svd.resolveBinding().getType());
+    CAstNode nextAssignNode = makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory.makeConstant(new CAstSymbolImpl(svd
+        .getName().getIdentifier(), fTypeDict.getCAstTypeFor(svd.resolveBinding().getType()), (svd.getModifiers() & Modifier.FINAL) != 0, defaultValue)), castedNode);
+
+    /*----------- put it all together ----------*/
+    ASTNode breakTarget = makeBreakOrContinueTarget(n, "breakLabel" + n.getStartPosition());
+    ASTNode continueTarget = makeBreakOrContinueTarget(n, "continueLabel" + n.getStartPosition());
+    String loopLabel = context.getLabelMap().get(n);
+    WalkContext loopContext = new LoopContext(context, loopLabel, breakTarget, continueTarget);
+
+    // LOCAL_SCOPE(BLOCK(iterassign,LOOP(cond,BLOCK(BLOCK(paramassign,bodyblock),continuetarget,BLOCK())),breaktarget))
+    return makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, iterAssignNode,
+        makeNode(context, fFactory, n, CAstNode.LOOP, hasNextCallNode, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT,
+            makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT,
+                nextAssignNode, visitNode(body, loopContext))), visitNode(continueTarget, context), makeNode(context, fFactory, n,
+                CAstNode.BLOCK_STMT))), visitNode(breakTarget, context)));
+  }
+
+  private CAstNode makeArrayEnhancedForLoop(EnhancedForStatement n, WalkContext context) {
+    // ********* BEFORE:
+    // for ( String x: doSomething() ) { ... }
+    // ********* AFTER:
+    // {
+    // String tmparray[] = doSomething();
+    // for ( int tmpindex = 0; i < tmparray.length; tmpindex++ ) {
+    // String x = tmparray[tmpindex];
+    // ...
+    // }
+    // }
+    // simplest:
+    // LOCAL_SCOPE(BLOCK(arrayDecl,indexDecl,LOOP(cond,BLOCK(nextAssign,bodyblock,continuetarget,iter)),breaktarget))
+    // match up exactly:
+    // LOCAL_SCOPE(BLOCK(arrayDecl,LOCAL_SCOPE(BLOCK(BLOCK(indexDecl),LOOP(cond,BLOCK(LOCAL_SCOPE(BLOCK(nextAssign,bodyblock)),continuetarget,BLOCK(iter))),breaktarget))))
+
+    /*------ arrayDecl --------- String tmparray[] = doSomething() ------*/
+    final String tmpArrayName = "for temp array"; // illegal java identifier
+    CAstNode exprNode = visitNode(n.getExpression(), context);
+    CAstNode arrayDeclNode = makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory.makeConstant(new InternalCAstSymbol(
+        tmpArrayName, fTypeDict.getCAstTypeFor(n.getExpression().resolveTypeBinding()), true)), exprNode);
+
+    /*------ indexDecl --------- int tmpindex = 0 ------*/
+    final String tmpIndexName = "for temp index";
+    CAstNode indexDeclNode = makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory.makeConstant(new InternalCAstSymbol(
+        tmpIndexName, fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("int")), true)), fFactory.makeConstant(Integer.valueOf(0)));
+
+    /*------ cond ------------- tmpindex < tmparray.length ------*/
+    CAstNode tmpArrayLengthNode = makeNode(context, fFactory, n, CAstNode.ARRAY_LENGTH, makeNode(context, fFactory, n,
+        CAstNode.VAR, fFactory.makeConstant(tmpArrayName), fFactory.makeConstant(fTypeDict.getCAstTypeFor(n.getExpression().resolveTypeBinding()))));
+    CAstNode condNode = makeNode(context, fFactory, n, CAstNode.BINARY_EXPR, CAstOperator.OP_LT, makeNode(context, fFactory, n,
+        CAstNode.VAR, fFactory.makeConstant(tmpIndexName), fFactory.makeConstant(JavaPrimitiveType.INT)), tmpArrayLengthNode);
+
+    /*------ tmpIndexInc -------- tmpindex++ ------*/
+    CAstNode tmpArrayIncNode = makeNode(context, fFactory, n, CAstNode.ASSIGN_POST_OP, makeNode(context, fFactory, n, CAstNode.VAR,
+        fFactory.makeConstant(tmpIndexName)), fFactory.makeConstant(1), CAstOperator.OP_ADD);
+
+    /*------ tmpArrayAccess ----- String x = tmparray[tmpindex] ------*/
+    CAstNode tmpArrayAccessNode = makeNode(context, fFactory, n, CAstNode.ARRAY_REF, makeNode(context, fFactory, n, CAstNode.VAR,
+        fFactory.makeConstant(tmpArrayName)), fFactory.makeConstant(fIdentityMapper.getTypeRef(n.getExpression()
+        .resolveTypeBinding().getComponentType())), makeNode(context, fFactory, n, CAstNode.VAR, fFactory
+        .makeConstant(tmpIndexName)));
+
+    SingleVariableDeclaration svd = n.getParameter();
+    Object defaultValue = JDT2CAstUtils.defaultValueForType(svd.resolveBinding().getType());
+    CAstNode nextAssignNode = makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory.makeConstant(new CAstSymbolImpl(svd
+        .getName().getIdentifier(), fTypeDict.getCAstTypeFor(n.getExpression()
+        .resolveTypeBinding().getComponentType()), (svd.getModifiers() & Modifier.FINAL) != 0, defaultValue)), tmpArrayAccessNode);
+
+    // LOCAL_SCOPE(BLOCK(arrayDecl,LOCAL_SCOPE(BLOCK(BLOCK(indexDecl),LOOP(cond,BLOCK(LOCAL_SCOPE(BLOCK(nextAssign,bodyblock)),continuetarget,BLOCK(iter))),breaktarget))))
+    // more complicated than it has to be, but it matches up exactly with the Java expansion above.
+
+    ASTNode breakTarget = makeBreakOrContinueTarget(n, "breakLabel" + n.getStartPosition());
+    ASTNode continueTarget = makeBreakOrContinueTarget(n, "continueLabel" + n.getStartPosition());
+    String loopLabel = context.getLabelMap().get(n);
+    WalkContext loopContext = new LoopContext(context, loopLabel, breakTarget, continueTarget);
+
+    return makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE,
+        makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, arrayDeclNode, makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE,
+            makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, indexDeclNode),
+                makeNode(context, fFactory, n, CAstNode.LOOP, condNode, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT,
+                    makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT,
+                        nextAssignNode, visitNode(n.getBody(), loopContext))), visitNode(continueTarget, context), makeNode(
+                        context, fFactory, n, CAstNode.BLOCK_STMT, tmpArrayIncNode))), visitNode(breakTarget, context)))));
+
+  }
+
+  private CAstNode visit(ForStatement n, WalkContext context) {
+    ASTNode breakTarget = makeBreakOrContinueTarget(n, "breakLabel" + n.getStartPosition());
+    ASTNode continueTarget = makeBreakOrContinueTarget(n, "continueLabel" + n.getStartPosition());
+    String loopLabel = context.getLabelMap().get(n);
+    WalkContext loopContext = new LoopContext(context, loopLabel, breakTarget, continueTarget);
+
+    ArrayList<CAstNode> inits = new ArrayList<>();
+    for (int i = 0; i < n.initializers().size(); i++) {
+      ASTNode init = (ASTNode) n.initializers().get(i);
+      if (init instanceof VariableDeclarationExpression) {
+        for (ASTNode o : (Iterable<ASTNode>) ((VariableDeclarationExpression) init).fragments())
+          inits.add(visitNode(o, context));
+      } else
+        inits.add(visitNode(init, context));
+    }
+
+    CAstNode[] iters = new CAstNode[n.updaters().size()];
+    for (int i = 0; i < iters.length; i++)
+      iters[i] = visitNode((ASTNode) n.updaters().get(i), context);
+
+    CAstNode initsBlock = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, inits.toArray(new CAstNode[0]));
+    CAstNode itersBlock = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, iters);
+
+    // { [inits]; while (cond) { [body]; [label continueTarget]; iters } [label breakTarget]
+    return makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, initsBlock,
+        makeNode(context, fFactory, n, CAstNode.LOOP, visitNode(n.getExpression(), context), makeNode(context, fFactory, n,
+            CAstNode.BLOCK_STMT, visitNode(n.getBody(), loopContext), visitNode(continueTarget, context), itersBlock)), visitNode(
+            breakTarget, context)));
+
+  }
+
+  private CAstNode visit(TryStatement n, WalkContext context) {
+    List<CatchClause> catchBlocks = n.catchClauses();
+    Block finallyBlock = n.getFinally();
+    Block tryBlock = n.getBody();
+
+    // try/finally
+    if (catchBlocks.isEmpty()) {
+      return makeNode(context, fFactory, n, CAstNode.UNWIND, visitNode(tryBlock, context), visitNode(finallyBlock, context));
+
+      // try/catch/[finally]
+    } else {
+      TryCatchContext tc = new TryCatchContext(context, n);
+
+      CAstNode tryNode = visitNode(tryBlock, tc);
+      for (CatchClause catchClause : catchBlocks) {
+        tryNode = makeNode(context, fFactory, n, CAstNode.TRY, tryNode, visitNode(catchClause, context));
+      }
+
+      // try/catch
+      if (finallyBlock == null) {
+        return tryNode;
+
+        // try/catch/finally
+      } else {
+        return makeNode(context, fFactory, n, CAstNode.UNWIND, tryNode, visitNode(finallyBlock, context));
+      }
+    }
+
+  }
+
+  private CAstNode visit(CatchClause n, WalkContext context) {
+    Block body = n.getBody();
+    SingleVariableDeclaration formal = n.getException();
+
+    CAstNode excDecl = makeNode(context, fFactory, n, CAstNode.CATCH, fFactory.makeConstant(formal.getName().getIdentifier()),
+        visitNode(body, context));
+    CAstNode localScope = makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE, excDecl);
+
+    context.cfg().map(n, excDecl);
+    context.getNodeTypeMap().add(excDecl, fTypeDict.getCAstTypeFor(n.getException().resolveBinding().getType()));
+    return localScope;
+  }
+
+  private CAstNode visit(ThrowStatement n, WalkContext context) {
+    CAstNode result = makeNode(context, fFactory, n, CAstNode.THROW, visitNode(n.getExpression(), context));
+    ITypeBinding label = n.getExpression().resolveTypeBinding();
+
+    context.cfg().map(n, result);
+
+    Collection<Pair<ITypeBinding, Object>> catchNodes = context.getCatchTargets(label);
+
+    for (Pair<ITypeBinding, Object> catchNode : catchNodes) {
+      context.cfg().add(n, catchNode.snd, catchNode.fst);
+    }
+
+    return result;
+  }
+
+  private void hookUpNPETargets(ASTNode n, WalkContext wc) {
+    Collection<Pair<ITypeBinding, Object>> excTargets = wc.getCatchTargets(fNullPointerExcType);
+    if (!excTargets.isEmpty()) {
+      // connect NPE exception edge to relevant catch targets
+      // (presumably only one)
+      for (Pair<ITypeBinding, Object> catchPair : excTargets) {
+        wc.cfg().add(n, catchPair.snd, fNullPointerExcType);
+      }
+    } else {
+      // connect exception edge to exit
+      wc.cfg().add(n, CAstControlFlowMap.EXCEPTION_TO_EXIT, fNullPointerExcType);
+    }
+  }
+
+  //
+  // ARRAYS
+  //
+
+  private CAstNode visit(ArrayAccess n, WalkContext context) {
+    TypeReference eltTypeRef = fIdentityMapper.getTypeRef(n.resolveTypeBinding());
+
+    CAstNode cast = makeNode(context, fFactory, n, CAstNode.ARRAY_REF, visitNode(n.getArray(), context), fFactory.makeConstant(eltTypeRef),
+        visitNode(n.getIndex(), context));
+
+    hookUpNPETargets(n, context);
+    
+    context.cfg().map(n, cast);
+    
+    return cast;
+  }
+
+  // FIXME: inner classes here, probably too...
+  private CAstNode visit(ArrayCreation n, WalkContext context) {
+    ITypeBinding newType = n.resolveTypeBinding();
+    ArrayInitializer ai = n.getInitializer();
+    assert newType.isArray();
+
+    if (ai != null) {
+      return visitNode(ai, context);
+    } else {
+      TypeReference arrayTypeRef = fIdentityMapper.getTypeRef(newType);
+
+      List<Expression> dims = n.dimensions();
+      CAstNode[] args = new CAstNode[dims.size() + 1];
+
+      int idx = 0;
+      args[idx++] = fFactory.makeConstant(arrayTypeRef);
+      for (Expression dimExpr : dims) {
+        args[idx++] = visitNode(dimExpr, context);
+      }
+      return makeNode(context, fFactory, n, CAstNode.NEW, args);
+    }
+  }
+
+  private CAstNode visit(SynchronizedStatement n, WalkContext context) {
+    CAstNode exprNode = visitNode(n.getExpression(), context);
+    String exprName = fFactory.makeUnique();
+    CAstNode declStmt = makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory
+        .makeConstant(new CAstSymbolImpl(exprName, fTypeDict.getCAstTypeFor(n.getExpression().resolveTypeBinding()), true)), exprNode);
+
+    CAstNode monitorEnterNode = makeNode(context, fFactory, n, CAstNode.MONITOR_ENTER, makeNode(context, fFactory, n, CAstNode.VAR,
+        fFactory.makeConstant(exprName)));
+    context.cfg().map(monitorEnterNode, monitorEnterNode);
+    for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(fNullPointerExcType))
+      context.cfg().add(monitorEnterNode, catchTarget.snd, catchTarget.fst);
+
+    CAstNode bodyNodes = visitNode(n.getBody(), context);
+
+    CAstNode monitorExitNode = makeNode(context, fFactory, n, CAstNode.MONITOR_EXIT, makeNode(context, fFactory, n, CAstNode.VAR,
+        fFactory.makeConstant(exprName)));
+    context.cfg().map(monitorExitNode, monitorExitNode);
+    for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(fNullPointerExcType))
+      context.cfg().add(monitorExitNode, catchTarget.snd, catchTarget.fst);
+
+    CAstNode tryBody = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, monitorEnterNode, bodyNodes);
+    CAstNode bigBody = makeNode(context, fFactory, n, CAstNode.UNWIND, tryBody, monitorExitNode);
+
+    return makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, declStmt, bigBody);
+  }
+
+  // ///////////////////////////////////////////
+  // / THE GIANT SWITCH STATEMENT ( BORING ) ///
+  // ///////////////////////////////////////////
+
+  /**
+   * Giant switch statement.
+   */
+  private CAstEntity visit(AbstractTypeDeclaration n, WalkContext context) {
+    // handling of compilationunit in translate()
+    if (n instanceof TypeDeclaration) {
+      return visitTypeDecl(n, context);
+    } else if (n instanceof EnumDeclaration) {
+      return visit((EnumDeclaration) n, context);
+    } else if (n instanceof AnnotationTypeDeclaration) {
+      return visitTypeDecl(n, context);
+    } else {
+      Assertions.UNREACHABLE("Unhandled type declaration type");
+      return null;
+    }
+  }
+
+  /**
+   * Giant switch statement, part deux
+   */
+  private CAstNode visitNode(ASTNode n, WalkContext context) {
+    if (n == null)
+      return makeNode(context, fFactory, null, CAstNode.EMPTY);
+
+    if (n instanceof ArrayAccess) {
+      return visit((ArrayAccess) n, context);
+    } else if (n instanceof ArrayCreation) {
+      return visit((ArrayCreation) n, context);
+    } else if (n instanceof ArrayInitializer) {
+      return visit((ArrayInitializer) n, context);
+    } else if (n instanceof AssertStatement) {
+      return visit((AssertStatement) n, context);
+    } else if (n instanceof Assignment) {
+      return visit((Assignment) n, context);
+    } else if (n instanceof Block) {
+      return visit((Block) n, context);
+    } else if (n instanceof BooleanLiteral) {
+      return visit((BooleanLiteral) n);
+    } else if (n instanceof BreakStatement) {
+      return visit((BreakStatement) n, context);
+    } else if (n instanceof CastExpression) {
+      return visit((CastExpression) n, context);
+    } else if (n instanceof CatchClause) {
+      return visit((CatchClause) n, context);
+    } else if (n instanceof CharacterLiteral) {
+      return visit((CharacterLiteral) n);
+    } else if (n instanceof ClassInstanceCreation) {
+      return visit((ClassInstanceCreation) n, context);
+    } else if (n instanceof ConditionalExpression) {
+      return visit((ConditionalExpression) n, context);
+    } else if (n instanceof ConstructorInvocation) {
+      return visit((ConstructorInvocation) n, context);
+    } else if (n instanceof ContinueStatement) {
+      return visit((ContinueStatement) n, context);
+    } else if (n instanceof DoStatement) {
+      return visit((DoStatement) n, context);
+    } else if (n instanceof EmptyStatement) {
+      return visit((EmptyStatement) n, context);
+    } else if (n instanceof EnhancedForStatement) {
+      return visit((EnhancedForStatement) n, context);
+    } else if (n instanceof ExpressionStatement) {
+      return visit((ExpressionStatement) n, context);
+    } else if (n instanceof FieldAccess) {
+      return visit((FieldAccess) n, context);
+    } else if (n instanceof ForStatement) {
+      return visit((ForStatement) n, context);
+    } else if (n instanceof IfStatement) {
+      return visit((IfStatement) n, context);
+    } else if (n instanceof InfixExpression) {
+      return visit((InfixExpression) n, context);
+    } else if (n instanceof InstanceofExpression) {
+      return visit((InstanceofExpression) n, context);
+    } else if (n instanceof LabeledStatement) {
+      return visit((LabeledStatement) n, context);
+    } else if (n instanceof MethodInvocation) {
+      return visit((MethodInvocation) n, context);
+    } else if (n instanceof NumberLiteral) {
+      return visit((NumberLiteral) n);
+    } else if (n instanceof NullLiteral) {
+      return visit();
+    } else if (n instanceof ParenthesizedExpression) {
+      return visit((ParenthesizedExpression) n, context);
+    } else if (n instanceof PostfixExpression) {
+      return visit((PostfixExpression) n, context);
+    } else if (n instanceof PrefixExpression) {
+      return visit((PrefixExpression) n, context);
+    } else if (n instanceof QualifiedName) {
+      return visit((QualifiedName) n, context);
+    } else if (n instanceof ReturnStatement) {
+      return visit((ReturnStatement) n, context);
+    } else if (n instanceof SimpleName) {
+      return visit((SimpleName) n, context);
+    } else if (n instanceof StringLiteral) {
+      return visit((StringLiteral) n);
+    } else if (n instanceof SuperConstructorInvocation) {
+      return visit((SuperConstructorInvocation) n, context);
+    } else if (n instanceof SuperFieldAccess) {
+      return visit((SuperFieldAccess) n, context);
+    } else if (n instanceof SuperMethodInvocation) {
+      return visit((SuperMethodInvocation) n, context);
+    } else if (n instanceof SynchronizedStatement) {
+      return visit((SynchronizedStatement) n, context);
+    } else if (n instanceof SwitchStatement) {
+      return visit((SwitchStatement) n, context);
+    } else if (n instanceof SwitchCase) {
+      return visit((SwitchCase) n, context);
+    } else if (n instanceof ThisExpression) {
+      return visit((ThisExpression) n, context);
+    } else if (n instanceof TypeLiteral) {
+      return visit((TypeLiteral) n, context);
+    } else if (n instanceof ThrowStatement) {
+      return visit((ThrowStatement) n, context);
+    } else if (n instanceof TryStatement) {
+      return visit((TryStatement) n, context);
+    } else if (n instanceof TypeDeclarationStatement) {
+      return visit((TypeDeclarationStatement) n, context);
+    } else if (n instanceof VariableDeclarationFragment) {
+      return visit((VariableDeclarationFragment) n, context);
+    } else if (n instanceof WhileStatement) {
+      return visit((WhileStatement) n, context);
+    }
+
+    // VariableDeclarationStatement handled as special case (returns multiple statements)
+
+    Assertions.UNREACHABLE("Unhandled JDT node type " + n.getClass().getCanonicalName());
+
+    return null;
+  }
+
+  private void visitNodeOrNodes(ASTNode n, WalkContext context, Collection<CAstNode> coll) {
+    if (n instanceof VariableDeclarationStatement)
+      coll.addAll(visit((VariableDeclarationStatement) n, context));
+    else
+      coll.add(visitNode(n, context));
+  }
+
+  // /////////////////////////////////////////
+  // SPECIALIZED CASTENTITYs AND CASTNODEs //
+  // /////////////////////////////////////////
+
+  protected static final class CompilationUnitEntity implements CAstEntity {
+    private final String fName;
+
+    private final Collection<CAstEntity> fTopLevelDecls;
+
+    public CompilationUnitEntity(PackageDeclaration packageDeclaration, List<CAstEntity> topLevelDecls) {
+      fName = (packageDeclaration == null) ? "" : packageDeclaration.getName().getFullyQualifiedName().replace('.', '/');
+      fTopLevelDecls = topLevelDecls;
+    }
+
+    @Override
+	public Collection<CAstAnnotation> getAnnotations() {
+		return null;
+	}
+
+	@Override
+  public int getKind() {
+      return FILE_ENTITY;
+    }
+
+    @Override
+    public String getName() {
+      return fName;
+    }
+
+    @Override
+    public String getSignature() {
+      Assertions.UNREACHABLE();
+      return null;
+    }
+
+    @Override
+    public String[] getArgumentNames() {
+      return new String[0];
+    }
+
+    @Override
+    public CAstNode[] getArgumentDefaults() {
+      return new CAstNode[0];
+    }
+
+    @Override
+    public int getArgumentCount() {
+      return 0;
+    }
+
+    @Override
+    public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
+      return Collections.singletonMap(null, fTopLevelDecls);
+    }
+
+    @Override
+    public Iterator<CAstEntity> getScopedEntities(CAstNode construct) {
+      Assertions.UNREACHABLE("CompilationUnitEntity asked for AST-related entities, but it has no AST.");
+      return null;
+    }
+
+    @Override
+    public CAstNode getAST() {
+      return null;
+    }
+
+    @Override
+    public CAstControlFlowMap getControlFlow() {
+      Assertions.UNREACHABLE("CompilationUnitEntity.getControlFlow()");
+      return null;
+    }
+
+    @Override
+    public CAstSourcePositionMap getSourceMap() {
+      Assertions.UNREACHABLE("CompilationUnitEntity.getSourceMap()");
+      return null;
+    }
+
+    @Override
+    public CAstSourcePositionMap.Position getPosition() {
+      return null;
+    }
+
+    @Override
+    public CAstNodeTypeMap getNodeTypeMap() {
+      Assertions.UNREACHABLE("CompilationUnitEntity.getNodeTypeMap()");
+      return null;
+    }
+
+    @Override
+    public Collection<CAstQualifier> getQualifiers() {
+      return Collections.emptyList();
+    }
+
+    @Override
+    public CAstType getType() {
+      Assertions.UNREACHABLE("CompilationUnitEntity.getType()");
+      return null;
+    }
+
+	@Override
+	public Position getPosition(int arg) {
+		return null;
+	}
+
+	@Override
+	public Position getNamePosition() {
+		return null;
+	}
+  }
+
+  // /////////////////////////////
+  // WALK CONTEXTS
+  // WHY????
+  // ////////////////////////////////
+
+  /**
+   * Contains things needed by in the visit() of some nodes to process the nodes. For example, pos() contains the source position
+   * mapping which each node registers
+   */
+  public static interface WalkContext extends TranslatorToCAst.WalkContext<WalkContext, ASTNode> {
+
+    public Collection<Pair<ITypeBinding, Object>> getCatchTargets(ITypeBinding type);
+
+    public Map<ASTNode, String> getLabelMap();
+
+    public boolean needLValue();
+  }
+
+  /**
+   * Default context functions. When one context doesn't handle something, it the next one up does. For example, there is only one
+   * source pos. mapping per MethodContext, so loop contexts delegate it up.
+   */
+  public static class DelegatingContext extends TranslatorToCAst.DelegatingContext<WalkContext, ASTNode> implements WalkContext {
+
+    public DelegatingContext(WalkContext parent) {
+      super(parent);
+    }
+
+    @Override
+    public Collection<Pair<ITypeBinding, Object>> getCatchTargets(ITypeBinding type) {
+      return parent.getCatchTargets(type);
+    }
+
+    @Override
+    public Map<ASTNode, String> getLabelMap() {
+      return parent.getLabelMap();
+    }
+
+     @Override
+    public boolean needLValue() {
+      return parent.needLValue();
+    }
+  }
+
+  /*
+   * Root context. Doesn't do anything.
+   */
+  public static class RootContext extends TranslatorToCAst.RootContext<WalkContext, ASTNode> implements WalkContext {
+     @Override
+    public Collection<Pair<ITypeBinding, Object>> getCatchTargets(ITypeBinding type) {
+      Assertions.UNREACHABLE("RootContext.getCatchTargets()");
+      return null;
+    }
+
+    @Override
+    public Map<ASTNode, String> getLabelMap() {
+      Assertions.UNREACHABLE("RootContext.getLabelMap()");
+      return null;
+    }
+
+    @Override
+    public boolean needLValue() {
+      Assertions.UNREACHABLE("Rootcontext.needLValue()");
+      return false;
+    }
+  }
+
+  private class AssignmentContext extends DelegatingContext {
+
+    protected AssignmentContext(WalkContext parent) {
+      super(parent);
+    }
+
+    @Override
+    public boolean needLValue() {
+      return true;
+    }
+  }
+
+  private static class TryCatchContext extends DelegatingContext {
+    Collection<Pair<ITypeBinding, Object>> fCatchNodes = new ArrayList<>();
+
+    TryCatchContext(WalkContext parent, TryStatement tryNode) {
+      super(parent);
+
+      for (CatchClause c : (Iterable<CatchClause>) tryNode.catchClauses()) {
+        Pair<ITypeBinding, Object> p = Pair.make(c.getException().resolveBinding().getType(), (Object) c);
+
+        fCatchNodes.add(p);
+      }
+    }
+
+    @Override
+    public Collection<Pair<ITypeBinding, Object>> getCatchTargets(ITypeBinding label) {
+      // Look for all matching targets for this thrown type:
+      // if supertpe match, then return only matches at this catch
+      // if subtype match, then matches here and parent matches
+      Collection<Pair<ITypeBinding, Object>> catchNodes = new ArrayList<>();
+
+      for (Pair<ITypeBinding, Object> p : fCatchNodes) {
+        ITypeBinding catchType = p.fst;
+
+        // catchType here should NEVER be FakeExceptionTypeBinary, because these can only be thrown (not caught) by
+        // "1/0", implicit null pointer exceptions, etc.
+        assert !(catchNodes instanceof FakeExceptionTypeBinding) : "catchNodes instanceof FakeExceptionTypeBinary!";
+
+        if (label.isSubTypeCompatible(catchType) || label.isEqualTo(catchType)) {
+          catchNodes.add(p);
+          return catchNodes;
+          // _might_ get caught
+        } else if (catchType.isSubTypeCompatible(label)) {
+          catchNodes.add(p);
+          continue;
+        }
+      }
+      catchNodes.addAll(parent.getCatchTargets(label));
+      return catchNodes;
+    }
+  }
+
+  private class BreakContext extends DelegatingContext {
+    protected final String label;
+
+    private final ASTNode breakTo;
+
+    BreakContext(WalkContext parent, String label, ASTNode breakTo) {
+      super(parent);
+      this.label = label;
+      this.breakTo = breakTo;
+    }
+
+    @Override
+    public ASTNode getBreakFor(String label) {
+      return (label == null || label.equals(this.label)) ? breakTo : super.getBreakFor(label);
+    }
+  }
+
+  private class LoopContext extends BreakContext {
+    private final ASTNode continueTo;
+
+    protected LoopContext(WalkContext parent, String label, ASTNode breakTo, ASTNode continueTo) {
+      super(parent, label, breakTo);
+      this.continueTo = continueTo;
+    }
+
+    @Override
+    public ASTNode getContinueFor(String label) {
+      return (label == null || label.equals(this.label)) ? continueTo : super.getContinueFor(label);
+    }
+  }
+
+  public class MethodContext extends DelegatingContext {
+    private final Map<CAstNode, CAstEntity> fEntities;
+
+    private final Map<ASTNode, String> labelMap = HashMapFactory.make(2);
+
+    public MethodContext(WalkContext parent, Map<CAstNode, CAstEntity> entities) {
+      // constructor did take: pd.procedureInstance(), memberEntities, context
+      super(parent);
+      fEntities = entities;
+    }
+
+    @Override
+    public Map<ASTNode, String> getLabelMap() {
+      return labelMap; // labels are kept within a method.
+    }
+
+    final CAstSourcePositionRecorder fSourceMap = new CAstSourcePositionRecorder();
+
+    final CAstControlFlowRecorder fCFG = new CAstControlFlowRecorder(fSourceMap);
+
+    final CAstNodeTypeMapRecorder fNodeTypeMap = new CAstNodeTypeMapRecorder();
+
+    @Override
+    public CAstControlFlowRecorder cfg() {
+      return fCFG;
+    }
+
+    @Override
+    public void addScopedEntity(CAstNode node, CAstEntity entity) {
+      fEntities.put(node, entity);
+    }
+
+    @Override
+    public CAstSourcePositionRecorder pos() {
+      return fSourceMap;
+    }
+
+    @Override
+    public CAstNodeTypeMapRecorder getNodeTypeMap() {
+      return fNodeTypeMap;
+    }
+
+    @Override
+    public Collection<Pair<ITypeBinding, Object>> getCatchTargets(ITypeBinding label) {
+      // TAGALONG (need fRuntimeExcType)
+      // Why do we seemingly catch a RuntimeException in every method? this won't catch the RuntimeException above where
+      // it is supposed to be caught?
+      Collection<Pair<ITypeBinding, Object>> result = Collections.singleton(Pair.<ITypeBinding, Object> make(fRuntimeExcType,
+          CAstControlFlowMap.EXCEPTION_TO_EXIT));
+      return result;
+    }
+
+    @Override
+    public boolean needLValue() {
+      return false;
+    }
+
+  }
+
+  // ////////////////////////////////////
+  // MAKE NODE VARIATIONS & POSITIONS (BORING)
+  // maybe moved to different file.
+  // makeNode() simply calls Ast.makeNode() and sets the position for the node
+  // ////////////////////////////////////
+  protected CAstNode makeNode(WalkContext wc, CAst Ast, ASTNode n, int kind) {
+    CAstNode cn = Ast.makeNode(kind);
+    setPos(wc, cn, n);
+    return cn;
+  }
+
+  protected CAstNode makeNode(WalkContext wc, CAst Ast, ASTNode n, int kind, CAstNode c[]) {
+    CAstNode cn = Ast.makeNode(kind, c);
+    setPos(wc, cn, n);
+    return cn;
+  }
+
+  protected CAstNode makeNode(WalkContext wc, CAst Ast, T pos, int kind, CAstNode c[]) {
+    CAstNode cn = Ast.makeNode(kind, c);
+    wc.pos().setPosition(cn, pos);
+    return cn;
+  }
+
+  protected CAstNode makeNode(WalkContext wc, CAst Ast, ASTNode n, int kind, CAstNode c1, CAstNode c2) {
+    CAstNode cn = Ast.makeNode(kind, c1, c2);
+    setPos(wc, cn, n);
+    return cn;
+  }
+
+  protected CAstNode makeNode(WalkContext wc, CAst Ast, ASTNode n, int kind, CAstNode c) {
+    CAstNode cn = Ast.makeNode(kind, c);
+    setPos(wc, cn, n);
+    return cn;
+  }
+
+  protected CAstNode makeNode(WalkContext wc, CAst Ast, ASTNode n, int kind, CAstNode c1, CAstNode c2, CAstNode c3) {
+    CAstNode cn = Ast.makeNode(kind, c1, c2, c3);
+    setPos(wc, cn, n);
+    return cn;
+  }
+
+  protected CAstNode makeNode(WalkContext wc, CAst Ast, ASTNode n, int kind, CAstNode c1, CAstNode c2, CAstNode c3, CAstNode c4) {
+    CAstNode cn = Ast.makeNode(kind, c1, c2, c3, c4);
+    setPos(wc, cn, n);
+    return cn;
+  }
+
+  protected CAstNode makeNode(WalkContext wc, CAst Ast, T pos, int kind, CAstNode c1, CAstNode c2, CAstNode c3) {
+    CAstNode cn = Ast.makeNode(kind, c1, c2, c3);
+    wc.pos().setPosition(cn, pos);
+    return cn;
+  }
+
+  protected void setPos(WalkContext wc, CAstNode cn, ASTNode jdtNode) {
+    if (jdtNode != null)
+      wc.pos().setPosition(cn, makePosition(jdtNode));
+  }
+
+  public T makePosition(ASTNode n) {
+    return makePosition(n.getStartPosition(), n.getStartPosition() + n.getLength());
+  }
+
+  public abstract T makePosition(int start, int end);
+ 
+  // /////////////////////////////////////////////////////////////////
+  // // ENUM TRANSFORMATION //////////////////////////////////////////
+  // /////////////////////////////////////////////////////////////////
+
+  private static final ArrayList<CAstQualifier> enumQuals = new ArrayList<>(3);
+  static {
+    enumQuals.add(CAstQualifier.PUBLIC);
+    enumQuals.add(CAstQualifier.STATIC);
+    enumQuals.add(CAstQualifier.FINAL);
+  }
+
+  /**
+   * Only called from createClassDeclaration.
+   */
+  private CAstEntity visit(EnumConstantDeclaration decl) {
+    return new FieldEntity(decl.getName().getIdentifier(), decl.resolveVariable().getType(), enumQuals, makePosition(decl
+        .getStartPosition(), decl.getStartPosition() + decl.getLength()), null, makePosition(decl.getName()));
+  }
+
+  /**
+   * Called only from visitFieldInitNode(node,context)
+   */
+  private CAstNode createEnumConstantDeclarationInit(EnumConstantDeclaration node, WalkContext context) {
+    String hiddenVariableName = (String) node.getProperty("com.ibm.wala.cast.java.translator.jdt.fakeValuesDeclName");
+    if (hiddenVariableName == null) {
+      FieldReference fieldRef = fIdentityMapper.getFieldRef(node.resolveVariable());
+      // We use null to indicate an OBJECT_REF to a static field
+      CAstNode lhsNode = makeNode(context, fFactory, node, CAstNode.OBJECT_REF, makeNode(context, fFactory, null, CAstNode.VOID),
+          fFactory.makeConstant(fieldRef));
+
+      // CONSTRUCT ARGUMENTS & "new MyEnum(...)" statement
+      ArrayList<Object> arguments = new ArrayList<>();
+      arguments.add(fFactory.makeConstant(node.getName().getIdentifier())); // name of constant
+      arguments.add(fFactory.makeConstant(node.resolveVariable().getVariableId())); // id
+      arguments.addAll(node.arguments());
+      CAstNode rhsNode = createClassInstanceCreation(node, arguments, node.resolveConstructorBinding(), null, node
+          .getAnonymousClassDeclaration(), context);
+
+      CAstNode assNode = makeNode(context, fFactory, node, CAstNode.ASSIGN, lhsNode, rhsNode);
+
+      return assNode; // their naming, not mine
+    } else {
+
+      // String[] x = (new Direction[] {
+      // NORTH, EAST, SOUTH, WEST, $VALUES, $VALUES$
+      // });
+
+      return null;
+    }
+  }
+
+  private CAstEntity createEnumValueOfMethod(ITypeBinding enumType, WalkContext oldContext) {
+    IMethodBinding met = null, superMet = null;
+    // find our valueOf(String)
+    for (IMethodBinding m : enumType.getDeclaredMethods())
+      if (m.getName().equals("valueOf") && m.getParameterTypes().length == 1
+          && m.getParameterTypes()[0].isEqualTo(ast.resolveWellKnownType("java.lang.String")))
+        met = m;
+    // find Enum.valueOf(Class, String)
+    for (IMethodBinding m : enumType.getSuperclass().getTypeDeclaration().getDeclaredMethods())
+      if (m.getName().equals("valueOf") && m.getParameterTypes().length == 2)
+        superMet = m;
+    assert met != null && superMet != null : "Couldn't find enum values() function in JDT bindings!";
+
+    Map<CAstNode, CAstEntity> memberEntities = new LinkedHashMap<>();
+    final MethodContext context = new MethodContext(oldContext, memberEntities);
+
+    MethodDeclaration fakeMet = ast.newMethodDeclaration();
+    fakeMet.setName(ast.newSimpleName("valueOf"));
+    fakeMet.setSourceRange(-1, 0);
+    fakeMet.setBody(ast.newBlock());
+    SingleVariableDeclaration stringS = ast.newSingleVariableDeclaration();
+    stringS.setName(ast.newSimpleName("s"));
+    fakeMet.parameters().add(stringS);
+
+    // TODO: probably uses reflection so isn't very useful for analyses. Is there something more useful we could put in here?
+    // return (MyEnum)Enum.valueOf(MyEnum.class, s);
+    // cast(call(type_literal, var)))
+
+    CAstNode typeLit = makeNode(context, fFactory, fakeMet, CAstNode.TYPE_LITERAL_EXPR, fFactory.makeConstant(fIdentityMapper
+        .typeToTypeID(enumType)));
+    CAstNode stringSvar = makeNode(context, fFactory, fakeMet, CAstNode.VAR, fFactory.makeConstant("s"), fFactory.makeConstant(fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("java.lang.String"))));
+    ArrayList<Object> args = new ArrayList<>();
+    args.add(typeLit);
+    args.add(stringSvar);
+    CAstNode call = createMethodInvocation(fakeMet, superMet, makeNode(context, fFactory, fakeMet, CAstNode.VOID), args, context);
+    CAstNode cast = createCast(fakeMet, call, enumType, superMet.getReturnType(), context);
+    CAstNode bodyNode = makeNode(context, fFactory, fakeMet, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, fakeMet,
+        CAstNode.BLOCK_STMT, makeNode(context, fFactory, fakeMet, CAstNode.RETURN, cast)));
+
+    ArrayList<CAstType> paramTypes = new ArrayList<>(1);
+    paramTypes.add(fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("java.lang.String")));
+
+    return new ProcedureEntity(bodyNode, fakeMet, enumType, memberEntities, context, paramTypes, enumType, met.getModifiers(), handleAnnotations(met));
+  }
+
+  private CAstEntity createEnumValuesMethod(ITypeBinding enumType, ArrayList<IVariableBinding> constants, WalkContext oldContext) {
+    IMethodBinding met = null;
+    for (IMethodBinding m : enumType.getDeclaredMethods())
+      if (m.getName().equals("values") && m.getParameterTypes().length == 0)
+        met = m;
+    assert met != null : "Couldn't find enum values() function in JDT bindings!";
+
+    Map<CAstNode, CAstEntity> memberEntities = new LinkedHashMap<>();
+    final MethodContext context = new MethodContext(oldContext, memberEntities);
+
+    MethodDeclaration fakeMet = ast.newMethodDeclaration();
+    fakeMet.setName(ast.newSimpleName("values"));
+    fakeMet.setSourceRange(-1, 0);
+    fakeMet.setBody(ast.newBlock());
+
+    // make enum constant values array: new MyEnum() { MYENUMCST1, MYENUMCST2, ... }
+    CAstNode[] eltNodes = new CAstNode[constants.size() + 1];
+    int idx = 0;
+    TypeReference arrayTypeRef = fIdentityMapper.getTypeRef(enumType.createArrayType(1));
+    eltNodes[idx++] = makeNode(context, fFactory, fakeMet, CAstNode.NEW, fFactory.makeConstant(arrayTypeRef), fFactory
+        .makeConstant(constants.size()));
+    for (IVariableBinding cst : constants)
+      eltNodes[idx++] = createFieldAccess(makeNode(context, fFactory, fakeMet, CAstNode.VOID), cst.getName(), cst, fakeMet, context);
+
+    CAstNode bodyNode = makeNode(context, fFactory, fakeMet, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, fakeMet,
+        CAstNode.BLOCK_STMT, makeNode(context, fFactory, fakeMet, CAstNode.RETURN, makeNode(context, fFactory, fakeMet,
+            CAstNode.ARRAY_LITERAL, eltNodes))));
+
+    ArrayList<CAstType> paramTypes = new ArrayList<>(0);
+    return new ProcedureEntity(bodyNode, fakeMet, enumType, memberEntities, context, paramTypes, enumType.createArrayType(1), met
+        .getModifiers(), handleAnnotations(enumType));
+  }
+
+  private void doEnumHiddenEntities(ITypeBinding typeBinding, List<CAstEntity> memberEntities, WalkContext context) {
+    // PART I: create a $VALUES field
+    // collect constants
+    // ArrayList<String> constants = new ArrayList<String>();
+    // for ( ASTNode n: staticInits )
+    // if ( n instanceof EnumConstantDeclaration )
+    // constants.add(((EnumConstantDeclaration)n).getName().getIdentifier());
+    // figure out a suitable untaken name
+    // String hiddenFieldName = "hidden values field"; // illegal name
+    // // public static final MyEnum[] $VALUES;
+    // memberEntities.add(new FieldEntity(hiddenFieldName,
+    // typeBinding.createArrayType(1), enumQuals,
+    // makePosition(-1,-1)));
+    //
+    // EnumConstantDeclaration fakeValuesDecl = ast.newEnumConstantDeclaration();
+    // // pass along values that we will use in createEnumConstantDeclarationInit() in creating static initializer
+    // fakeValuesDecl.setProperty("com.ibm.wala.cast.java.translator.jdt.fakeValuesDeclName", hiddenFieldName);
+    // fakeValuesDecl.setProperty("com.ibm.wala.cast.java.translator.jdt.fakeValuesDeclConstants", constants);
+    // staticInits.add(fakeValuesDecl);
+
+    ArrayList<IVariableBinding> constants = new ArrayList<>();
+    for (IVariableBinding var : typeBinding.getDeclaredFields())
+      if (var.isEnumConstant())
+        constants.add(var);
+
+    // constants are unsorted by default
+    Collections.sort(constants, (arg0, arg1) -> arg0.getVariableId() - arg1.getVariableId());
+
+    // PART II: create values()
+    memberEntities.add(createEnumValuesMethod(typeBinding, constants, context));
+
+    // PART III: create valueOf()
+    memberEntities.add(createEnumValueOfMethod(typeBinding, context));
+  }
+
+  private CAstEntity visit(EnumDeclaration n, WalkContext context) {
+    // JDT contains correct type info / class / subclass info for the enum
+    return createClassDeclaration(n, n.bodyDeclarations(), n.enumConstants(), n.resolveBinding(), n.getName().getIdentifier(), n
+        .resolveBinding().getModifiers(), false, false, context, makePosition(n.getName()));
+  }
+
+  /**
+   * @param n for positioning.
+   */
+  private CAstEntity createEnumConstructorWithParameters(IMethodBinding ctor, ASTNode n, WalkContext oldContext,
+      ArrayList<ASTNode> inits, MethodDeclaration nonDefaultCtor) {
+    // PART I: find super ctor to call
+    ITypeBinding newType = ctor.getDeclaringClass();
+    ITypeBinding javalangenumType = newType.getSuperclass();
+    IMethodBinding superCtor = null;
+
+    if (newType.isEnum()) {
+      for (IMethodBinding met : javalangenumType.getDeclaredMethods())
+        if (met.isConstructor()) {
+          superCtor = met;
+          break;
+        }
+    }
+
+    assert superCtor != null : "enum";
+
+    // PART II: make ctor with simply "super(a,b,c...)"
+    // TODO: extra CAstNodes
+    final Map<CAstNode, CAstEntity> memberEntities = new LinkedHashMap<>();
+    final MethodContext context = new MethodContext(oldContext, memberEntities);
+    MethodDeclaration fakeCtor = ast.newMethodDeclaration();
+    fakeCtor.setConstructor(true);
+    fakeCtor.setSourceRange(n.getStartPosition(), n.getLength());
+    fakeCtor.setBody(ast.newBlock());
+
+    // PART IIa: make a fake JDT constructor method with the proper number of args
+    // Make fake args that will be passed
+    String[] fakeArguments = new String[3 + ctor.getParameterTypes().length];
+    if (nonDefaultCtor == null) {
+      for (int i = 3; i < fakeArguments.length; i++)
+        fakeArguments[i] = "__wala_jdtcast_argument" + i; // this is in the case of an anonymous class with parameters, eg NORTH in
+                                                          // the following example: public enum A { NORTH("south") { ...} A(String
+                                                          // s){} }
+    } else {
+      for (int i = 3; i < fakeArguments.length; i++)
+        fakeArguments[i] = ((SingleVariableDeclaration) nonDefaultCtor.parameters().get(i - 3)).getName().getIdentifier();
+    }
+
+    ArrayList<CAstType> paramTypes = new ArrayList<>(superCtor.getParameterTypes().length);
+    fakeArguments[0] = "this";
+    fakeArguments[1] = "__wala_jdtcast_argument1"; // TODO FIXME: change to invalid name in the case that nonDefaultCtor != null
+    fakeArguments[2] = "__wala_jdtcast_argument2"; // otherwise there will be conflicts if we name our variable
+                                                   // __wala_jdtcast_argument1!!!
+    for (int i = 1; i < fakeArguments.length; i++) {
+      // the name
+      SingleVariableDeclaration svd = ast.newSingleVariableDeclaration();
+      svd.setName(ast.newSimpleName(fakeArguments[i]));
+      fakeCtor.parameters().add(svd);
+
+      // the type
+      if (i == 1)
+        paramTypes.add(fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("java.lang.String")));
+      else if (i == 2)
+        paramTypes.add(fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("int")));
+      else
+        paramTypes.add(fTypeDict.getCAstTypeFor(ctor.getParameterTypes()[i - 3]));
+    }
+
+    // PART IIb: create the statements in the constructor
+    // one super() call plus the inits
+    CAstNode[] bodyNodes;
+    if (nonDefaultCtor == null)
+      bodyNodes = new CAstNode[inits.size() + 1];
+    else
+      bodyNodes = new CAstNode[inits.size() + 2];
+
+    // make super(...) call
+    // this, call ref, args
+    CAstNode[] children;
+    if (ctor.isDefaultConstructor())
+      children = new CAstNode[4 + ctor.getParameterTypes().length]; // anonymous class' implicit constructors call constructors with
+                                                                    // more than standard two enum args
+    else
+      children = new CAstNode[4]; // explicit constructor
+    children[0] = makeNode(context, fFactory, n, CAstNode.SUPER);
+    CallSiteReference callSiteRef = CallSiteReference.make(0, fIdentityMapper.getMethodRef(superCtor),
+        IInvokeInstruction.Dispatch.SPECIAL);
+    children[1] = fFactory.makeConstant(callSiteRef);
+    children[2] = makeNode(context, fFactory, n, CAstNode.VAR, fFactory.makeConstant(fakeArguments[1]), fFactory.makeConstant(paramTypes.get(0)));
+    children[3] = makeNode(context, fFactory, n, CAstNode.VAR, fFactory.makeConstant(fakeArguments[2]), fFactory.makeConstant(paramTypes.get(1)));
+
+    if (ctor.isDefaultConstructor())
+      for (int i = 0; i < ctor.getParameterTypes().length; i++)
+        children[i + 4] = makeNode(context, fFactory, n, CAstNode.VAR, fFactory.makeConstant(fakeArguments[i + 3]), fFactory.makeConstant(paramTypes.get(i+2)));
+
+    bodyNodes[0] = makeNode(context, fFactory, n, CAstNode.CALL, children);
+    // QUESTION: no handleExceptions?
+
+    for (int i = 0; i < inits.size(); i++)
+      bodyNodes[i + 1] = visitFieldInitNode(inits.get(i), context);
+
+    if (nonDefaultCtor != null)
+      bodyNodes[bodyNodes.length - 1] = visitNode(nonDefaultCtor.getBody(), context);
+
+    // finally, make the procedure entity
+    CAstNode ast = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, bodyNodes);
+    return new ProcedureEntity(ast, fakeCtor, newType, memberEntities, context, paramTypes, null, handleAnnotations(ctor));
+
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java
--- wala-1.3.9/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,194 @@
+/*
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * This file is a derivative of code released by the University of
+ * California under the terms listed below.  
+ *
+ * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
+ * University of California (Regents). Provided that this notice and
+ * the following two paragraphs are included in any distribution of
+ * Refinement Analysis Tools or its derivative work, Regents agrees
+ * not to assert any of Regents' copyright rights in Refinement
+ * Analysis Tools against recipient for recipient's reproduction,
+ * preparation of derivative works, public display, public
+ * performance, distribution or sublicensing of Refinement Analysis
+ * Tools and derivative works, in source code and object code form.
+ * This agreement not to assert does not confer, by implication,
+ * estoppel, or otherwise any license or rights in any intellectual
+ * property of Regents, including, but not limited to, any patents
+ * of Regents or Regents' employees.
+ * 
+ * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
+ * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
+ * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *   
+ * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
+ * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
+ * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
+ * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
+ * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+package com.ibm.wala.cast.java.translator.jdt;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.core.dom.ITypeBinding;
+
+import com.ibm.wala.cast.java.types.JavaPrimitiveTypeMap;
+import com.ibm.wala.cast.java.types.JavaType;
+import com.ibm.wala.cast.tree.CAstQualifier;
+import com.ibm.wala.cast.tree.CAstType;
+import com.ibm.wala.cast.tree.impl.CAstTypeDictionaryImpl;
+import com.ibm.wala.util.debug.Assertions;
+
+public class JDTTypeDictionary extends CAstTypeDictionaryImpl<ITypeBinding> {
+
+  // TODO: better way of getting type "ObjecT" that doesn't require us to keep AST? although this is similar to
+  // polyglot.
+  protected final AST fAst; // TAGALONG
+
+  protected final JDTIdentityMapper fIdentityMapper; // TAGALONG
+
+  /**
+   * 
+   * @param ast Needed to get root type "java.lang.Object"
+   */
+  public JDTTypeDictionary(AST ast, JDTIdentityMapper identityMapper) {
+    fAst = ast;
+    fIdentityMapper = identityMapper;
+  }
+
+  @Override
+  public CAstType getCAstTypeFor(Object astType) {
+
+    ITypeBinding jdtType = JDT2CAstUtils.getErasedType((ITypeBinding) astType, fAst);
+
+    CAstType type = super.getCAstTypeFor(astType); // check cache first
+    // Handle the case where we haven't seen an AST decl for some type before
+    // processing a reference. This can certainly happen with classes in byte-
+    // code libraries, for which we never see an AST decl.
+    // In this case, just create a new type and return that.
+    if (type == null) {
+
+      if (jdtType.isClass() || jdtType.isEnum() || jdtType.isInterface()) // in JDT interfaces are not classes
+        type = new JdtJavaType(jdtType);
+      else if (jdtType.isPrimitive()) {
+        type = JavaPrimitiveTypeMap.lookupType(jdtType.getName());
+      } else if (jdtType.isArray()) {
+        type = new JdtJavaArrayType(jdtType);
+      } else
+        Assertions.UNREACHABLE("getCAstTypeFor() passed type that is not primitive, array, or class?");
+      super.map((ITypeBinding)astType, type); // put in cache
+    }
+    return type;
+  }
+
+  private final class JdtJavaArrayType implements CAstType.Array {
+    private final ITypeBinding fEltJdtType;
+
+    private final CAstType fEltCAstType;
+
+    private JdtJavaArrayType(ITypeBinding arrayType) {
+      super();
+      fEltJdtType = arrayType.getComponentType();
+      fEltCAstType = getCAstTypeFor(fEltJdtType);
+    }
+
+    @Override
+    public int getNumDimensions() {
+      return 1; // always 1 for Java
+    }
+
+    @Override
+    public CAstType getElementType() {
+      return fEltCAstType;
+    }
+
+    @Override
+    public String getName() {
+      return '[' + fEltCAstType.getName();
+    }
+
+    @Override
+    public Collection<CAstType> getSupertypes() {
+      if (fEltJdtType.isPrimitive())
+        return Collections.singleton(getCAstTypeFor(fAst.resolveWellKnownType("java.lang.Object")));
+      // TODO: there is no '.isReference()' as in Polyglot: is this right? enum? I think if it's another array it will
+      // just ignore it
+      // TEST DOUBLE ARRAYS! and maybe ask someone?
+      assert fEltJdtType.isArray() || fEltJdtType.isClass() : "Non-primitive, non-reference array element type!";
+      Collection<CAstType> supers = new ArrayList<>();
+      for (ITypeBinding type : fEltJdtType.getInterfaces()) {
+        supers.add(getCAstTypeFor(type));
+      }
+      if (fEltJdtType.getSuperclass() != null)
+        supers.add(getCAstTypeFor(fEltJdtType.getSuperclass()));
+      return supers;
+    }
+  }
+
+  public final class JdtJavaType implements JavaType {
+    private final ITypeBinding fType;
+
+    private Collection<CAstType> fSuperTypes = null;
+
+    @Override
+    public String toString() {
+      return super.toString() + ':' + getName();
+    }
+
+    public JdtJavaType(ITypeBinding type) {
+      super();
+      fType = type;
+    }
+
+    @Override
+    public String getName() {
+      return fIdentityMapper.getTypeRef(fType).getName().toString();
+    }
+
+    @Override
+    public Collection<CAstType> getSupertypes() {
+      if (fSuperTypes == null) {
+        buildSuperTypes();
+      }
+      return fSuperTypes;
+    }
+
+    private void buildSuperTypes() {
+      // TODO this is a source entity, but it might actually be the root type
+      // (Object), so assume # intfs + 1
+      ITypeBinding superType = (fType.getSuperclass() == null) ? fAst.resolveWellKnownType("java.lang.Object") : fType
+          .getSuperclass();
+      int N = fType.getInterfaces().length + 1;
+
+      fSuperTypes = new ArrayList<>(N);
+      // Following assumes that noone can call getSupertypes() before we have
+      // created CAstType's for every type in the program being analyzed.
+      fSuperTypes.add(getCAstTypeFor(superType));
+      for (ITypeBinding t : fType.getInterfaces())
+        fSuperTypes.add(getCAstTypeFor(t));
+    }
+
+    @Override
+    public Collection<CAstQualifier> getQualifiers() {
+      return JDT2CAstUtils.mapModifiersToQualifiers(fType.getModifiers(), fType.isInterface(), fType.isAnnotation());
+    }
+
+    @Override
+    public boolean isInterface() {
+      return fType.isInterface();
+    }
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/build.properties wala-1.5.1/com.ibm.wala.cast.java.polyglot/build.properties
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/build.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-source.. = source/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               lib/java_cup.jar,\
-               lib/polyglot.jar
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/build.xml wala-1.5.1/com.ibm.wala.cast.java.polyglot/build.xml
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/build.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.ibm.wala.cast.java.polyglot" default="getJars" basedir=".">
-
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="true"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="javacSource" value="1.5"/>
-	<property name="javacTarget" value="1.5"/>
-	<!-- This property has been updated to correspond to the paths used by the latest Java update
-	on Mac OS X 10.6 (Java version 1.6.0_22).  If you are not using this version of Mac OS X or Java,
-	try changing the value of the property to "${java.home}/../../../Classes" -->
-<!--    <condition property="dir_bootclasspath" value="${java.home}/../Classes">
-            <os family="mac"/>
-    </condition>
-    <property name="dir_bootclasspath" value="${java.home}/lib"/>
-    <path id="path_bootclasspath">
-            <fileset dir="${dir_bootclasspath}">
-
-                    <include name="*.jar"/>
-            </fileset>
-    </path>	
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/> -->
-
-     <target name="PolyglotPresent" depends="init">
-        <available file="${plugin.destination}/lib/polyglot.jar" property="polyglot.present"/>
-     </target>
-
-   <target name="fetchPolyglot" depends="PolyglotPresent" unless="polyglot.present">
-     <delete dir="${temp.folder}"/>
-     <mkdir dir="${temp.folder}"/>
-   	 <echo message="Getting polyglot from svn; may take a few minutes"/>
-     <exec executable="svn"
-   	       dir="${temp.folder}">
-      <arg value="--quiet"/>
-   	  <arg value="checkout"/>
-      <arg value="http://polyglot-compiler.googlecode.com/svn/trunk/"/>
-      <arg value="polyglot-compiler-read-only"/>
-     </exec>
-     <ant target="jar" inheritAll="false" dir="${temp.folder}/polyglot-compiler-read-only/polyglot/" />
-     <copy file="${temp.folder}/polyglot-compiler-read-only/polyglot/lib/polyglot.jar" tofile="${plugin.destination}/lib/polyglot.jar" />
-     <copy file="${temp.folder}/polyglot-compiler-read-only/polyglot/lib/java_cup.jar" tofile="${plugin.destination}/lib/java_cup.jar" />
-     <delete dir="${temp.folder}"/>
-   </target>
-	
-	<target name="getJars" depends="fetchPolyglot" />
-
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/com.ibm.wala.core.testdata">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/.classpath wala-1.5.1/com.ibm.wala.cast.java.polyglot/.classpath
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="source"/>
-	<classpathentry exported="true" kind="lib" path="lib/java_cup.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/polyglot.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/META-INF/MANIFEST.MF	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: WALA CAst Java Polyglot Plug-in
-Bundle-SymbolicName: com.ibm.wala.cast.java.polyglot
-Bundle-Version: 1.3.9
-Bundle-Vendor: IBM
-Require-Bundle: com.ibm.wala.cast.java,
- com.ibm.wala.cast,
- com.ibm.wala.core,
- org.eclipse.core.runtime,
- com.ibm.wala.shrike,
- org.eclipse.jdt.core,
- org.eclipse.core.resources
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-ActivationPolicy: lazy
-Export-Package: com.ibm.wala.cast.java.translator.polyglot;
-  uses:="com.ibm.wala.types,
-   polyglot.types,
-   polyglot.util,
-   polyglot.ast,
-   com.ibm.wala.ipa.cha,
-   com.ibm.wala.cast.java.client,
-   com.ibm.wala.classLoader,
-   com.ibm.wala.cast.tree,
-   com.ibm.wala.cast.java.loader,
-   com.ibm.wala.ipa.callgraph.impl,
-   com.ibm.wala.ipa.callgraph,
-   polyglot.frontend.goals,
-   com.ibm.wala.cast.tree.impl,
-   com.ibm.wala.cast.java.translator,
-   com.ibm.wala.cast.java.types",
- java_cup,
- java_cup.runtime,
- polyglot.ast,
- polyglot.dispatch,
- polyglot.frontend,
- polyglot.lex,
- polyglot.main,
- polyglot.parse,
- polyglot.qq,
- polyglot.types,
- polyglot.types.reflect,
- polyglot.util,
- polyglot.util.typedump,
- polyglot.visit
-Bundle-ClassPath: lib/java_cup.jar,
- lib/polyglot.jar,
- .
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/pom.xml wala-1.5.1/com.ibm.wala.cast.java.polyglot/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/pom.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>WALA</artifactId>
-		<groupId>com.ibm.wala</groupId>
-		<version>1.3.9</version>
-	</parent>
-	<artifactId>com.ibm.wala.cast.java.polyglot</artifactId>
-	<packaging>eclipse-plugin</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
-				<executions>
-					<execution>
-						<phase>process-resources</phase>
-						<configuration>
-							<tasks>
-								<property name="compile_classpath" refid="maven.compile.classpath" />
-								<ant antfile="${basedir}/build.xml" target="getJars" />
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-              <dependencies>
-                <dependency>
-                  <groupId>com.sun</groupId>
-                  <artifactId>tools</artifactId>
-                  <version>1.7</version>
-                  <scope>system</scope>
-                  <systemPath>${java.home}/../lib/tools.jar</systemPath>
-                </dependency>
-              </dependencies>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/.project wala-1.5.1/com.ibm.wala.cast.java.polyglot/.project
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.cast.java.polyglot</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.java.polyglot/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/.settings/org.eclipse.jdt.core.prefs	1970-01-01 00:00:00.000000000 +0000
@@ -1,346 +0,0 @@
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=2
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=132
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=2
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/.settings/org.eclipse.jdt.ui.prefs wala-1.5.1/com.ibm.wala.cast.java.polyglot/.settings/org.eclipse.jdt.ui.prefs
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/.settings/org.eclipse.jdt.ui.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/.settings/org.eclipse.jdt.ui.prefs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#Mon Apr 13 15:38:50 EDT 2009
-eclipse.preferences.version=1
-formatter_profile=_WALA
-formatter_settings_version=11
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/AscriptionGoal.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/AscriptionGoal.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/AscriptionGoal.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/AscriptionGoal.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import polyglot.ast.ArrayInit;
-import polyglot.ast.Expr;
-import polyglot.frontend.Job;
-import polyglot.frontend.Scheduler;
-import polyglot.frontend.VisitorGoal;
-import polyglot.types.SemanticException;
-import polyglot.types.Type;
-import polyglot.visit.AscriptionVisitor;
-
-/**
- * Runs an AscriptionVisitor to make sure that empty array literals actually get a type.
- * @author rfuhrer
- */
-public class AscriptionGoal extends VisitorGoal {
-  /**
-   * 
-   */
-  private static final long serialVersionUID = 7416951196743862079L;
-
-  public AscriptionGoal(Job job) {
-    super(job,
-      new AscriptionVisitor(job, job.extensionInfo().typeSystem(), job.extensionInfo().nodeFactory()) {
-        @Override
-        public Expr ascribe(Expr e, Type toType) throws SemanticException {
-          if (e instanceof ArrayInit && e.type().isNull()) {
-            return e.type(toType);
-          }
-          return super.ascribe(e, toType);
-        }
-    }
-    );
-    Scheduler scheduler= job.extensionInfo().scheduler();
-
-	addPrereq(scheduler.TypeChecked(job));
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/ASTTraverser.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/ASTTraverser.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/ASTTraverser.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/ASTTraverser.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,204 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-/*
- * Created on Sep 1, 2005
- */
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import polyglot.ast.ArrayAccess;
-import polyglot.ast.ArrayAccessAssign;
-import polyglot.ast.ArrayInit;
-import polyglot.ast.ArrayTypeNode;
-import polyglot.ast.Assert;
-import polyglot.ast.Binary;
-import polyglot.ast.Block;
-import polyglot.ast.BooleanLit;
-import polyglot.ast.Branch;
-import polyglot.ast.Call;
-import polyglot.ast.CanonicalTypeNode;
-import polyglot.ast.Case;
-import polyglot.ast.Cast;
-import polyglot.ast.Catch;
-import polyglot.ast.CharLit;
-import polyglot.ast.ClassBody;
-import polyglot.ast.ClassDecl;
-import polyglot.ast.ClassLit;
-import polyglot.ast.Conditional;
-import polyglot.ast.ConstructorCall;
-import polyglot.ast.ConstructorDecl;
-import polyglot.ast.Do;
-import polyglot.ast.Empty;
-import polyglot.ast.Eval;
-import polyglot.ast.Field;
-import polyglot.ast.FieldAssign;
-import polyglot.ast.FieldDecl;
-import polyglot.ast.FloatLit;
-import polyglot.ast.For;
-import polyglot.ast.Formal;
-import polyglot.ast.If;
-import polyglot.ast.Import;
-import polyglot.ast.Initializer;
-import polyglot.ast.Instanceof;
-import polyglot.ast.IntLit;
-import polyglot.ast.Labeled;
-import polyglot.ast.Local;
-import polyglot.ast.LocalAssign;
-import polyglot.ast.LocalClassDecl;
-import polyglot.ast.LocalDecl;
-import polyglot.ast.MethodDecl;
-import polyglot.ast.New;
-import polyglot.ast.NewArray;
-import polyglot.ast.Node;
-import polyglot.ast.NullLit;
-import polyglot.ast.PackageNode;
-import polyglot.ast.Return;
-import polyglot.ast.Special;
-import polyglot.ast.StringLit;
-import polyglot.ast.Switch;
-import polyglot.ast.SwitchBlock;
-import polyglot.ast.Synchronized;
-import polyglot.ast.Throw;
-import polyglot.ast.Try;
-import polyglot.ast.Unary;
-import polyglot.ast.While;
-
-import com.ibm.wala.cast.java.translator.polyglot.PolyglotJava2CAstTranslator.MethodContext;
-import com.ibm.wala.cast.java.translator.polyglot.PolyglotJava2CAstTranslator.WalkContext;
-import com.ibm.wala.cast.tree.CAstNode;
-import com.ibm.wala.util.debug.Assertions;
-
-/**
- * Wrapper for the logic (nasty cascaded instanceof tests) necessary to visit a Polyglot AST and dispatch to the appropriate
- * TranslatingVisitor methods for each AST node type.
- * 
- * @author rfuhrer
- */
-public class ASTTraverser {
-  protected ASTTraverser() {
-  }
-
-  public static CAstNode visit(Node n, TranslatingVisitor tv, WalkContext wc) {
-    if (n instanceof MethodDecl) {
-      return tv.visit((MethodDecl) n, (MethodContext) wc);
-    } else if (n instanceof ConstructorDecl) {
-      return tv.visit((ConstructorDecl) n, (MethodContext) wc);
-    } else if (n instanceof FieldDecl) {
-      return tv.visit((FieldDecl) n, (MethodContext) wc);
-    } else if (n instanceof Import) {
-      return tv.visit((Import) n, wc);
-    } else if (n instanceof PackageNode) {
-      return tv.visit((PackageNode) n, wc);
-    } else if (n instanceof CanonicalTypeNode) {
-      return tv.visit((CanonicalTypeNode) n, wc);
-    } else if (n instanceof ArrayTypeNode) {
-      return tv.visit((ArrayTypeNode) n, wc);
-    } else if (n instanceof ArrayInit) {
-      return tv.visit((ArrayInit) n, wc);
-    } else if (n instanceof ArrayAccessAssign) {
-      return tv.visit((ArrayAccessAssign) n, wc);
-    } else if (n instanceof FieldAssign) {
-      return tv.visit((FieldAssign) n, wc);
-    } else if (n instanceof LocalAssign) {
-      return tv.visit((LocalAssign) n, wc);
-    } else if (n instanceof Binary) {
-      return tv.visit((Binary) n, wc);
-    } else if (n instanceof Call) {
-      return tv.visit((Call) n, wc);
-    } else if (n instanceof ConstructorCall) {
-      return tv.visit((ConstructorCall) n, wc);
-    } else if (n instanceof Cast) {
-      return tv.visit((Cast) n, wc);
-    } else if (n instanceof Conditional) {
-      return tv.visit((Conditional) n, wc);
-    } else if (n instanceof Instanceof) {
-      return tv.visit((Instanceof) n, wc);
-    } else if (n instanceof BooleanLit) {
-      return tv.visit((BooleanLit) n, wc);
-    } else if (n instanceof ClassLit) {
-      return tv.visit((ClassLit) n, wc);
-    } else if (n instanceof FloatLit) {
-      return tv.visit((FloatLit) n, wc);
-    } else if (n instanceof NullLit) {
-      return tv.visit((NullLit) n, wc);
-    } else if (n instanceof CharLit) {
-      return tv.visit((CharLit) n, wc);
-    } else if (n instanceof IntLit) {
-      return tv.visit((IntLit) n, wc);
-    } else if (n instanceof StringLit) {
-      return tv.visit((StringLit) n, wc);
-    } else if (n instanceof New) {
-      return tv.visit((New) n, wc);
-    } else if (n instanceof NewArray) {
-      return tv.visit((NewArray) n, wc);
-    } else if (n instanceof Special) {
-      return tv.visit((Special) n, wc);
-    } else if (n instanceof Unary) {
-      return tv.visit((Unary) n, wc);
-    } else if (n instanceof ArrayAccess) {
-      return tv.visit((ArrayAccess) n, wc);
-    } else if (n instanceof Field) {
-      return tv.visit((Field) n, wc);
-    } else if (n instanceof Local) {
-      return tv.visit((Local) n, wc);
-    } else if (n instanceof ClassBody) {
-      return tv.visit((ClassBody) n, wc);
-    } else if (n instanceof ClassDecl) {
-      return tv.visit((ClassDecl) n, wc);
-    } else if (n instanceof Initializer) {
-      return tv.visit((Initializer) n, wc);
-    } else if (n instanceof Assert) {
-      return tv.visit((Assert) n, wc);
-    } else if (n instanceof Branch) {
-      return tv.visit((Branch) n, wc);
-    } else if (n instanceof SwitchBlock) { // must test for this one before Block
-      return tv.visit((SwitchBlock) n, wc);
-    } else if (n instanceof Block) { // must test for this one before Block
-      return tv.visit((Block) n, wc);
-    } else if (n instanceof Catch) {
-      return tv.visit((Catch) n, wc);
-    } else if (n instanceof If) {
-      return tv.visit((If) n, wc);
-    } else if (n instanceof Labeled) {
-      return tv.visit((Labeled) n, wc);
-    } else if (n instanceof LocalClassDecl) {
-      return tv.visit((LocalClassDecl) n, wc);
-    } else if (n instanceof Do) {
-      return tv.visit((Do) n, wc);
-    } else if (n instanceof For) {
-      return tv.visit((For) n, wc);
-    } else if (n instanceof While) {
-      return tv.visit((While) n, wc);
-    } else if (n instanceof Switch) {
-      return tv.visit((Switch) n, wc);
-    } else if (n instanceof Synchronized) {
-      return tv.visit((Synchronized) n, wc);
-    } else if (n instanceof Try) {
-      return tv.visit((Try) n, wc);
-    } else if (n instanceof Empty) {
-      return tv.visit((Empty) n, wc);
-    } else if (n instanceof Eval) {
-      return tv.visit((Eval) n, wc);
-    } else if (n instanceof LocalDecl) {
-      return tv.visit((LocalDecl) n, wc);
-    } else if (n instanceof Return) {
-      return tv.visit((Return) n, wc);
-    } else if (n instanceof Case) {
-      return tv.visit((Case) n, wc);
-    } else if (n instanceof Throw) {
-      return tv.visit((Throw) n, wc);
-    } else if (n instanceof Formal) {
-      return tv.visit((Formal) n, wc);
-    } else {
-      Assertions.UNREACHABLE("Unhandled node " + n + " of type " + n.getClass().getName() + " in ASTTraverser.visit().");
-      return null;
-    }
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/IRGoal.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/IRGoal.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/IRGoal.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/IRGoal.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import polyglot.frontend.ExtensionInfo;
-import polyglot.frontend.Job;
-import polyglot.frontend.Scheduler;
-import polyglot.frontend.SourceGoal_c;
-
-import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl;
-import com.ibm.wala.cast.java.translator.Java2IRTranslator;
-
-/**
- * A kind of EndGoal that indicates that WALA IR has been generated for the given compilation unit.
- * @author rfuhrer
- */
-public class IRGoal extends SourceGoal_c /* PORT1.7 removed 'implements EndGoal' */ {
-  /**
-   * 
-   */
-  private static final long serialVersionUID = -8023929848709826817L;
-
-  private JavaSourceLoaderImpl fSourceLoader;
-
-  protected Java2IRTranslator fTranslator;
-
-  public IRGoal(Job job, JavaSourceLoaderImpl sourceLoader) {
-    super(job);
-    fSourceLoader = sourceLoader;
-
-    Scheduler scheduler= job.extensionInfo().scheduler();
-
-    addPrereq(scheduler.TypeChecked(job));
-    // PORT1.7 - TypeChecked will suffice for what used to require ConstantsChecked.
-    // Need ConstantsChecked in order to make sure that case statements have non-zero labels.
-//  addPrereq(scheduler.ConstantsChecked(job));
-    // Need to add an AscriptionGoal as a prereq to make sure that empty array initializers get a type ascribed.
-    addPrereq(new AscriptionGoal(job));
-  }
-
-  @Override
-  public boolean runTask() {
-    ExtensionInfo extInfo= job.extensionInfo();
-
-    fTranslator= new Java2IRTranslator(
-            fSourceLoader,
-            ((IRTranslatorExtension)extInfo).getCAstRewriterFactory());
-    ModuleSource src = (ModuleSource) job.source();
-    fTranslator.translate( 
-        src.getModule(),
-        new PolyglotJava2CAstTranslator(
-            job.ast(),
-            fSourceLoader.getReference(),
-            extInfo.nodeFactory(),
-            extInfo.typeSystem(),
-            new PolyglotIdentityMapper(fSourceLoader.getReference()),
-            ((IRTranslatorExtension)extInfo).getReplicateForDoLoops()).translateToCAst());
-    return true;
-  }
-
-  @Override
-  public String name() {
-    return "<WALA IR goal for " + job.source().path() + ">";
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/IRTranslatorExtension.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/IRTranslatorExtension.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/IRTranslatorExtension.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/IRTranslatorExtension.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-/*
- * Created on Oct 21, 2005
- */
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
-
-public interface IRTranslatorExtension {
-  void setSourceLoader(PolyglotSourceLoaderImpl jsli);
-
-  /**
-   * @return the identity mapper, for mapping AST nodes to WALA TypeReferences, MethodReferences and FieldReferences. Helps clients
-   *         to correlate analysis results to AST nodes.
-   */
-  PolyglotIdentityMapper getIdentityMapper();
-
-  /**
-   */
-  CAstRewriterFactory<?,?> getCAstRewriterFactory();
-
-  boolean getReplicateForDoLoops();
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/JavaIRTranslatorExtension.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/JavaIRTranslatorExtension.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/JavaIRTranslatorExtension.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/JavaIRTranslatorExtension.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-/*
- * Created on Oct 6, 2005
- */
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import java.util.List;
-
-import polyglot.frontend.Goal;
-import polyglot.frontend.JLExtensionInfo;
-import polyglot.frontend.JLScheduler;
-import polyglot.frontend.Job;
-import polyglot.frontend.Scheduler;
-
-import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
-
-/**
- * A Polyglot extension descriptor for a test harness extension that generates WALA IR for
- * the sources and class files in the classpath.
- * @author rfuhrer
- */
-public class JavaIRTranslatorExtension extends JLExtensionInfo implements IRTranslatorExtension {
-  protected PolyglotSourceLoaderImpl fSourceLoader;
-
-  protected PolyglotIdentityMapper fMapper;
-
-  protected CAstRewriterFactory<?,?> rewriterFactory;
-
-  //PORT1.7 getCompileGoal() no longer exists; set the compile goal by manipulating the End goal for the job
-  @Override
-  protected Scheduler createScheduler() {
-    return new JLScheduler(this) {
-      @Override
-      public List<Goal> goals(Job job) {
-        List<Goal> goals= super.goals(job);
-        Goal endGoal = goals.get(goals.size()-1);
-        if (!(endGoal.name().equals("End"))) {
-          throw new IllegalStateException("Last goal is not an End goal?");
-        }
-        endGoal.addPrereq(new IRGoal(job, fSourceLoader));
-        return goals;
-      }
-    };
-  }
-
-  @Override
-  public void setSourceLoader(PolyglotSourceLoaderImpl sourceLoader) {
-    fSourceLoader= sourceLoader;
-    fMapper= new PolyglotIdentityMapper(sourceLoader.getReference());
-  }
-
-  @Override
-  public PolyglotIdentityMapper getIdentityMapper() {
-    return fMapper;
-  }
-
-  public void setCAstRewriterFactory(CAstRewriterFactory<?,?> factory) {
-    rewriterFactory = factory;
-  }
-
-  @Override
-  public CAstRewriterFactory<?,?> getCAstRewriterFactory() {
-    return rewriterFactory;
-  }
-
-  @Override
-  public boolean getReplicateForDoLoops() {
-    return false;
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/ModuleSource.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/ModuleSource.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/ModuleSource.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/ModuleSource.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-/*
- * Created on Oct 6, 2005
- */
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import polyglot.frontend.FileSource;
-import polyglot.frontend.Resource;
-
-import com.ibm.wala.classLoader.SourceModule;
-
-/**
- * A Polyglot Source whose input comes from an InputStream.<br>
- * Currently extends FileSource since that's all that the Polyglot Compiler class
- * will accept.
- * @author rfuhrer
- */
-public class ModuleSource extends FileSource {
-  private final SourceModule module;
-  
-  SourceModule getModule() {
-    return module;
-  }
-  
-  public ModuleSource(final SourceModule module) throws IOException {
-    super(new Resource() {
-      @Override
-      public File file() {
-        return new File(module.getURL().getFile());
-      }
-
-      @Override
-      public InputStream getInputStream() throws IOException {
-        return module.getInputStream();
-      }
-
-      @Override
-      public String name() {
-        String fullPath = module.getURL().getFile();
-        int idx= fullPath.lastIndexOf(File.separatorChar);
-        return (idx > 0) ? fullPath.substring(idx+1) : fullPath;
-      }
-      @Override
-      public String toString() {
-        return module.getName();
-      }
-    }, true);
-    this.module = module;
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotClassLoaderFactory.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotClassLoaderFactory.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotClassLoaderFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotClassLoaderFactory.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-/*
- * Created on Oct 7, 2005
- */
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
-import com.ibm.wala.classLoader.ClassLoaderFactoryImpl;
-import com.ibm.wala.classLoader.ClassLoaderImpl;
-import com.ibm.wala.classLoader.IClassLoader;
-import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.util.config.SetOfClasses;
-
-public class PolyglotClassLoaderFactory extends ClassLoaderFactoryImpl {
-
-  /**
-   * A map from ClassLoaderReference to IRTranslatorExtension, so that source files in different languages are processed by the
-   * right kind of IRTranslatorExtension.
-   */
-  final protected Map<ClassLoaderReference, IRTranslatorExtension> fExtensionMap = new HashMap<ClassLoaderReference, IRTranslatorExtension>();
-
-  public PolyglotClassLoaderFactory(SetOfClasses exclusions, IRTranslatorExtension javaExtInfo) {
-    super(exclusions);
-    fExtensionMap.put(JavaSourceAnalysisScope.SOURCE, javaExtInfo);
-  }
-
-  protected IRTranslatorExtension getExtensionFor(ClassLoaderReference clr) {
-    return fExtensionMap.get(clr);
-  }
-
-  @Override
-  protected IClassLoader makeNewClassLoader(ClassLoaderReference classLoaderReference, IClassHierarchy cha, IClassLoader parent,
-      AnalysisScope scope) throws IOException {
-    if (classLoaderReference.equals(JavaSourceAnalysisScope.SOURCE)) {
-      ClassLoaderImpl cl = new PolyglotSourceLoaderImpl(classLoaderReference, parent, getExclusions(), cha,
-          getExtensionFor(classLoaderReference));
-      cl.init(scope.getModules(classLoaderReference));
-      return cl;
-    } else {
-      return super.makeNewClassLoader(classLoaderReference, cha, parent, scope);
-    }
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotIdentityMapper.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotIdentityMapper.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotIdentityMapper.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotIdentityMapper.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,243 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2014 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-
-/**
- * 
- */
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import polyglot.types.ArrayType;
-import polyglot.types.ClassType;
-import polyglot.types.CodeInstance;
-import polyglot.types.ConstructorInstance;
-import polyglot.types.FieldInstance;
-import polyglot.types.InitializerInstance;
-import polyglot.types.MemberDef;
-import polyglot.types.MethodInstance;
-import polyglot.types.PrimitiveType;
-import polyglot.types.ProcedureInstance;
-import polyglot.types.Type;
-
-import com.ibm.wala.cast.java.translator.polyglot.PolyglotJava2CAstTranslator.IdentityMapper;
-import com.ibm.wala.cast.java.types.JavaPrimitiveTypeMap;
-import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.types.Descriptor;
-import com.ibm.wala.types.FieldReference;
-import com.ibm.wala.types.MethodReference;
-import com.ibm.wala.types.Selector;
-import com.ibm.wala.types.TypeName;
-import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.collections.HashMapFactory;
-import com.ibm.wala.util.debug.Assertions;
-import com.ibm.wala.util.strings.Atom;
-
-/**
- * Class responsible for mapping Polyglot type system objects representing types,
- * methods and fields to the corresponding WALA TypeReferences, MethodReferences
- * and FieldReferences. Used during translation and by clients to help correlate
- * WALA analysis results to the various AST nodes.
- * @author rfuhrer
- */
-public class PolyglotIdentityMapper implements IdentityMapper<Type, CodeInstance, FieldInstance> {
-  private final Map<Type, TypeReference> fTypeMap = HashMapFactory.make();
-
-  private final Map<FieldInstance, FieldReference> fFieldMap = HashMapFactory.make();
-
-  private final Map<CodeInstance, MethodReference> fMethodMap = HashMapFactory.make();
-
-  /**
-   * Map from Polyglot local ClassTypes to their enclosing methods. Used by localTypeToTypeID().<br>
-   * Needed since Polyglot doesn't provide this information. (It doesn't need to, since it
-   * doesn't need to generate unambiguous names for such entities -- it hands the source
-   * off to javac to generate bytecode. It probably also wouldn't want to, since that would
-   * create back-pointers from Type objects in the TypeSystem to AST's.)
-   */
-  protected Map<ClassType, CodeInstance> fLocalTypeMap = new LinkedHashMap<ClassType, CodeInstance>();
-
-  protected final ClassLoaderReference fClassLoaderRef;
-
-  public PolyglotIdentityMapper(ClassLoaderReference clr) {
-    fClassLoaderRef= clr;
-  }
-
-  @Override
-  public FieldReference getFieldRef(FieldInstance field) {
-    if (!fFieldMap.containsKey(field)) {
-      FieldReference ref= referenceForField(field);
-      fFieldMap.put(field, ref);
-      return ref;
-    }
-    return fFieldMap.get(field);
-  }
-
-  @Override
-  public TypeReference getTypeRef(Type type) {
-    if (!fTypeMap.containsKey(type)) {
-      TypeReference ref= referenceForType(type);
-      fTypeMap.put(type, ref);
-      return ref;
-    }
-    return fTypeMap.get(type);
-  }
-
-  @Override
-  public MethodReference getMethodRef(CodeInstance method) {
-    if (!fMethodMap.containsKey(method)) {
-      MethodReference sel= referenceForMethod(method);
-      fMethodMap.put(method, sel);
-      return sel;
-    }
-    return fMethodMap.get(method);
-  }
-
-  public void mapLocalAnonTypeToMethod(ClassType anonLocalType, CodeInstance owningProc) {
-    fLocalTypeMap.put(anonLocalType, owningProc);
-  }
-
-  /**
-   * Create a FieldReference for the given Polyglot FieldInstance.<br>
-   * N.B.: This method <b>does not canonicalize</b> the FieldReferences,
-   * but rather creates a new one for each call.
-   * You more likely want to call getFieldRef(). This method is exposed
-   * so that multiple Polyglot instances can use the translation services
-   * without having FieldInstances collide (producing the dreaded "we are
-   * TypeSystem_c but type Foo is from TypeSystem_c" exception).
-   */
-  public FieldReference referenceForField(FieldInstance field) {
-    Type targetType= field.container();
-    Type fieldType= field.type();
-    TypeReference targetTypeRef= TypeReference.findOrCreate(fClassLoaderRef, typeToTypeID(targetType));
-    TypeReference fieldTypeRef= TypeReference.findOrCreate(fClassLoaderRef, typeToTypeID(fieldType));
-    Atom fieldName= Atom.findOrCreateUnicodeAtom(field.name().toString());
-    FieldReference fieldRef= FieldReference.findOrCreate(targetTypeRef, fieldName, fieldTypeRef);
-
-    return fieldRef;
-  }
-
-  /**
-   * Create a TypeReference for the given Polyglot Type.<br>
-   * N.B.: This method <b>does not canonicalize</b> the TypeReferences,
-   * but rather creates a new one for each call.
-   * You more likely want to call getTypeRef(). This method is exposed
-   * so that multiple Polyglot instances can use the translation services
-   * without having Types collide (producing the dreaded "we are
-   * TypeSystem_c but type Foo is from TypeSystem_c" exception).
-   */
-  public TypeReference referenceForType(Type type) {
-    TypeName typeName= TypeName.string2TypeName(typeToTypeID(type));
-    TypeReference typeRef= TypeReference.findOrCreate(fClassLoaderRef, typeName);
-
-    return typeRef;
-  }
-
-  private Selector selectorForMethod(CodeInstance procInstance) {
-    Atom name= 
-      (procInstance instanceof ConstructorInstance) ?
-          MethodReference.initAtom : 
-            (procInstance instanceof InitializerInstance) ?
-                MethodReference.clinitName : 
-                  Atom.findOrCreateUnicodeAtom(((MethodInstance) procInstance).name().toString());
-
-    TypeName[] argTypeNames = null;
-    if (! (procInstance instanceof InitializerInstance)) {
-      List formalTypes = ((ProcedureInstance)procInstance).formalTypes();
-      int numArgs = formalTypes.size();
-      // Descriptor prefers null to an empty array
-      if (numArgs > 0) {
-        argTypeNames = new TypeName[numArgs];
-      
-        int i = 0;
-        for(Iterator iter = formalTypes.iterator(); iter.hasNext(); i++)  {
-          Type argType= (Type) iter.next();
-          argTypeNames[i]= TypeName.string2TypeName(typeToTypeID(argType));
-        }
-      }
-    }
-
-    Type retType= 
-      (procInstance instanceof MethodInstance) ? ((MethodInstance) procInstance).returnType() : procInstance.typeSystem().Void();
-	TypeName retTypeName= TypeName.string2TypeName(typeToTypeID(retType));
-
-	Descriptor desc= Descriptor.findOrCreate(argTypeNames, retTypeName);
-
-	return new Selector(name, desc);
-  }
-
-  /**
-   * Create a MethodReference for the given Polyglot MethodInstance.<br>
-   * N.B.: This method <b>does not canonicalize</b> the MethodReferences,
-   * but rather creates a new one for each call.
-   * You more likely want to call getMethodRef(). This method is exposed
-   * so that multiple Polyglot instances can use the translation services
-   * without having MethodInstances collide (producing the dreaded "we are
-   * TypeSystem_c but type Foo is from TypeSystem_c" exception).
-   */
-  public MethodReference referenceForMethod(CodeInstance procInstance) {
-    // Handles both ConstructorInstance's and MethodInstance's
-    TypeName ownerType= TypeName.string2TypeName(typeToTypeID(((MemberDef) procInstance.def()).container().get()));
-    TypeReference ownerTypeRef= TypeReference.findOrCreate(fClassLoaderRef, ownerType);
-    MethodReference methodRef= MethodReference.findOrCreate(ownerTypeRef, selectorForMethod(procInstance));
-
-    return methodRef;
-  }
-
-  /**
-   * Translates the given Polyglot type to a name suitable for use in a WALA TypeReference
-   * (i.e. a bytecode-compliant type name).
-   */
-  public String typeToTypeID(Type type) {
-    if (type.isPrimitive()) {
-      PrimitiveType ptype= (PrimitiveType) type;
-
-      return JavaPrimitiveTypeMap.getShortName(ptype.name().toString());
-    } else if (type.isArray()) {
-      ArrayType atype= (ArrayType) type;
-      return "[" + typeToTypeID(atype.base());
-    } else if (type.isNull()) {
-      Assertions.UNREACHABLE("typeToTypeID() encountered a null type!");
-      return null;
-    }
-    Assertions.productionAssertion(type.isClass(), "typeToTypeID() encountered the type " + type + " that is neither primitive, array, nor class!");
-
-    ClassType ctype= (ClassType) type;
-
-    return (ctype.isLocal() || ctype.isAnonymous()) ? anonLocalTypeToTypeID(ctype) : composeWALATypeDescriptor(ctype);
-  }
-
-  public String anonLocalTypeToTypeID(ClassType ctype) {
-    CodeInstance procInstance= fLocalTypeMap.get(ctype);
-
-    String outerTypeID= typeToTypeID(ctype.outer());
-    String shortName= (ctype.isAnonymous()) ? PolyglotJava2CAstTranslator.anonTypeName(ctype) : ctype.fullName().name().toString();
-
-    return outerTypeID + '/' + getMethodRef(procInstance).getSelector() + '/' + shortName;
-  }
-
-  public String composeWALATypeDescriptor(ClassType ctype) {
-    return "L" + composeWALATypeName(ctype);
-  }
-
-  public String composeWALATypeName(ClassType ctype) {
-    if (ctype.package_() != null) {
-      String packageName = ctype.package_().fullName().toString();
-
-      Assertions.productionAssertion(ctype.fullName().toString().startsWith(packageName));
-      return packageName.replace('.','/') + "/" + ctype.fullName().toString().substring( packageName.length()+1 ).replace('.','$'); 
-    } else {
-      return ctype.fullName().toString().replace('.', '$');
-    }
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotJava2CAstTranslator.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotJava2CAstTranslator.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotJava2CAstTranslator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotJava2CAstTranslator.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,2901 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-/*
- * Created on Aug 22, 2005
- */
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import polyglot.ast.ArrayAccess;
-import polyglot.ast.ArrayAccessAssign;
-import polyglot.ast.ArrayInit;
-import polyglot.ast.ArrayTypeNode;
-import polyglot.ast.Assert;
-import polyglot.ast.Assign;
-import polyglot.ast.Binary;
-import polyglot.ast.Binary.Operator;
-import polyglot.ast.Block;
-import polyglot.ast.BooleanLit;
-import polyglot.ast.Branch;
-import polyglot.ast.Call;
-import polyglot.ast.CanonicalTypeNode;
-import polyglot.ast.Case;
-import polyglot.ast.Cast;
-import polyglot.ast.Catch;
-import polyglot.ast.CharLit;
-import polyglot.ast.ClassBody;
-import polyglot.ast.ClassDecl;
-import polyglot.ast.ClassLit;
-import polyglot.ast.ClassMember;
-import polyglot.ast.Conditional;
-import polyglot.ast.ConstructorCall;
-import polyglot.ast.ConstructorCall.Kind;
-import polyglot.ast.ConstructorDecl;
-import polyglot.ast.Do;
-import polyglot.ast.Empty;
-import polyglot.ast.Eval;
-import polyglot.ast.Expr;
-import polyglot.ast.Field;
-import polyglot.ast.FieldAssign;
-import polyglot.ast.FieldDecl;
-import polyglot.ast.FloatLit;
-import polyglot.ast.For;
-import polyglot.ast.Formal;
-import polyglot.ast.Id;
-import polyglot.ast.If;
-import polyglot.ast.Import;
-import polyglot.ast.Initializer;
-import polyglot.ast.Instanceof;
-import polyglot.ast.IntLit;
-import polyglot.ast.Labeled;
-import polyglot.ast.Local;
-import polyglot.ast.LocalAssign;
-import polyglot.ast.LocalClassDecl;
-import polyglot.ast.LocalDecl;
-import polyglot.ast.MethodDecl;
-import polyglot.ast.New;
-import polyglot.ast.NewArray;
-import polyglot.ast.Node;
-import polyglot.ast.NodeFactory;
-import polyglot.ast.NullLit;
-import polyglot.ast.PackageNode;
-import polyglot.ast.ProcedureDecl;
-import polyglot.ast.Receiver;
-import polyglot.ast.Return;
-import polyglot.ast.SourceFile;
-import polyglot.ast.Special;
-import polyglot.ast.Stmt;
-import polyglot.ast.StringLit;
-import polyglot.ast.Switch;
-import polyglot.ast.SwitchBlock;
-import polyglot.ast.SwitchElement;
-import polyglot.ast.Synchronized;
-import polyglot.ast.Throw;
-import polyglot.ast.TopLevelDecl;
-import polyglot.ast.Try;
-import polyglot.ast.Unary;
-import polyglot.ast.While;
-import polyglot.types.ArrayType;
-import polyglot.types.ClassType;
-import polyglot.types.CodeInstance;
-import polyglot.types.ConstructorInstance;
-import polyglot.types.Context;
-import polyglot.types.FieldInstance;
-import polyglot.types.Flags;
-import polyglot.types.InitializerDef;
-import polyglot.types.InitializerInstance;
-import polyglot.types.MemberDef;
-import polyglot.types.MethodInstance;
-import polyglot.types.ObjectType;
-import polyglot.types.ProcedureInstance;
-import polyglot.types.SemanticException;
-import polyglot.types.StructType;
-import polyglot.types.Type;
-import polyglot.types.TypeSystem;
-import polyglot.types.Types;
-import polyglot.util.Position;
-
-import com.ibm.wala.cast.ir.translator.AstTranslator.InternalCAstSymbol;
-import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
-import com.ibm.wala.cast.ir.translator.TranslatorToCAst.DoLoopTranslator;
-import com.ibm.wala.cast.java.loader.Util;
-import com.ibm.wala.cast.java.translator.JavaProcedureEntity;
-import com.ibm.wala.cast.java.types.JavaType;
-import com.ibm.wala.cast.tree.CAst;
-import com.ibm.wala.cast.tree.CAstAnnotation;
-import com.ibm.wala.cast.tree.CAstControlFlowMap;
-import com.ibm.wala.cast.tree.CAstEntity;
-import com.ibm.wala.cast.tree.CAstNode;
-import com.ibm.wala.cast.tree.CAstNodeTypeMap;
-import com.ibm.wala.cast.tree.CAstQualifier;
-import com.ibm.wala.cast.tree.CAstSourcePositionMap;
-import com.ibm.wala.cast.tree.CAstSymbol;
-import com.ibm.wala.cast.tree.CAstType;
-import com.ibm.wala.cast.tree.CAstTypeDictionary;
-import com.ibm.wala.cast.tree.impl.AbstractSourcePosition;
-import com.ibm.wala.cast.tree.impl.CAstControlFlowRecorder;
-import com.ibm.wala.cast.tree.impl.CAstImpl;
-import com.ibm.wala.cast.tree.impl.CAstNodeTypeMapRecorder;
-import com.ibm.wala.cast.tree.impl.CAstOperator;
-import com.ibm.wala.cast.tree.impl.CAstSourcePositionRecorder;
-import com.ibm.wala.cast.tree.impl.CAstSymbolImpl;
-import com.ibm.wala.classLoader.CallSiteReference;
-import com.ibm.wala.shrikeBT.IInvokeInstruction;
-import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.types.FieldReference;
-import com.ibm.wala.types.MemberReference;
-import com.ibm.wala.types.MethodReference;
-import com.ibm.wala.types.Selector;
-import com.ibm.wala.types.TypeName;
-import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.collections.EmptyIterator;
-import com.ibm.wala.util.collections.HashMapFactory;
-import com.ibm.wala.util.collections.IteratorPlusOne;
-import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.debug.Assertions;
-
-public class PolyglotJava2CAstTranslator {
-  protected final CAst fFactory = new CAstImpl();
-
-  protected final NodeFactory fNodeFactory;
-
-  protected final TypeSystem fTypeSystem;
-
-  protected Type fNPEType;
-
-  protected Type fCCEType;
-
-  protected Type fREType; // RuntimeException
-
-  protected Type fDivByZeroType;
-
-  protected final ClassLoaderReference fClassLoaderRef;
-
-  private CAstTypeDictionary fTypeDict;
-
-  private TranslatingVisitor fTranslator;
-
-  protected PolyglotIdentityMapper fIdentityMapper;
-
-  protected final DoLoopTranslator doLoopTranslator;
-  
-  protected final boolean DEBUG = true;
- 
-  private final Node ast;
- 
-  final protected TranslatingVisitor getTranslator() {
-    if (fTranslator == null)
-      fTranslator = createTranslator();
-    return fTranslator;
-  }
-
-  protected TranslatingVisitor createTranslator() {
-    return new JavaTranslatingVisitorImpl();
-  }
-
-  protected CAstTypeDictionary getTypeDict() {
-    if (fTypeDict == null) {
-      fTypeDict = createTypeDict();
-    }
-    return fTypeDict;
-  }
-
-  protected PolyglotTypeDictionary createTypeDict() {
-    return new PolyglotTypeDictionary(fTypeSystem, this);
-  }
-
-  protected static CAstOperator mapUnaryOpcode(Unary.Operator operator) {
-    if (operator.equals(Unary.BIT_NOT))
-      return CAstOperator.OP_BITNOT;
-    if (operator.equals(Unary.NEG))
-      return CAstOperator.OP_SUB; // CAst will handle OP_SUB with only 1
-    // arg properly !!! Hah!
-    if (operator.equals(Unary.NOT))
-      return CAstOperator.OP_NOT;
-    if (operator.equals(Unary.POS))
-      return CAstOperator.OP_ADD; // CAst will throw away OP_ADD with only
-    // 1 arg!!!
-
-    if (operator.equals(Unary.POST_DEC))
-      return CAstOperator.OP_SUB; // translator will produce different
-    // CAstNode types for post dec
-    if (operator.equals(Unary.POST_INC))
-      return CAstOperator.OP_ADD; // translator will produce different
-    // CAstNode types for post inc
-    if (operator.equals(Unary.PRE_DEC))
-      return CAstOperator.OP_SUB; // translator will produce different
-    // CAstNode types for pre dec
-    if (operator.equals(Unary.PRE_INC))
-      return CAstOperator.OP_ADD; // translator will produce different
-    // CAstNode types for pre inc
-
-    Assertions.UNREACHABLE("Java2CAstTranslator.JavaTranslatingVisitorImpl.mapUnaryOpcode(): unrecognized unary operator.");
-    return null;
-  }
-
-  protected static CAstOperator mapBinaryOpcode(Binary.Operator operator) {
-    if (operator.equals(Binary.ADD))
-      return CAstOperator.OP_ADD;
-    if (operator.equals(Binary.BIT_AND))
-      return CAstOperator.OP_BIT_AND;
-    if (operator.equals(Binary.BIT_OR))
-      return CAstOperator.OP_BIT_OR;
-    if (operator.equals(Binary.BIT_XOR))
-      return CAstOperator.OP_BIT_XOR;
-    if (operator.equals(Binary.COND_AND))
-      return CAstOperator.OP_REL_AND;
-    if (operator.equals(Binary.COND_OR))
-      return CAstOperator.OP_REL_OR;
-    if (operator.equals(Binary.DIV))
-      return CAstOperator.OP_DIV;
-    if (operator.equals(Binary.EQ))
-      return CAstOperator.OP_EQ;
-    if (operator.equals(Binary.GE))
-      return CAstOperator.OP_GE;
-    if (operator.equals(Binary.GT))
-      return CAstOperator.OP_GT;
-    if (operator.equals(Binary.LE))
-      return CAstOperator.OP_LE;
-    if (operator.equals(Binary.LT))
-      return CAstOperator.OP_LT;
-    if (operator.equals(Binary.MOD))
-      return CAstOperator.OP_MOD;
-    if (operator.equals(Binary.MUL))
-      return CAstOperator.OP_MUL;
-    if (operator.equals(Binary.NE))
-      return CAstOperator.OP_NE;
-    if (operator.equals(Binary.SHL))
-      return CAstOperator.OP_LSH;
-    if (operator.equals(Binary.SHR))
-      return CAstOperator.OP_RSH;
-    if (operator.equals(Binary.SUB))
-      return CAstOperator.OP_SUB;
-    if (operator.equals(Binary.USHR))
-      return CAstOperator.OP_URSH;
-    Assertions.UNREACHABLE("Java2CAstTranslator.JavaTranslatingVisitorImpl.mapBinaryOpcode(): unrecognized binary operator.");
-    return null;
-  }
-
-  protected CAstNode translateConstant(Object constant) {
-    return fFactory.makeConstant(constant);
-  }
-
-  protected class JavaTranslatingVisitorImpl implements TranslatingVisitor {
-    @Override
-    public CAstNode visit(MethodDecl m, MethodContext mc) {
-      if (m.body() == null || m.body().statements().size() == 0)
-        return makeNode(mc, fFactory, m, CAstNode.RETURN);
-      else
-        return walkNodes(m.body(), mc);
-    }
-
-    @Override
-    public CAstNode visit(ConstructorDecl cd, MethodContext mc) {
-      // Needs to examine the initializers in the ClassContext
-      // and glue that code into the right place relative to the
-      // constructor method body ("wherever that may turn out to be").
-      List/* <FieldDecl|Initializer> */inits = mc.getInitializers();
-      Block body = cd.body();
-
-      if (hasSuperCall(body)) {
-        // Split at call to super:
-        // super();
-        // field initializer code
-        // remainder of ctor body
-        CAstNode[] bodyNodes = new CAstNode[inits.size() + body.statements().size()];
-
-        int idx = 0;
-        for (Iterator iter = body.statements().iterator(); iter.hasNext();) {
-          Stmt s = (Stmt) iter.next();
-
-          bodyNodes[idx++] = walkNodes(s, mc);
-          if (idx == 1) {
-            Assertions.productionAssertion(isSpecialCallStmt(s, ConstructorCall.SUPER));
-            idx = insertInitializers(mc, bodyNodes, false, idx);
-          }
-        }
-        return makeNode(mc, fFactory, body, CAstNode.BLOCK_STMT, bodyNodes);
-      } else if (hasThisCall(body)) {
-        return walkNodes(body, mc);
-      } else {
-        // add explicit call to default super()
-        // RMF 4/17/2009- The following search for a superClass default ctor
-        // won't work if we process Object in source. In particular, the
-        // superClass might be null. In that case, simply omit the explicit
-        // super() call.
-        ClassType superClass = (ClassType) ((ObjectType) cd.constructorDef().asInstance().container()).superClass();
-        CAstNode[] bodyNodes;
-        int idx= 0;
-        int bodyInitsSize= inits.size() + body.statements().size();
-        if (superClass != null) {
-          ProcedureInstance defaultSuperCtor = findDefaultCtor(superClass);
-          CallSiteReference callSiteRef = CallSiteReference.make(0, fIdentityMapper.getMethodRef(defaultSuperCtor),
-              IInvokeInstruction.Dispatch.SPECIAL);
-          CAstNode superCall = makeNode(mc, fFactory, cd, CAstNode.CALL,
-              makeNode(mc, fFactory, cd, CAstNode.SUPER),
-              fFactory.makeConstant(callSiteRef));
-          bodyNodes = new CAstNode[bodyInitsSize + 1];
-          bodyNodes[idx++] = superCall;
-        } else { // no super class, so no super call
-          bodyNodes = new CAstNode[bodyInitsSize];
-        }
-        idx= insertInitializers(mc, bodyNodes, false, idx);
-
-        for (Iterator iter = body.statements().iterator(); iter.hasNext(); idx++) {
-          Stmt s = (Stmt) iter.next();
-          bodyNodes[idx] = walkNodes(s, mc);
-        }
-        return makeNode(mc, fFactory, body, CAstNode.BLOCK_STMT, bodyNodes);
-      }
-    }
-
-    private ProcedureInstance findDefaultCtor(ClassType superClass) {
-      List/* <ProcedureInstance> */ctors = superClass.constructors();
-      for (Iterator iter = ctors.iterator(); iter.hasNext();) {
-        ConstructorInstance ctor = (ConstructorInstance) iter.next();
-        if (ctor.formalTypes().isEmpty())
-          return ctor;
-      }
-      Assertions.UNREACHABLE("Couldn't find default ctor");
-      return null;
-    }
-
-    @Override
-    public CAstNode visit(FieldDecl f, MethodContext ctorContext) {
-      // Generate CAST node for the initializer (init())
-      // Type targetType = f.memberInstance().container();
-      // Type fieldType = f.type().type();
-      FieldReference fieldRef = fIdentityMapper.getFieldRef(f.fieldDef().asInstance());
-      // We use null to indicate an OBJECT_REF to a static field, as the
-      // FieldReference doesn't
-      // hold enough info to determine this. In this case, (unlike field ref)
-      // we don't have a
-      // target expr to evaluate.
-      CAstNode thisNode = f.flags().flags().isStatic() ? makeNode(ctorContext, fFactory, null, CAstNode.VOID) : makeNode(ctorContext,
-          fFactory, f, CAstNode.THIS);
-      CAstNode lhsNode = makeNode(ctorContext, fFactory, f, CAstNode.OBJECT_REF, thisNode, fFactory.makeConstant(fieldRef));
-
-      Expr init = f.init();
-      CAstNode rhsNode;
-      if (init instanceof ArrayInit) {
-        rhsNode = visit((ArrayInit) init, ctorContext, f.declType());
-      } else {
-        rhsNode = walkNodes(init, ctorContext);
-      }
-      CAstNode assNode = makeNode(ctorContext, fFactory, f, CAstNode.ASSIGN, lhsNode, rhsNode);
-
-      return assNode;
-    }
-
-    @Override
-    public CAstNode visit(Import i, WalkContext wc) {
-      Assertions.UNREACHABLE("walkNodes.ASTTraverser.visit(Import)");
-      return null;
-    }
-
-    @Override
-    public CAstNode visit(PackageNode p, WalkContext wc) {
-      Assertions.UNREACHABLE("walkNodes.ASTTraverser.visit(PackageNode)");
-      return null;
-    }
-
-    @Override
-    public CAstNode visit(CanonicalTypeNode ctn, WalkContext wc) {
-      // We'll take care of this in its surrounding context...
-      return makeNode(wc, fFactory, null, CAstNode.EMPTY);
-    }
-
-    @Override
-    public CAstNode visit(ArrayTypeNode ctn, WalkContext wc) {
-      // We'll take care of this in its surrounding context...
-      Assertions.UNREACHABLE("walkNodes.ASTTraverser.visit(CanonicalTypeNode)");
-      return null;
-    }
-
-    /*
-     * If we've handled all the parent cases, this should never be called --
-     * visit(ArrayInit,WalkContext,Type) should be instead.
-     */
-    @Override
-    public CAstNode visit(ArrayInit ai, WalkContext wc) {
-      if (((ArrayType) ai.type()).base().isNull()) {
-        Assertions.productionAssertion(false, "bad type " + ai.type() + " for " + ai + " at " + ai.position());
-      }
-
-      TypeReference newTypeRef = fIdentityMapper.getTypeRef(ai.type());
-      CAstNode[] eltNodes = new CAstNode[ai.elements().size() + 1];
-      int idx = 0;
-
-      eltNodes[idx++] = makeNode(wc, fFactory, ai, CAstNode.NEW, fFactory.makeConstant(newTypeRef), fFactory.makeConstant(ai
-          .elements().size()));
-      for (Iterator iter = ai.elements().iterator(); iter.hasNext(); idx++) {
-        Expr element = (Expr) iter.next();
-        if ( element instanceof ArrayInit ) {
-          eltNodes[idx] = visit((ArrayInit)element, wc, ((ArrayType)ai.type()).base());
-        } else {
-          eltNodes[idx] = walkNodes(element, wc);
-        }
-        if (eltNodes[idx] == null) {
-          Assertions.productionAssertion(eltNodes[idx] != null, element.toString());
-        }
-      }
-
-      return makeNode(wc, fFactory, ai, CAstNode.ARRAY_LITERAL, eltNodes);
-    }
-
-    /*
-     * Workaround for the null array init bug: just in case ai.type().base() is null (e.g.
-     * "new Object[] {null}") we get the type from the parent (in this example, a
-     * NewArray of type Object[])
-     */
-    public CAstNode visit(ArrayInit ai, WalkContext wc, Type t) {
-      TypeReference newTypeRef = fIdentityMapper.getTypeRef(t);
-      CAstNode[] eltNodes = new CAstNode[ai.elements().size() + 1];
-      int idx = 0;
-
-      eltNodes[idx++] = makeNode(wc, fFactory, ai, CAstNode.NEW, fFactory.makeConstant(newTypeRef), fFactory.makeConstant(ai
-          .elements().size()));
-      for (Iterator iter = ai.elements().iterator(); iter.hasNext(); idx++) {
-        Expr element = (Expr) iter.next();
-        if (element instanceof ArrayInit) {
-          eltNodes[idx] = visit((ArrayInit) element, wc, ((ArrayType) t).base());
-        } else {
-          eltNodes[idx] = walkNodes(element, wc);
-        }
-        if (eltNodes[idx] == null) {
-          Assertions.productionAssertion(eltNodes[idx] != null, element.toString());
-        }
-      }
-
-      return makeNode(wc, fFactory, ai, CAstNode.ARRAY_LITERAL, eltNodes);
-    }
-
-    @Override
-    public CAstNode visit(ArrayAccessAssign aaa, WalkContext wc) {
-      return processAssign(aaa, wc);
-    }
-
-    @Override
-    public CAstNode visit(FieldAssign fa, WalkContext wc) {
-      return processAssign(fa, wc);
-    }
-
-    @Override
-    public CAstNode visit(LocalAssign la, WalkContext wc) {
-      return processAssign(la, wc);
-    }
-
-    protected CAstNode processAssign(Node assign, CAstNode lhsCAstNode, Assign.Operator operator, Expr rhs, WalkContext wc) {
-      if (operator == Assign.ASSIGN) {
-        return makeNode(wc, fFactory, assign, CAstNode.ASSIGN, lhsCAstNode, walkNodes(rhs, wc));
-      } else {
-        CAstNode op =
-          makeNode(wc, 
-              fFactory, 
-              assign, 
-              CAstNode.ASSIGN_PRE_OP,
-              lhsCAstNode,
-              walkNodes(rhs, wc),
-              mapAssignOperator(operator));
-
-        if (rhs.type().isLongOrLess() &&
-            (mapAssignOperator(operator)==CAstOperator.OP_DIV ||
-             mapAssignOperator(operator)==CAstOperator.OP_MOD))
-        {
-          Collection excTargets = wc.getCatchTargets(fDivByZeroType);
-          if (!excTargets.isEmpty()) {
-            for (Iterator iterator = excTargets.iterator(); iterator.hasNext();) {
-              Pair catchPair = (Pair) iterator.next();
-              wc.cfg().add(op, catchPair.snd, fDivByZeroType);
-            }
-          } else {
-            wc.cfg().add(op, 
-                CAstControlFlowMap.EXCEPTION_TO_EXIT, 
-                fDivByZeroType);
-          }
-        }
-
-        return op;
-      }
-    }
-
-    private CAstNode processAssign(Assign a, WalkContext wc) {
-      Expr lhs= a.left(fNodeFactory).type(a.type()); // PORT1.7 An Assign no longer has a lhs Expr per se; but you can ask it to materialize one...
-      WalkContext lvc = new AssignmentContext(wc);
-
-      return processAssign(a, walkNodes(lhs, lvc), a.operator(), a.right(), wc);
-    }
-
-    protected CAstOperator mapAssignOperator(Assign.Operator op) {
-      if (op == Assign.ADD_ASSIGN)
-        return CAstOperator.OP_ADD;
-      else if (op == Assign.BIT_AND_ASSIGN)
-        return CAstOperator.OP_BIT_AND;
-      else if (op == Assign.BIT_OR_ASSIGN)
-        return CAstOperator.OP_BIT_OR;
-      else if (op == Assign.BIT_XOR_ASSIGN)
-        return CAstOperator.OP_BIT_XOR;
-      else if (op == Assign.DIV_ASSIGN)
-        return CAstOperator.OP_DIV;
-      else if (op == Assign.MOD_ASSIGN)
-        return CAstOperator.OP_MOD;
-      else if (op == Assign.MUL_ASSIGN)
-        return CAstOperator.OP_MUL;
-      else if (op == Assign.SHL_ASSIGN)
-        return CAstOperator.OP_LSH;
-      else if (op == Assign.SHR_ASSIGN)
-        return CAstOperator.OP_RSH;
-      else if (op == Assign.SUB_ASSIGN)
-        return CAstOperator.OP_SUB;
-      else if (op == Assign.USHR_ASSIGN)
-        return CAstOperator.OP_URSH;
-      Assertions.UNREACHABLE("Unknown assignment operator");
-      return null;
-    }
-
-    @Override
-    public CAstNode visit(Binary b, WalkContext wc) {
-      Expr left = b.left();
-      Expr right = b.right();
-      Operator operator = b.operator();
-
-      if (operator.equals(Binary.COND_AND))
-        return makeNode(wc, fFactory, b, CAstNode.IF_EXPR, walkNodes(left, wc), walkNodes(right, wc), fFactory.makeConstant(false));
-      else if (operator.equals(Binary.COND_OR))
-        return makeNode(wc, fFactory, b, CAstNode.IF_EXPR, walkNodes(left, wc), fFactory.makeConstant(true), walkNodes(right, wc));
-      else {
-	Type leftType = left.type();
-	Type rightType = right.type();
-	if (leftType.isPrimitive() && rightType.isPrimitive()) {
-	  CAstNode leftNode = walkNodes(left, wc);
-	  CAstNode rightNode = walkNodes(right, wc);
-	  
-	  try {
-	    Type result = fTypeSystem.promote(leftType, rightType);
-
-	    if (! result.typeEquals(leftType, fTypeSystem.emptyContext())) {
-	      leftNode = makeNode(wc, fFactory, b, CAstNode.CAST, fFactory.makeConstant(getTypeDict().getCAstTypeFor(result)), leftNode, fFactory.makeConstant(getTypeDict().getCAstTypeFor(leftType)));
-	    }
-
-	    if (! result.typeEquals(rightType, fTypeSystem.emptyContext())) {
-	      rightNode = makeNode(wc, fFactory, b, CAstNode.CAST, fFactory.makeConstant(getTypeDict().getCAstTypeFor(result)), rightNode, fFactory.makeConstant(getTypeDict().getCAstTypeFor(rightType)));
-	    }
-	  } catch (SemanticException e) {
-
-	  }
-
-	  CAstNode op = makeNode(wc, fFactory, b, CAstNode.BINARY_EXPR, mapBinaryOpcode(operator), leftNode, rightNode);
-
-	  if (leftType.isLongOrLess() &&
-	      rightType.isLongOrLess() &&
-	      (mapBinaryOpcode(operator)==CAstOperator.OP_DIV ||
-	       mapBinaryOpcode(operator)==CAstOperator.OP_MOD))
-	  {
-	    Collection excTargets = wc.getCatchTargets(fDivByZeroType);
-	    if (!excTargets.isEmpty()) {
-	      for (Iterator iterator = excTargets.iterator(); 
-		   iterator.hasNext();) 
-	      {
-		Pair catchPair = (Pair) iterator.next();
-		wc.cfg().add(op, catchPair.snd, fDivByZeroType);
-	      }
-	    } else {
-	      wc.cfg().add(op, 
-			   CAstControlFlowMap.EXCEPTION_TO_EXIT, 
-			   fDivByZeroType);
-	    }
-	  }
-
-	  return op;
-	  
-	} else {
-	  return makeNode(wc, fFactory, b, CAstNode.BINARY_EXPR, mapBinaryOpcode(operator), walkNodes(left, wc), walkNodes(right, wc));
-	}
-      }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void handleThrowsFromCall(ProcedureInstance procedureInstance, Node callAstNode, WalkContext wc) {
-      List<Type> throwTypes = procedureInstance.throwTypes();
-      for (Iterator<Type> iter = IteratorPlusOne.make(throwTypes.iterator(), fREType); iter.hasNext();) {
-        Type thrownType = iter.next();
-        Collection/* <Pair<Type,Node>> */catchTargets = wc.getCatchTargets(thrownType);
-
-        for (Iterator targetIter = catchTargets.iterator(); targetIter.hasNext();) {
-          Pair/* <Type,Node> */catchTarget = (Pair/* <Type,Node> */) targetIter.next();
-
-          wc.cfg().add(callAstNode, catchTarget.snd, catchTarget.fst);
-        }
-      }
-    }
-
-    @Override
-    public CAstNode visit(Call c, WalkContext wc) {
-      MethodInstance methodInstance = c.methodInstance();
-      boolean isStatic = methodInstance.flags().isStatic();
-      StructType methodOwner = methodInstance.container();
-
-      if (methodOwner.isArray()) {
-        List realOne = methodInstance.overrides(fTypeSystem.emptyContext());
-        Assertions.productionAssertion(realOne.size() == 2, "bad array method");
-        methodInstance = (MethodInstance) realOne.get(1);
-        methodOwner = methodInstance.container();
-      }
-
-      if (!methodOwner.isClass()) {
-        Assertions.productionAssertion(false, "owner " + methodOwner + " of " + methodInstance + " is not a class");
-      }
-
-      boolean isIntf = ((ClassType) methodOwner).flags().isInterface();
-      Receiver target = c.target();
-      boolean isSpecial = methodInstance.flags().isPrivate()
-          || (target instanceof Special && ((Special) target).kind() == Special.SUPER);
-
-      CAstNode[] children = new CAstNode[2 + methodInstance.formalTypes().size()]; // including
-      // the
-      // MethodReference
-      int i = 0;
-
-      if (!isStatic)
-        children[i++] = walkNodes(target, wc);
-      else
-        children[i++] = makeNode(wc, fFactory, null, CAstNode.VOID);
-
-      if (children[0] == null) {
-        Assertions.productionAssertion(children[0] != null, "no receiver for " + methodInstance + " in " + wc.getEnclosingMethod());
-      }
-
-      MethodReference methodRef = fIdentityMapper.getMethodRef(methodInstance);
-      int dummyPC = 0; // Just want to wrap the kind of call; the "rear end"
-      // won't care about anything else...
-      CallSiteReference callSiteRef;
-
-      if (isStatic)
-        callSiteRef = CallSiteReference.make(dummyPC, methodRef, IInvokeInstruction.Dispatch.STATIC);
-      else if (isIntf)
-        callSiteRef = CallSiteReference.make(dummyPC, methodRef, IInvokeInstruction.Dispatch.INTERFACE);
-      else if (isSpecial)
-        callSiteRef = CallSiteReference.make(dummyPC, methodRef, IInvokeInstruction.Dispatch.SPECIAL);
-      else
-        callSiteRef = CallSiteReference.make(dummyPC, methodRef, IInvokeInstruction.Dispatch.VIRTUAL);
-
-      children[i++] = fFactory.makeConstant(callSiteRef);
-      for (Iterator iter = c.arguments().iterator(); iter.hasNext();) {
-        Expr arg = (Expr) iter.next();
-        children[i++] = walkNodes(arg, wc);
-      }
-
-      handleThrowsFromCall(methodInstance, c, wc);
-
-      CAstNode result = makeNode(wc, fFactory, c, CAstNode.CALL, children);
-      wc.cfg().map(c, result);
-      return result;
-    }
-
-    @Override
-    public CAstNode visit(ConstructorCall cc, WalkContext wc) {
-      ConstructorInstance ctorInstance = cc.constructorInstance();
-      StructType methodOwner = ctorInstance.container();
-      Assertions.productionAssertion(methodOwner.isClass());
-      MethodReference methodRef = fIdentityMapper.getMethodRef(ctorInstance);
-
-      int dummyPC = 0; // Just want to wrap the kind of call; the "rear end"
-      // won't care about anything else...
-      CallSiteReference callSiteRef = CallSiteReference.make(dummyPC, methodRef, IInvokeInstruction.Dispatch.SPECIAL);
-
-      CAstNode[] children = new CAstNode[1 + 1 + ctorInstance.formalTypes().size()]; // including
-      // the
-      // MethodReference
-      int i = 0;
-
-      CAstNode targetNode;
-
-      targetNode = (cc.kind() == ConstructorCall.THIS) ? makeNode(wc, fFactory, cc, CAstNode.THIS) : makeNode(wc, fFactory, cc,
-          CAstNode.SUPER);
-
-      children[i++] = targetNode;
-      children[i++] = fFactory.makeConstant(callSiteRef);
-      for (Iterator iter = cc.arguments().iterator(); iter.hasNext();) {
-        Expr arg = (Expr) iter.next();
-        children[i++] = walkNodes(arg, wc);
-      }
-
-      handleThrowsFromCall(ctorInstance, cc, wc);
-
-      CAstNode result = makeNode(wc, fFactory, cc, CAstNode.CALL, children);
-      wc.cfg().map(cc, result);
-      return result;
-    }
-
-    @Override
-    public CAstNode visit(Cast c, WalkContext wc) {
-      Expr arg = c.expr();
-      Type castedFrom = arg.type();
-      Type castedTo = c.castType().type();
-
-      // null can go into anything (e.g. in "((Foobar) null)" null can be assumed to be of type Foobar already) 
-      if (castedFrom.isNull())
-        castedFrom = castedTo;
-      
-      CAstNode ast = makeNode(wc, fFactory, c, CAstNode.CAST, fFactory.makeConstant(getTypeDict().getCAstTypeFor(castedTo)),
-          walkNodes(arg, wc),
-	  fFactory.makeConstant(getTypeDict().getCAstTypeFor(castedFrom)));
-
-      Collection excTargets = wc.getCatchTargets(fCCEType);
-      if (!excTargets.isEmpty()) {
-        // connect ClassCastException exception edge to relevant catch targets
-        // (presumably only one)
-        for (Iterator iterator = excTargets.iterator(); iterator.hasNext();) {
-          Pair catchPair = (Pair) iterator.next();
-          wc.cfg().add(c, catchPair.snd, fCCEType);
-        }
-      } else {
-        // connect exception edge to exit
-        wc.cfg().add(c, CAstControlFlowMap.EXCEPTION_TO_EXIT, fCCEType);
-      }
-
-      wc.cfg().map(c, ast);
-      return ast;
-    }
-
-    @Override
-    public CAstNode visit(Conditional c, WalkContext wc) {
-      return makeNode(wc, fFactory, c, CAstNode.IF_EXPR, walkNodes(c.cond(), wc), walkNodes(c.consequent(), wc), walkNodes(c
-          .alternative(), wc));
-    }
-
-    @Override
-    public CAstNode visit(Instanceof io, WalkContext wc) {
-      return makeNode(wc, fFactory, io, CAstNode.INSTANCEOF, fFactory.makeConstant(getTypeDict().getCAstTypeFor(
-          io.compareType().type())), walkNodes(io.expr(), wc));
-    }
-
-    @Override
-    public CAstNode visit(BooleanLit bl, WalkContext wc) {
-      return fFactory.makeConstant(bl.value());
-    }
-
-    @Override
-    public CAstNode visit(ClassLit cl, WalkContext wc) {
-      Type litType = cl.typeNode().type();
-      String typeName = fIdentityMapper.typeToTypeID(litType);
-      return makeNode(wc, fFactory, cl, CAstNode.TYPE_LITERAL_EXPR, fFactory.makeConstant(typeName));
-    }
-
-    @Override
-    public CAstNode visit(FloatLit fl, WalkContext wc) {
-      return (fl.kind() == FloatLit.FLOAT) ? fFactory.makeConstant((float) fl.value()) : fFactory.makeConstant(fl.value());
-    }
-
-    @Override
-    public CAstNode visit(NullLit nl, WalkContext wc) {
-      return fFactory.makeConstant(null);
-    }
-
-    @Override
-    public CAstNode visit(CharLit cl, WalkContext wc) {
-      return fFactory.makeConstant(cl.value());
-    }
-
-    @Override
-    public CAstNode visit(IntLit il, WalkContext wc) {
-      return fFactory.makeConstant((int) il.value());
-    }
-
-    @Override
-    public CAstNode visit(StringLit sl, WalkContext wc) {
-      return fFactory.makeConstant(sl.value());
-    }
-
-    @Override
-    public CAstNode visit(New n, WalkContext wc) {
-      CAstEntity anonClass = null;
-      String newTypeNameStr;
-      TypeReference newTypeRef;
-      ConstructorInstance ctorInst = n.constructorInstance();
-      MethodReference ctorRef = fIdentityMapper.getMethodRef(ctorInst);
-
-      if (n.body() != null) {
-        fIdentityMapper.mapLocalAnonTypeToMethod((ClassType) n.type(), wc.getEnclosingMethod());
-
-        anonClass = walkEntity(n, wc);
-
-        newTypeNameStr = anonClass.getType().getName();
-        TypeName newTypeName = TypeName.string2TypeName(newTypeNameStr);
-        Selector ctorSel = ctorRef.getSelector();
-        newTypeRef = TypeReference.findOrCreate(fClassLoaderRef, newTypeName);
-        ctorRef = MethodReference.findOrCreate(newTypeRef, ctorSel);
-      } else {
-        newTypeRef = fIdentityMapper.getTypeRef(n.type());
-      }
-
-      List/* <Expr> */args = n.arguments();
-      String tmpName = "ctor temp"; // this name is an illegal Java
-      // identifier
-
-      // new nodes with an explicit enclosing argument, e.g. "outer.new Inner()". They are mostly treated the same, except in JavaCAst2IRTranslator.doNewObject
-      CAstNode newNode;
-      Expr enclosing = n.qualifier();
-      if (enclosing != null) {
-        CAstNode encNode = walkNodes(enclosing, wc);
-        newNode = makeNode(wc, fFactory, n, CAstNode.NEW_ENCLOSING, fFactory.makeConstant(newTypeRef), encNode);
-      }
-      else 
-        newNode = makeNode(wc, fFactory, n, CAstNode.NEW, fFactory.makeConstant(newTypeRef));
-      // end enclosing new stuff
-
-      if (n.body() != null)
-        wc.addScopedEntity(newNode, anonClass);
-
-      int dummyPC = 0; // Just want to wrap the kind of call; the "rear end"
-      // won't care about anything else...
-      CallSiteReference callSiteRef = CallSiteReference.make(dummyPC, ctorRef, IInvokeInstruction.Dispatch.SPECIAL);
-
-      CAstNode[] argNodes = new CAstNode[args.size() + 2]; // args + recvr
-      // + ctor ref
-
-      int idx = 0;
-      argNodes[idx++] = makeNode(wc, fFactory, n, CAstNode.VAR, fFactory.makeConstant(tmpName));
-      argNodes[idx++] = fFactory.makeConstant(callSiteRef);
-      for (Iterator iter = args.iterator(); iter.hasNext();) {
-        Expr arg = (Expr) iter.next();
-        argNodes[idx++] = walkNodes(arg, wc);
-      }
-      CAstNode callNode = makeNode(wc, fFactory, n, CAstNode.CALL, argNodes);
-      wc.cfg().map(n, callNode);
-
-      handleThrowsFromCall(ctorInst, n, wc);
-
-      return makeNode(wc, fFactory, n, CAstNode.LOCAL_SCOPE, makeNode(wc, fFactory, n, CAstNode.BLOCK_EXPR, makeNode(wc, fFactory,
-          n, CAstNode.DECL_STMT, fFactory.makeConstant(new InternalCAstSymbol(tmpName, getTypeDict().getCAstTypeFor(n.type()), true)), newNode), callNode, makeNode(wc,
-          fFactory, n, CAstNode.VAR, fFactory.makeConstant(tmpName))));
-    }
-
-    @Override
-    public CAstNode visit(NewArray na, WalkContext wc) {
-      Type newType = na.type();
-      ArrayInit ai = na.init();
-      Assertions.productionAssertion(newType.isArray());
-
-      if (ai != null) {
-        return visit(ai, wc, newType);
-      } else {
-        ArrayType arrayType = (ArrayType) newType;
-        TypeReference arrayTypeRef = fIdentityMapper.getTypeRef(arrayType);
-
-        List/* <Expr> */dims = na.dims();
-        CAstNode[] args = new CAstNode[dims.size() + 1];
-
-        int idx = 0;
-        args[idx++] = fFactory.makeConstant(arrayTypeRef);
-        for (Iterator iter = dims.iterator(); iter.hasNext();) {
-          Expr dimExpr = (Expr) iter.next();
-          args[idx++] = walkNodes(dimExpr, wc);
-        }
-        return makeNode(wc, fFactory, na, CAstNode.NEW, args);
-      }
-    }
-
-    @Override
-    public CAstNode visit(Special s, WalkContext wc) {
-      if (s.qualifier() != null) {
-        Type owningType = s.qualifier().type();
-        TypeReference owningTypeRef = fIdentityMapper.getTypeRef(owningType);
-
-        return makeNode(wc, fFactory, s, s.kind() == Special.THIS ? CAstNode.THIS : CAstNode.SUPER, fFactory
-            .makeConstant(owningTypeRef));
-      } else {
-        return makeNode(wc, fFactory, s, s.kind() == Special.THIS ? CAstNode.THIS : CAstNode.SUPER);
-      }
-    }
-
-    @Override
-    public CAstNode visit(Unary u, WalkContext wc) {
-      if (isAssignOp(u.operator())) {
-        WalkContext lvc = new AssignmentContext(wc);
-        if (u.operator().isPrefix())
-          return makeNode(wc, fFactory, u, CAstNode.ASSIGN_PRE_OP, walkNodes(u.expr(), lvc), fFactory.makeConstant(1),
-              mapUnaryOpcode(u.operator()));
-        else
-          return makeNode(wc, fFactory, u, CAstNode.ASSIGN_POST_OP, walkNodes(u.expr(), lvc), fFactory.makeConstant(1),
-              mapUnaryOpcode(u.operator()));
-      } else if (u.operator() == Unary.POS) // drop useless unary plus
-        // operator
-        return walkNodes(u.expr(), wc);
-      else if (u.operator() == Unary.NEG) {
-        CAstNode zero;
-        if (u.expr().type().isLongOrLess())
-          zero = fFactory.makeConstant(0L);
-        else
-          zero = fFactory.makeConstant(0.0);
-        return makeNode(wc, fFactory, u, CAstNode.BINARY_EXPR, CAstOperator.OP_SUB, zero, walkNodes(u.expr(), wc));
-      } else
-        return makeNode(wc, fFactory, u, CAstNode.UNARY_EXPR, mapUnaryOpcode(u.operator()), walkNodes(u.expr(), wc));
-    }
-
-    protected boolean isAssignOp(Unary.Operator operator) {
-      return operator == Unary.POST_DEC || operator == Unary.POST_INC || operator == Unary.PRE_DEC || operator == Unary.PRE_INC;
-    }
-
-    @Override
-    public CAstNode visit(ArrayAccess aa, WalkContext wc) {
-      TypeReference eltTypeRef = fIdentityMapper.getTypeRef(aa.type());
-
-      hookUpNPETargets(aa, wc);
-
-      CAstNode n = makeNode(wc, fFactory, aa, CAstNode.ARRAY_REF, walkNodes(aa.array(), wc), fFactory.makeConstant(eltTypeRef),
-          walkNodes(aa.index(), wc));
-      
-      wc.cfg().map(aa, n);
-      
-      return n;
-    }
-
-    protected void hookUpNPETargets(Node n, WalkContext wc) {
-      Collection excTargets = wc.getCatchTargets(fNPEType);
-      if (!excTargets.isEmpty()) {
-        // connect NPE exception edge to relevant catch targets
-        // (presumably only one)
-        for (Iterator iterator = excTargets.iterator(); iterator.hasNext();) {
-          Pair catchPair = (Pair) iterator.next();
-          wc.cfg().add(n, catchPair.snd, fNPEType);
-        }
-      } else {
-        // connect exception edge to exit
-        wc.cfg().add(n, CAstControlFlowMap.EXCEPTION_TO_EXIT, fNPEType);
-      }
-    }
-
-    @Override
-    public CAstNode visit(Field f, WalkContext wc) {
-      Receiver target = f.target();
-      Type targetType = target.type();
-
-      if (targetType.isArray()) {
-        Assertions.productionAssertion(f.name().toString().equals("length"));
-
-        return makeNode(wc, fFactory, f, CAstNode.ARRAY_LENGTH, walkNodes(target, wc));
-      }
-      FieldInstance fi = f.fieldInstance();
-      FieldReference fieldRef = fIdentityMapper.getFieldRef(fi);
-      CAstNode targetNode = walkNodes(target, wc);
-
-      if (fi.flags().isStatic()) {
-        // JLS says: evaluate the target of the field ref and throw it away.
-        // Hence the following block expr, whose 2 children are the target
-        // evaluation
-        // followed by the OBJECT_REF with a null target child (which the
-        // "back-end"
-        // CAst -> IR translator interprets as a static ref).
-        if (fi.isConstant()) {
-          return makeNode(wc, fFactory, f, CAstNode.BLOCK_EXPR, targetNode, // can have side effects!
-              translateConstant(fi.constantValue()));
-        } else {
-          return makeNode(wc, fFactory, f, CAstNode.BLOCK_EXPR, targetNode, makeNode(wc, fFactory, f, CAstNode.OBJECT_REF,
-              makeNode(wc, fFactory, null, CAstNode.VOID), fFactory.makeConstant(fieldRef)));
-        }
-      } else {
-        Collection excTargets = wc.getCatchTargets(fNPEType);
-        if (!excTargets.isEmpty()) {
-          // connect NPE exception edge to relevant catch targets
-          // (presumably only one)
-          for (Iterator iterator = excTargets.iterator(); iterator.hasNext();) {
-            Pair catchPair = (Pair) iterator.next();
-            wc.cfg().add(f, catchPair.snd, fNPEType);
-          }
-        } else {
-          // connect exception edge to exit
-          wc.cfg().add(f, CAstControlFlowMap.EXCEPTION_TO_EXIT, fNPEType);
-        }
-        CAstNode refNode = makeNode(wc, fFactory, f, CAstNode.OBJECT_REF, targetNode, fFactory.makeConstant(fieldRef));
-
-        wc.cfg().map(f, refNode);
-
-        if (fi.isConstant()) {
-          return makeNode(wc, fFactory, f, CAstNode.BLOCK_EXPR, refNode, // can have side effects!
-              translateConstant(fi.constantValue()));
-        } else {
-          return refNode;
-        }
-      }
-    }
-
-    @Override
-    public CAstNode visit(Local l, WalkContext wc) {
-      return makeNode(wc, fFactory, l, CAstNode.VAR, fFactory.makeConstant(l.name().id().toString()));
-    }
-
-    @Override
-    public CAstNode visit(ClassBody cb, WalkContext wc) {
-      Assertions.UNREACHABLE("walkNodes.ASTTraverser.visit(ClassBody)");
-      return null;
-    }
-
-    @Override
-    public CAstNode visit(ClassDecl cd, WalkContext wc) {
-      Assertions.UNREACHABLE("walkNodes.ASTTraverser.visit(ClassDecl)");
-      return null;
-    }
-
-    @Override
-    public CAstNode visit(Initializer i, WalkContext wc) {
-      // Perhaps this is invoked from within the ConstructorDecl visit()
-      // method...
-      return walkNodes(i.body(), wc);
-    }
-
-    @Override
-    public CAstNode visit(Assert a, WalkContext wc) {
-      return PolyglotJava2CAstTranslator.this.makeNode(wc, fFactory, a, CAstNode.ASSERT, walkNodes(a.cond(), wc));
-    }
-
-    @Override
-    public CAstNode visit(Branch b, WalkContext wc) {
-      Node target = null;
-      Id labelNode = b.labelNode();
-      String labelStr = labelNode != null ? labelNode.id().toString() : null;
-      if (b.kind() == Branch.BREAK) {
-        target = wc.getBreakFor(labelStr);
-      } else {
-        target = wc.getContinueFor(labelStr);
-      }
-
-      Assertions.productionAssertion(target != null);
-
-      CAstNode result = makeNode(wc, fFactory, b, CAstNode.GOTO);
-
-      wc.cfg().map(b, result);
-      wc.cfg().add(b, target, null);
-
-      return result;
-    }
-
-    @Override
-    public CAstNode visit(Block b, WalkContext wc) {
-      CAstNode[] stmtNodes = new CAstNode[b.statements().size()];
-
-      int idx = 0;
-      for (Iterator iter = b.statements().iterator(); iter.hasNext(); idx++) {
-        Stmt s = (Stmt) iter.next();
-        stmtNodes[idx] = walkNodes(s, wc);
-      }
-      return makeNode(wc, fFactory, b, CAstNode.LOCAL_SCOPE, makeNode(wc, fFactory, b, CAstNode.BLOCK_STMT, stmtNodes));
-    }
-
-    @Override
-    public CAstNode visit(SwitchBlock sb, WalkContext wc) {
-      CAstNode[] stmtNodes = new CAstNode[sb.statements().size()];
-
-      int idx = 0;
-      for (Iterator iter = sb.statements().iterator(); iter.hasNext(); idx++) {
-        Stmt s = (Stmt) iter.next();
-        stmtNodes[idx] = walkNodes(s, wc);
-      }
-      return makeNode(wc, fFactory, sb, CAstNode.BLOCK_STMT, stmtNodes);
-    }
-
-    @Override
-    public CAstNode visit(Catch c, WalkContext wc) {
-      Block body = c.body();
-      Formal f = c.formal();
-
-      CAstNode excDecl = makeNode(wc, fFactory, c, CAstNode.CATCH, fFactory.makeConstant(f.name().id().toString()), walkNodes(body, wc));
-      CAstNode localScope = makeNode(wc, fFactory, c, CAstNode.LOCAL_SCOPE, excDecl);
-
-      wc.cfg().map(c, excDecl);
-      wc.getNodeTypeMap().add(excDecl, wc.getTypeDictionary().getCAstTypeFor(c.catchType()));
-      return localScope;
-    }
-
-    @Override
-    public CAstNode visit(If i, WalkContext wc) {
-      return makeNode(wc, fFactory, i, CAstNode.IF_STMT, walkNodes(i.cond(), wc), walkNodes(i.consequent(), wc), walkNodes(i
-          .alternative(), wc));
-    }
-
-    @Override
-    public CAstNode visit(Labeled l, WalkContext wc) {
-      Node breakTarget = makeBreakTarget(l);
-
-      Node stmt = l.statement();
-      while (stmt instanceof Block) {
-        stmt = ((Block) stmt).statements().iterator().next();
-      }
-
-      wc.getLabelMap().put(stmt, l.labelNode().id().toString());
-
-      CAstNode result;
-      if (! (l.statement() instanceof Empty)) {
-	WalkContext child = new BreakContext(wc, l.labelNode().id().toString(), breakTarget);
-
-	result = 
-	  makeNode(wc, fFactory, l, CAstNode.BLOCK_STMT, 
-	    makeNode(wc, fFactory, l, CAstNode.LABEL_STMT, fFactory.makeConstant(l.labelNode().id().toString()), walkNodes(l.statement(), child)),
-	    walkNodes(breakTarget, wc));
-      } else {
-	result = 
-	  makeNode(wc, fFactory, l, CAstNode.LABEL_STMT, fFactory.makeConstant(l.labelNode().id().toString()), walkNodes(l.statement(), wc));
-      }
-
-      wc.cfg().map(l, result);
-
-      wc.getLabelMap().remove(stmt);
-
-      return result;
-    }
-
-    @Override
-    public CAstNode visit(LocalClassDecl lcd, WalkContext wc) {
-      fIdentityMapper.mapLocalAnonTypeToMethod(lcd.decl().classDef().asType(), wc.getEnclosingMethod());
-
-      CAstEntity classEntity = walkEntity(lcd.decl(), wc);
-
-      final CAstNode lcdNode = makeNode(wc, fFactory, lcd, CAstNode.EMPTY);
-
-      wc.addScopedEntity(lcdNode, classEntity);
-      return lcdNode;
-    }
-
-    protected Node makeBreakTarget(Node loop) {
-      return fNodeFactory.Labeled(Position.COMPILER_GENERATED,
-              fNodeFactory.Id(Position.COMPILER_GENERATED, "breakLabel" + loop.position().toString().replace('.', '_')),
-              fNodeFactory.Empty(Position.COMPILER_GENERATED));
-    }
-
-    protected Node makeContinueTarget(Node loop) {
-      return fNodeFactory.Labeled(Position.COMPILER_GENERATED,
-              fNodeFactory.Id(Position.COMPILER_GENERATED, "continueLabel" + loop.position().toString().replace('.', '_')),
-          fNodeFactory.Empty(Position.COMPILER_GENERATED));
-    }
-
-    @Override
-    public CAstNode visit(Do d, WalkContext wc) {
-      Node breakTarget = makeBreakTarget(d);
-      Node continueTarget = makeContinueTarget(d);
-
-      String loopLabel = wc.getLabelMap().get(d);
-
-      CAstNode continueNode = walkNodes(continueTarget, wc);
-      CAstNode breakNode = walkNodes(breakTarget, wc);
-
-      
-      WalkContext lc = new LoopContext(wc, loopLabel, breakTarget, continueTarget);
-      CAstNode loopExpr = walkNodes(d.cond(), wc);
-      CAstNode loopBody = walkNodes(d.body(), lc);
- 
-      return doLoopTranslator.translateDoLoop(loopExpr, loopBody, continueNode, breakNode, wc);
-    }
-
-    
-    @Override
-    public CAstNode visit(For f, WalkContext wc) {
-      Node breakTarget = makeBreakTarget(f);
-      Node continueTarget = makeContinueTarget(f);
-      String loopLabel = wc.getLabelMap().get(f);
-      WalkContext lc = new LoopContext(wc, loopLabel, breakTarget, continueTarget);
-
-      CAstNode[] inits = new CAstNode[f.inits().size()];
-      for (int i = 0; i < inits.length; i++) {
-        inits[i] = walkNodes(f.inits().get(i), wc);
-      }
-
-      CAstNode[] iters = new CAstNode[f.iters().size()];
-      for (int i = 0; i < iters.length; i++) {
-        iters[i] = walkNodes(f.iters().get(i), wc);
-      }
-
-      CAstNode initsBlock = makeNode(wc, fFactory, f, CAstNode.BLOCK_STMT, inits);
-      CAstNode itersBlock = makeNode(wc, fFactory, f, CAstNode.BLOCK_STMT, iters);
-
-      return makeNode(wc, fFactory, f, CAstNode.BLOCK_STMT, initsBlock, makeNode(wc, fFactory, f, CAstNode.LOOP, walkNodes(
-          f.cond(), wc), makeNode(wc, fFactory, f, CAstNode.BLOCK_STMT, walkNodes(f.body(), lc), walkNodes(continueTarget, wc),
-          itersBlock)), walkNodes(breakTarget, wc));
-
-    }
-
-    @Override
-    public CAstNode visit(While w, WalkContext wc) {
-      Expr c = w.cond();
-      Stmt b = w.body();
-
-      Node breakTarget = makeBreakTarget(w);
-      Node continueTarget = makeContinueTarget(w);
-      String loopLabel = wc.getLabelMap().get(w);
-      LoopContext lc = new LoopContext(wc, loopLabel, breakTarget, continueTarget);
-
-      /*
-       * The following loop is created sligtly differently than in jscore. It doesn't have a specific target for continue.
-       */
-      return makeNode(wc, fFactory, w, CAstNode.BLOCK_STMT, makeNode(wc, fFactory, w, CAstNode.LOOP, walkNodes(c, wc), makeNode(wc,
-          fFactory, w, CAstNode.BLOCK_STMT, walkNodes(b, lc), walkNodes(continueTarget, wc))), walkNodes(breakTarget, wc));
-    }
-
-    @Override
-    public CAstNode visit(Switch s, WalkContext wc) {
-	Node breakLabel = fNodeFactory.Labeled(s.position(),
-	        fNodeFactory.Id(s.position(), "switchBreakLabel" + s.position().toString().replace('.', '_')),
-	        fNodeFactory.Empty(s.position()));
-      CAstNode breakAst = walkNodes(breakLabel, wc);
-      String loopLabel = wc.getLabelMap().get(s);
-      WalkContext child = new BreakContext(wc, loopLabel, breakLabel);
-      Expr cond = s.expr();
-      List cases = s.elements();
-
-      // First compute the control flow edges for the various case labels
-      for (int i = 0; i < cases.size(); i++) {
-        SwitchElement se = (SwitchElement) cases.get(i);
-        if (se instanceof Case) {
-          Case c = (Case) se;
-
-          if (c.isDefault())
-            wc.cfg().add(s, c, CAstControlFlowMap.SWITCH_DEFAULT);
-          else
-            wc.cfg().add(s, c, fFactory.makeConstant(c.value()));
-        }
-      }
-      CAstNode[] caseNodes = new CAstNode[cases.size()];
-
-      // Now produce the CAst representation for each case
-      int idx = 0;
-      for (Iterator iter = cases.iterator(); iter.hasNext(); idx++) {
-        SwitchElement se = (SwitchElement) iter.next();
-
-        caseNodes[idx] = walkNodes(se, child);
-      }
-
-      // Now produce the switch stmt itself
-      CAstNode switchAst = makeNode(wc, fFactory, s, CAstNode.SWITCH, walkNodes(cond, wc), makeNode(wc, fFactory, s,
-          CAstNode.BLOCK_STMT, caseNodes));
-
-      wc.cfg().map(s, switchAst);
-
-      // Finally, wrap the entire switch in a block so that we have a
-      // well-defined place to 'break' to.
-      return makeNode(wc, fFactory, s, CAstNode.BLOCK_STMT, switchAst, breakAst);
-    }
-
-    @Override
-    public CAstNode visit(Synchronized s, WalkContext wc) {
-      CAstNode exprNode = walkNodes(s.expr(), wc);
-      String exprName = fFactory.makeUnique();
-      CAstNode declStmt = makeNode(wc, fFactory, s, CAstNode.DECL_STMT, fFactory.makeConstant(new CAstSymbolImpl(exprName, getTypeDict().getCAstTypeFor(s.expr().type()), true)),
-          exprNode);
-      CAstNode monitorEnterNode = makeNode(wc, fFactory, s, CAstNode.MONITOR_ENTER, makeNode(wc, fFactory, s, CAstNode.VAR,
-          fFactory.makeConstant(exprName)));
-      CAstNode bodyNodes = walkNodes(s.body(), wc);
-      CAstNode monitorExitNode = makeNode(wc, fFactory, s, CAstNode.MONITOR_EXIT, makeNode(wc, fFactory, s, CAstNode.VAR, fFactory
-          .makeConstant(exprName)));
-      CAstNode tryBody = makeNode(wc, fFactory, s, CAstNode.BLOCK_STMT, monitorEnterNode, bodyNodes);
-      CAstNode bigBody = makeNode(wc, fFactory, s, CAstNode.UNWIND, tryBody, monitorExitNode);
-
-      return makeNode(wc, fFactory, s, CAstNode.BLOCK_STMT, declStmt, bigBody);
-    }
-
-    @Override
-    public CAstNode visit(Try t, WalkContext wc) {
-      List catchBlocks = t.catchBlocks();
-      Block finallyBlock = t.finallyBlock();
-      Block tryBlock = t.tryBlock();
-
-      // try/finally
-      if (catchBlocks.isEmpty()) {
-        return makeNode(wc, fFactory, t, CAstNode.UNWIND, walkNodes(tryBlock, wc), walkNodes(finallyBlock, wc));
-
-        // try/catch/[finally]
-      } else {
-        TryCatchContext tc = new TryCatchContext(wc, t, fTypeSystem.emptyContext());
-
-        CAstNode tryNode = walkNodes(tryBlock, tc);
-        for (Iterator iter = catchBlocks.iterator(); iter.hasNext();) {
-          tryNode = makeNode(wc, fFactory, t, CAstNode.TRY, tryNode, walkNodes((Catch) iter.next(), wc));
-        }
-
-        // try/catch
-        if (finallyBlock == null) {
-          return tryNode;
-
-          // try/catch/finally
-        } else {
-          return makeNode(wc, fFactory, t, CAstNode.UNWIND, tryNode, walkNodes(finallyBlock, wc));
-        }
-      }
-    }
-
-    @Override
-    public CAstNode visit(Empty e, WalkContext wc) {
-      CAstNode result = makeNode(wc, fFactory, e, CAstNode.EMPTY);
-      wc.cfg().map(e, result);
-      return result;
-    }
-
-    @Override
-    public CAstNode visit(Eval e, WalkContext wc) {
-      return walkNodes(e.expr(), wc);
-    }
-
-    @Override
-    public CAstNode visit(LocalDecl ld, WalkContext wc) {
-      Expr init = ld.init();
-      Type type = ld.declType();
-      CAstNode initNode;
-      if (init == null) {
-        if (type.isLongOrLess())
-          initNode = fFactory.makeConstant(0);
-        else if (type.isDouble() || type.isFloat())
-          initNode = fFactory.makeConstant(0.0);
-        else
-          initNode = fFactory.makeConstant(null);
-      } else if (init instanceof ArrayInit)
-        initNode = visit((ArrayInit) init, wc, type); 
-      else
-          initNode = walkNodes(init, wc);
-
-      Object defaultValue;
-      if (type.isLongOrLess())
-        defaultValue = new Integer(0);
-      else if (type.isDouble() || type.isFloat())
-        defaultValue = new Double(0.0);
-      else
-        defaultValue = CAstSymbol.NULL_DEFAULT_VALUE;
-
-      boolean isFinal = ld.flags().flags().isFinal();
-
-      return makeNode(wc, fFactory, ld, CAstNode.DECL_STMT, fFactory.makeConstant(new CAstSymbolImpl(ld.name().id().toString(), getTypeDict().getCAstTypeFor(type), isFinal,
-          defaultValue)), initNode);
-    }
-
-    @Override
-    public CAstNode visit(Return r, WalkContext wc) {
-      Expr retExpr = r.expr();
-      if (retExpr == null)
-        return makeNode(wc, fFactory, r, CAstNode.RETURN);
-      else
-        return makeNode(wc, fFactory, r, CAstNode.RETURN, walkNodes(retExpr, wc));
-    }
-
-    @Override
-    public CAstNode visit(Case c, WalkContext wc) {
-      CAstNode label = makeNode(wc, fFactory, c, CAstNode.LABEL_STMT, fFactory.makeConstant(c.value()));
-
-      wc.cfg().map(c, label);
-      return label;
-    }
-
-    @Override
-    public CAstNode visit(Throw t, WalkContext wc) {
-      CAstNode result = makeNode(wc, fFactory, t, CAstNode.THROW, walkNodes(t.expr(), wc));
-      Type label = t.expr().type();
-
-      wc.cfg().map(t, result);
-
-      Collection/* <Pair<Type,Node>> */catchNodes = wc.getCatchTargets(label);
-
-      for (Iterator iter = catchNodes.iterator(); iter.hasNext();) {
-        Pair/* <Type,Node> */catchNode = (Pair/* <Type,Node> */) iter.next();
-
-        wc.cfg().add(t, catchNode.snd, catchNode.fst);
-      }
-
-      return result;
-    }
-
-    @Override
-    public CAstNode visit(Formal f, WalkContext wc) {
-      return makeNode(wc, fFactory, f, CAstNode.VAR, fFactory.makeConstant(f.name().id().toString()));
-    }
-  }
-
-  protected static final class CompilationUnitEntity implements CAstEntity {
-    private final String fName;
-
-    private final Collection<CAstEntity> fTopLevelDecls;
-
-    public CompilationUnitEntity(SourceFile file, List<CAstEntity> topLevelDecls) {
-      fName = (file.package_() == null) ? "" : file.package_().package_().get().fullName().toString().replace('.', '/');
-      fTopLevelDecls = topLevelDecls;
-    }
-
-    @Override
-    public int getKind() {
-      return FILE_ENTITY;
-    }
-
-    @Override
-    public String getName() {
-      return fName;
-    }
-
-    @Override
-    public String getSignature() {
-      Assertions.UNREACHABLE();
-      return null;
-    }
-
-    @Override
-    public String[] getArgumentNames() {
-      return new String[0];
-    }
-
-    @Override
-    public CAstNode[] getArgumentDefaults() {
-      return new CAstNode[0];
-    }
-
-    @Override
-    public int getArgumentCount() {
-      return 0;
-    }
-
-    @Override
-    public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
-      return Collections.singletonMap(null, fTopLevelDecls);
-    }
-
-    @Override
-    public Iterator<CAstEntity> getScopedEntities(CAstNode construct) {
-      Assertions.UNREACHABLE("CompilationUnitEntity asked for AST-related entities, but it has no AST.");
-      return null;
-    }
-
-    @Override
-    public CAstNode getAST() {
-      return null;
-    }
-
-    @Override
-    public Collection<CAstAnnotation> getAnnotations() {
-        return null;
-    }
-
-    @Override
-    public CAstControlFlowMap getControlFlow() {
-      Assertions.UNREACHABLE("CompilationUnitEntity.getControlFlow()");
-      return null;
-    }
-
-    @Override
-    public CAstSourcePositionMap getSourceMap() {
-      Assertions.UNREACHABLE("CompilationUnitEntity.getSourceMap()");
-      return null;
-    }
-
-    @Override
-    public CAstSourcePositionMap.Position getPosition() {
-      return null;
-    }
-
-    @Override
-    public CAstNodeTypeMap getNodeTypeMap() {
-      Assertions.UNREACHABLE("CompilationUnitEntity.getNodeTypeMap()");
-      return null;
-    }
-
-    @Override
-    public Collection<CAstQualifier> getQualifiers() {
-      return Collections.emptyList();
-    }
-
-    @Override
-    public CAstType getType() {
-      Assertions.UNREACHABLE("CompilationUnitEntity.getType()");
-      return null;
-    }
-  }
-
-  public class PolyglotJavaType implements JavaType {
-    protected final CAstTypeDictionary fDict;
-
-    protected final TypeSystem fSystem;
-
-    protected final ClassType fType;
-
-    private Collection<CAstType> fSuperTypes = null;
-
-    public PolyglotJavaType(ClassType type, CAstTypeDictionary dict, TypeSystem system) {
-      super();
-      fDict = dict;
-      fSystem = system;
-      fType = type;
-    }
-
-    @Override
-    public String getName() {
-      // TODO Will the IdentityMapper do the right thing for anonymous classes?
-      // If so, we can delete most of the following logic...
-      if (fType.isLocal() || fType.isAnonymous()) {
-        return fIdentityMapper.anonLocalTypeToTypeID(fType);
-      } else
-        return fIdentityMapper.getTypeRef(fType).getName().toString();
-    }
-
-    @Override
-    public Collection<CAstType> getSupertypes() {
-      if (fSuperTypes == null) {
-        buildSuperTypes();
-      }
-      return fSuperTypes;
-    }
-
-    private void buildSuperTypes() {
-      // TODO this is a source entity, but it might actually be the root type
-      // (Object), so assume # intfs + 1
-      Type superType;
-      if (fType.superClass() == null && fType != fSystem.Object()) {
-        superType = fSystem.Object(); // fSystem.Object() MUST be the root of the class hierarchy
-      } else {
-        superType = fType.superClass();
-      }
-      int N = fType.interfaces().size() + 1;
-
-      fSuperTypes = new ArrayList<CAstType>(N);
-      // Following assumes that no one can call getSupertypes() before we have
-      // created CAstType's for every type in the program being analyzed.
-      if (superType != null) {
-        fSuperTypes.add(fDict.getCAstTypeFor(superType));
-      }
-      for (Iterator iter = fType.interfaces().iterator(); iter.hasNext(); ) {
-        Type t = (Type) iter.next();
-        if (t instanceof ClassType) {
-          ClassType classType = (ClassType) t;
-          if (classType == fSystem.Object()) {
-            continue; // Skip fSystem.Object() as a super-interface; it really MUST be a class as far as WALA is concerned
-          }
-        }
-        fSuperTypes.add(fDict.getCAstTypeFor(t));
-      }
-    }
-
-    @Override
-    public Collection<CAstQualifier> getQualifiers() {
-      return mapFlagsToQualifiers(fType.flags());
-    }
-
-    @Override
-    public boolean isInterface() {
-      if (fType == fSystem.Object()) {
-        return false; // fSystem.Object() MUST be a class, as far as WALA is concerned
-      }
-      return fType.flags().isInterface();
-    }
-  }
-
-  protected abstract static class CodeBodyEntity implements CAstEntity {
-    private final Map<CAstNode, Collection<CAstEntity>> fEntities;
-
-    public CodeBodyEntity(Map<CAstNode, Collection<CAstEntity>> entities) {
-      fEntities = new LinkedHashMap<CAstNode, Collection<CAstEntity>>(entities);
-    }
-
-    @Override
-    public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
-      return Collections.unmodifiableMap(fEntities);
-    }
-
-    @Override
-    public Iterator<CAstEntity> getScopedEntities(CAstNode construct) {
-      if (fEntities.containsKey(construct)) {
-        return (fEntities.get(construct)).iterator();
-      } else {
-        return EmptyIterator.instance();
-      }
-    }
-
-    @Override
-    public String getSignature() {
-      return Util.methodEntityToSelector(this).toString();
-    }
-  }
-
-  protected final class ClassEntity implements CAstEntity {
-    @SuppressWarnings("unused")
-    private final ClassContext fContext;
-
-    private final ClassType fCT;
-
-    private final String fName;
-
-    private final Collection<CAstEntity> fEntities;
-
-    private final CAstSourcePositionMap.Position sourcePosition;
-
-    private ClassEntity(ClassContext context, List<CAstEntity> entities, ClassDecl cd, Position p) {
-      this(context, entities, cd.classDef().asType(), cd.name().id().toString(), p);
-    }
-
-    private ClassEntity(ClassContext context, List<CAstEntity> entities, ClassType ct, String name, Position p) {
-      fContext = context;
-      this.fEntities = entities;
-      fCT = ct;
-      fName = name;
-      sourcePosition = makePosition(p);
-    }
-
-    @Override
-    public int getKind() {
-      return TYPE_ENTITY;
-    }
-
-    @Override
-    public String getName() {
-      return fName; // unqualified?
-    }
-
-    @Override
-    public String getSignature() {
-      return "L" + fName.replace('.', '/') + ";";
-    }
-
-    @Override
-    public String[] getArgumentNames() {
-      return new String[0];
-    }
-
-    @Override
-    public CAstNode[] getArgumentDefaults() {
-      return new CAstNode[0];
-    }
-
-    @Override
-    public int getArgumentCount() {
-      return 0;
-    }
-
-    @Override
-    public CAstNode getAST() {
-      // This entity has no AST nodes, really.
-      return null;
-    }
-
-    @Override
-    public Collection<CAstAnnotation> getAnnotations() {
-        return null;
-    }
-
-    @Override
-    public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
-      return Collections.singletonMap(null, fEntities);
-    }
-
-    @Override
-    public Iterator<CAstEntity> getScopedEntities(CAstNode construct) {
-      Assertions.UNREACHABLE("Non-AST-bearing entity (ClassEntity) asked for scoped entities related to a given AST node");
-      return null;
-    }
-
-    @Override
-    public CAstControlFlowMap getControlFlow() {
-      // This entity has no AST nodes, really.
-      return null;
-    }
-
-    @Override
-    public CAstSourcePositionMap getSourceMap() {
-      // This entity has no AST nodes, really.
-      return null;
-    }
-
-    @Override
-    public CAstSourcePositionMap.Position getPosition() {
-      return sourcePosition;
-    }
-
-    @Override
-    public CAstNodeTypeMap getNodeTypeMap() {
-      // This entity has no AST nodes, really.
-      return new CAstNodeTypeMap() {
-        @Override
-        public CAstType getNodeType(CAstNode node) {
-          throw new UnsupportedOperationException();
-        }
-        
-        @Override
-        public Collection<CAstNode> getMappedNodes() {
-          throw new UnsupportedOperationException();
-        }
-      };
-    }
-
-    @Override
-    public Collection<CAstQualifier> getQualifiers() {
-      if (fCT == fTypeSystem.Object()) { // pretend the root of the hierarchy is always a class
-        return mapFlagsToQualifiers(fCT.flags().clear(Flags.INTERFACE));
-      }
-      return mapFlagsToQualifiers(fCT.flags());
-    }
-
-    @Override
-    public CAstType getType() {
-      return new PolyglotJavaType(fCT, getTypeDict(), fTypeSystem);
-    }
-    
-    @Override
-    public String toString() {
-      return fCT.fullName().toString();
-    }
-  }
-
-  protected final class ProcedureEntity extends CodeBodyEntity implements JavaProcedureEntity {
-    private final CAstNode fPdast;
-
-    private final TypeSystem fSystem;
-
-    private final Type declaringType;
-
-    private final CodeInstance fPd;
-
-    private final MethodContext fMc;
-
-    private final String[] argumentNames;
-
-    public ProcedureEntity(CAstNode pdast, TypeSystem system, CodeInstance pd, Type declaringType, String[] argumentNames,
-        Map<CAstNode, Collection<CAstEntity>> entities, MethodContext mc) {
-      super(entities);
-      fPdast = pdast;
-      fSystem = system;
-      fPd = pd;
-      this.declaringType = declaringType;
-      this.argumentNames = argumentNames;
-      fMc = mc;
-    }
-
-    public ProcedureEntity(CAstNode pdast, TypeSystem system, CodeInstance pd, String[] argumentNames,
-        Map<CAstNode, Collection<CAstEntity>> entities, MethodContext mc) {
-        //PORT1.7 used to be this(pdast, system, pd, ((MemberInstance) pd).container(), argumentNames, entities, mc);
-        this(pdast, system, pd, ((MemberDef) pd.def()).container().get(), argumentNames, entities, mc);
-    }
-
-    private List formalTypes() {
-      if (fPd instanceof ProcedureInstance) {
-        return ((ProcedureInstance) fPd).formalTypes();
-      } else {
-        return Collections.EMPTY_LIST;
-      }
-    }
-
-    @Override
-    public String toString() {
-      return fPd.toString();
-    }
-
-    @Override
-    public int getKind() {
-      return CAstEntity.FUNCTION_ENTITY;
-    }
-
-    @Override
-    public String getName() {
-      if (fPd instanceof ConstructorInstance) {
-        return MethodReference.initAtom.toString();
-      } else {
-        if (fPd instanceof InitializerInstance) {
-          return MethodReference.clinitName.toString();
-        } else {
-          Assertions.productionAssertion(fPd instanceof MethodInstance);
-          return ((MethodInstance) fPd).name().toString();
-        }
-      }
-    }
-
-    @Override
-    public String[] getArgumentNames() {
-      return argumentNames;
-    }
-
-    @Override
-    public CAstNode[] getArgumentDefaults() {
-      return new CAstNode[0];
-    }
-
-    private Flags getFlags() {
-        // PORT1.7
-        if (fPd instanceof ProcedureInstance) {
-            return ((MemberDef) fPd.def()).flags();
-        }
-        return Flags.NONE;
-    }
-
-    private boolean isStatic() {
-        // PORT1.7
-        if (fPd instanceof ProcedureInstance) {
-            return ((MemberDef) fPd.def()).flags().isStatic();
-        } else if (fPd instanceof InitializerInstance) {
-            return ((InitializerInstance) fPd).def().flags().isStatic();
-        }
-        return false;
-    }
-
-    @Override
-    public int getArgumentCount() {
-      return isStatic() ? formalTypes().size() : formalTypes().size() + 1;
-    }
-
-    @Override
-    public CAstNode getAST() {
-      return fPdast;
-    }
-
-    @Override
-    public CAstControlFlowMap getControlFlow() {
-      return fMc.cfg();
-    }
-
-    @Override
-    public CAstSourcePositionMap getSourceMap() {
-      return fMc.pos();
-    }
-
-    @Override
-    public CAstSourcePositionMap.Position getPosition() {
-      return getSourceMap().getPosition(fPdast);
-    }
-
-    @Override
-    public CAstNodeTypeMap getNodeTypeMap() {
-      return fMc.getNodeTypeMap();
-    }
-
-    @Override
-    public Collection<CAstQualifier> getQualifiers() {
-      return mapFlagsToQualifiers(getFlags());
-    }
-
-    @Override
-    public CAstType getType() {
-      return new CAstType.Method() {
-        private Collection<CAstType> fExceptionTypes = null;
-
-        private List<CAstType> fParameterTypes = null;
-
-        @Override
-        public CAstType getReturnType() {
-          return fMc.getTypeDictionary().getCAstTypeFor(
-              (fPd instanceof MethodInstance) ? ((MethodInstance) fPd).returnType() : fSystem.Void());
-        }
-
-        @Override
-        public List<CAstType> getArgumentTypes() {
-          if (fParameterTypes == null) {
-            final List formalTypes = formalTypes();
-            fParameterTypes = new ArrayList<CAstType>(formalTypes.size());
-
-            for (Iterator iter = formalTypes.iterator(); iter.hasNext();) {
-              fParameterTypes.add(fMc.getTypeDictionary().getCAstTypeFor(iter.next()));
-            }
-          }
-          return fParameterTypes;
-        }
-
-        @Override
-        public String getName() {
-          Assertions.UNREACHABLE("CAstType.FunctionImpl#getName() called???");
-          return "?";
-        }
-
-        @Override
-        public Collection<CAstType> getSupertypes() {
-          Assertions.UNREACHABLE("CAstType.FunctionImpl#getSupertypes() called???");
-          return null;
-        }
-
-        @Override
-        public Collection/* <CAstType> */<CAstType> getExceptionTypes() {
-          if (fExceptionTypes == null) {
-            fExceptionTypes = new LinkedHashSet<CAstType>();
-
-            if (fPd instanceof ProcedureInstance) {
-              List exceptions = ((ProcedureInstance) fPd).throwTypes();
-
-              if (exceptions != null) {
-                for (Iterator iterator = exceptions.iterator(); iterator.hasNext();) {
-                  Type type = (Type) iterator.next();
-                  fExceptionTypes.add(fMc.getTypeDictionary().getCAstTypeFor(type));
-                }
-              }
-            }
-          }
-
-          return fExceptionTypes;
-        }
-
-        @Override
-        public int getArgumentCount() {
-          return formalTypes().size();
-        }
-
-        @Override
-        public CAstType getDeclaringType() {
-          return getTypeDict().getCAstTypeFor(declaringType);
-        }
-      };
-    }
-    
-    @Override
-    public Collection<CAstAnnotation> getAnnotations() {
-        return null;
-    }
-  }
-
-  protected final class FieldEntity implements CAstEntity {
-    private final FieldInstance fFI;
-
-    private final WalkContext fContext;
-
-    private FieldEntity(FieldDecl fd, WalkContext context) {
-      super();
-      fFI = fd.fieldDef().asInstance();
-      fContext = context;
-    }
-
-    @Override
-    public int getKind() {
-      return CAstEntity.FIELD_ENTITY;
-    }
-
-    @Override
-    public String getName() {
-      return fFI.name().toString();
-    }
-
-    @Override
-    public String getSignature() {
-      return fFI.name() + fIdentityMapper.typeToTypeID(fFI.type());
-    }
-
-    @Override
-    public String[] getArgumentNames() {
-      return new String[0];
-    }
-
-    @Override
-    public CAstNode[] getArgumentDefaults() {
-      return new CAstNode[0];
-    }
-
-    @Override
-    public int getArgumentCount() {
-      return 0;
-    }
-
-    @Override
-    public Iterator<CAstEntity> getScopedEntities(CAstNode construct) {
-      return EmptyIterator.instance();
-    }
-
-    @Override
-    public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
-      return Collections.emptyMap();
-    }
-
-    @Override
-    public CAstNode getAST() {
-      // No AST for a field decl; initializers folded into
-      // constructor processing...
-      return null;
-    }
-
-    @Override
-    public Collection<CAstAnnotation> getAnnotations() {
-        return null;
-    }
-
-    @Override
-    public CAstControlFlowMap getControlFlow() {
-      // No AST for a field decl; initializers folded into
-      // constructor processing...
-      return null;
-    }
-
-    @Override
-    public CAstSourcePositionMap getSourceMap() {
-      // No AST for a field decl; initializers folded into
-      // constructor processing...
-      return null;
-    }
-
-    @Override
-    public CAstSourcePositionMap.Position getPosition() {
-      return makePosition(fFI.position());
-    }
-
-    @Override
-    public CAstNodeTypeMap getNodeTypeMap() {
-      // No AST for a field decl; initializers folded into
-      // constructor processing...
-      return null;
-    }
-
-    @Override
-    public Collection<CAstQualifier> getQualifiers() {
-      return mapFlagsToQualifiers(fFI.flags());
-    }
-
-    @Override
-    public CAstType getType() {
-      return fContext.getTypeDictionary().getCAstTypeFor(fFI.type());
-    }
-  }
-
-  public interface WalkContext extends TranslatorToCAst.WalkContext<WalkContext, Node> {
-    Collection<Pair<Type, Object>> getCatchTargets(Type label);
-
-    Node getFinally();
-
-    CodeInstance getEnclosingMethod();
-
-    Type getEnclosingType();
-
-    CAstTypeDictionary getTypeDictionary();
-
-    List<ClassMember> getStaticInitializers();
-
-    List<ClassMember> getInitializers();
-
-    Map<Node, String> getLabelMap();
-
-    boolean needLVal();
-  }
-
-  protected static class DelegatingContext extends TranslatorToCAst.DelegatingContext<WalkContext, Node> implements WalkContext {
-    protected DelegatingContext(WalkContext parent) {
-      super(parent);
-    }
-
-    @Override
-    public Collection<Pair<Type, Object>> getCatchTargets(Type label) {
-      return parent.getCatchTargets(label);
-    }
-
-    @Override
-    public Node getFinally() {
-      return parent.getFinally();
-    }
-
-    @Override
-    public CodeInstance getEnclosingMethod() {
-      return parent.getEnclosingMethod();
-    }
-
-    @Override
-    public Type getEnclosingType() {
-      return parent.getEnclosingType();
-    }
-
-    @Override
-    public CAstTypeDictionary getTypeDictionary() {
-      return parent.getTypeDictionary();
-    }
-
-    @Override
-    public List<ClassMember> getStaticInitializers() {
-      return parent.getStaticInitializers();
-    }
-
-    @Override
-    public List<ClassMember> getInitializers() {
-      return parent.getInitializers();
-    }
-
-    @Override
-    public Map<Node, String> getLabelMap() {
-      return parent.getLabelMap();
-    }
-
-    @Override
-    public boolean needLVal() {
-      return parent.needLVal();
-    }
-  }
-
-  public class ClassContext extends DelegatingContext {
-    // private final ClassDecl cd;
-    private final Type type;
-
-    private List<ClassMember>/* <Initializer+FieldDecl> */fInitializers = new ArrayList<ClassMember>();
-
-    private List<ClassMember>/* <Initializer+FieldDecl> */fStaticInitializers = new ArrayList<ClassMember>();
-
-    private List<CAstEntity> fChildren;
-
-    public ClassContext(Type type, List<CAstEntity> entities, WalkContext parent) {
-      super(parent);
-      this.type = type;
-      fChildren = entities;
-    }
-
-    @Override
-    public void addScopedEntity(CAstNode node, CAstEntity e) {
-      Assertions.productionAssertion(node == null);
-      fChildren.add(e);
-    }
-
-    // public Map/*<CAstNode,CAstEntity>*/ getScopedEntities() {
-    // return null; // fChildren;
-    // }
-
-    @Override
-    public Type getEnclosingType() {
-      return type;
-    }
-
-    @Override
-    public List<ClassMember> getInitializers() {
-      return fInitializers;
-    }
-
-    @Override
-    public List<ClassMember> getStaticInitializers() {
-      return fStaticInitializers;
-    }
-
-    @Override
-    public CAstControlFlowRecorder cfg() {
-      Assertions.UNREACHABLE("ClassContext.cfg()");
-      return null;
-    }
-
-    public Iterator/* <Pair<Type,Node>> */getCatchTarget(Type label) {
-      Assertions.UNREACHABLE("ClassContext.getCatchTarget()");
-      return null;
-    }
-
-    @Override
-    public Node getFinally() {
-      Assertions.UNREACHABLE("ClassContext.getFinally()");
-      return null;
-    }
-
-    @Override
-    public CodeInstance getEnclosingMethod() {
-      // No one outside a method defining a local class can see it,
-      // so it clearly can't escape through to the method's enclosing
-      // type...
-      Assertions.UNREACHABLE("ClassContext.getEnclosingMethod()");
-      return null;
-    }
-
-    @Override
-    public CAstSourcePositionRecorder pos() {
-      // No AST, so no AST map
-      Assertions.UNREACHABLE("ClassContext.pos()");
-      return null;
-    }
-
-    @Override
-    public Node getContinueFor(String label) {
-      Assertions.UNREACHABLE("ClassContext.getContinueFor() with label " + label + " in " + type);
-      return null;
-    }
-
-    @Override
-    public Node getBreakFor(String label) {
-      System.err.println("Cannot find break target for " + label + " in " + type);
-      Assertions.UNREACHABLE("ClassContext.getBreakFor()");
-      return null;
-    }
-
-    @Override
-    public Map<Node, String> getLabelMap() {
-      Assertions.UNREACHABLE("ClassContext.getLabelMap()");
-      return null;
-    }
-
-    @Override
-    public boolean needLVal() {
-      Assertions.UNREACHABLE("ClassContext.needLVal()");
-      return false;
-    }
-  }
-
-  public class CodeBodyContext extends DelegatingContext {
-    final CAstSourcePositionRecorder fSourceMap = new CAstSourcePositionRecorder();
-
-    final CAstControlFlowRecorder fCFG = new CAstControlFlowRecorder(fSourceMap);
-
-    final CAstNodeTypeMapRecorder fNodeTypeMap = new CAstNodeTypeMapRecorder();
-
-    private final Map<Node, String> labelMap = HashMapFactory.make(2);
-
-    private final Map<CAstNode, Collection<CAstEntity>> fEntities;
-
-    public CodeBodyContext(WalkContext parent, Map<CAstNode, Collection<CAstEntity>> entities) {
-      super(parent);
-      fEntities = entities;
-    }
-
-    @Override
-    public CAstNodeTypeMapRecorder getNodeTypeMap() {
-      return fNodeTypeMap;
-    }
-
-    @Override
-    public CAstSourcePositionRecorder pos() {
-      return fSourceMap;
-    }
-
-    @Override
-    public CAstControlFlowRecorder cfg() {
-      return fCFG;
-    }
-
-    @Override
-    public void addScopedEntity(CAstNode node, CAstEntity entity) {
-      if (! fEntities.containsKey(node)) { fEntities.put(node, new HashSet<CAstEntity>(1)); }
-      fEntities.get(node).add(entity);
-    }
-
-    @Override
-    public Map<CAstNode, Collection<CAstEntity>> getScopedEntities() {
-      return fEntities;
-    }
-
-    @Override
-    public Map<Node, String> getLabelMap() {
-      return labelMap;
-    }
-
-    @Override
-    public boolean needLVal() {
-      return false;
-    }
-  }
-
-  public class MethodContext extends CodeBodyContext {
-    final CodeInstance fPI;
-
-    public MethodContext(CodeInstance pi, Map<CAstNode, Collection<CAstEntity>> entities, WalkContext parent) {
-      super(parent, entities);
-      fPI = pi;
-    }
-
-    @Override
-    public Collection<Pair<Type, Object>> getCatchTargets(Type label) {
-      Collection<Pair<Type, Object>> result = Collections.singleton(Pair.<Type,Object>make(fREType, CAstControlFlowMap.EXCEPTION_TO_EXIT));
-      return result;
-    }
-
-    @Override
-    public CodeInstance getEnclosingMethod() {
-      return fPI;
-    }
-  }
-
-  private static class TryCatchContext extends DelegatingContext {
-    @SuppressWarnings("unused")
-    private final Try tryNode;
-    
-    private final Context context;
-
-    Collection<Pair<Type,Object>> fCatchNodes = new ArrayList<Pair<Type, Object>>();
-
-    TryCatchContext(WalkContext parent, Try tryNode, final Context context) {
-      super(parent);
-      this.tryNode = tryNode;
-      this.context = context;   
-
-      for (Iterator<Catch> catchIter = tryNode.catchBlocks().iterator(); catchIter.hasNext();) {
-        Catch c = catchIter.next();
-        Pair<Type,Object> p = Pair.make(c.catchType(), (Object)c);
-
-        fCatchNodes.add(p);
-      }
-    }
-
-    @Override
-    public Collection<Pair<Type, Object>> getCatchTargets(Type label) {
-      // Look for all matching targets for this thrown type:
-      // if supertpe match, then return only matches at this catch
-      // if subtype match, then matches here and parent matches
-      Collection<Pair<Type, Object>> catchNodes = new ArrayList<Pair<Type, Object>>();
-
-      for (Iterator<Pair<Type, Object>> iter = fCatchNodes.iterator(); iter.hasNext();) {
-        Pair<Type, Object> p = iter.next();
-        Type catchType = p.fst;
-
-        // _must_ be caught
-        if (label.isSubtype(catchType, this.context) || label.typeEquals(catchType, this.context)) {
-          catchNodes.add(p);
-          return catchNodes;
-
-          // _might_ get caught
-        } else if (catchType.isSubtype(label, this.context)) {
-          catchNodes.add(p);
-          continue;
-        }
-      }
-      catchNodes.addAll(parent.getCatchTargets(label));
-      return catchNodes;
-    }
-
-    @Override
-    public List<ClassMember> getStaticInitializers() {
-      return null;
-    }
-
-    @Override
-    public List<ClassMember> getInitializers() {
-      return null;
-    }
-  }
-
-  protected static class RootContext extends TranslatorToCAst.RootContext<WalkContext, Node> implements WalkContext {
-    final CAstTypeDictionary fTypeDict;
-
-    public RootContext(CAstTypeDictionary typeDict) {
-      fTypeDict = typeDict;
-    }
-
-    @Override
-    public Collection<Pair<Type, Object>> getCatchTargets(Type label) {
-      Assertions.UNREACHABLE("RootContext.getCatchTargets()");
-      return null;
-    }
-
-    @Override
-    public Node getFinally() {
-      Assertions.UNREACHABLE("RootContext.getFinally()");
-      return null;
-    }
-
-    @Override
-    public CodeInstance getEnclosingMethod() {
-      Assertions.UNREACHABLE("RootContext.getEnclosingMethod()");
-      return null;
-    }
-
-    @Override
-    public Type getEnclosingType() {
-      Assertions.UNREACHABLE("RootContext.getEnclosingType()");
-      return null;
-    }
-
-    @Override
-    public CAstTypeDictionary getTypeDictionary() {
-      return fTypeDict;
-    }
-
-    @Override
-    public List<ClassMember> getStaticInitializers() {
-      Assertions.UNREACHABLE("RootContext.getStaticInitializers()");
-      return null;
-    }
-
-    @Override
-    public List<ClassMember> getInitializers() {
-      Assertions.UNREACHABLE("RootContext.getInitializers()");
-      return null;
-    }
-
-    @Override
-    public Map<Node, String> getLabelMap() {
-      Assertions.UNREACHABLE("RootContext.getLabelMap()");
-      return null;
-    }
-
-    @Override
-    public boolean needLVal() {
-      Assertions.UNREACHABLE("ClassContext.needLVal()");
-      return false;
-    }
-  }
-
-  public class BreakContext extends DelegatingContext {
-    protected final String label;
-
-    private final Node breakTo;
-
-    BreakContext(WalkContext parent, String label, Node breakTo) {
-      super(parent);
-      this.label = label;
-      this.breakTo = breakTo;
-    }
-
-    @Override
-    public Node getBreakFor(String label) {
-      return (label == null || label.equals(this.label)) ? breakTo : super.getBreakFor(label);
-    }
-
-    @Override
-    public List<ClassMember> getStaticInitializers() {
-      return null;
-    }
-
-    @Override
-    public List<ClassMember> getInitializers() {
-      return null;
-    }
-  }
-
-  public class LoopContext extends BreakContext {
-    private final Node continueTo;
-
-    public LoopContext(WalkContext parent, String label, Node breakTo, Node continueTo) {
-      super(parent, label, breakTo);
-      this.continueTo = continueTo;
-    }
-
-    @Override
-    public Node getContinueFor(String label) {
-      return (label == null || label.equals(this.label)) ? continueTo : super.getContinueFor(label);
-    }
-  }
-
-  private class AssignmentContext extends DelegatingContext {
-
-    protected AssignmentContext(WalkContext parent) {
-      super(parent);
-    }
-
-    @Override
-    public boolean needLVal() {
-      return true;
-    }
-  }
-
-  public PolyglotJava2CAstTranslator(Node ast, ClassLoaderReference clr, NodeFactory nf, TypeSystem ts, PolyglotIdentityMapper identityMapper, boolean replicateForDoLoops) {
-    this.ast = ast;
-    fClassLoaderRef = clr;
-    fTypeSystem = ts;
-    fNodeFactory = nf;
-    fIdentityMapper = identityMapper;
-    doLoopTranslator = new DoLoopTranslator(replicateForDoLoops, fFactory);
-    fNPEType = fTypeSystem.NullPointerException();
-    fCCEType = fTypeSystem.ClassCastException();
-    fREType = fTypeSystem.RuntimeException();
-    fDivByZeroType = fTypeSystem.ArithmeticException();
-  }
-
-  public static class PolyglotSourcePosition extends AbstractSourcePosition {
-    private final Position p;
-
-    public PolyglotSourcePosition(Position p) {
-      this.p = p;
-    }
-
-    @Override
-    public int getFirstLine() {
-      return p.line();
-    }
-
-    @Override
-    public int getLastLine() {
-      return p.endLine();
-    }
-
-    @Override
-    public int getFirstCol() {
-      return p.column();
-    }
-
-    @Override
-    public int getLastCol() {
-      return p.endColumn();
-    }
-     
-    @Override
-    public int getFirstOffset() {
-      return p.offset();
-    }
-
-    @Override
-    public int getLastOffset() {
-      return p.endOffset();
-    }
-
-    @Override
-    public URL getURL() {
-      try {
-        String path = p.path();
-        return new URL("file:" + (path.length() == 0 ? p.file() : path));
-      } catch (MalformedURLException e) {
-        Assertions.UNREACHABLE(e.toString());
-        return null;
-      }
-    }
-
-    @Override
-    public Reader getReader() throws IOException {
-      return new InputStreamReader(getURL().openConnection().getInputStream());
-    }
-  }
-
-  protected CAstSourcePositionMap.Position makePosition(Position p) {
-    return new PolyglotSourcePosition(p);
-  }
-
-  private void setPos(WalkContext wc, CAstNode cn, Node pn) {
-    if (pn != null) {
-      wc.pos().setPosition(cn, makePosition(pn.position()));
-    }
-  }
-
-  private void setPos(WalkContext wc, CAstNode cn, Position p) {
-    if (p != null) {
-      wc.pos().setPosition(cn, makePosition(p));
-    }
-  }
-
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, Node n, int kind) {
-    CAstNode cn = Ast.makeNode(kind);
-    setPos(wc, cn, n);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, Node n, int kind, CAstNode c[]) {
-    CAstNode cn = Ast.makeNode(kind, c);
-    setPos(wc, cn, n);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, Node n, int kind, CAstNode c) {
-    CAstNode cn = Ast.makeNode(kind, c);
-    setPos(wc, cn, n);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, Node n, int kind, CAstNode c1, CAstNode c2) {
-    CAstNode cn = Ast.makeNode(kind, c1, c2);
-    setPos(wc, cn, n);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, Node n, int kind, CAstNode c1, CAstNode c2, CAstNode c3) {
-    CAstNode cn = Ast.makeNode(kind, c1, c2, c3);
-    setPos(wc, cn, n);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, Node n, int kind, CAstNode c1, CAstNode c2, CAstNode c3, CAstNode c4) {
-    CAstNode cn = Ast.makeNode(kind, c1, c2, c3, c4);
-    setPos(wc, cn, n);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, Node n, int kind) {
-    return makeNode(wc, fFactory, n, kind);
-  }
-
-  protected CAstNode makeNode(WalkContext wc, Node n, int kind, CAstNode c[]) {
-    return makeNode(wc, fFactory, n, kind, c);
-  }
-
-  protected CAstNode makeNode(WalkContext wc, Node n, int kind, CAstNode c) {
-    return makeNode(wc, fFactory, n, kind, c);
-  }
-
-  protected CAstNode makeNode(WalkContext wc, Node n, int kind, CAstNode c1, CAstNode c2) {
-    return makeNode(wc, fFactory, n, kind, c1, c2);
-  }
-
-  protected CAstNode makeNode(WalkContext wc, Node n, int kind, CAstNode c1, CAstNode c2, CAstNode c3) {
-    return makeNode(wc, fFactory, n, kind, c1, c2, c3);
-  }
-
-  protected CAstNode makeNode(WalkContext wc, Node n, int kind, CAstNode c1, CAstNode c2, CAstNode c3, CAstNode c4) {
-    return makeNode(wc, fFactory, n, kind, c1, c2, c3, c4);
-  }
-
-  protected CAstNode makeNode(WalkContext wc, int kind, Position p) {
-    CAstNode cn = fFactory.makeNode(kind);
-    setPos(wc, cn, p);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, Position p, int kind, CAstNode c1) {
-    CAstNode cn = fFactory.makeNode(kind, c1);
-    setPos(wc, cn, p);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, Position p, int kind, CAstNode c1, CAstNode[] rest) {
-    CAstNode cn = fFactory.makeNode(kind, c1, rest);
-    setPos(wc, cn, p);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, Position p, int kind, CAstNode c1, CAstNode c2) {
-    CAstNode cn = fFactory.makeNode(kind, c1, c2);
-    setPos(wc, cn, p);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, Position p, int kind, CAstNode c1, CAstNode c2, CAstNode c3) {
-    CAstNode cn = fFactory.makeNode(kind, c1, c2, c3);
-    setPos(wc, cn, p);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, Position p, int kind, CAstNode c1, CAstNode c2, CAstNode c3, CAstNode c4) {
-    CAstNode cn = fFactory.makeNode(kind, c1, c2, c3, c4);
-    setPos(wc, cn, p);
-    return cn;
-  }
-
-  public CAstEntity translateToCAst() {
-    return walkEntity(ast, new RootContext(getTypeDict()));
-  }
-
-  /**
-   * Maps front-end-specific representations into WALA references of the appropriate kind.
-   * @author rfuhrer
-   *
-   * @param <TypeRep> The front-end-specific representation of a type (e.g., for Polyglot, a Type)
-   * @param <MethodRep> The front-end-specific representation of a procedure/method (e.g., for Polyglot, a CodeInstance)
-   * @param <FieldRep> The front-end-specific representation of a field (e.g., for Polyglot, a FieldInstance)
-   */
-  public interface IdentityMapper<TypeRep, MethodRep, FieldRep> {
-    MemberReference getMethodRef(MethodRep method);
-
-    TypeReference getTypeRef(TypeRep type);
-
-    FieldReference getFieldRef(FieldRep field);
-  }
-
-  protected static Collection<CAstQualifier> mapFlagsToQualifiers(Flags flags) {
-    Set<CAstQualifier> quals = new LinkedHashSet<CAstQualifier>();
-
-    if (flags.isAbstract())
-      quals.add(CAstQualifier.ABSTRACT);
-    if (flags.isFinal())
-      quals.add(CAstQualifier.FINAL);
-    if (flags.isInterface())
-      quals.add(CAstQualifier.INTERFACE);
-    if (flags.isNative())
-      quals.add(CAstQualifier.NATIVE);
-    // if (flags.isPackage()) quals.add(CAstQualifier.PACKAGE);
-    if (flags.isPrivate())
-      quals.add(CAstQualifier.PRIVATE);
-    if (flags.isProtected())
-      quals.add(CAstQualifier.PROTECTED);
-    if (flags.isPublic())
-      quals.add(CAstQualifier.PUBLIC);
-    if (flags.isStatic())
-      quals.add(CAstQualifier.STATIC);
-    if (flags.isStrictFP())
-      quals.add(CAstQualifier.STRICTFP);
-    if (flags.isSynchronized())
-      quals.add(CAstQualifier.SYNCHRONIZED);
-    if (flags.isTransient())
-      quals.add(CAstQualifier.TRANSIENT);
-    if (flags.isVolatile())
-      quals.add(CAstQualifier.VOLATILE);
-
-    return quals;
-  }
-
-  protected void processClassMembers(Node n, ClassType classType, List<ClassMember> members, DelegatingContext classContext,
-      List<CAstEntity> memberEntities) {
-    // Collect all initializer-related gorp
-    for (Iterator<ClassMember> memberIter = members.iterator(); memberIter.hasNext();) {
-      ClassMember member = memberIter.next();
-
-      if (member instanceof Initializer) {
-        Initializer initializer = (Initializer) member;
-
-        if (initializer.flags().flags().isStatic())
-          classContext.getStaticInitializers().add(initializer);
-        else
-          classContext.getInitializers().add(initializer);
-      } else if (member instanceof FieldDecl) {
-        FieldDecl fd = (FieldDecl) member;
-
-        if (fd.init() != null) {
-          if (fd.flags().flags().isStatic())
-            classContext.getStaticInitializers().add(fd);
-          else
-            classContext.getInitializers().add(fd);
-        }
-      }
-    }
-
-    // Now process
-    for (Iterator<ClassMember> memberIter = members.iterator(); memberIter.hasNext();) {
-      ClassMember member = memberIter.next();
-
-      if (!(member instanceof Initializer)) {
-        CAstEntity memberEntity = walkEntity(member, classContext);
-
-        memberEntities.add(memberEntity);
-      }
-    }
-
-    // add class initializer, if needed
-    if (!classContext.getStaticInitializers().isEmpty()) {
-        InitializerDef initDef = fTypeSystem.initializerDef(n.position(), Types.ref(classType), Flags.STATIC);
-      InitializerInstance initInstance = fTypeSystem.createInitializerInstance(n.position(), Types.ref(initDef));
-
-      Map<CAstNode, Collection<CAstEntity>> childEntities = HashMapFactory.make();
-      final MethodContext mc = new MethodContext(initInstance, childEntities, classContext);
-
-      List inits = classContext.getStaticInitializers();
-      CAstNode[] bodyNodes = new CAstNode[inits.size()];
-      insertInitializers(mc, bodyNodes, true, 0);
-
-      CAstNode ast = makeNode(mc, fFactory, n, CAstNode.BLOCK_STMT, bodyNodes);
-
-      memberEntities.add(new ProcedureEntity(ast, fTypeSystem, initInstance, new String[0], childEntities, mc));
-
-    }
-  }
-
-  protected void addConstructorsToAnonymousClass(New n, ClassType anonType, ClassContext classContext,
-      List<CAstEntity> memberEntities) {
-    List superConstructors = ((ClassType) anonType.superClass()).constructors();
-
-    for (Iterator iter = superConstructors.iterator(); iter.hasNext();) {
-      ConstructorInstance superCtor = (ConstructorInstance) iter.next();
-
-      Map<CAstNode, Collection<CAstEntity>> childEntities = HashMapFactory.make();
-      final MethodContext mc = new MethodContext(superCtor, childEntities, classContext);
-
-      String[] fakeArguments = new String[superCtor.formalTypes().size() + 1];
-      for (int i = 0; i < fakeArguments.length; i++) {
-        fakeArguments[i] = (i == 0) ? "this" : ("argument" + i);
-      }
-
-      List inits = classContext.getInitializers();
-
-      CAstNode[] bodyNodes = new CAstNode[inits.size() + 1];
-
-      CallSiteReference callSiteRef = CallSiteReference.make(0, fIdentityMapper.getMethodRef(superCtor),
-          IInvokeInstruction.Dispatch.SPECIAL);
-      CAstNode[] children = new CAstNode[fakeArguments.length + 1];
-      children[0] = makeNode(mc, fFactory, n, CAstNode.SUPER);
-      children[1] = fFactory.makeConstant(callSiteRef);
-      for (int i = 1; i < fakeArguments.length; i++) {
-        children[i + 1] = makeNode(mc, fFactory, n, CAstNode.VAR, fFactory.makeConstant(fakeArguments[i]));
-      }
-      bodyNodes[0] = makeNode(mc, fFactory, n, CAstNode.CALL, children);
-
-      insertInitializers(mc, bodyNodes, false, 1);
-
-      CAstNode ast = makeNode(mc, fFactory, n, CAstNode.BLOCK_STMT, bodyNodes);
-
-      memberEntities.add(new ProcedureEntity(ast, fTypeSystem, superCtor, anonType, fakeArguments, childEntities, mc));
-    }
-  }
-
-  static String anonTypeName(ClassType ct) {
-    Position pos = ct.position();
-
-    return ct.fullName() + "$" + pos.line() + "$" + pos.column();
-  }
-
-  protected CAstEntity walkEntity(Node rootNode, final WalkContext context) {
-    if (rootNode instanceof SourceFile) {
-      SourceFile file = (SourceFile) rootNode;
-      List<CAstEntity> declEntities = new ArrayList<CAstEntity>();
-
-      for (Iterator iter = file.decls().iterator(); iter.hasNext();) {
-        TopLevelDecl decl = (TopLevelDecl) iter.next();
-
-        declEntities.add(walkEntity(decl, context));
-      }
-      return new CompilationUnitEntity(file, declEntities);
-    } else if (rootNode instanceof ClassDecl) {
-      final ClassDecl cd = (ClassDecl) rootNode;
-      final List<CAstEntity> memberEntities = new ArrayList<CAstEntity>();
-      final ClassContext classContext = new ClassContext(cd.classDef().asType(), memberEntities, context);
-
-      processClassMembers(rootNode, cd.classDef().asType(), cd.body().members(), classContext, memberEntities);
-
-      return new ClassEntity(classContext, memberEntities, cd, cd.position());
-    } else if (rootNode instanceof New) {
-      final New n = (New) rootNode;
-      final List<CAstEntity> memberEntities = new ArrayList<CAstEntity>();
-      ClassType anonType = n.anonType().asType();
-      String anonTypeName = anonTypeName(anonType);
-      final ClassContext classContext = new ClassContext(anonType, memberEntities, context);
-
-      processClassMembers(rootNode, anonType, n.body().members(), classContext, memberEntities);
-      addConstructorsToAnonymousClass(n, anonType, classContext, memberEntities);
-
-      return new ClassEntity(classContext, memberEntities, anonType, anonTypeName, n.position());
-    } else if (rootNode instanceof ProcedureDecl) {
-      final ProcedureDecl pd = (ProcedureDecl) rootNode;
-      final Map<CAstNode, Collection<CAstEntity>> memberEntities = HashMapFactory.make();
-      final MethodContext mc = new MethodContext(pd.procedureInstance().asInstance(), memberEntities, context);
-
-      CAstNode pdAST = null;
-
-      if (!pd.flags().flags().isAbstract()) {
-        // Presumably the MethodContext's parent is a ClassContext,
-        // and he has the list of initializers. Hopefully the following
-        // will glue that stuff in the right place in any constructor body.
-        pdAST = walkNodes(pd, mc);
-      }
-
-      List/* <Formal> */formals = pd.formals();
-      String[] argNames;
-      int i = 0;
-      if (!pd.flags().flags().isStatic()) {
-        argNames = new String[formals.size() + 1];
-        argNames[i++] = "this";
-      } else {
-        argNames = new String[formals.size()];
-      }
-      for (Iterator iter = formals.iterator(); iter.hasNext(); i++) {
-        Formal formal = (Formal) iter.next();
-        argNames[i] = formal.name().toString();
-      }
-
-      return new ProcedureEntity(pdAST, fTypeSystem, pd.procedureInstance().asInstance(), argNames, memberEntities, mc);
-    } else if (rootNode instanceof FieldDecl) {
-      final FieldDecl fd = (FieldDecl) rootNode;
-
-      return new FieldEntity(fd, context);
-    } else {
-      Assertions.UNREACHABLE("Unknown node type for walkEntity():" + rootNode.getClass().getName());
-      return null;
-    }
-  }
-
-  private boolean isSpecialCallStmt(Stmt maybeSuper, Kind kind) {
-    if (maybeSuper instanceof ConstructorCall) {
-      ConstructorCall cc = (ConstructorCall) maybeSuper;
-      return cc.kind() == kind;
-    }
-    return false;
-  }
-
-  private boolean hasSpecialCall(Block body, Kind kind) {
-    if (body.statements().size() <= 0)
-      return false;
-
-    Stmt maybeSuper = body.statements().get(0);
-
-    return isSpecialCallStmt(maybeSuper, kind);
-  }
-
-  private boolean hasSuperCall(Block body) {
-    return hasSpecialCall(body, ConstructorCall.SUPER);
-  }
-
-  private boolean hasThisCall(Block body) {
-    return hasSpecialCall(body, ConstructorCall.THIS);
-  }
-
-  private int insertInitializers(WalkContext wc, CAstNode[] initCode, boolean wantStatic, int offset) {
-    List<ClassMember> inits = wantStatic ? wc.getStaticInitializers() : wc.getInitializers();
-
-    for (Iterator<ClassMember> iter = inits.iterator(); iter.hasNext(); offset++) {
-      ClassMember init = iter.next();
-      CAstNode initNode = walkNodes(init, wc);
-
-      if (initNode != null) {
-        initCode[offset] = initNode;
-      } else {
-        initCode[offset] = makeNode(wc, fFactory, null, CAstNode.EMPTY);
-      }
-    }
-    return offset;
-  }
-
-  protected CAstNode walkNodes(Node n, final WalkContext context) {
-    if (n == null)
-      return makeNode(context, fFactory, null, CAstNode.EMPTY);
-    return ASTTraverser.visit(n, getTranslator(), context);
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotJavaSourceAnalysisEngine.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotJavaSourceAnalysisEngine.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotJavaSourceAnalysisEngine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotJavaSourceAnalysisEngine.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import com.ibm.wala.cast.java.client.JavaSourceAnalysisEngine;
-import com.ibm.wala.classLoader.ClassLoaderFactory;
-import com.ibm.wala.util.config.SetOfClasses;
-
-public class PolyglotJavaSourceAnalysisEngine extends JavaSourceAnalysisEngine {
-
-  public IRTranslatorExtension getTranslatorExtension() {
-    return new JavaIRTranslatorExtension();
-  }
-
-  @Override
-  protected ClassLoaderFactory getClassLoaderFactory(SetOfClasses exclusions) {
-    return new PolyglotClassLoaderFactory(exclusions, getTranslatorExtension());
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotSourceLoaderImpl.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotSourceLoaderImpl.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotSourceLoaderImpl.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotSourceLoaderImpl.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-/*
- * Created on Oct 7, 2005
- */
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import java.io.IOException;
-
-import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
-import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl;
-import com.ibm.wala.cast.java.translator.SourceModuleTranslator;
-import com.ibm.wala.classLoader.ArrayClassLoader;
-import com.ibm.wala.classLoader.IClassLoader;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.util.config.SetOfClasses;
-
-public class PolyglotSourceLoaderImpl extends JavaSourceLoaderImpl {
-  protected final IRTranslatorExtension fExtInfo;
-
-  public PolyglotSourceLoaderImpl(ClassLoaderReference loaderRef, IClassLoader parent, SetOfClasses exclusions,
-      IClassHierarchy cha, IRTranslatorExtension extInfo) throws IOException {
-    super(loaderRef, parent, exclusions, cha);
-    this.fExtInfo = extInfo;
-  }
-
-  public PolyglotSourceLoaderImpl(ClassLoaderReference loader, ArrayClassLoader arrayClassLoader, IClassLoader parent,
-      SetOfClasses exclusions, IClassHierarchy cha) throws IOException {
-    this(loader, parent, exclusions, cha, new JavaIRTranslatorExtension());
-  }
-  
-  public IRTranslatorExtension getTranslatorExtension() {
-    return fExtInfo;
-  }
-
-  @Override
-  protected SourceModuleTranslator getTranslator() {
-    return new PolyglotSourceModuleTranslator(cha.getScope(), fExtInfo, this, JavaSourceAnalysisScope.SOURCE);
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotSourceModuleTranslator.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotSourceModuleTranslator.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotSourceModuleTranslator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotSourceModuleTranslator.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,156 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import polyglot.frontend.Compiler;
-import polyglot.frontend.ExtensionInfo;
-import polyglot.frontend.Globals;
-import polyglot.frontend.Source;
-import polyglot.main.Options;
-import polyglot.main.UsageError;
-import polyglot.util.ErrorInfo;
-import polyglot.util.Position;
-
-import com.ibm.wala.cast.java.translator.SourceModuleTranslator;
-import com.ibm.wala.classLoader.DirectoryTreeModule;
-import com.ibm.wala.classLoader.FileModule;
-import com.ibm.wala.classLoader.JarFileModule;
-import com.ibm.wala.classLoader.Module;
-import com.ibm.wala.classLoader.ModuleEntry;
-import com.ibm.wala.classLoader.SourceFileModule;
-import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.util.debug.Assertions;
-
-/**
- * A SourceModuleTranslator whose implementation of loadAllSources() uses a suitably
- * configured Polyglot-based compiler to generate WALA IR for the sources in the
- * compile-time classpath.
- * @author rfuhrer
- */
-public class PolyglotSourceModuleTranslator implements SourceModuleTranslator {
-  private final ExtensionInfo fExtInfo;
-
-  /**
-   * A client-supplied ClassLoaderReference to identify the innermost class loader
-   * to use when populating the classpath with loader Modules.
-   */
-  private final ClassLoaderReference fSearchPathStart;
-
-  protected String fClassPath;
-
-  protected String fSourcePath;
-
-  public PolyglotSourceModuleTranslator(AnalysisScope scope, IRTranslatorExtension extInfo,
-      PolyglotSourceLoaderImpl sourceLoader, ClassLoaderReference searchPathStart) {
-    fSearchPathStart = searchPathStart;
-    fExtInfo= (ExtensionInfo) extInfo;
-	computeClassPath(scope);
-	computeSourcePath(scope);
-	extInfo.setSourceLoader(sourceLoader);	
-  }
-
-  protected void computeClassPath(AnalysisScope scope) {
-    StringBuilder sb= new StringBuilder();
-    ClassLoaderReference cl= fSearchPathStart;
-
-    while (cl != null) {
-      addModulesForLoader(scope, cl, sb);
-      cl= cl.getParent();
-    }
-    fClassPath= sb.toString();
-  }
-
-  protected void addModulesForLoader(AnalysisScope scope, ClassLoaderReference cl, StringBuilder sb) {
-    for(Module m: scope.getModules(cl)) {
-      if (sb.length() > 0)
-        sb.append(File.pathSeparator);
-
-      if (m instanceof JarFileModule) {
-        JarFileModule jarFileModule= (JarFileModule) m;
-
-        sb.append(jarFileModule.getAbsolutePath());
-      } else if (m instanceof DirectoryTreeModule) {
-        DirectoryTreeModule directoryTreeModule= (DirectoryTreeModule) m;
-
-        sb.append(directoryTreeModule.getPath());
-      } else if (m instanceof FileModule) {
-        // do nothing
-      } else
-        Assertions.UNREACHABLE("Module entry is neither jar file nor directory");
-    }
-  }
-
-  protected void computeSourcePath(AnalysisScope scope) {
-    // Ordinarily, the source files to process are specified using absolute paths (see
-    // loadAllSources()), so the source path won't be needed. However, derived classes
-    // may choose to place entries on the source path to resolve source entities that
-    // were not explicitly specified. E.g., the X10 1.7 runtime jar contains source
-    // code, since class files don't contain all of the necessary type information.
-    // Given all of the above, the following value will either be correct or do no
-    // harm (even if the source path isn't used).
-    fSourcePath = ".";
-  }
-
-  @Override
-  public void loadAllSources(Set<ModuleEntry> modules) {
-    Options opts= fExtInfo.getOptions();
-    opts.assertions = true;
-
-    try {
-      opts.parseCommandLine(new String[] { "-noserial", "-cp", fClassPath, "-sourcepath", fSourcePath }, new HashSet<String>());
-    } catch (UsageError e) {
-      // Assertions.UNREACHABLE("Error parsing classpath spec???");
-    }
-
-    Compiler compiler= new Compiler(fExtInfo);
-    List<Source> streams= new ArrayList<Source>();
-
-    Globals.initialize(compiler);//PORT1.7 Must initialize before actually calling compiler
-
-    // N.B.: 'modules' is a flat set of source file ModuleEntry's.
-    for(Iterator<ModuleEntry> it= modules.iterator(); it.hasNext(); ) {
-      SourceFileModule entry= (SourceFileModule) it.next();
-
-      Assertions.productionAssertion(entry.isSourceFile());
-
-      if (skipSourceFile(entry)) {
-        continue;
-      }
-
-      try {
-        ModuleSource srcStream= new ModuleSource(entry);
-
-        streams.add(srcStream);
-      } catch (IOException e) {
-        compiler.errorQueue().enqueue(new ErrorInfo(ErrorInfo.IO_ERROR, "Unable to open source file '" + entry.getName() + "'", Position.COMPILER_GENERATED));
-      }
-    }
-    compiler.compile(streams);
-    // At this point, WALA now "knows" about all the source-originated stuff
-  }
-
-  /**
-   * @return true if the given source file module should not be processed,
-   * e.g. because it is generated on behalf of some upstream source.
-   */
-  protected boolean skipSourceFile(SourceFileModule entry) {
-    return false;
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotTypeDictionary.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotTypeDictionary.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotTypeDictionary.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotTypeDictionary.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,110 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-/*
- * Created on Sep 28, 2005
- */
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-import polyglot.types.ArrayType;
-import polyglot.types.ClassType;
-import polyglot.types.ObjectType;
-import polyglot.types.PrimitiveType;
-import polyglot.types.Type;
-import polyglot.types.TypeSystem;
-
-import com.ibm.wala.cast.java.types.JavaPrimitiveTypeMap;
-import com.ibm.wala.cast.tree.CAstType;
-import com.ibm.wala.cast.tree.impl.CAstTypeDictionaryImpl;
-import com.ibm.wala.util.debug.Assertions;
-
-public class PolyglotTypeDictionary extends CAstTypeDictionaryImpl {
-  private final class PolyglotJavaArrayType implements CAstType.Array {
-    private final Type fEltPolyglotType;
-
-    private final CAstType fEltCAstType;
-
-    private PolyglotJavaArrayType(ArrayType arrayType) {
-      super();
-      fEltPolyglotType = arrayType.base();
-      fEltCAstType = getCAstTypeFor(fEltPolyglotType);
-    }
-
-    @Override
-    public int getNumDimensions() {
-      return 1; // always 1 for Java
-    }
-
-    @Override
-    public CAstType getElementType() {
-      return fEltCAstType;
-    }
-
-    @Override
-    public String getName() {
-      return "[" + fEltCAstType.getName();
-    }
-
-    @Override
-    public Collection<CAstType> getSupertypes() {
-      if (fEltPolyglotType.isPrimitive())
-        return Collections.singleton(getCAstTypeFor(fTypeSystem.Object()));
-      Assertions.productionAssertion(fEltPolyglotType.isReference(), "Non-primitive, non-reference array element type!");
-      ObjectType baseRefType = (ObjectType) fEltPolyglotType;
-      Collection<CAstType> supers = new ArrayList<CAstType>();
-      for (Iterator<Type> superIter = baseRefType.interfaces().iterator(); superIter.hasNext(); ) {
-        supers.add(getCAstTypeFor(superIter.next()));
-      }
-      if (baseRefType instanceof ClassType) {
-          ClassType baseClassType = (ClassType) baseRefType;
-        if (baseClassType.superClass() != null)
-              supers.add(getCAstTypeFor(baseRefType.superClass()));
-      }
-      return supers;
-    }
-  }
-
-  protected final TypeSystem fTypeSystem;
-
-  protected final PolyglotJava2CAstTranslator fTranslator;
-
-  public PolyglotTypeDictionary(TypeSystem typeSystem, PolyglotJava2CAstTranslator translator) {
-    fTypeSystem = typeSystem;
-    fTranslator = translator;
-  }
-
-  @Override
-  public CAstType getCAstTypeFor(Object astType) {
-    CAstType type = super.getCAstTypeFor(astType);
-    // Handle the case where we haven't seen an AST decl for some type before
-    // processing a reference. This can certainly happen with classes in byte-
-    // code libraries, for which we never see an AST decl.
-    // In this case, just create a new type and return that.
-    if (type == null) {
-      final Type polyglotType = (Type) astType;
-
-      if (polyglotType.isClass())
-        type = fTranslator.new PolyglotJavaType((ClassType) astType, this, fTypeSystem);
-      else if (polyglotType.isPrimitive()) {
-        type = JavaPrimitiveTypeMap.lookupType(((PrimitiveType) polyglotType).name().toString());
-      } else if (polyglotType.isArray()) {
-        type = new PolyglotJavaArrayType((ArrayType) polyglotType);
-      } else
-        Assertions.UNREACHABLE("getCAstTypeFor() passed type that is not primitive, array, or class?");
-      super.map(astType, type);
-    }
-    return type;
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotUnwoundIRTranslatorExtension.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotUnwoundIRTranslatorExtension.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotUnwoundIRTranslatorExtension.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/PolyglotUnwoundIRTranslatorExtension.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import com.ibm.wala.cast.tree.CAst;
-import com.ibm.wala.cast.tree.rewrite.AstLoopUnwinder;
-import com.ibm.wala.cast.tree.rewrite.CAstRewriter;
-import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
-
-public class PolyglotUnwoundIRTranslatorExtension 
-    extends JavaIRTranslatorExtension 
-{
-  private final int unrollDepth;
-
-  public PolyglotUnwoundIRTranslatorExtension(int unrollDepth) {
-    this.unrollDepth = unrollDepth;
-  }
-
-  @Override
-  public CAstRewriterFactory<CAstRewriter.RewriteContext<AstLoopUnwinder.UnwindKey>,AstLoopUnwinder.UnwindKey> getCAstRewriterFactory() {
-	  return new CAstRewriterFactory<CAstRewriter.RewriteContext<AstLoopUnwinder.UnwindKey>,AstLoopUnwinder.UnwindKey>() {
-		  @Override
-      public AstLoopUnwinder createCAstRewriter(CAst ast) {
-			  return new AstLoopUnwinder(ast, true, unrollDepth);
-		  }  
-	  };
-  }
-  
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/TranslatingVisitor.java wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/TranslatingVisitor.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/TranslatingVisitor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot/source/com/ibm/wala/cast/java/translator/polyglot/TranslatingVisitor.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,192 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-/*
- * Created on Sep 1, 2005
- */
-package com.ibm.wala.cast.java.translator.polyglot;
-
-import polyglot.ast.ArrayAccess;
-import polyglot.ast.ArrayAccessAssign;
-import polyglot.ast.ArrayInit;
-import polyglot.ast.ArrayTypeNode;
-import polyglot.ast.Assert;
-import polyglot.ast.Binary;
-import polyglot.ast.Block;
-import polyglot.ast.BooleanLit;
-import polyglot.ast.Branch;
-import polyglot.ast.Call;
-import polyglot.ast.CanonicalTypeNode;
-import polyglot.ast.Case;
-import polyglot.ast.Cast;
-import polyglot.ast.Catch;
-import polyglot.ast.CharLit;
-import polyglot.ast.ClassBody;
-import polyglot.ast.ClassDecl;
-import polyglot.ast.ClassLit;
-import polyglot.ast.Conditional;
-import polyglot.ast.ConstructorCall;
-import polyglot.ast.ConstructorDecl;
-import polyglot.ast.Do;
-import polyglot.ast.Empty;
-import polyglot.ast.Eval;
-import polyglot.ast.Field;
-import polyglot.ast.FieldAssign;
-import polyglot.ast.FieldDecl;
-import polyglot.ast.FloatLit;
-import polyglot.ast.For;
-import polyglot.ast.Formal;
-import polyglot.ast.If;
-import polyglot.ast.Import;
-import polyglot.ast.Initializer;
-import polyglot.ast.Instanceof;
-import polyglot.ast.IntLit;
-import polyglot.ast.Labeled;
-import polyglot.ast.Local;
-import polyglot.ast.LocalAssign;
-import polyglot.ast.LocalClassDecl;
-import polyglot.ast.LocalDecl;
-import polyglot.ast.MethodDecl;
-import polyglot.ast.New;
-import polyglot.ast.NewArray;
-import polyglot.ast.NullLit;
-import polyglot.ast.PackageNode;
-import polyglot.ast.Return;
-import polyglot.ast.Special;
-import polyglot.ast.StringLit;
-import polyglot.ast.Switch;
-import polyglot.ast.SwitchBlock;
-import polyglot.ast.Synchronized;
-import polyglot.ast.Throw;
-import polyglot.ast.Try;
-import polyglot.ast.Unary;
-import polyglot.ast.While;
-
-import com.ibm.wala.cast.java.translator.polyglot.PolyglotJava2CAstTranslator.MethodContext;
-import com.ibm.wala.cast.java.translator.polyglot.PolyglotJava2CAstTranslator.WalkContext;
-import com.ibm.wala.cast.tree.CAstNode;
-
-/**
- * An alternative visitor API for Polyglot, whose API is somewhat brain-damaged...
- * 
- * @author rfuhrer
- */
-public interface TranslatingVisitor {
-  CAstNode visit(MethodDecl m, MethodContext context);
-
-  CAstNode visit(ConstructorDecl cd, MethodContext cc);
-
-  CAstNode visit(FieldDecl f, MethodContext mc); // yes, a MethodContext; we process FieldDecl's only to add their initializers to
-                                                 // each constructor
-
-  CAstNode visit(Import i, WalkContext wc);
-
-  CAstNode visit(PackageNode p, WalkContext wc);
-
-  CAstNode visit(CanonicalTypeNode ctn, WalkContext wc);
-
-  CAstNode visit(ArrayTypeNode ctn, WalkContext wc);
-
-  CAstNode visit(ArrayInit ai, WalkContext wc);
-
-  CAstNode visit(ArrayAccessAssign aaa, WalkContext wc);
-
-  CAstNode visit(FieldAssign fa, WalkContext wc);
-
-  CAstNode visit(LocalAssign la, WalkContext wc);
-
-  CAstNode visit(Binary b, WalkContext wc);
-
-  CAstNode visit(Call c, WalkContext wc);
-
-  CAstNode visit(ConstructorCall cc, WalkContext wc);
-
-  CAstNode visit(Cast c, WalkContext wc);
-
-  CAstNode visit(Conditional c, WalkContext wc);
-
-  CAstNode visit(Instanceof io, WalkContext wc);
-
-  CAstNode visit(BooleanLit bl, WalkContext wc);
-
-  CAstNode visit(ClassLit cl, WalkContext wc);
-
-  CAstNode visit(FloatLit fl, WalkContext wc);
-
-  CAstNode visit(NullLit nl, WalkContext wc);
-
-  CAstNode visit(CharLit cl, WalkContext wc);
-
-  CAstNode visit(IntLit il, WalkContext wc);
-
-  CAstNode visit(StringLit sl, WalkContext wc);
-
-  CAstNode visit(New n, WalkContext wc);
-
-  CAstNode visit(NewArray na, WalkContext wc);
-
-  CAstNode visit(Special s, WalkContext wc);
-
-  CAstNode visit(Unary u, WalkContext wc);
-
-  CAstNode visit(ArrayAccess aa, WalkContext wc);
-
-  CAstNode visit(Field f, WalkContext wc);
-
-  CAstNode visit(Local l, WalkContext wc);
-
-  CAstNode visit(ClassBody cb, WalkContext wc); // should never see this when producing CAstNodes
-
-  CAstNode visit(ClassDecl cd, WalkContext wc); // should never see this when producing CAstNodes
-
-  CAstNode visit(Initializer i, WalkContext wc); // should never see this when producing CAstNodes
-
-  CAstNode visit(Assert a, WalkContext wc);
-
-  CAstNode visit(Branch b, WalkContext wc);
-
-  CAstNode visit(Block b, WalkContext wc);
-
-  CAstNode visit(SwitchBlock sb, WalkContext wc);
-
-  CAstNode visit(Catch c, WalkContext wc);
-
-  CAstNode visit(If i, WalkContext wc);
-
-  CAstNode visit(Labeled l, WalkContext wc);
-
-  CAstNode visit(LocalClassDecl lcd, WalkContext wc);
-
-  CAstNode visit(Do d, WalkContext wc);
-
-  CAstNode visit(For f, WalkContext wc);
-
-  CAstNode visit(While w, WalkContext wc);
-
-  CAstNode visit(Switch s, WalkContext wc);
-
-  CAstNode visit(Synchronized s, WalkContext wc);
-
-  CAstNode visit(Try t, WalkContext wc);
-
-  CAstNode visit(Empty e, WalkContext wc);
-
-  CAstNode visit(Eval e, WalkContext wc);
-
-  CAstNode visit(LocalDecl ld, WalkContext wc);
-
-  CAstNode visit(Return r, WalkContext wc);
-
-  CAstNode visit(Case c, WalkContext wc);
-
-  CAstNode visit(Throw t, WalkContext wc);
-
-  CAstNode visit(Formal f, WalkContext wc); // may not see these (might be handled by parent)
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/build.properties wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/build.properties
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/build.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-source.. = source/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/.classpath wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/.classpath
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="source"/>
-	<classpathentry kind="lib" path="/com.ibm.wala.cast.java.polyglot/lib/polyglot.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotJLexTest.launch wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotJLexTest.launch
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotJLexTest.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotJLexTest.launch	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<stringAttribute key="bad_container_name" value="/com.ibm.wala.cast.java.polyglottest/launchers"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJLexTest.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="/tmp/jlexpolytest.out"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.java.test.PolyglotJLexTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.cast.java.polyglot.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.ibm.wala.tracefile=/tmp/jlexpolytrace.txt"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:com.ibm.wala.cast.java.test.data}"/>
-</launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotSyncDuplicatorTest.launch wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotSyncDuplicatorTest.launch
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotSyncDuplicatorTest.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotSyncDuplicatorTest.launch	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<stringAttribute key="bad_container_name" value="/com.ibm.wala.cast.java.polyglottest/launchers"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotSyncDuplicatorTest.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.java.test.PolyglotSyncDuplicatorTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.cast.java.polyglot.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:com.ibm.wala.cast.java.test.data}"/>
-</launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: WALA Cast Java Polyglot Test Plug-in
-Bundle-SymbolicName: com.ibm.wala.cast.java.polyglot.test
-Bundle-Version: 1.3.9
-Bundle-Activator: com.ibm.wala.cast.java.polyglot.test.Activator
-Bundle-Vendor: IBM
-Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",
- com.ibm.wala.cast.java;bundle-version="1.0.0",
- com.ibm.wala.cast.java.test;bundle-version="1.0.0",
- com.ibm.wala.core;bundle-version="1.1.3",
- com.ibm.wala.core.tests;bundle-version="1.1.3",
- org.eclipse.core.runtime,
- com.ibm.wala.cast.test;bundle-version="1.0.0",
- com.ibm.wala.cast.java.polyglot;bundle-version="1.0.0",
- org.junit;bundle-version="4.0.0",
- com.ibm.wala.cast.java.test.data;bundle-version="1.3.4"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-ActivationPolicy: lazy
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/pom.xml wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/pom.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.ibm.wala</groupId>
-        <artifactId>WALA</artifactId>
-        <version>1.3.9</version>
-    </parent>
-  <artifactId>com.ibm.wala.cast.java.polyglot.test</artifactId>
-  <packaging>eclipse-plugin</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>test</id>
-            <phase>test</phase>
-            <configuration>
-              <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
-              <argLine>-Xmx1200M -ea</argLine>
-              <redirectTestOutputToFile>true</redirectTestOutputToFile>
-              <workingDirectory>${basedir}/../com.ibm.wala.cast.java.test.data</workingDirectory>
-            </configuration>
-            <goals>
-              <goal>test</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies> 
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/.project wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/.project
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.cast.java.polyglot.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/.settings/org.eclipse.jdt.core.prefs	1970-01-01 00:00:00.000000000 +0000
@@ -1,346 +0,0 @@
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=2
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=132
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=2
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/.settings/org.eclipse.jdt.ui.prefs wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/.settings/org.eclipse.jdt.ui.prefs
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/.settings/org.eclipse.jdt.ui.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/.settings/org.eclipse.jdt.ui.prefs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-#Mon Apr 13 15:21:17 EDT 2009
-eclipse.preferences.version=1
-formatter_profile=_WALA
-formatter_settings_version=11
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/polyglot/test/Activator.java wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/polyglot/test/Activator.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/polyglot/test/Activator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/polyglot/test/Activator.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package com.ibm.wala.cast.java.polyglot.test;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-  // The plug-in ID
-  public static final String PLUGIN_ID = "com.ibm.wala.cast.java.polyglot.test";
-
-  // The shared instance
-  private static Activator plugin;
-
-  /**
-   * The constructor
-   */
-  public Activator() {
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-   */
-  @Override
-  public void start(BundleContext context) throws Exception {
-    super.start(context);
-    plugin = this;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-   */
-  @Override
-  public void stop(BundleContext context) throws Exception {
-    plugin = null;
-    super.stop(context);
-  }
-
-  /**
-   * Returns the shared instance
-   * 
-   * @return the shared instance
-   */
-  public static Activator getDefault() {
-    return plugin;
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJavaIRTest.java wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJavaIRTest.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJavaIRTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJavaIRTest.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package com.ibm.wala.cast.java.test;
-
-import java.util.Collection;
-import java.util.List;
-
-import com.ibm.wala.cast.java.client.JavaSourceAnalysisEngine;
-import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
-import com.ibm.wala.cast.java.translator.polyglot.PolyglotJavaSourceAnalysisEngine;
-import com.ibm.wala.client.AbstractAnalysisEngine;
-import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
-import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.ipa.callgraph.Entrypoint;
-import com.ibm.wala.ipa.callgraph.impl.Util;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
-
-public class PolyglotJavaIRTest extends JavaIRTests {
-  
-  public PolyglotJavaIRTest() {
-    super(null);
-  }
-
-  @Override
-  protected AbstractAnalysisEngine getAnalysisEngine(final String[] mainClassDescriptors, Collection<String> sources, List<String> libs) {
-    JavaSourceAnalysisEngine engine = new PolyglotJavaSourceAnalysisEngine() {
-      @Override
-      protected Iterable<Entrypoint> makeDefaultEntrypoints(AnalysisScope scope, IClassHierarchy cha) {
-        return Util.makeMainEntrypoints(JavaSourceAnalysisScope.SOURCE, cha, mainClassDescriptors);
-      }
-    };
-    engine.setExclusionsFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    populateScope(engine, sources, libs);
-    return engine;
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJLexTest.java wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJLexTest.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJLexTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJLexTest.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package com.ibm.wala.cast.java.test;
-
-import java.util.Collection;
-import java.util.List;
-
-import com.ibm.wala.cast.java.client.JavaSourceAnalysisEngine;
-import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
-import com.ibm.wala.cast.java.translator.polyglot.PolyglotJavaSourceAnalysisEngine;
-import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
-import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.ipa.callgraph.Entrypoint;
-import com.ibm.wala.ipa.callgraph.impl.Util;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
-
-public class PolyglotJLexTest extends JLexTest {
-
-  @Override
-  protected JavaSourceAnalysisEngine getAnalysisEngine(final String[] mainClassDescriptors, Collection<String> sources, List<String> libs) {
-    JavaSourceAnalysisEngine engine = new PolyglotJavaSourceAnalysisEngine() {
-      @Override
-      protected Iterable<Entrypoint> makeDefaultEntrypoints(AnalysisScope scope, IClassHierarchy cha) {
-        return Util.makeMainEntrypoints(JavaSourceAnalysisScope.SOURCE, cha, new String[] { "LJLex/Main" });
-      }
-    };
-    engine.setExclusionsFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    populateScope(engine, sources, libs);
-    return engine;
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotSyncDuplicatorTest.java wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotSyncDuplicatorTest.java
--- wala-1.3.9/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotSyncDuplicatorTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotSyncDuplicatorTest.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package com.ibm.wala.cast.java.test;
-
-import java.util.Collection;
-import java.util.List;
-
-import com.ibm.wala.cast.java.client.JavaSourceAnalysisEngine;
-import com.ibm.wala.cast.java.examples.ast.SynchronizedBlockDuplicator;
-import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
-import com.ibm.wala.cast.java.translator.polyglot.IRTranslatorExtension;
-import com.ibm.wala.cast.java.translator.polyglot.JavaIRTranslatorExtension;
-import com.ibm.wala.cast.java.translator.polyglot.PolyglotJavaSourceAnalysisEngine;
-import com.ibm.wala.cast.tree.CAst;
-import com.ibm.wala.cast.tree.rewrite.CAstRewriter;
-import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
-import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
-import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.ipa.callgraph.Entrypoint;
-import com.ibm.wala.ipa.callgraph.impl.Util;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
-
-public class PolyglotSyncDuplicatorTest extends SyncDuplicatorTest {
-
-  @Override
-  protected JavaSourceAnalysisEngine getAnalysisEngine(final String[] mainClassDescriptors, Collection<String> sources, List<String> libs) {
-    JavaSourceAnalysisEngine engine = new PolyglotJavaSourceAnalysisEngine() {
-      @Override
-      protected Iterable<Entrypoint> makeDefaultEntrypoints(AnalysisScope scope, IClassHierarchy cha) {
-        return Util.makeMainEntrypoints(JavaSourceAnalysisScope.SOURCE, cha, mainClassDescriptors);
-      }
-
-      @Override
-      public IRTranslatorExtension getTranslatorExtension() {
-        JavaIRTranslatorExtension ext = new JavaIRTranslatorExtension();
-        ext.setCAstRewriterFactory(new CAstRewriterFactory() {
-          @Override
-          public CAstRewriter createCAstRewriter(CAst ast) {
-            return new SynchronizedBlockDuplicator(ast, true, testMethod);
-          }
-        });
-        return ext;
-      }
-
-    };
-    engine.setExclusionsFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    populateScope(engine, sources, libs);
-    return engine;
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/build.gradle wala-1.5.1/com.ibm.wala.cast.java.test/build.gradle
--- wala-1.3.9/com.ibm.wala.cast.java.test/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,34 @@
+plugins {
+	id 'com.github.hauner.jarTest'
+	id 'eclipse'
+}
+
+eclipse.project.natures 'org.eclipse.pde.PluginNature'
+
+sourceSets.test {
+	java.srcDirs = ['src']
+	resources.srcDirs = ['data']
+}
+
+publishing.publications {
+	mavenJava(MavenPublication) {
+		artifact jarTest
+	}
+}
+
+dependencies {
+	testCompile(
+		'junit:junit:4.12',
+		'org.osgi:org.osgi.core:4.2.0',
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.cast.java'),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.shrike'),
+		project(':com.ibm.wala.util'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
+		)
+}
+
+test {
+	maxHeapSize = '800M'
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/build.properties wala-1.5.1/com.ibm.wala.cast.java.test/build.properties
--- wala-1.3.9/com.ibm.wala.cast.java.test/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,6 @@
 source.. = src/
-output.. = bin/
+output.. = bin/test
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/.classpath wala-1.5.1/com.ibm.wala.cast.java.test/.classpath
--- wala-1.3.9/com.ibm.wala.cast.java.test/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/.cvsignore wala-1.5.1/com.ibm.wala.cast.java.test/.cvsignore
--- wala-1.3.9/com.ibm.wala.cast.java.test/.cvsignore	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/.cvsignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-bin
-domo-trace.txt*
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Java AST WALA Test Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.java.test
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Bundle-Activator: com.ibm.wala.cast.java.test.TestPlugin
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.core.tests,
  com.ibm.wala.cast.java,
  com.ibm.wala.cast,
@@ -14,4 +14,5 @@
  org.junit;bundle-version="4.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.ibm.wala.cast.java.test
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: com.ibm.wala.cast.java.test
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast.java.test/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast.java.test/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.java.test
+Bundle-Vendor = IBM
+Bundle-Name = Java AST WALA Test Plug-in
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/pom.xml wala-1.5.1/com.ibm.wala.cast.java.test/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.java.test/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
   <artifactId>com.ibm.wala.cast.java.test</artifactId>
   <packaging>eclipse-plugin</packaging>
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
   </dependencies> 
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/.project wala-1.5.1/com.ibm.wala.cast.java.test/.project
--- wala-1.3.9/com.ibm.wala.cast.java.test/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.cast.java.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.java.test/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.java.test/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,78 +1,126 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=error
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast.java.test/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast.java.test/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.cast.java.test/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.cast.java.test/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/IRTests.java wala-1.5.1/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/IRTests.java
--- wala-1.3.9/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/IRTests.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/IRTests.java	2019-01-29 17:08:39.000000000 +0000
@@ -40,6 +40,7 @@
 import com.ibm.wala.client.AbstractAnalysisEngine;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
@@ -53,6 +54,7 @@
 import com.ibm.wala.types.annotations.Annotation;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.strings.Atom;
@@ -126,7 +128,7 @@
   protected static class EdgeAssertions implements IRAssertion {
     public final String srcDescriptor;
 
-    public final List/* <String> */<String> tgtDescriptors = new ArrayList<String>();
+    public final List/* <String> */<String> tgtDescriptors = new ArrayList<>();
 
     public EdgeAssertions(String srcDescriptor) {
       this.srcDescriptor = srcDescriptor;
@@ -190,9 +192,7 @@
         CGNode tgtNode = tgtNodes.iterator().next();
 
         boolean found = false;
-        for (Iterator<? extends CGNode> succIter = callGraph.getSuccNodes(srcNode); succIter.hasNext();) {
-          CGNode succ = succIter.next();
-
+        for (CGNode succ : Iterator2Iterable.make(callGraph.getSuccNodes(srcNode))) {
           if (tgtNode == succ) {
             found = true;
             break;
@@ -339,19 +339,23 @@
   }
   
   protected String[] simpleTestEntryPoint() {
-    return new String[] { "L" + getTestName().substring(4) };
+    return new String[] { 'L' + getTestName().substring(4) };
   }
 
   protected String[] simplePkgTestEntryPoint(String pkgName) {
     return new String[] { "L" + pkgName + "/" + getTestName().substring(4) };
   }
 
-  protected abstract AbstractAnalysisEngine getAnalysisEngine(String[] mainClassDescriptors, Collection<String> sources, List<String> libs);
+  protected abstract <I extends InstanceKey> AbstractAnalysisEngine<I, CallGraphBuilder<I>, ?> getAnalysisEngine(String[] mainClassDescriptors, Collection<String> sources, List<String> libs);
 
-  public Pair<CallGraph, PointerAnalysis<InstanceKey>> runTest(Collection<String> sources, List<String> libs,
-        String[] mainClassDescriptors, List<? extends IRAssertion> ca, boolean assertReachable) throws IllegalArgumentException, CancelException, IOException {
-      AbstractAnalysisEngine engine = getAnalysisEngine(mainClassDescriptors, sources, libs);
+  public <I extends InstanceKey> Pair<CallGraph, PointerAnalysis<? extends InstanceKey>> runTest(Collection<String> sources, List<String> libs,
+        String[] mainClassDescriptors, List<? extends IRAssertion> ca, boolean assertReachable, String exclusionsFile) throws IllegalArgumentException, CancelException, IOException {
+      AbstractAnalysisEngine<I, CallGraphBuilder<I>, ?> engine = getAnalysisEngine(mainClassDescriptors, sources, libs);
 
+      if (exclusionsFile != null) {
+        engine.setExclusionsFile(exclusionsFile);
+      }
+      
       CallGraph callGraph;
         callGraph = engine.buildDefaultCallGraph();
         //System.err.println(callGraph.toString());
@@ -369,7 +373,7 @@
         return Pair.make(callGraph, engine.getPointerAnalysis());
   }
 
-  protected static void dumpIR(CallGraph cg, Collection<String> sources, boolean assertReachable) throws IOException {
+  protected static void dumpIR(CallGraph cg, Collection<String> sources, boolean assertReachable) {
     Set<String> sourcePaths = HashSetFactory.make();
     for(String src : sources) {
       sourcePaths.add(src.substring(src.lastIndexOf(File.separator)+1));
@@ -378,8 +382,7 @@
     Set<IMethod> unreachable = HashSetFactory.make();
     IClassHierarchy cha = cg.getClassHierarchy();
     IClassLoader sourceLoader = cha.getLoader(JavaSourceAnalysisScope.SOURCE);
-    for (Iterator iter = sourceLoader.iterateAllClasses(); iter.hasNext();) {
-      IClass clazz = (IClass) iter.next();
+    for (IClass clazz : Iterator2Iterable.make(sourceLoader.iterateAllClasses())) {
 
       System.err.println(clazz);
       if (clazz.isInterface())
@@ -389,7 +392,7 @@
         if (m.isAbstract()) {
           System.err.println(m);
         } else {
-          Iterator nodeIter = cg.getNodes(m.getReference()).iterator();
+          Iterator<CGNode> nodeIter = cg.getNodes(m.getReference()).iterator();
           if (!nodeIter.hasNext()) {
             if (m instanceof AstMethod) {
               String fn = ((AstClass)m.getDeclaringClass()).getSourcePosition().getURL().getFile();
@@ -400,7 +403,7 @@
             }
             continue;
           }
-          CGNode node = (CGNode) nodeIter.next();
+          CGNode node = nodeIter.next();
           System.err.println(node.getIR());
         }
       }
@@ -412,10 +415,8 @@
   }
 
   /**
-   * 
    * @param srcMethodDescriptor a full method descriptor of the form ldr#type#methName#methSig example:
    *          Source#Simple1#main#([Ljava/lang/String;)V
-   * @param cha
    */
   public static MethodReference descriptorToMethodRef(String srcMethodDescriptor, IClassHierarchy cha) {
     String[] ldrTypeMeth = srcMethodDescriptor.split("\\#");
@@ -433,7 +434,7 @@
 
   static TypeReference findOrCreateTypeReference(String loaderName, String typeStr, IClassHierarchy cha) {
     ClassLoaderReference clr = findLoader(loaderName, cha);
-    TypeName typeName = TypeName.string2TypeName("L" + typeStr);
+    TypeName typeName = TypeName.string2TypeName('L' + typeStr);
     TypeReference typeRef = TypeReference.findOrCreate(clr, typeName);
     return typeRef;
   }
@@ -450,14 +451,14 @@
     return null;
   }
 
-  protected void populateScope(JavaSourceAnalysisEngine engine, Collection<String> sources, List<String> libs) {
+  public static void populateScope(JavaSourceAnalysisEngine<?> engine, Collection<String> sources, List<String> libs) {
     boolean foundLib = false;
     for (String lib : libs) {
       File libFile = new File(lib);
       if (libFile.exists()) {
         foundLib = true;
         try {
-          engine.addSystemModule(new JarFileModule(new JarFile(libFile)));
+          engine.addSystemModule(new JarFileModule(new JarFile(libFile, false)));
         } catch (IOException e) {
           Assert.fail(e.getMessage());
         }
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java wala-1.5.1/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java
--- wala-1.3.9/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,10 +13,12 @@
  */
 package com.ibm.wala.cast.java.test;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -36,6 +38,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.LocalPointerKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.slicer.SDG;
 import com.ibm.wala.ipa.slicer.Statement;
 import com.ibm.wala.ssa.SSAArrayLengthInstruction;
@@ -52,6 +55,7 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.Pair;
+import com.ibm.wala.util.io.TemporaryFile;
 import com.ibm.wala.util.strings.Atom;
 
 public abstract class JavaIRTests extends IRTests {
@@ -68,7 +72,7 @@
 
     List<? extends IRAssertion> assertions = Arrays.asList(
         new SourceMapAssertion("Source#Simple1#doStuff#(I)V", "prod", 24),
-        new SourceMapAssertion("Source#Simple1#doStuff#(I)V", "j", 23), 
+        new SourceMapAssertion("Source#Simple1#doStuff#(I)V", "j", 23),
         new SourceMapAssertion("Source#Simple1#main#([Ljava/lang/String;)V", "s", 32), 
         new SourceMapAssertion("Source#Simple1#main#([Ljava/lang/String;)V", "i", 28), 
         new SourceMapAssertion("Source#Simple1#main#([Ljava/lang/String;)V", "sum", 29), 
@@ -76,114 +80,87 @@
         EdgeAssertions.make("Source#Simple1#instanceMethod1#()V", "Source#Simple1#instanceMethod2#()V"));
 
     // this needs soure positions to work too
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), assertions, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), assertions, true, null);
   }
 
   @Test public void testTwoClasses() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Collections.singletonList(
 
-    new IRAssertion() {
+    cg -> {
+      final String typeStr = singleInputForTest();
 
-      @Override
-      public void check(CallGraph cg) {
-        final String typeStr = singleInputForTest();
+      final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
 
-        final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
+      final IClass iClass = cg.getClassHierarchy().lookupClass(type);
+      Assert.assertNotNull("Could not find class " + typeStr, iClass);
 
-        final IClass iClass = cg.getClassHierarchy().lookupClass(type);
-        Assert.assertNotNull("Could not find class " + typeStr, iClass);
+      /*
+      Assert.assertEquals("Expected two classes.", iClass.getClassLoader().getNumberOfClasses(), 2);
 
-        /*
-        Assert.assertEquals("Expected two classes.", iClass.getClassLoader().getNumberOfClasses(), 2);
-
-        for (Iterator<IClass> it = iClass.getClassLoader().iterateAllClasses(); it.hasNext();) {
-          IClass cls = it.next();
-
-          Assert.assertTrue("Expected class to be either " + typeStr + " or " + "Bar", cls.getName().getClassName().toString()
-              .equals(typeStr)
-              || cls.getName().getClassName().toString().equals("Bar"));
-        }
-        */
+      for (IClass cls : Iterator2Iterable.make(iClass.getClassLoader().iterateAllClasses())) {
+        Assert.assertTrue("Expected class to be either " + typeStr + " or " + "Bar", cls.getName().getClassName().toString()
+            .equals(typeStr)
+            || cls.getName().getClassName().toString().equals("Bar"));
       }
-    }), true);
+      */
+    }), true, null);
   }
 
   @Test public void testInterfaceTest1() throws IllegalArgumentException, CancelException, IOException {
     runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
 
-    /**
-     * IFoo is an interface
-     */
-    new IRAssertion() {
-
-      @Override
-      public void check(CallGraph cg) {
-        final String typeStr = "IFoo";
+    cg -> {
+      final String typeStr = "IFoo";
 
-        final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
+      final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
 
-        final IClass iClass = cg.getClassHierarchy().lookupClass(type);
-        Assert.assertNotNull("Could not find class " + typeStr, iClass);
+      final IClass iClass = cg.getClassHierarchy().lookupClass(type);
+      Assert.assertNotNull("Could not find class " + typeStr, iClass);
 
-        Assert.assertTrue("Expected IFoo to be an interface.", iClass.isInterface());
-      }
+      Assert.assertTrue("Expected IFoo to be an interface.", iClass.isInterface());
     },
 
-    /**
-     * Foo implements IFoo
-     */
-    new IRAssertion() {
-
-      @Override
-      public void check(CallGraph cg) {
-        final String typeStr = "FooIT1";
+    cg -> {
+      final String typeStr = "FooIT1";
 
-        final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
+      final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
 
-        final IClass iClass = cg.getClassHierarchy().lookupClass(type);
-        Assert.assertNotNull("Could not find class " + typeStr, iClass);
+      final IClass iClass = cg.getClassHierarchy().lookupClass(type);
+      Assert.assertNotNull("Could not find class " + typeStr, iClass);
 
-        final Collection<? extends IClass> interfaces = iClass.getDirectInterfaces();
+      final Collection<? extends IClass> interfaces = iClass.getDirectInterfaces();
 
-        Assert.assertEquals("Expected one single interface.", interfaces.size(), 1);
+      Assert.assertEquals("Expected one single interface.", interfaces.size(), 1);
 
-        Assert.assertTrue("Expected Foo to implement IFoo", interfaces.contains(cg.getClassHierarchy().lookupClass(
-            findOrCreateTypeReference("Source", "IFoo", cg.getClassHierarchy()))));
-      }
-    }), true);
+      Assert.assertTrue("Expected Foo to implement IFoo", interfaces.contains(cg.getClassHierarchy().lookupClass(
+          findOrCreateTypeReference("Source", "IFoo", cg.getClassHierarchy()))));
+    }), true, null);
   }
 
   @Test public void testInheritance1() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
-    /**
-     * 'Derived' extends 'Base'
-     */
-    new IRAssertion() {
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Collections.singletonList(
+    cg -> {
+      final String typeStr = "Derived";
 
-      @Override
-      public void check(CallGraph cg) {
-        final String typeStr = "Derived";
+      final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
 
-        final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
+      final IClass derivedClass = cg.getClassHierarchy().lookupClass(type);
+      Assert.assertNotNull("Could not find class " + typeStr, derivedClass);
 
-        final IClass derivedClass = cg.getClassHierarchy().lookupClass(type);
-        Assert.assertNotNull("Could not find class " + typeStr, derivedClass);
+      final TypeReference baseType = findOrCreateTypeReference("Source", "Base", cg.getClassHierarchy());
+      final IClass baseClass = cg.getClassHierarchy().lookupClass(baseType);
 
-        final TypeReference baseType = findOrCreateTypeReference("Source", "Base", cg.getClassHierarchy());
-        final IClass baseClass = cg.getClassHierarchy().lookupClass(baseType);
+      Assert.assertTrue("Expected 'Base' to be the superclass of 'Derived'", derivedClass.getSuperclass().equals(baseClass));
 
-        Assert.assertTrue("Expected 'Base' to be the superclass of 'Derived'", derivedClass.getSuperclass().equals(baseClass));
+      Collection<IClass> subclasses = cg.getClassHierarchy().computeSubClasses(baseType);
 
-        Collection<IClass> subclasses = cg.getClassHierarchy().computeSubClasses(baseType);
-
-        Assert.assertTrue("Expected subclasses of 'Base' to be 'Base' and 'Derived'.", subclasses.contains(derivedClass)
-            && subclasses.contains(baseClass));
-      }
-    }), true);
+      Assert.assertTrue("Expected subclasses of 'Base' to be 'Base' and 'Derived'.", subclasses.contains(derivedClass)
+          && subclasses.contains(baseClass));
+    }), true, null);
   }
 
   @Test public void testArray1() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Collections.singletonList(
     /**
      * 'foo' has four array instructions: - 2 SSAArrayLengthInstruction - 1
      * SSAArrayLoadInstruction - 1 SSAArrayStoreInstruction
@@ -209,183 +186,149 @@
       private boolean isArrayInstruction(SSAInstruction s) {
         return s instanceof SSAArrayReferenceInstruction || s instanceof SSAArrayLengthInstruction;
       }
-    }), true);
+    }), true, null);
   }
 
   @Test public void testArrayLiteral1() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
-    /**
-     * 'foo' has four array instructions: - 2 SSAArrayLengthInstruction - 1
-     * SSAArrayLoadInstruction - 1 SSAArrayStoreInstruction
-     */
-    new IRAssertion() {
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Collections.singletonList(
+    cg -> {
 
-      @Override
-      public void check(CallGraph cg) {
+      MethodReference mref = descriptorToMethodRef("Source#ArrayLiteral1#main#([Ljava/lang/String;)V", cg.getClassHierarchy());
 
-        MethodReference mref = descriptorToMethodRef("Source#ArrayLiteral1#main#([Ljava/lang/String;)V", cg.getClassHierarchy());
-
-        CGNode node = cg.getNodes(mref).iterator().next();
-        SSAInstruction s = node.getIR().getInstructions()[2];
-        Assert.assertTrue("Did not find new array instruction.", s instanceof SSANewInstruction);
-        Assert.assertTrue("", ((SSANewInstruction) s).getNewSite().getDeclaredType().isArrayType());
-      }
-
-    }), true);
+      CGNode node = cg.getNodes(mref).iterator().next();
+      SSAInstruction s = node.getIR().getInstructions()[2];
+      Assert.assertTrue("Did not find new array instruction.", s instanceof SSANewInstruction);
+      Assert.assertTrue("", ((SSANewInstruction) s).getNewSite().getDeclaredType().isArrayType());
+    }), true, null);
   }
 
   @Test public void testArrayLiteral2() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
-    /**
-     * int[] y= { 1, 2, 3, 4 } is represented in the IR as four array store
-     * instructions
-     */
-    new IRAssertion() {
-
-      @Override
-      public void check(CallGraph cg) {
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Collections.singletonList(
+    cg -> {
 
-        MethodReference mref = descriptorToMethodRef("Source#ArrayLiteral2#main#([Ljava/lang/String;)V", cg.getClassHierarchy());
+      MethodReference mref = descriptorToMethodRef("Source#ArrayLiteral2#main#([Ljava/lang/String;)V", cg.getClassHierarchy());
 
-        CGNode node = cg.getNodes(mref).iterator().next();
+      CGNode node = cg.getNodes(mref).iterator().next();
 
-        final SSAInstruction[] instructions = node.getIR().getInstructions();
-        // test 1
-        {
-          SSAInstruction s1 = instructions[2];
-          if (s1 instanceof SSANewInstruction) {
-            Assert.assertTrue("", ((SSANewInstruction) s1).getNewSite().getDeclaredType().isArrayType());
-          } else {
-            Assert.assertTrue("Expected 3rd to be a new array instruction.", false);
-          }
+      final SSAInstruction[] instructions = node.getIR().getInstructions();
+      // test 1
+      {
+        SSAInstruction s1 = instructions[2];
+        if (s1 instanceof SSANewInstruction) {
+          Assert.assertTrue("", ((SSANewInstruction) s1).getNewSite().getDeclaredType().isArrayType());
+        } else {
+          Assert.assertTrue("Expected 3rd to be a new array instruction.", false);
         }
-        // test 2
-        {
-          SSAInstruction s2 = instructions[3];
-          if (s2 instanceof SSANewInstruction) {
-            Assert.assertTrue("", ((SSANewInstruction) s2).getNewSite().getDeclaredType().isArrayType());
-          } else {
-            Assert.assertTrue("Expected 4th to be a new array instruction.", false);
-          }
+      }
+      // test 2
+      {
+        SSAInstruction s2 = instructions[3];
+        if (s2 instanceof SSANewInstruction) {
+          Assert.assertTrue("", ((SSANewInstruction) s2).getNewSite().getDeclaredType().isArrayType());
+        } else {
+          Assert.assertTrue("Expected 4th to be a new array instruction.", false);
         }
-        // test 3: the last 4 instructions are of the form y[i] = i+1;
-        {
-          final SymbolTable symbolTable = node.getIR().getSymbolTable();
-          for (int i = 4; i <= 7; i++) {
-            Assert.assertTrue("Expected only array stores.", instructions[i] instanceof SSAArrayStoreInstruction);
+      }
+      // test 3: the last 4 instructions are of the form y[i] = i+1;
+      {
+        final SymbolTable symbolTable = node.getIR().getSymbolTable();
+        for (int i = 4; i <= 7; i++) {
+          Assert.assertTrue("Expected only array stores.", instructions[i] instanceof SSAArrayStoreInstruction);
 
-            SSAArrayStoreInstruction as = (SSAArrayStoreInstruction) instructions[i];
+          SSAArrayStoreInstruction as = (SSAArrayStoreInstruction) instructions[i];
 
-            Assert.assertEquals("Expected an array store to 'y'.", node.getIR().getLocalNames(i, as.getArrayRef())[0], "y");
+          Assert.assertEquals("Expected an array store to 'y'.", node.getIR().getLocalNames(i, as.getArrayRef())[0], "y");
 
-            final Integer valueOfArrayIndex = ((Integer) symbolTable.getConstantValue(as.getIndex()));
-            final Integer valueAssigned = (Integer) symbolTable.getConstantValue(as.getValue());
+          final Integer valueOfArrayIndex = ((Integer) symbolTable.getConstantValue(as.getIndex()));
+          final Integer valueAssigned = (Integer) symbolTable.getConstantValue(as.getValue());
 
-            Assert.assertEquals("Expected an array store to 'y' with value " + (valueOfArrayIndex + 1), valueAssigned.intValue(),
-                valueOfArrayIndex + 1);
+          Assert.assertEquals("Expected an array store to 'y' with value " + (valueOfArrayIndex + 1), valueAssigned.intValue(),
+              valueOfArrayIndex + 1);
 
-          }
         }
       }
-
-    }), true);
+    }), true, null);
   }
 
   @Test public void testInheritedField() throws IllegalArgumentException, CancelException, IOException {
     List<EdgeAssertions> edgeAssertionses = Arrays.asList(EdgeAssertions.make("Source#InheritedField#main#([Ljava/lang/String;)V",
         "Source#B#foo#()V"), EdgeAssertions.make("Source#InheritedField#main#([Ljava/lang/String;)V", "Source#B#bar#()V"));
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), edgeAssertionses, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), edgeAssertionses, true, null);
   }
 
   @Test public void testQualifiedStatic() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
-    /**
-     * 
-     */
-    new IRAssertion() {
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Collections.singletonList(
+    cg -> {
 
-      @Override
-      public void check(CallGraph cg) {
+      MethodReference mref = descriptorToMethodRef("Source#QualifiedStatic#main#([Ljava/lang/String;)V", cg.getClassHierarchy());
 
-        MethodReference mref = descriptorToMethodRef("Source#QualifiedStatic#main#([Ljava/lang/String;)V", cg.getClassHierarchy());
+      CGNode node = cg.getNodes(mref).iterator().next();
+      SSAInstruction s = node.getIR().getInstructions()[4];
 
-        CGNode node = cg.getNodes(mref).iterator().next();
-        SSAInstruction s = node.getIR().getInstructions()[4];
-
-        Assert.assertTrue("Did not find a getstatic instruction.", s instanceof SSAGetInstruction
-            && ((SSAGetInstruction) s).isStatic());
-        final FieldReference field = ((SSAGetInstruction) s).getDeclaredField();
-        Assert.assertEquals("Expected a getstatic for 'value'.", field.getName().toString(), "value");
-        Assert.assertEquals("Expected a getstatic for 'value'.", field.getDeclaringClass().getName().toString(), "LFooQ");
-      }
-
-    }), true);
+      Assert.assertTrue("Did not find a getstatic instruction.", s instanceof SSAGetInstruction
+          && ((SSAGetInstruction) s).isStatic());
+      final FieldReference field = ((SSAGetInstruction) s).getDeclaredField();
+      Assert.assertEquals("Expected a getstatic for 'value'.", field.getName().toString(), "value");
+      Assert.assertEquals("Expected a getstatic for 'value'.", field.getDeclaringClass().getName().toString(), "LFooQ");
+    }), true, null);
   }
 
   @Test public void testStaticNesting() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Collections.singletonList(
 
-    new IRAssertion() {
+    cg -> {
+      final String typeStr = singleInputForTest() + "$WhatsIt";
 
-      @Override
-      public void check(CallGraph cg) {
-        final String typeStr = singleInputForTest() + "$WhatsIt";
+      final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
 
-        final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
+      final IClass iClass = cg.getClassHierarchy().lookupClass(type);
+      Assert.assertNotNull("Could not find class " + typeStr, iClass);
 
-        final IClass iClass = cg.getClassHierarchy().lookupClass(type);
-        Assert.assertNotNull("Could not find class " + typeStr, iClass);
+      // todo: this fails: Assert.assertNotNull("Expected to be enclosed in
+      // 'StaticNesting'.",
+      // ((JavaSourceLoaderImpl.JavaClass)iClass).getEnclosingClass());
+      // todo: is there the concept of CompilationUnit?
 
-        // todo: this fails: Assert.assertNotNull("Expected to be enclosed in
-        // 'StaticNesting'.",
-        // ((JavaSourceLoaderImpl.JavaClass)iClass).getEnclosingClass());
-        // todo: is there the concept of CompilationUnit?
-
-        /**
-         * {@link JavaCAst2IRTranslator#getEnclosingType} return null for static
-         * inner classes..?
-         */
-      }
-    }), true);
+      /**
+       * {@link JavaCAst2IRTranslator#getEnclosingType} return null for static
+       * inner classes..?
+       */
+    }), true, null);
   }
 
   @Test public void testCastFromNull() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), new ArrayList<IRAssertion>(), true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), new ArrayList<IRAssertion>(), true, null);
   }
   
   @Test public void testInnerClass() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
-
-    new IRAssertion() {
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Collections.singletonList(
 
-      @Override
-      public void check(CallGraph cg) {
-        final String typeStr = singleInputForTest();
+    cg -> {
+      final String typeStr = singleInputForTest();
 
-        final TypeReference type = findOrCreateTypeReference("Source", typeStr + "$WhatsIt", cg.getClassHierarchy());
+      final TypeReference type = findOrCreateTypeReference("Source", typeStr + "$WhatsIt", cg.getClassHierarchy());
 
-        final IClass iClass = cg.getClassHierarchy().lookupClass(type);
-        Assert.assertNotNull("Could not find class " + typeStr, iClass);
+      final IClass iClass = cg.getClassHierarchy().lookupClass(type);
+      Assert.assertNotNull("Could not find class " + typeStr, iClass);
 
-        Assert.assertEquals("Expected to be enclosed in 'InnerClass'.", ((JavaSourceLoaderImpl.JavaClass) iClass)
-            .getEnclosingClass(), // todo is there another way?
-            cg.getClassHierarchy().lookupClass(findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy())));
-      }
-    }), true);
+      Assert.assertEquals("Expected to be enclosed in 'InnerClass'.", ((JavaSourceLoaderImpl.JavaClass) iClass)
+          .getEnclosingClass(), // todo is there another way?
+          cg.getClassHierarchy().lookupClass(findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy())));
+    }), true, null);
   }
 
   @Test public void testNullArrayInit() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), new ArrayList<IRAssertion>(), true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), new ArrayList<IRAssertion>(), true, null);
   }
 
   @Test public void testInnerClassA() throws IllegalArgumentException, CancelException, IOException {
-    Pair<CallGraph, PointerAnalysis<InstanceKey>> x =
-        runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), new ArrayList<IRAssertion>(), true);
+    Pair<CallGraph, PointerAnalysis<? extends InstanceKey>> x =
+        runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), new ArrayList<IRAssertion>(), true, null);
     
     // can't do an IRAssertion() -- we need the pointer analysis
     
     CallGraph cg = x.fst;
-    PointerAnalysis<InstanceKey> pa = x.snd;
+    PointerAnalysis<? extends InstanceKey> pa = x.snd;
 
     Iterator<CGNode> iter = cg.iterator();
     while ( iter.hasNext() ) {
@@ -419,11 +362,12 @@
                   // find enclosing instruction
                   for ( SSAInstruction instr: n.getIR().getInstructions() ) {
                       if ( instr instanceof EnclosingObjectReference ) {
-                          String allIks = "";
+                          StringBuilder allIksBuilder = new StringBuilder();
                           for (InstanceKey ik: pa.getPointsToSet(new LocalPointerKey(n,instr.getDef())))
-                              allIks += ik.getConcreteType().getName() +",";
+                              allIksBuilder.append(ik.getConcreteType().getName()).append(',');
                           // System.out.printf("in method %s, got ik %s\n", methodSigs[i], allIks);
                           
+                          final String allIks = allIksBuilder.toString();
                           Assert.assertTrue("assertion failed: expecting ik " + ikConcreteTypeStrings[i] + " in method " + methodSigs[i] +  ", got " + allIks + "\n",
                               allIks.equals(ikConcreteTypeStrings[i]));
                           
@@ -438,13 +382,13 @@
   }
 
   @Test public void testInnerClassSuper() throws IllegalArgumentException, CancelException, IOException {
-    Pair<CallGraph, PointerAnalysis<InstanceKey>> x =
-        runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), new ArrayList<IRAssertion>(), true);
+    Pair<CallGraph, PointerAnalysis<? extends InstanceKey>> x =
+        runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), new ArrayList<IRAssertion>(), true, null);
     
     // can't do an IRAssertion() -- we need the pointer analysis
     
     CallGraph cg = x.fst;
-    PointerAnalysis<InstanceKey> pa = x.snd;
+    PointerAnalysis<? extends InstanceKey> pa = x.snd;
 
     Iterator<CGNode> iter = cg.iterator();
     while ( iter.hasNext() ) {
@@ -453,9 +397,10 @@
         // find enclosing instruction
         for ( SSAInstruction instr: n.getIR().getInstructions() ) {
           if ( instr instanceof EnclosingObjectReference ) {
-            String allIks = "";
+            StringBuilder allIksBuilder = new StringBuilder();
             for (InstanceKey ik: pa.getPointsToSet(new LocalPointerKey(n,instr.getDef())))
-              allIks += ik.getConcreteType().getName() +",";
+              allIksBuilder.append(ik.getConcreteType().getName()).append(',');
+            final String allIks = allIksBuilder.toString();
             Assert.assertTrue("assertion failed: expecting ik \"LSub,\" in method, got \"" + allIks + "\"\n",
                 allIks.equals("LSub,"));
 
@@ -469,73 +414,61 @@
   }
 
   @Test public void testLocalClass() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
-
-    new IRAssertion() {
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Collections.singletonList(
 
-      /**
-       * Classes local to method are enclosed in the class the methods belong
-       * to.
-       */
-      @Override
-      public void check(CallGraph cg) {
-        final String typeStr = singleInputForTest();
-        final String localClassStr = "Foo";
-
-        // Observe the descriptor for a class local to a method.
-        final TypeReference mainFooType = findOrCreateTypeReference("Source", typeStr + "/main([Ljava/lang/String;)V/"
-            + localClassStr, cg.getClassHierarchy());
-
-        // Observe the descriptor for a class local to a method.
-        final IClass mainFooClass = cg.getClassHierarchy().lookupClass(mainFooType);
-        Assert.assertNotNull("Could not find class " + mainFooType, mainFooClass);
-
-        final TypeReference methodFooType = findOrCreateTypeReference("Source", typeStr + "/method()V/" + localClassStr, cg
-            .getClassHierarchy());
-
-        final IClass methodFooClass = cg.getClassHierarchy().lookupClass(methodFooType);
-        Assert.assertNotNull("Could not find class " + methodFooType, methodFooClass);
-
-        final IClass localClass = cg.getClassHierarchy().lookupClass(
-            findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy()));
-
-        Assert.assertSame("'Foo' is enclosed in 'Local'", ((JavaSourceLoaderImpl.JavaClass) methodFooClass).getEnclosingClass(),
-            localClass);
-        // todo: is this failing because 'main' is static?
-        // Assert.assertSame("'Foo' is enclosed in 'Local'",
-        // ((JavaSourceLoaderImpl.JavaClass)mainFooClass).getEnclosingClass(),
-        // localClass);
-      }
-    }), true);
+    cg -> {
+      final String typeStr = singleInputForTest();
+      final String localClassStr = "Foo";
+
+      // Observe the descriptor for a class local to a method.
+      final TypeReference mainFooType = findOrCreateTypeReference("Source", typeStr + "/main([Ljava/lang/String;)V/"
+          + localClassStr, cg.getClassHierarchy());
+
+      // Observe the descriptor for a class local to a method.
+      final IClass mainFooClass = cg.getClassHierarchy().lookupClass(mainFooType);
+      Assert.assertNotNull("Could not find class " + mainFooType, mainFooClass);
+
+      final TypeReference methodFooType = findOrCreateTypeReference("Source", typeStr + "/method()V/" + localClassStr, cg
+          .getClassHierarchy());
+
+      final IClass methodFooClass = cg.getClassHierarchy().lookupClass(methodFooType);
+      Assert.assertNotNull("Could not find class " + methodFooType, methodFooClass);
+
+      final IClass localClass = cg.getClassHierarchy().lookupClass(
+          findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy()));
+
+      Assert.assertSame("'Foo' is enclosed in 'Local'", ((JavaSourceLoaderImpl.JavaClass) methodFooClass).getEnclosingClass(),
+          localClass);
+      // todo: is this failing because 'main' is static?
+      // Assert.assertSame("'Foo' is enclosed in 'Local'",
+      // ((JavaSourceLoaderImpl.JavaClass)mainFooClass).getEnclosingClass(),
+      // localClass);
+    }), true, null);
   }
 
   @Test public void testAnonymousClass() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
-
-    new IRAssertion() {
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Collections.singletonList(
 
-      @Override
-      public void check(CallGraph cg) {
-        final String typeStr = singleInputForTest();
+    cg -> {
+      final String typeStr = singleInputForTest();
 
-        final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
+      final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
 
-        final IClass iClass = cg.getClassHierarchy().lookupClass(type);
-        Assert.assertNotNull("Could not find class " + typeStr, iClass);
+      final IClass iClass = cg.getClassHierarchy().lookupClass(type);
+      Assert.assertNotNull("Could not find class " + typeStr, iClass);
 
-        // todo what to check?? could not find anything in the APIs for
-        // anonymous
-      }
-    }), true);
+      // todo what to check?? could not find anything in the APIs for
+      // anonymous
+    }), true, null);
   }
 
   @Test public void testWhileTest1() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
   }
 
   @Test public void testSwitch1() {
     try {
-      runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+      runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
     } catch (IllegalArgumentException e) {
       // TODO Auto-generated catch block
       e.printStackTrace();
@@ -549,55 +482,55 @@
   }
 
   @Test public void testException1() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
   }
 
   @Test public void testException2() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
   }
 
   @Test public void testFinally1() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
   }
 
   @Test public void testScoping1() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
   }
 
   @Test public void testScoping2() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
   }
 
   @Test public void testNonPrimaryTopLevel() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("p"), rtJar, simplePkgTestEntryPoint("p"), emptyList, true);
+    runTest(singlePkgTestSrc("p"), rtJar, simplePkgTestEntryPoint("p"), emptyList, true, null);
   }
 
   @Test public void testMiniaturList() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
   }
 
   @Test public void testMonitor() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
   }
 
   @Test public void testStaticInitializers() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
   }
 
   @Test public void testThread1() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
   }
 
   @Test public void testCasts() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
   }
 
   @Test public void testBreaks() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
   }
 
-  private MethodReference getSliceRootReference(String className, String methodName, String methodDescriptor) {
-    TypeName clsName = TypeName.string2TypeName("L" + className.replace('.', '/'));
+  private static MethodReference getSliceRootReference(String className, String methodName, String methodDescriptor) {
+    TypeName clsName = TypeName.string2TypeName('L' + className.replace('.', '/'));
     TypeReference clsRef = TypeReference.findOrCreate(JavaSourceAnalysisScope.SOURCE, clsName);
 
     Atom nameAtom = Atom.findOrCreateUnicodeAtom(methodName);
@@ -607,15 +540,15 @@
   }
 
   @Test public void testMiniaturSliceBug() throws IllegalArgumentException, CancelException, IOException {
-    Pair<CallGraph, PointerAnalysis<InstanceKey>> x = runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
+    Pair<CallGraph, PointerAnalysis<? extends InstanceKey>> x = runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
 
-    PointerAnalysis<InstanceKey> pa = x.snd;
+    PointerAnalysis<? extends InstanceKey> pa = x.snd;
     CallGraph cg = x.fst;
 
     // test partial slice
     MethodReference sliceRootRef = getSliceRootReference("MiniaturSliceBug", "validNonDispatchedCall", "(LIntWrapper;)V");
     Set<CGNode> roots = cg.getNodes(sliceRootRef);
-    Pair<Collection<Statement>, SDG> y = AstJavaSlicer.computeAssertionSlice(cg, pa, roots, false);
+    Pair<Collection<Statement>,SDG<? extends InstanceKey>> y = AstJavaSlicer.computeAssertionSlice(cg, pa, roots, false);
     Collection<Statement> slice = y.fst;
     SlicerTest.dumpSlice(slice);
     Assert.assertEquals(0, SlicerTest.countAllocations(slice));
@@ -630,5 +563,23 @@
     Assert.assertEquals(2, SlicerTest.countAllocations(slice));
     Assert.assertEquals(2, SlicerTest.countPutfields(slice));
   }
+  
+  @Test public void testDoWhileInCase() throws IllegalArgumentException, CancelException, IOException {
+    runTest(singleTestSrc("bugfixes"), rtJar, simplePkgTestEntryPoint("bugfixes"), emptyList, true, null); 
+  }
+
+  @Test public void testExclusions() throws IllegalArgumentException, CancelException, IOException {
+    File exclusions = TemporaryFile.stringToFile(File.createTempFile("exl", "txt"), "Exclusions.Excluded\n");
+    Pair<CallGraph, PointerAnalysis<? extends InstanceKey>> x = runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, exclusions.getAbsolutePath());
+    IClassHierarchy cha = x.fst.getClassHierarchy();
+    
+    TypeReference topType = TypeReference.findOrCreate(JavaSourceAnalysisScope.SOURCE, TypeName.findOrCreate("LExclusions"));
+    assert cha.lookupClass(topType) != null;
+
+    TypeReference inclType = TypeReference.findOrCreate(JavaSourceAnalysisScope.SOURCE, TypeName.findOrCreate("LExclusions$Included"));
+    assert cha.lookupClass(inclType) != null;
 
+    TypeReference exclType = TypeReference.findOrCreate(JavaSourceAnalysisScope.SOURCE, TypeName.findOrCreate("LExclusions$Excluded"));
+    assert cha.lookupClass(exclType) == null;
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JLexTest.java wala-1.5.1/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JLexTest.java
--- wala-1.3.9/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JLexTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JLexTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -28,7 +28,7 @@
   }
 
   @Test public void testJLex() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, new String[] { "LJLex/Main" }, emptyList, false);
+    runTest(singleTestSrc(), rtJar, new String[] { "LJLex/Main" }, emptyList, false, null);
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/SyncDuplicatorTest.java wala-1.5.1/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/SyncDuplicatorTest.java
--- wala-1.3.9/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/SyncDuplicatorTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/SyncDuplicatorTest.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-package com.ibm.wala.cast.java.test;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
-import com.ibm.wala.classLoader.CallSiteReference;
-import com.ibm.wala.classLoader.Language;
-import com.ibm.wala.shrikeBT.IInvokeInstruction;
-import com.ibm.wala.types.Descriptor;
-import com.ibm.wala.types.MethodReference;
-import com.ibm.wala.types.TypeName;
-import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.CancelException;
-import com.ibm.wala.util.strings.Atom;
-
-public abstract class SyncDuplicatorTest extends IRTests {
-
-  public SyncDuplicatorTest() {
-    super(null);
-  }
-
-  protected final static CallSiteReference testMethod = CallSiteReference.make(0, MethodReference.findOrCreate(TypeReference
-      .findOrCreate(JavaSourceAnalysisScope.SOURCE, TypeName.string2TypeName("LMonitor2")), Atom.findOrCreateUnicodeAtom("test"),
-      Descriptor.findOrCreateUTF8(Language.JAVA, "(Ljava/lang/Object;)Z")), IInvokeInstruction.Dispatch.STATIC);
-
-  @Test public void testMonitor2() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true);
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/SyncDuplicatorTests.java wala-1.5.1/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/SyncDuplicatorTests.java
--- wala-1.3.9/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/SyncDuplicatorTests.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/SyncDuplicatorTests.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,47 @@
+/******************************************************************************
+ * Copyright (c) 2002 - 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *****************************************************************************/
+package com.ibm.wala.cast.java.test;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
+import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.classLoader.Language;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.shrikeBT.IInvokeInstruction;
+import com.ibm.wala.types.Descriptor;
+import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.types.TypeName;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.collections.Pair;
+import com.ibm.wala.util.strings.Atom;
+
+public abstract class SyncDuplicatorTests extends IRTests {
+
+  public SyncDuplicatorTests() {
+    super(null);
+  }
+
+  protected final static CallSiteReference testMethod = CallSiteReference.make(0, MethodReference.findOrCreate(TypeReference
+      .findOrCreate(JavaSourceAnalysisScope.SOURCE, TypeName.string2TypeName("LMonitor2")), Atom.findOrCreateUnicodeAtom("test"),
+      Descriptor.findOrCreateUTF8(Language.JAVA, "(Ljava/lang/Object;)Z")), IInvokeInstruction.Dispatch.STATIC);
+
+  @Test public void testMonitor2() throws IllegalArgumentException, CancelException, IOException {
+    Pair<CallGraph, PointerAnalysis<? extends InstanceKey>> result = runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true, null);
+    System.err.println(result.fst);
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/build.gradle wala-1.5.1/com.ibm.wala.cast.java.test.data/build.gradle
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,35 @@
+plugins {
+	id 'eclipse'
+}
+
+sourceSets.test.java.srcDirs = ['src']
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  download JLex
+//
+
+task downloadJLex(type: VerifiedDownload) {
+	src 'http://www.cs.princeton.edu/~appel/modern/java/JLex/current/Main.java'
+	checksum 'fe0cff5db3e2f0f5d67a153cf6c783af'
+	dest 'src/JLex/Main.java'
+}
+
+task cleanDownloadJLex(type: Delete) {
+	delete downloadJLex.dest.parent
+}
+
+compileTestJava.dependsOn downloadJLex
+clean.dependsOn cleanDownloadJLex
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  create Eclipse metadata for use by Maven when running
+//  com.ibm.wala.cast.java.test.JDTJavaIRTests and
+//  com.ibm.wala.cast.java.test.JDTJava15IRTests tests
+//
+
+task prepareMavenBuild(dependsOn: [eclipseClasspath, eclipseProject]) {
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/build.properties wala-1.5.1/com.ibm.wala.cast.java.test.data/build.properties
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,7 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/build.xml wala-1.5.1/com.ibm.wala.cast.java.test.data/build.xml
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/build.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project>
 <project name="com.ibm.wala.cast.java.test.data" default="jar" basedir=".">
 
   <property name="basews" value="${ws}"/>
@@ -12,8 +13,8 @@
   <property name="javacVerbose" value="false"/>
   <property name="logExtension" value=".log"/>
   <property name="compilerArg" value=""/>
-  <property name="javacSource" value="1.7"/>
-  <property name="javacTarget" value="1.7"/>
+  <property name="javacSource" value="1.8"/>
+  <property name="javacTarget" value="1.8"/>
 	<!-- This property has been updated to correspond to the paths used by the latest Java update
 	on Mac OS X 10.6 (Java version 1.6.0_22).  If you are not using this version of Mac OS X or Java,
 	try changing the value of the property to "${java.home}/../../../Classes" -->
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/.classpath wala-1.5.1/com.ibm.wala.cast.java.test.data/.classpath
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/.gitignore wala-1.5.1/com.ibm.wala.cast.java.test.data/.gitignore
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/.gitignore	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,103 +0,0 @@
-/p
-/A.class
-/AnonymousClass.class
-/AnonymousClass.java
-/AnonymousClass$1.class
-/AnonymousClass$1FooImpl.class
-/AnonymousClass$2.class
-/AnonymousClass$Foo.class
-/Array1.class
-/Array1.java
-/ArrayLiteral1.class
-/ArrayLiteral1.java
-/ArrayLiteral2.class
-/ArrayLiteral2.java
-/B.class
-/BadLanguageExceptionEx1.class
-/BadLanguageExceptionF1.class
-/Bar.class
-/Base.class
-/Breaks.class
-/Breaks.java
-/Breaks$1.class
-/Breaks$Ref.class
-/CastFromNull.class
-/CastFromNull.java
-/Casts.class
-/Casts.java
-/Derived.class
-/Exception1.class
-/Exception1.java
-/Exception2.class
-/Exception2.java
-/Finally1.class
-/Finally1.java
-/FooEx1.class
-/FooEx2.class
-/FooF1.class
-/FooIT1.class
-/FooQ.class
-/IFoo.class
-/Inheritance1.class
-/Inheritance1.java
-/InheritedField.class
-/InheritedField.java
-/InnerClass.class
-/InnerClass.java
-/InnerClass$WhatsIt.class
-/InnerClass$WhatsIt$NotAgain.class
-/InnerClass$WhatsThat.class
-/InnerClassA.class
-/InnerClassA.java
-/InnerClassA$AA.class
-/InnerClassA$AB.class
-/InnerClassA$AB$ABA.class
-/InnerClassA$AB$ABA$ABAA.class
-/InnerClassA$AB$ABA$ABAB.class
-/InnerClassA$AB$ABSubA.class
-/InnerClassA$AB$ABSubA$ABSubAA.class
-/InnerClassSuper.class
-/InnerClassSuper.java
-/InnerClassSuper$SuperOuter.class
-/InterfaceTest1.class
-/InterfaceTest1.java
-/IntWrapper.class
-/LocalClass.class
-/LocalClass.java
-/LocalClass$1Foo.class
-/LocalClass$2Foo.class
-/MiniaturList.class
-/MiniaturList.java
-/MiniaturSliceBug.class
-/MiniaturSliceBug.java
-/Monitor.class
-/Monitor.java
-/NullArrayInit.class
-/NullArrayInit.java
-/PrimitiveWrapper.class
-/QualifiedStatic.class
-/QualifiedStatic.java
-/R.class
-/Scoping1.class
-/Scoping1.java
-/Scoping2.class
-/Scoping2.java
-/Scoping2$1.class
-/Simple1.class
-/Simple1.java
-/StaticInitializers.class
-/StaticInitializers.java
-/StaticInitializers$X.class
-/StaticNesting.class
-/StaticNesting.java
-/StaticNesting$WhatsIt.class
-/Sub.class
-/Sub$SubInner.class
-/Switch1.class
-/Switch1.java
-/Thread1.class
-/Thread1.java
-/TwoClasses.class
-/TwoClasses.java
-/WhileTest1.class
-/WhileTest1.java
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Data Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.java.test.data
-Bundle-Version: 1.3.9
-Bundle-Vendor: IBM
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Version: 1.5.1
+Bundle-Vendor: %Bundle-Vendor
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast.java.test.data/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.java.test.data
+Bundle-Vendor = IBM
+Bundle-Name = Data Plug-in
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/pom.xml wala-1.5.1/com.ibm.wala.cast.java.test.data/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
   <artifactId>com.ibm.wala.cast.java.test.data</artifactId>
   <packaging>eclipse-plugin</packaging>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/.project wala-1.5.1/com.ibm.wala.cast.java.test.data/.project
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.cast.java.test.data</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/java.test.data JLex download.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,9 +1,13 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -14,38 +18,39 @@
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.APILeak=error
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=ignore
 org.eclipse.jdt.core.compiler.problem.deadCode=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
 org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
 org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
 org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
@@ -57,55 +62,65 @@
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
 org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=error
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
 org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=1
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=1
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=2
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=1
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude08113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT0304file128target/antrun/build-main.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassAA.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassAA.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassAA.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassAA.java	2019-01-29 17:08:39.000000000 +0000
@@ -167,4 +167,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassSuperA.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassSuperA.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassSuperA.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassSuperA.java	2019-01-29 17:08:39.000000000 +0000
@@ -55,4 +55,4 @@
 			so.test();
 		}
 	}
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/AnonymousClass.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/AnonymousClass.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/AnonymousClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/AnonymousClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,13 +15,15 @@
     }
 
     public static void main(String[] args) {
-	final Integer base = new Integer(6);
+	final Integer base = Integer.valueOf(6);
 
 	Foo f= new Foo() {
 	    int value = 3;
 	    
+      @Override
       public int getValue() { return value; }
 	    
+      @Override
       public int getValueBase() { return value - base.intValue(); }
 	};
 
@@ -32,12 +34,13 @@
     }
 
     public void method() {
-	final Integer base = new Integer(7);
+	final Integer base = Integer.valueOf(7);
 
 	abstract class FooImpl implements Foo {
 	    int y;
 
 	    
+      @Override
       public abstract int getValue();
 
 	    FooImpl(int _y) {
@@ -45,6 +48,7 @@
 	    }
 
 	    
+      @Override
       public int getValueBase() { 
 	      return y + getValue() - base.intValue(); 
 	    }
@@ -52,6 +56,7 @@
 
 	Foo f= new FooImpl(-4) {
 	  
+    @Override
     public int getValue() { return 7; }
 	};
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Array1.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Array1.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Array1.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Array1.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,4 +26,4 @@
 	    sum += ary[j];
 	}
     }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/ArrayLiteral1.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,6 +12,6 @@
     public static void main(String[] args) {
       ArrayLiteral1 al1= new ArrayLiteral1();
       int[] a= new int[] { 0, 1, 2, 3, 5 };
-      Object[] b= new Object[] { null, "hi", new Integer(55), new int[] { 3, 1, 4 } };
+      Object[] b= new Object[] { null, "hi", Integer.valueOf(55), new int[] { 3, 1, 4 } };
     }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Breaks.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Breaks.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Breaks.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Breaks.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,4 +42,4 @@
     (new Breaks()).testBreakFromIf("whatever", new Ref(args));
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/bugfixes/DoWhileInCase.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/bugfixes/DoWhileInCase.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/bugfixes/DoWhileInCase.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/bugfixes/DoWhileInCase.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,17 @@
+package bugfixes;
+
+public class DoWhileInCase {
+  static int x = 3;
+  public static void main(String[] args) {
+    switch(x) {
+    case 1:
+      do {
+        System.out.println("Problem");
+        x ++;
+      } while (x < 3);
+      break;
+    default:
+      System.out.println("Default");
+    }
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Casts.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Casts.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Casts.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Casts.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,4 +34,4 @@
     int i2 = i1 + s1;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Exception2.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Exception2.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Exception2.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Exception2.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,6 +15,7 @@
 
 public final class Exception2 {
 
+  @SuppressWarnings("resource")
   public static void main(String[] args) {
     Exception2 e2= new Exception2();
     FileInputStream fis = null;
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Exclusions.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Exclusions.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Exclusions.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Exclusions.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,31 @@
+
+public class Exclusions {
+
+  public static class Included {
+    private final int f;
+    
+    private Included(int f) {
+      this.f = f;
+    }
+    
+    public int doit() {
+      return f + 1;
+    }
+  }
+
+  public static class Excluded {
+    private final int f;
+    
+    private Excluded(int f) {
+      this.f = f;
+    }
+    
+    public int doit() {
+      return f + 1;
+    }
+  }
+
+  public static void main(String[] args) {
+    int i = new Included(5).doit();
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ArraysAndSuch.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ArraysAndSuch.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ArraysAndSuch.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ArraysAndSuch.java	2019-01-29 17:08:39.000000000 +0000
@@ -54,7 +54,7 @@
 
 		os1.clone();
 		if ( os1.equals(os2) ) {
-			Class x = os1.getClass();
+			Class<? extends Object[]> x = os1.getClass();
 			os1.notify();
 			os1.toString();
 			try {
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ConstructorsAndInitializers.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ConstructorsAndInitializers.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ConstructorsAndInitializers.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/ConstructorsAndInitializers.java	2019-01-29 17:08:39.000000000 +0000
@@ -46,6 +46,7 @@
 	}
 }
 
+@SuppressWarnings("ClassInitializerMayBeStatic")
 public class ConstructorsAndInitializers extends Super {
 	static int iX;
 	static int sX;
@@ -76,6 +77,7 @@
 				iX = 55 + 12;
 			}
 
+      @Override
       public String toString() {
 				return s + " -- from an anon class in " + iX + "," + sX + ": " + ConstructorsAndInitializers.this.s;
 			}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/InnerClasses.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/InnerClasses.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/InnerClasses.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/InnerClasses.java	2019-01-29 17:08:39.000000000 +0000
@@ -45,6 +45,7 @@
 	Object supportLocalBusiness() {
 		final int x = 54;
 		class FooBar {
+      @Override
       public int hashCode() { return x; }
 		}
 		return new FooBar();
@@ -53,6 +54,7 @@
 	static Object anonymousCoward() {
 		final int x = 5;
 		return new Object() {
+      @Override
       public int hashCode() { return x; }
 		};
 	}
@@ -64,6 +66,7 @@
 		System.out.println(anonymousCoward().hashCode());
 		final String xx = "crazy";
 		Outie outie = new Outie("weird") {
+      @Override
       public String toString() {
 				return "bogus" + x + xx + xxxx;
 			}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/LoopsAndLabels.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/LoopsAndLabels.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/LoopsAndLabels.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/LoopsAndLabels.java	2019-01-29 17:08:39.000000000 +0000
@@ -38,6 +38,7 @@
 package foo.bar.hello.world;
 
 public class LoopsAndLabels {
+	@SuppressWarnings("unused")
 	public static void main(String args[]) {
 
 		aaa: do {
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/MethodMadness.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/MethodMadness.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/MethodMadness.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/foo/bar/hello/world/MethodMadness.java	2019-01-29 17:08:39.000000000 +0000
@@ -95,10 +95,12 @@
 			return 13 + x;
 		}
 		
+    @Override
     protected int protectedInteger() {
 			return 233 + x;
 		}
 		
+		@SuppressWarnings("static-access")
 		public void hello() {
 			System.out.println(privateInteger()); // inner function, inner this, 200013
 			System.out.println(MethodMadness.this.privateInteger()); // outer function, outer this, 100007 
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/foo/SimpleNames.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/foo/SimpleNames.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/foo/SimpleNames.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/foo/SimpleNames.java	2019-01-29 17:08:39.000000000 +0000
@@ -56,6 +56,7 @@
 		final int i = 5;
 		new Object() {
 			
+      @Override
       public int hashCode() {
 				f = 5; // SimpleNames.this = 5
 				s = 6; // SimpleNames.s = 6
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/FunkySupers.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/FunkySupers.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/FunkySupers.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/FunkySupers.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,6 +22,7 @@
 
 class SubFunkySupers extends FunkySupers {
 	
+  @Override
   int funky(FunkySupers fs) {
 		SubFunkySupers.super.funky(fs);
 		SubFunkySupers.this.funky(fs);
@@ -35,4 +36,4 @@
 
 //class EE { class X {} }
 //class Y extends EE.X { Y(EE e) { e.super(); } }
-// DOESNT WORK IN POLYGLOT!!!
\ No newline at end of file
+// DOESNT WORK IN POLYGLOT!!!
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Inheritance1.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Inheritance1.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Inheritance1.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Inheritance1.java	2019-01-29 17:08:39.000000000 +0000
@@ -30,11 +30,13 @@
 }
 class Derived extends Base {
     
+    @Override
     public void foo() {
 	super.foo();
     }
     
+    @Override
     public String bar(int x) {
 	return Integer.toHexString(x);
     }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/InnerClassLexicalReads.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/InnerClassLexicalReads.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/InnerClassLexicalReads.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/InnerClassLexicalReads.java	2019-01-29 17:08:39.000000000 +0000
@@ -32,6 +32,7 @@
 			 * 1   return v2:com.ibm.wala.ssa.SymbolTable$1@16b18b6[11:4] -> [11:13]
 			 */
 			
+      @Override
       public int getConstant() {
 				return y;
 			}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/InnerClassSuper.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/InnerClassSuper.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/InnerClassSuper.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/InnerClassSuper.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,4 +26,4 @@
 			so.test();
 		}
 	}
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/InterfaceTest1.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/InterfaceTest1.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/InterfaceTest1.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/InterfaceTest1.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,6 +26,7 @@
 	fValue= ch;
     }
 
+    @Override
     public char getValue() {
 	return fValue;
     }
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/AnonGeneNullarySimple.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/AnonGeneNullarySimple.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/AnonGeneNullarySimple.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/AnonGeneNullarySimple.java	2019-01-29 17:08:39.000000000 +0000
@@ -45,6 +45,7 @@
 
 	static class StrTripler implements Ops<String> {
 		
+    @Override
     public String nullary() {
 			String x = "talk about it ";
 			return x+x+x;
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/AnonymousGenerics.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/AnonymousGenerics.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/AnonymousGenerics.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/AnonymousGenerics.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,10 +49,12 @@
 		// get erasures for all of those types and make a new method
 		// that calls this one (with casts). no worries about return values.
 		
+    @Override
     public String unary(String x) {
 			return x + x + x;
 		}
 		
+    @Override
     public String nullary() {
 			String x = "talk about it ";
 			return x+x+x;
@@ -66,10 +68,12 @@
 	private void doit() {
 		Ops<String> strQuadrupler = new Ops<String>() {
 			
+      @Override
       public String unary(String x) {
 				return x+x+x+x;
 			}
 			
+      @Override
       public String nullary() {
 				String x = "time to make a move to the global economy ";
 				return x+x+x+x;
@@ -85,7 +89,7 @@
 		globalEconomy = ops.nullary();
 		System.out.println(globalEconomy);
 		
-		Ops hack = ops;
+		Ops<String> hack = ops;
 		hack.unary("whatever");
 		hack.nullary();
 		hack = strQuadrupler;
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/BasicsGenerics.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/BasicsGenerics.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/BasicsGenerics.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/BasicsGenerics.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,8 +42,8 @@
 
 public class BasicsGenerics {
 	
-	static ArrayList<String> strs = new ArrayList<String>();
-	static ArrayList ints = new ArrayList();
+	static ArrayList<String> strs = new ArrayList<>();
+	static ArrayList<Integer> ints = new ArrayList<>();
 	
 	public BasicsGenerics() {
 		strs.add("Coucou, monde!");
@@ -64,7 +64,7 @@
 		System.out.println(frenchy);
 		System.out.println(sicilian);
 		strs.add("hello");
-		ints.add(new Integer(3));
+		ints.add(Integer.valueOf(3));
 		
 		String qqq;
 		
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/Cocovariant.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/Cocovariant.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/Cocovariant.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/Cocovariant.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,10 +43,12 @@
         }
         static class B extends A {
                 
+                @Override
                 B foo(String x) { return null; }
         }
         static class C extends B {
                 
+                @Override
                 C foo(String x) { return null; }
         }
         public static void main(String[] args) {
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/CustomGenericsAndFields.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/CustomGenericsAndFields.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/CustomGenericsAndFields.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/CustomGenericsAndFields.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,6 +52,7 @@
 	Q x;
 
 	
+  @Override
   public Q bar(Q a, Q b) {
 		x = a;
 		if (b.hashCode() == a.hashCode() || b.toString().equals(a.toString()))
@@ -60,6 +61,7 @@
 	}
 
 	
+  @Override
   public Q foo() {
 		return x;
 	}
@@ -71,6 +73,7 @@
 		y = a;
 	}
 	
+  @Override
   public Q foo() {
 		return y;
 	}
@@ -92,7 +95,7 @@
 }
 
 public class CustomGenericsAndFields {
-	static ConcreteGeneric2<String> cg2 = new ConcreteGeneric2<String>();
+	static ConcreteGeneric2<String> cg2 = new ConcreteGeneric2<>();
 
 	static public ConcreteGeneric2<String> cg2WithSideEffects() {
 		System.out.println("look at me! I'm a side effect!");
@@ -106,7 +109,7 @@
 	private void doit() {
 		// Simple: concrete generic
 		
-		ConcreteGeneric<String> absinthe = new ConcreteGeneric<String>();
+		ConcreteGeneric<String> absinthe = new ConcreteGeneric<>();
 		IGeneric<String> rye = absinthe;
 		String foo = rye.bar("hello", "world");
 		System.out.println(absinthe.foo() + foo);
@@ -115,7 +118,7 @@
 
 		String thrownaway = cg2.bar("a","b");
 		cg2.setFoo("real one");
-		MyGeneric<String,ConcreteGeneric2<String>> mygeneric = new MyGeneric<String,ConcreteGeneric2<String>>("useless",cg2);
+		MyGeneric<String,ConcreteGeneric2<String>> mygeneric = new MyGeneric<>("useless",cg2);
 		String x = mygeneric.doFoo();
 		System.out.println(x);
 		String y = cg2.x;
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/ExplicitBoxingTest.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/ExplicitBoxingTest.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/ExplicitBoxingTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/ExplicitBoxingTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,8 +47,8 @@
 		int a = 6;
 		a = a + a;
 		System.out.println(a);
-		Integer useless1 = new Integer(5+6);
-		Integer aa = new Integer(a+a);
+		Integer useless1 = Integer.valueOf(5+6);
+		Integer aa = Integer.valueOf(a+a);
 		int aaa = aa.intValue();
 		System.out.println(aaa);
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericArrays.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericArrays.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericArrays.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericArrays.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,8 +49,8 @@
 		List<?>[] lsa = new List<?>[10]; // ok, array of unbounded wildcard type
 		Object o = lsa;
 		Object[] oa = (Object[]) o;
-		List<Integer> li = new ArrayList<Integer>();
-		li.add(new Integer(3));
+		List<Integer> li = new ArrayList<>();
+		li.add(Integer.valueOf(3));
 		oa[1] = li; // correct
 		String s = (String) lsa[1].get(0); // run time error, but cast is explicit
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericMemberClasses.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericMemberClasses.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericMemberClasses.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericMemberClasses.java	2019-01-29 17:08:39.000000000 +0000
@@ -46,22 +46,25 @@
     	T x = null;
         private int localChangeID;
 		
+    @Override
     public boolean hasNext() {
 			return ( localChangeID == 5 );
 		}
 
 		
+    @Override
     public T next() {
 			localChangeID = 5;
 			return x;
 		}
 
 		
+    @Override
     public void remove() {
 		}
     }
     public static void main(String args[]) {
-    	(new GenericMemberClasses<Object>()).doit();
+    	(new GenericMemberClasses<>()).doit();
     }
     
     private void doit() {
@@ -72,4 +75,4 @@
     		System.out.println(x);
     	}
     }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericSuperSink.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericSuperSink.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericSuperSink.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/GenericSuperSink.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,14 +47,14 @@
 	
 	private void doit() {
 		Collection<? super String> sink;
-		Collection<String> cs = new ArrayList<String>();
+		Collection<String> cs = new ArrayList<>();
 		cs.add("hello");
 		
 		sink = new ArrayList<Object>();
 		sink.add(cs.iterator().next());
 		System.out.println(sink);
 
-		sink = new ArrayList<String>();
+		sink = new ArrayList<>();
 		sink.add(cs.iterator().next());
 		System.out.println(sink);
 	}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/MethodGenerics.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/MethodGenerics.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/MethodGenerics.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/MethodGenerics.java	2019-01-29 17:08:39.000000000 +0000
@@ -55,7 +55,7 @@
 	}
 	
 	private void doit() {
-		ArrayList<String> list = new ArrayList<String>();
+		ArrayList<String> list = new ArrayList<>();
 		String array[] = new String[] { "coucou monde", "ciao mondo", "guten tag welt", "hola mundo", "shalom olam" };
 		fromArrayToCollection(array, list);
 		System.out.println(list);
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/MoreOverriddenGenerics.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/MoreOverriddenGenerics.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/MoreOverriddenGenerics.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/MoreOverriddenGenerics.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,6 +48,7 @@
 
 	class Sub extends Super<Number> {
 		
+    @Override
     public Number get() {
 			return super.get();
 		} 
@@ -55,8 +56,9 @@
 	
 	class SubSub extends Sub {
 		
+    @Override
     public Long get() {
-			return new Long(6);
+			return Long.valueOf(6);
 		}
 	}
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/NotSoSimpleEnums.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/NotSoSimpleEnums.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/NotSoSimpleEnums.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/NotSoSimpleEnums.java	2019-01-29 17:08:39.000000000 +0000
@@ -40,12 +40,16 @@
 public class NotSoSimpleEnums {
 	public enum Direction {
 	    NORTH("nord") { 
+      @Override
       public Direction getOpposite() { return SOUTH; }},
 	    EAST("est") { 
+      @Override
       public Direction getOpposite() { return WEST; }},
 	    SOUTH("sud") { 
+      @Override
       public Direction getOpposite() { return NORTH; }},
 	    WEST("ouest") { 
+      @Override
       public Direction getOpposite() { return EAST; }};
 		
 	    public abstract Direction getOpposite();
@@ -69,4 +73,4 @@
 			(new NotSoSimpleEnums()).doit(d);
 		}
 	}
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/OverridesOnePointFour.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/OverridesOnePointFour.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/OverridesOnePointFour.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/OverridesOnePointFour.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,8 +44,9 @@
 	
 	static class Sub implements Super {
 		
+    @Override
     public Long get() {
-			return new Long(6);
+			return Long.valueOf(6);
 		}
 	}
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/VarargsCovariant.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/VarargsCovariant.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/VarargsCovariant.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/VarargsCovariant.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,6 +47,7 @@
 
 	static class B extends A { 
 		
+    @Override
     B hello(int... x) {
 			System.out.println("b hello");
 			return this;
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/VarargsOverriding.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/VarargsOverriding.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/VarargsOverriding.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/VarargsOverriding.java	2019-01-29 17:08:39.000000000 +0000
@@ -70,6 +70,7 @@
 
 class VarityTestSub extends VarityTestSuper {
 	
+  @Override
   void bar(String... args) {}
 }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/Wildcards.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/Wildcards.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/javaonepointfive/Wildcards.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/javaonepointfive/Wildcards.java	2019-01-29 17:08:39.000000000 +0000
@@ -64,16 +64,16 @@
 	}
 	
 	private void doit() {
-		ArrayList<String> e = new ArrayList<String>();
+		ArrayList<String> e = new ArrayList<>();
 		e.add("hello");
 		e.add("goodbye");
 		printCollection(e);
 		printCollection1(e);
 		printCollection2(e);
 
-		ArrayList<Integer> e3 = new ArrayList<Integer>();
-		e3.add(new Integer(123));
-		e3.add(new Integer(42));
+		ArrayList<Integer> e3 = new ArrayList<>();
+		e3.add(Integer.valueOf(123));
+		e3.add(Integer.valueOf(42));
 		printCollection(e3);
 		printCollection1(e3);
 		
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/LocalClass.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/LocalClass.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/LocalClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/LocalClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,7 @@
  *****************************************************************************/
 public class LocalClass {
     public static void main(String[] args) {
-	final Integer base = new Integer(6);
+	final Integer base = Integer.valueOf(6);
 
 	class Foo {
 	    int value;
@@ -27,7 +27,7 @@
     }
 
     public void method() {
-	final Integer base = new Integer(6);
+	final Integer base = Integer.valueOf(6);
 
 	class Foo {
 	    int value;
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/MiniaturSliceBug.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/MiniaturSliceBug.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/MiniaturSliceBug.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/MiniaturSliceBug.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,7 +13,6 @@
   /**
    * Sets the integer representation of the underlying primitive
    * to the given value.
-   * @effects this.intVal' = i
    */
   public abstract void setIntValue(int i);
     
@@ -27,9 +26,9 @@
    * Returns true if this and the given object are 
    * pri
    * {@inheritDoc}
-   * @see java.lang.Object#equals(java.lang.Object)
    */
   
+  @Override
   abstract public boolean equals(Object o);
 }
 
@@ -38,36 +37,23 @@
 	
   /**
    * Constructs a wrapper for the given int.
-   * @effects this.intVal' = val
    */
   public IntWrapper(int val) { 
     this.val = val;
   }
-	
-  /**
-   * {@inheritDoc}
-   * @see com.ibm.miniatur.tests.sequential.PrimitiveWrapper#intValue()
-   */
-  
+
+  @Override
   public int intValue() {
     return val;
   }
 
-  /**
-   * {@inheritDoc}
-   * @see com.ibm.miniatur.tests.sequential.PrimitiveWrapper#setIntValue(int)
-   */
-  
+  @Override
   public void setIntValue(int i) {
     this.val = i;
   }
 	
-  /**
-   * {@inheritDoc}
-   * @see com.ibm.miniatur.tests.sequential.PrimitiveWrapper#equals(java.lang.Object)
-   */
-  
-  public boolean equals(Object o) { 
+  @Override
+  public boolean equals(Object o) {
     return o instanceof IntWrapper && ((IntWrapper)o).val==val;
   }
 }
@@ -84,4 +70,4 @@
     (new MiniaturSliceBug()).validNonDispatchedCall(new IntWrapper(-1));
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Monitor2.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Monitor2.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Monitor2.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Monitor2.java	2019-01-29 17:08:39.000000000 +0000
@@ -9,16 +9,16 @@
  *     IBM Corporation - initial API and implementation
  *****************************************************************************/
 public class Monitor2 {
+  private static boolean randomIsolate() {
+    return Math.random() > .5;
+  }
+  
   int i = 0;
 
   public Monitor2() { }
 
   public void incr() { synchronized(this) { i++; } }
 
-  private static boolean test(Object o) {
-    return true;
-  }
-
   public static void main(String[] a) {
     new Monitor2().incr();
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/p/NonPrimaryTopLevel.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/p/NonPrimaryTopLevel.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/p/NonPrimaryTopLevel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/p/NonPrimaryTopLevel.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,4 +19,4 @@
 
 class Foo {
     
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Scoping1.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Scoping1.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Scoping1.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Scoping1.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,4 +20,4 @@
 	    System.out.println(x);
 	}
     }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Scoping2.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Scoping2.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Scoping2.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Scoping2.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,4 +25,4 @@
       System.out.println(x);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/SimpleCalls.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/SimpleCalls.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/SimpleCalls.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/SimpleCalls.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,6 +14,7 @@
 }
 public class SimpleCalls implements ISimpleCalls {
 	
+  @Override
   public void helloWorld() {
 		System.out.println("hello world!");
 	}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/StaticNesting.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/StaticNesting.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/StaticNesting.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/StaticNesting.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,4 +19,4 @@
 	    value= 0;
 	}
     }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Thread1.java wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Thread1.java
--- wala-1.3.9/com.ibm.wala.cast.java.test.data/src/Thread1.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.java.test.data/src/Thread1.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,6 +14,7 @@
   R(int i) { this.i = i; }
 
   
+  @Override
   public void run() {
     return;
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/build.gradle wala-1.5.1/com.ibm.wala.cast.js/build.gradle
--- wala-1.3.9/com.ibm.wala.cast.js/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,27 @@
+sourceSets.main {
+	java.srcDirs = ['source']
+	resources.srcDirs = ['dat']
+}
+
+dependencies {
+	compile(
+		'commons-io:commons-io:2.4',
+		'net.htmlparser.jericho:jericho-html:3.2',
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.shrike'),
+		project(':com.ibm.wala.util'),
+		)
+}
+
+task createPackageList(type: CreatePackageList) {
+	sourceSet sourceSets.main.java
+}
+
+javadoc {
+	def rhino = project(':com.ibm.wala.cast.js.rhino').compileJava
+	dependsOn rhino
+	doFirst {
+		classpath += files rhino
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/build.properties wala-1.5.1/com.ibm.wala.cast.js/build.properties
--- wala-1.3.9/com.ibm.wala.cast.js/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,6 +1,10 @@
 bin.includes = .,\
                META-INF/,\
                lib/,\
-               lib/jericho-html-3.2.jar
+               lib/jericho-html-3.2.jar,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 source.. = source/,\
            dat/
+javacProjectSettings = true
+output.. = bin/
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/build.xml wala-1.5.1/com.ibm.wala.cast.js/build.xml
--- wala-1.3.9/com.ibm.wala.cast.js/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/build.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.ibm.wala.cast.js" default="getJars" basedir=".">
-
-  <property name="basews" value="${ws}"/>
-  <property name="baseos" value="${os}"/>
-  <property name="basearch" value="${arch}"/>
-  <property name="basenl" value="${nl}"/>
-  
-  <!-- Compiler settings. -->
-  <property name="javacFailOnError" value="true"/>
-  <property name="javacDebugInfo" value="on"/>
-  <property name="javacVerbose" value="false"/>
-  <property name="logExtension" value=".log"/>
-  <property name="compilerArg" value=""/>
-  <property name="javacSource" value="1.5"/>
-  <property name="javacTarget" value="1.5"/>
-  <!-- This property has been updated to correspond to the paths used by the latest Java update
-       on Mac OS X 10.6 (Java version 1.6.0_22).  If you are not using this version of Mac OS X or Java,
-       try changing the value of the property to "${java.home}/../../../Classes" -->
-  <condition property="dir_bootclasspath" value="${java.home}/../Classes">
-    <os family="mac"/>
-  </condition>
-  <property name="dir_bootclasspath" value="${java.home}/lib"/>
-  <path id="path_bootclasspath">
-    <fileset dir="${dir_bootclasspath}">
-      
-      <include name="*.jar"/>
-    </fileset>
-  </path>	
-  <property name="bootclasspath" refid="path_bootclasspath"/>
-  <property name="bundleJavacSource" value="${javacSource}"/>
-  <property name="bundleJavacTarget" value="${javacTarget}"/>
-  <property name="bundleBootClasspath" value="${bootclasspath}"/>
-  
-  <target name="JerichoPresent" depends="init">
-    <available file="${plugin.destination}/lib/jericho-html-3.2.jar" property="jericho.present"/>
-  </target>
-  
-  <target name="fetchJericho" depends="JerichoPresent" unless="jericho.present">
-    <delete dir="${temp.folder}"/>
-    <mkdir dir="${temp.folder}"/>
-    <get src="http://sourceforge.net/projects/jerichohtml/files/jericho-html/3.2/jericho-html-3.2.zip/download" dest="${temp.folder}/jericho-html-3.2.zip"/>
-    <unzip src="${temp.folder}/jericho-html-3.2.zip" dest="${temp.folder}"/>
-    <copy file="${temp.folder}/jericho-html-3.2/dist/jericho-html-3.2.jar" tofile="${plugin.destination}/lib/jericho-html-3.2.jar" />
-    <delete dir="${temp.folder}"/>
-  </target>  
-  
-  <target name="getJars" depends="fetchJericho" />
-  
-  <target name="init" depends="properties">
-    <condition property="pluginTemp" value="${buildTempFolder}/plugins">
-      <isset property="buildTempFolder"/>
-    </condition>
-    <property name="pluginTemp" value="${basedir}"/>
-    <condition property="build.result.folder" value="${pluginTemp}/com.ibm.wala.core.testdata">
-      <isset property="buildTempFolder"/>
-    </condition>
-    <property name="build.result.folder" value="${basedir}"/>
-    <property name="temp.folder" value="${basedir}/temp.folder"/>
-    <property name="plugin.destination" value="${basedir}"/>
-  </target>
-  
-  <target name="properties" if="eclipse.running">
-    <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-  </target>
-  
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/.classpath wala-1.5.1/com.ibm.wala.cast.js/.classpath
--- wala-1.3.9/com.ibm.wala.cast.js/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="source"/>
-	<classpathentry kind="src" path="dat"/>
-	<classpathentry exported="true" kind="lib" path="lib/jericho-html-3.2.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/.cvsignore wala-1.5.1/com.ibm.wala.cast.js/.cvsignore
--- wala-1.3.9/com.ibm.wala.cast.js/.cvsignore	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/.cvsignore	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/dat/preamble.js wala-1.5.1/com.ibm.wala.cast.js/dat/preamble.js
--- wala-1.3.9/com.ibm.wala.cast.js/dat/preamble.js	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/dat/preamble.js	2019-01-29 17:08:39.000000000 +0000
@@ -219,6 +219,7 @@
 }
 
 Location = function Location(){
+	this.hash = new String();
 	this.port = new String();
 	this.port.value = new String();
 	this.host = new String();
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.js/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.js/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: JavaScript Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js;singleton:=true
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Bundle-ClassPath: .,
  lib/jericho-html-3.2.jar
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Export-Package: .,
  com.ibm.wala.cast.js.analysis.typeInference,
  com.ibm.wala.cast.js.callgraph.fieldbased,
@@ -34,4 +34,4 @@
  com.ibm.wala.cast,
  com.ibm.wala.shrike;bundle-version="1.1.3"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/mvncentral.xml wala-1.5.1/com.ibm.wala.cast.js/mvncentral.xml
--- wala-1.3.9/com.ibm.wala.cast.js/mvncentral.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/mvncentral.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.wala</groupId>
   <artifactId>com.ibm.wala.cast.js</artifactId>
-  <version>1.3.9</version>  
+  <version>1.5.1</version>
   <packaging>jar</packaging>
   <name>WALA CAst JS</name>
   <description>WALA JS frontend</description>
@@ -42,20 +42,25 @@
   </distributionManagement>
 
   <dependencies>
+   <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.util</artifactId>
+      <version>1.5.1</version>
+    </dependency>
     <dependency>
       <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.core</artifactId>
-      <version>1.3.9</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.shrike</artifactId>
-      <version>1.3.9</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.cast</artifactId>
-      <version>1.3.9</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>net.htmlparser.jericho</groupId>
@@ -66,7 +71,7 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>2.4</version>
-    </dependency>    
+    </dependency>
   </dependencies>
 
   <repositories>
@@ -74,18 +79,35 @@
       <id>sonatype-snapshots</id>
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </repository>
-  </repositories>  
-  
+  </repositories>
+
+  <profiles>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
+
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>dat</directory>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.2</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
 
@@ -117,6 +139,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <additionalparam>${javadoc.options}</additionalparam>
+        </configuration>
         <version>2.9.1</version>
         <executions>
           <execution>
@@ -142,7 +167,7 @@
         </execution>
       </executions>
     </plugin>
-    
+
     </plugins>
-  </build>  
+  </build>
 </project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast.js/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast.js/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.js
+Bundle-Vendor = IBM
+Bundle-Name = JavaScript Plug-in
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/pom.xml wala-1.5.1/com.ibm.wala.cast.js/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.js/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>WALA</artifactId>
 		<groupId>com.ibm.wala</groupId>
-		<version>1.3.9</version>
+		<version>1.5.1</version>
 	</parent>
 	<groupId>com.ibm.wala</groupId>
 	<artifactId>com.ibm.wala.cast.js</artifactId>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/.project wala-1.5.1/com.ibm.wala.cast.js/.project
--- wala-1.3.9/com.ibm.wala.cast.js/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.cast.js</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.js/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.js/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,78 +1,128 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.APILeak=error
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=error
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast.js/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast.js/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.cast.js/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.cast.js/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/analysis/typeInference/JSTypeInference.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/analysis/typeInference/JSTypeInference.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/analysis/typeInference/JSTypeInference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/analysis/typeInference/JSTypeInference.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,8 +18,6 @@
 import com.ibm.wala.cast.js.ssa.JavaScriptCheckReference;
 import com.ibm.wala.cast.js.ssa.JavaScriptInstanceOf;
 import com.ibm.wala.cast.js.ssa.JavaScriptInvoke;
-import com.ibm.wala.cast.js.ssa.JavaScriptPropertyRead;
-import com.ibm.wala.cast.js.ssa.JavaScriptPropertyWrite;
 import com.ibm.wala.cast.js.ssa.JavaScriptTypeOfInstruction;
 import com.ibm.wala.cast.js.ssa.JavaScriptWithRegion;
 import com.ibm.wala.cast.js.ssa.PrototypeLookup;
@@ -34,7 +32,7 @@
 public class JSTypeInference extends AstTypeInference {
 
   public JSTypeInference(IR ir, IClassHierarchy cha) {
-    super(ir, cha, new PointType(cha.lookupClass(JavaScriptTypes.Boolean)), true);
+    super(ir, new PointType(cha.lookupClass(JavaScriptTypes.Boolean)), true);
   }
 
   @Override
@@ -46,11 +44,6 @@
       }
 
       @Override
-      public void visitJavaScriptPropertyRead(JavaScriptPropertyRead inst) {
-        result = new DeclaredTypeOperator(new ConeType(cha.getRootClass()));
-      }
-
-      @Override
       public void visitTypeOf(JavaScriptTypeOfInstruction inst) {
         result = new DeclaredTypeOperator(new PointType(cha.lookupClass(JavaScriptTypes.String)));
       }
@@ -61,10 +54,6 @@
       }
 
       @Override
-      public void visitJavaScriptPropertyWrite(JavaScriptPropertyWrite inst) {
-      }
-
-      @Override
       public void visitCheckRef(JavaScriptCheckReference instruction) {
       }
 
@@ -81,7 +70,6 @@
         result = new DeclaredTypeOperator(new ConeType(cha.getRootClass()));
       }
     }
-    ;
 
     class JSTypeVarFactory extends TypeVarFactory {
 
@@ -104,7 +92,6 @@
         }
       }
     }
-    ;
 
     init(ir, new JSTypeVarFactory(), new JSTypeOperatorFactory());
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/FieldBasedCallGraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -29,21 +29,23 @@
 import com.ibm.wala.cast.js.ipa.callgraph.JavaScriptFunctionDotCallTargetSelector;
 import com.ibm.wala.cast.js.ipa.summaries.JavaScriptConstructorFunctions;
 import com.ibm.wala.cast.js.ipa.summaries.JavaScriptConstructorFunctions.JavaScriptConstructor;
+import com.ibm.wala.cast.js.loader.JavaScriptLoader;
 import com.ibm.wala.cast.js.types.JavaScriptMethods;
 import com.ibm.wala.cast.types.AstMethodReference;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
 import com.ibm.wala.ipa.callgraph.impl.AbstractRootMethod;
 import com.ibm.wala.ipa.callgraph.impl.ContextInsensitiveSelector;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.DefaultSSAInterpreter;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.DelegatingSSAContextInterpreter;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.nCFAContextSelector;
@@ -70,23 +72,23 @@
 	
 	// standard call graph machinery
 	protected final AnalysisOptions options;
-	protected final AnalysisCache cache;
+	protected final IAnalysisCacheView cache;
 	protected final JavaScriptConstructorFunctions constructors;
-	protected final MethodTargetSelector targetSelector;
+	public final MethodTargetSelector targetSelector;
 	protected final boolean supportFullPointerAnalysis;
 	
 	private static final boolean LOG_TIMINGS = true;
 	
-	public FieldBasedCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache, boolean supportFullPointerAnalysis) {
+	public FieldBasedCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView iAnalysisCacheView, boolean supportFullPointerAnalysis) {
 		this.cha = cha;
 		this.options = options;
-		this.cache = cache;
+		this.cache = iAnalysisCacheView;
 		this.constructors = new JavaScriptConstructorFunctions(cha);
-		this.targetSelector = setupMethodTargetSelector(cha, constructors, options);
+		this.targetSelector = setupMethodTargetSelector(constructors, options);
 		this.supportFullPointerAnalysis = supportFullPointerAnalysis;
 	}
 
-  private MethodTargetSelector setupMethodTargetSelector(IClassHierarchy cha, JavaScriptConstructorFunctions constructors2, AnalysisOptions options) {
+  private static MethodTargetSelector setupMethodTargetSelector(JavaScriptConstructorFunctions constructors2, AnalysisOptions options) {
     MethodTargetSelector result = new JavaScriptConstructTargetSelector(constructors2, options.getMethodTargetSelector());
     if (options instanceof JSAnalysisOptions && ((JSAnalysisOptions)options).handleCallApply()) {
       result = new JavaScriptFunctionApplyTargetSelector(new JavaScriptFunctionDotCallTargetSelector(result));
@@ -107,7 +109,7 @@
 	/**
 	 * Main entry point: builds a flow graph, then extracts a call graph and returns it.
 	 */
-	public Pair<JSCallGraph,PointerAnalysis<ObjectVertex>> buildCallGraph(Iterable<Entrypoint> eps, IProgressMonitor monitor) throws CancelException {
+	public Pair<JSCallGraph,PointerAnalysis<ObjectVertex>> buildCallGraph(Iterable<? extends Entrypoint> eps, IProgressMonitor monitor) throws CancelException {
 		long fgBegin, fgEnd, cgBegin, cgEnd;
 	
 		if(LOG_TIMINGS) fgBegin = System.currentTimeMillis();
@@ -137,14 +139,18 @@
 	/**
 	 * Extract a call graph from a given flow graph.
 	 */
-	@SuppressWarnings("deprecation")
-	protected JSCallGraph extract(FlowGraph flowgraph, Iterable<Entrypoint> eps, IProgressMonitor monitor) throws CancelException {
+  public JSCallGraph extract(FlowGraph flowgraph, Iterable<? extends Entrypoint> eps, IProgressMonitor monitor) throws CancelException {
+    DelegatingSSAContextInterpreter interpreter = new DelegatingSSAContextInterpreter(new AstContextInsensitiveSSAContextInterpreter(options, cache), new DefaultSSAInterpreter(options, cache));
+    return extract(interpreter, flowgraph, eps, monitor);
+  }
+  
+  @SuppressWarnings("deprecation")
+	public JSCallGraph extract(SSAContextInterpreter interpreter, FlowGraph flowgraph, Iterable<? extends Entrypoint> eps, IProgressMonitor monitor) throws CancelException {
 	  // set up call graph
-		final JSCallGraph cg = new JSCallGraph(cha, options, cache);
+		final JSCallGraph cg = new JSCallGraph(JavaScriptLoader.JS.getFakeRootMethod(cha, options, cache), options, cache);
 		cg.init();
 		
 		// setup context interpreters
-		DelegatingSSAContextInterpreter interpreter = new DelegatingSSAContextInterpreter(new AstContextInsensitiveSSAContextInterpreter(options, cache), new DefaultSSAInterpreter(options, cache));
     if (options instanceof JSAnalysisOptions && ((JSAnalysisOptions)options).handleCallApply()) {
       interpreter = new DelegatingSSAContextInterpreter(new JavaScriptFunctionApplyContextInterpreter(options, cache), interpreter);
     }
@@ -153,8 +159,7 @@
 		// set up call edges from fake root to all script nodes
 		AbstractRootMethod fakeRootMethod = (AbstractRootMethod)cg.getFakeRootNode().getMethod();
 		CGNode fakeRootNode = cg.findOrCreateNode(fakeRootMethod, Everywhere.EVERYWHERE);
-		for(Iterator<Entrypoint> iter = eps.iterator(); iter.hasNext();) {
-			Entrypoint ep = iter.next();
+		for (Entrypoint ep : eps) {
 			CGNode nd = cg.findOrCreateNode(ep.getMethod(), Everywhere.EVERYWHERE);
 			SSAAbstractInvokeInstruction invk = ep.addCall(fakeRootMethod);
 			fakeRootNode.addTarget(invk.getCallSite(), nd);
@@ -206,7 +211,7 @@
 		return cg;
 	}
 
-  private boolean handleFunctionCallOrApplyInvocation(FlowGraph flowgraph, IProgressMonitor monitor, final JSCallGraph cg,
+  public boolean handleFunctionCallOrApplyInvocation(FlowGraph flowgraph, IProgressMonitor monitor, final JSCallGraph cg,
       CallVertex callVertex, CGNode caller, CallSiteReference site,
       IMethod target) throws CancelException {
     // use to get 1-level of call string for Function.prototype.call, to
@@ -220,6 +225,7 @@
     OrdinalSet<FuncVertex> reflectiveTargets = getReflectiveTargets(flowgraph, callVertex, monitor);
     System.err.println("adding callees " + reflectiveTargets + " for " + caller);
     // there should only be one call site in the synthetic method
+//    CallSiteReference reflectiveCallSite = cache.getIRFactory().makeIR(functionPrototypeCallNode.getMethod(), Everywhere.EVERYWHERE, options.getSSAOptions()).iterateCallSites().next();
     CallSiteReference reflectiveCallSite = functionPrototypeCallNode.getIR().iterateCallSites().next();
     for (FuncVertex f : reflectiveTargets) {
       IMethod reflectiveTgtMethod = targetSelector.getCalleeTarget(functionPrototypeCallNode, reflectiveCallSite, f.getConcreteType());
@@ -228,7 +234,7 @@
     return ret;
   }
 
-  private boolean addEdgeToJSCallGraph(final JSCallGraph cg, CallSiteReference site, IMethod target, CGNode caller)
+  public boolean addEdgeToJSCallGraph(final JSCallGraph cg, CallSiteReference site, IMethod target, CGNode caller)
       throws CancelException {
     return addCGEdgeWithContext(cg, site, target, caller, Everywhere.EVERYWHERE);
   }
@@ -237,7 +243,7 @@
   
   Everywhere targetContext = Everywhere.EVERYWHERE;
   @SuppressWarnings("deprecation")
-  private boolean addCGEdgeWithContext(final JSCallGraph cg, CallSiteReference site, IMethod target, CGNode caller,
+  private static boolean addCGEdgeWithContext(final JSCallGraph cg, CallSiteReference site, IMethod target, CGNode caller,
       Context targetContext) throws CancelException {
     boolean ret = false;
     if(target != null) {
@@ -258,15 +264,15 @@
   /**
    * Given a callVertex that can invoke Function.prototype.call, get the
    * FuncVertex nodes for the reflectively-invoked methods
-   * @throws CancelException 
    */
-	private OrdinalSet<FuncVertex> getReflectiveTargets(FlowGraph flowGraph, CallVertex callVertex, IProgressMonitor monitor) throws CancelException {
+	private static OrdinalSet<FuncVertex> getReflectiveTargets(FlowGraph flowGraph, CallVertex callVertex, IProgressMonitor monitor) throws CancelException {
 	  SSAAbstractInvokeInstruction invoke = callVertex.getInstruction();
 	  VarVertex functionParam = flowGraph.getVertexFactory().makeVarVertex(callVertex.getCaller(), invoke.getUse(1));
 	  return flowGraph.getReachingSet(functionParam, monitor);
   }
 
-  private OrdinalSet<FuncVertex> getConstructorTargets(FlowGraph flowGraph, CallVertex callVertex, IProgressMonitor monitor) throws CancelException {
+  @SuppressWarnings("unused")
+  private static OrdinalSet<FuncVertex> getConstructorTargets(FlowGraph flowGraph, CallVertex callVertex, IProgressMonitor monitor) throws CancelException {
     SSAAbstractInvokeInstruction invoke = callVertex.getInstruction();
     assert invoke.getDeclaredTarget().getName().equals(JavaScriptMethods.ctorAtom);
     VarVertex objectParam = flowGraph.getVertexFactory().makeVarVertex(callVertex.getCaller(), invoke.getUse(0));
@@ -276,7 +282,7 @@
   /**
 	 * Extract call edges from the flow graph into high-level representation.
 	 */
-	protected Set<Pair<CallVertex, FuncVertex>> extractCallGraphEdges(FlowGraph flowgraph, IProgressMonitor monitor) throws CancelException {
+	public Set<Pair<CallVertex, FuncVertex>> extractCallGraphEdges(FlowGraph flowgraph, IProgressMonitor monitor) throws CancelException {
 		VertexFactory factory = flowgraph.getVertexFactory();
 		final Set<Pair<CallVertex, FuncVertex>> result = HashSetFactory.make();
 		
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FilteredFlowGraphBuilder.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FilteredFlowGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FilteredFlowGraphBuilder.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FilteredFlowGraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,37 @@
+/******************************************************************************
+ * Copyright (c) 2002 - 2014 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *****************************************************************************/
+
+package com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph;
+
+import java.util.function.Function;
+
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.cha.IClassHierarchy;
+
+public class FilteredFlowGraphBuilder extends FlowGraphBuilder {
+
+	private final Function<IMethod, Boolean> filter;
+	
+	public FilteredFlowGraphBuilder(IClassHierarchy cha, IAnalysisCacheView cache, boolean fullPointerAnalysis, Function<IMethod, Boolean> filter) {
+		super(cha, cache, fullPointerAnalysis);
+		this.filter = filter;
+	}
+
+	@Override
+	public void visitFunction(FlowGraph flowgraph, IMethod method) {
+		if (filter.apply(method)) {
+			super.visitFunction(flowgraph, method);
+		}
+	}
+
+	
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FlowGraphBuilder.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FlowGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FlowGraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FlowGraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,13 +10,13 @@
  *****************************************************************************/
 package com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph;
 
-import java.util.Iterator;
-
 import com.ibm.wala.cast.ir.ssa.AstGlobalRead;
 import com.ibm.wala.cast.ir.ssa.AstGlobalWrite;
 import com.ibm.wala.cast.ir.ssa.AstLexicalAccess.Access;
 import com.ibm.wala.cast.ir.ssa.AstLexicalRead;
 import com.ibm.wala.cast.ir.ssa.AstLexicalWrite;
+import com.ibm.wala.cast.ir.ssa.AstPropertyRead;
+import com.ibm.wala.cast.ir.ssa.AstPropertyWrite;
 import com.ibm.wala.cast.js.callgraph.fieldbased.JSMethodInstructionVisitor;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.CreationSiteVertex;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.FuncVertex;
@@ -26,8 +26,6 @@
 import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
 import com.ibm.wala.cast.js.ipa.callgraph.JSSSAPropagationCallGraphBuilder;
 import com.ibm.wala.cast.js.ssa.JavaScriptInvoke;
-import com.ibm.wala.cast.js.ssa.JavaScriptPropertyRead;
-import com.ibm.wala.cast.js.ssa.JavaScriptPropertyWrite;
 import com.ibm.wala.cast.js.ssa.PrototypeLookup;
 import com.ibm.wala.cast.js.ssa.SetPrototype;
 import com.ibm.wala.cast.js.types.JavaScriptMethods;
@@ -38,7 +36,7 @@
 import com.ibm.wala.cast.types.AstMethodReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAGetCaughtExceptionInstruction;
@@ -50,6 +48,7 @@
 import com.ibm.wala.ssa.SSAReturnInstruction;
 import com.ibm.wala.ssa.SSAThrowInstruction;
 import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.intset.EmptyIntSet;
 import com.ibm.wala.util.intset.IntSet;
 
@@ -60,10 +59,10 @@
  */
 public class FlowGraphBuilder {
 	private final IClassHierarchy cha;
-	private final AnalysisCache cache;
+	private final IAnalysisCacheView cache;
 	private final boolean supportFullPointerAnalysis;
 	
-	public FlowGraphBuilder(IClassHierarchy cha, AnalysisCache cache, boolean supportPointerAnalysis) {
+	public FlowGraphBuilder(IClassHierarchy cha, IAnalysisCacheView cache, boolean supportPointerAnalysis) {
 		this.cha = cha;
 		this.cache = cache;
 		this.supportFullPointerAnalysis = supportPointerAnalysis;
@@ -74,7 +73,7 @@
 	 * 
 	 * <p>
 	 * It creates a new, empty flow graph, adds nodes for a small number of special primitive
-	 * functions such as <code>Object</code> and <code>Function</code> and sets up flow
+	 * functions such as {@code Object} and {@code Function} and sets up flow
 	 * edges to make them flow into the corresponding global variables. Then it iterates over
 	 * all functions in the class hierarchy and all their IR instructions, and adds the
 	 * flow edges induced by these instructions.
@@ -104,9 +103,6 @@
 
   public void visitFunction(FlowGraph flowgraph, IMethod method) {
     {
-      if (method.toString().contains("ctor") && method.toString().contains("dollar_init")) {
-        System.err.println("found it");
-      }
     	IR ir = cache.getIR(method);
     	FlowGraphSSAVisitor visitor = new FlowGraphSSAVisitor(ir, flowgraph);
 
@@ -120,11 +116,11 @@
     	
     	// now visit phis and catches
     	visitor.instructionIndex = -1;
-    	for(Iterator<? extends SSAInstruction> iter=ir.iteratePhis();iter.hasNext();)
-    		iter.next().visit(visitor);
+    	for(SSAInstruction inst : Iterator2Iterable.make(ir.iteratePhis()))
+    		inst.visit(visitor);
     	
-    	for(Iterator<SSAInstruction> iter=ir.iterateCatchInstructions();iter.hasNext();)
-    		iter.next().visit(visitor);
+    	for(SSAInstruction inst : Iterator2Iterable.make(ir.iterateCatchInstructions()))
+    		inst.visit(visitor);
     }
   }
 	
@@ -139,7 +135,7 @@
 	private void addPrimitives(FlowGraph flowgraph) {
 		VertexFactory factory = flowgraph.getVertexFactory();
 		for(String pf : primitiveFunctions) {
-			TypeReference typeref = TypeReference.findOrCreate(JavaScriptTypes.jsLoader, "L" + pf);
+			TypeReference typeref = TypeReference.findOrCreate(JavaScriptTypes.jsLoader, 'L' + pf);
 			IClass klass = cha.lookupClass(typeref);
 			String prop = pf.endsWith("Object")? pf.substring(0, pf.length() - 6): pf;
 			flowgraph.addEdge(factory.makeFuncVertex(klass), factory.makePropVertex(prop));
@@ -259,7 +255,7 @@
 		}
 		
 		@Override
-		public void visitJavaScriptPropertyWrite(JavaScriptPropertyWrite pw) {
+		public void visitPropertyWrite(AstPropertyWrite pw) {
 			int p = pw.getMemberRef();
 			if(symtab.isConstant(p)) {
 				String pn = JSCallGraphUtil.simulateToStringForPropertyNames(symtab.getConstantValue(p));
@@ -302,7 +298,7 @@
 		}
 		
 		@Override
-		public void visitJavaScriptPropertyRead(JavaScriptPropertyRead pr) {
+		public void visitPropertyRead(AstPropertyRead pr) {
 			int p = pr.getMemberRef();
 			if(symtab.isConstant(p)) {
 				String pn = JSCallGraphUtil.simulateToStringForPropertyNames(symtab.getConstantValue(p));
@@ -396,7 +392,7 @@
 	        flowgraph.addEdge(cs, factory.makeVarVertex(func, invk.getDef())); 
 	        
 	        // also passed as 'this' to constructor
-	        if (invk.getNumberOfParameters() > 1) {
+	        if (invk.getNumberOfPositionalParameters() > 1) {
 	          flowgraph.addEdge(cs, factory.makeVarVertex(func, invk.getUse(0)));
 	        }
 			  }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FlowGraph.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FlowGraph.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FlowGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FlowGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,7 +16,9 @@
 import java.util.Set;
 
 import com.ibm.wala.analysis.pointers.HeapGraph;
+import com.ibm.wala.cast.ipa.callgraph.AstHeapModel;
 import com.ibm.wala.cast.ir.ssa.AstGlobalWrite;
+import com.ibm.wala.cast.ir.ssa.AstPropertyWrite;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.AbstractVertexVisitor;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.CreationSiteVertex;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.FuncVertex;
@@ -38,9 +40,9 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.classLoader.ProgramCounter;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.callgraph.propagation.FilteredPointerKey;
 import com.ibm.wala.ipa.callgraph.propagation.FilteredPointerKey.TypeFilter;
@@ -56,9 +58,10 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
-import com.ibm.wala.util.Predicate;
+import com.ibm.wala.util.collections.CompoundIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.GraphReachability;
@@ -90,7 +93,7 @@
 	private GraphReachability<Vertex,FuncVertex> optimistic_closure;
 	
 	public FlowGraph() {
-		this.graph = new SlowSparseNumberedGraph<Vertex>(1);
+		this.graph = new SlowSparseNumberedGraph<>(1);
 		this.factory = new VertexFactory();
 	}
 	
@@ -102,34 +105,25 @@
 		optimistic_closure = computeClosure(graph, monitor, FuncVertex.class);
 	}
 	
-	private <T> GraphReachability<Vertex, T> computeClosure(NumberedGraph<Vertex> graph, IProgressMonitor monitor, final Class<?> type) throws CancelException {
+	private static <T> GraphReachability<Vertex, T> computeClosure(NumberedGraph<Vertex> graph, IProgressMonitor monitor, final Class<?> type) throws CancelException {
 		// prune flowgraph by taking out 'unknown' vertex
-		Graph<Vertex> pruned_flowgraph = GraphSlicer.prune(graph, new Predicate<Vertex>() {
-			@Override
-			public boolean test(Vertex t) {
-				return t.accept(new AbstractVertexVisitor<Boolean>() {
-					@Override
-					public Boolean visitVertex(Vertex vertex) {
-						return true;
-					}
-					
-					@Override
-					public Boolean visitUnknownVertex(UnknownVertex unknownVertex) {
-						return false;
-					}
-				});
-			}
-		});
+		Graph<Vertex> pruned_flowgraph = GraphSlicer.prune(graph, t -> t.accept(new AbstractVertexVisitor<Boolean>() {
+    	@Override
+    	public Boolean visitVertex() {
+    		return true;
+    	}
+    	
+    	@Override
+    	public Boolean visitUnknownVertex(UnknownVertex unknownVertex) {
+    		return false;
+    	}
+    }));
 		
 		// compute transitive closure
 		GraphReachability<Vertex, T> optimistic_closure = 
-		    new GraphReachability<Vertex,T>(
-		      new InvertedGraph<Vertex>(pruned_flowgraph),
-		      new Predicate<Vertex>() {
-		        @Override public boolean test(Vertex o) {
-		          return type.isInstance(o);
-		        } 
-		      }
+		    new GraphReachability<>(
+		      new InvertedGraph<>(pruned_flowgraph),
+		      type::isInstance
 		    );
 		
 		optimistic_closure.solve(monitor);
@@ -142,7 +136,7 @@
 	}
 	
 	/**
-	 * Adds an edge from vertex <code>from</code> to vertex <code>to</code>, adding the vertices
+	 * Adds an edge from vertex {@code from} to vertex {@code to}, adding the vertices
 	 * to the graph if they are not in there yet.
 	 */
 	public void addEdge(Vertex from, Vertex to) {
@@ -158,7 +152,7 @@
 	}
 
 	/**
-	 * Computes the set of vertices that may reach <code>dest</code> along paths not containing an
+	 * Computes the set of vertices that may reach {@code dest} along paths not containing an
 	 * {@link UnknownVertex}.
 	 */
 	public OrdinalSet<FuncVertex> getReachingSet(Vertex dest, IProgressMonitor monitor) throws CancelException {
@@ -178,16 +172,16 @@
     return graph.iterator();
   }
   
-  public PointerAnalysis<ObjectVertex> getPointerAnalysis(final CallGraph cg, final AnalysisCache cache, final IProgressMonitor monitor) throws CancelException {
+  public PointerAnalysis<ObjectVertex> getPointerAnalysis(final CallGraph cg, final IAnalysisCacheView cache, final IProgressMonitor monitor) throws CancelException {
     return new PointerAnalysis<ObjectVertex>() {
       
       private final Map<Pair<PrototypeField,ObjectVertex>,PrototypeFieldVertex> proto = HashMapFactory.make();
       
       private GraphReachability<Vertex,ObjectVertex> pointerAnalysis = computeClosure(graph, monitor, ObjectVertex.class);
 
-      private final ExtensionGraph<Vertex> dataflow = new ExtensionGraph<Vertex>(graph);
+      private final ExtensionGraph<Vertex> dataflow = new ExtensionGraph<>(graph);
 
-      protected IR getIR(final AnalysisCache cache, FuncVertex func) {
+      protected IR getIR(final IAnalysisCacheView cache, FuncVertex func) {
         return cache.getIR(func.getConcreteType().getMethod(AstMethodReference.fnSelector));
       }
 
@@ -202,16 +196,14 @@
       {
         PropVertex proto = factory.makePropVertex("prototype");
         if (graph.containsNode(proto)) {
-          for(Iterator<Vertex> ps = graph.getPredNodes(proto); ps.hasNext(); ) {
-            Vertex p = ps.next();
+          for(Vertex p : Iterator2Iterable.make(graph.getPredNodes(proto))) {
             if (p instanceof VarVertex) {
               int rval = ((VarVertex) p).getValueNumber();
               FuncVertex func = ((VarVertex) p).getFunction();
               DefUse du = cache.getDefUse(getIR(cache, func));
-              for(Iterator<SSAInstruction> insts = du.getUses(rval); insts.hasNext(); ) {
-                SSAInstruction inst = insts.next();
+              for(SSAInstruction inst : Iterator2Iterable.make(du.getUses(rval))) {
                 if (inst instanceof JavaScriptPropertyWrite) {
-                  int obj = ((JavaScriptPropertyWrite) inst).getObjectRef();
+                  int obj = ((AstPropertyWrite) inst).getObjectRef();
                   VarVertex object = factory.makeVarVertex(func, obj);
                   for(ObjectVertex o : getPointsToSet(object)) {
                     PrototypeFieldVertex prototype = get(PrototypeField.prototype, o);
@@ -283,13 +275,15 @@
 
       @Override
       public Iterable<PointerKey> getPointerKeys() {
-        // TODO Auto-generated method stub
-        return null;
+        return () -> new CompoundIterator<>(factory.getArgVertices().iterator(),
+            new CompoundIterator<>(factory.getRetVertices().iterator(), 
+                new CompoundIterator<PointerKey>(factory.getVarVertices().iterator(),
+                    factory.getPropVertices().iterator())));
       }
-
+      
       @Override
       public HeapModel getHeapModel() {
-        return new HeapModel() {
+        return new AstHeapModel() {
           
           @Override
           public PointerKey getPointerKeyForLocal(CGNode node, int valueNumber) {
@@ -387,6 +381,30 @@
           public IClassHierarchy getClassHierarchy() {
             assert false;
             return null;
+          }
+
+          @Override
+          public PointerKey getPointerKeyForArrayLength(InstanceKey I) {
+            // TODO Auto-generated method stub
+            return null;
+          }
+
+          @Override
+          public Iterator<PointerKey> getPointerKeysForReflectedFieldRead(InstanceKey I, InstanceKey F) {
+            // TODO Auto-generated method stub
+            return null;
+          }
+
+          @Override
+          public Iterator<PointerKey> getPointerKeysForReflectedFieldWrite(InstanceKey I, InstanceKey F) {
+            // TODO Auto-generated method stub
+            return null;
+          }
+
+          @Override
+          public PointerKey getPointerKeyForObjectCatalog(InstanceKey I) {
+            // TODO Auto-generated method stub
+            return null;
           }        
         };
       }
@@ -400,6 +418,8 @@
           final PointerAnalysis<ObjectVertex> pa = this;
           class FieldBasedHeapGraph extends SlowSparseNumberedGraph<Object> implements HeapGraph<ObjectVertex> {
 
+            private static final long serialVersionUID = -3544629644808422215L;
+
             private <X> X ensureNode(X n) {
               if (!containsNode(n)) {
                 addNode(n);
@@ -432,16 +452,14 @@
               for(PropVertex property : factory.getPropVertices()) {
 
                 // edges from objects to properties assigned to them
-                for(Iterator<Vertex> ps = dataflow.getPredNodes(property); ps.hasNext(); ) {
-                  Vertex p = ps.next();
+                for(Vertex p : Iterator2Iterable.make(dataflow.getPredNodes(property))) {
                   if (p instanceof VarVertex) {
                     int rval = ((VarVertex) p).getValueNumber();
                     FuncVertex func = ((VarVertex) p).getFunction();
                     DefUse du = cache.getDefUse(getIR(cache, func));
-                    for(Iterator<SSAInstruction> insts = du.getUses(rval); insts.hasNext(); ) {
-                      SSAInstruction inst = insts.next();
+                    for(SSAInstruction inst : Iterator2Iterable.make(du.getUses(rval))) {
                       if (inst instanceof JavaScriptPropertyWrite) {
-                        int obj = ((JavaScriptPropertyWrite) inst).getObjectRef();
+                        int obj = ((AstPropertyWrite) inst).getObjectRef();
                         VarVertex object = factory.makeVarVertex(func, obj);
                         for(ObjectVertex o : getPointsToSet(object)) {
                           addEdge(ensureNode(o), ensureNode(propertyKey(property.getPropName(), o)));
@@ -482,8 +500,7 @@
               // prototype dataflow for object creations
               for(CreationSiteVertex cs : factory.creationSites()) {
                 if (cg.getNode(cs.getMethod(), Everywhere.EVERYWHERE) != null) {
-                for(Iterator<Pair<CGNode, NewSiteReference>> sites = cs.getCreationSites(cg); sites.hasNext(); ) {
-                  Pair<CGNode, NewSiteReference> site = sites.next();
+                for(Pair<CGNode, NewSiteReference> site : Iterator2Iterable.make(cs.getCreationSites(cg))) {
                   IR ir = site.fst.getIR();
                   SSAInstruction creation = ir.getInstructions()[ site.snd.getProgramCounter() ];
                   if (creation instanceof JavaScriptInvoke) {
@@ -513,11 +530,7 @@
 
             @Override
             public Collection<Object> getReachableInstances(Set<Object> roots) {
-              return DFS.getReachableNodes(this, roots, new Predicate<Object>() {
-                @Override public boolean test(Object o) {
-                  return o instanceof ObjectVertex;
-                } 
-              });
+              return DFS.getReachableNodes(this, roots, ObjectVertex.class::isInstance);
             }
 
             @Override
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/AbstractVertexVisitor.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/AbstractVertexVisitor.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/AbstractVertexVisitor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/AbstractVertexVisitor.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,67 +16,67 @@
  * @author mschaefer
  */
 public class AbstractVertexVisitor<T> implements VertexVisitor<T> {
-	public T visitVertex(Vertex vertex) {
+	public T visitVertex() {
 		return null;
 	}
 	
 	@Override
   public T visitVarVertex(VarVertex varVertex) {
-		return visitVertex(varVertex);
+		return visitVertex();
 	}
 
 	@Override
   public T visitPropVertex(PropVertex propVertex) {
-		return visitVertex(propVertex);
+		return visitVertex();
 	}
 
 	@Override
   public T visitUnknownVertex(UnknownVertex unknownVertex) {
-		return visitVertex(unknownVertex);
+		return visitVertex();
 	}
 
 	@Override
   public T visitFuncVertex(FuncVertex funcVertex) {
-		return visitVertex(funcVertex);
+		return visitVertex();
 	}
 
 	 @Override
 	  public T visitCreationSiteVertex(CreationSiteVertex csVertex) {
-	    return visitVertex(csVertex);
+	    return visitVertex();
 	  }
 
 	@Override
   public T visitParamVertex(ParamVertex paramVertex) {
-		return visitVertex(paramVertex);
+		return visitVertex();
 	}
 
 	@Override
   public T visitRetVertex(RetVertex retVertex) {
-		return visitVertex(retVertex);
+		return visitVertex();
 	}
 
 	@Override
 	public T visitArgVertex(ArgVertex argVertex) {
-	  return visitVertex(argVertex);
+	  return visitVertex();
 	}
 
 	@Override
   public T visitCalleeVertex(CallVertex calleeVertex) {
-		return visitVertex(calleeVertex);
+		return visitVertex();
 	}
 
 	@Override
   public T visitLexicalAccessVertex(LexicalVarVertex lexicalAccessVertex) {
-		return visitVertex(lexicalAccessVertex);
+		return visitVertex();
 	}
 
 	 @Override
 	  public T visitGlobalVertex(GlobalVertex globalVertex) {
-	    return visitVertex(globalVertex);
+	    return visitVertex();
 	  }
 
 	 @Override
 	 public T visitPrototypeVertex(PrototypeFieldVertex protoVertex) {
-	   return visitVertex(protoVertex);
+	   return visitVertex();
 	 }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/ArgVertex.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/ArgVertex.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/ArgVertex.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/ArgVertex.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,6 +10,8 @@
  *****************************************************************************/
 package com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices;
 
+import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
+
 
 /**
  * A return vertex represents the 'arguments' array of a given function.
@@ -17,7 +19,7 @@
  * @author Julian Dolby (dolby@us.ibm.com)
  *
  */
-public class ArgVertex extends Vertex {
+public class ArgVertex extends Vertex implements PointerKey {
 	private final FuncVertex func;
 
 	ArgVertex(FuncVertex func) {
@@ -35,6 +37,6 @@
 	
 	@Override
 	public String toString() {
-	  return "Args(" + func + ")";
+	  return "Args(" + func + ')';
 	}
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/CallVertex.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/CallVertex.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/CallVertex.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/CallVertex.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,7 +15,7 @@
 import com.ibm.wala.classLoader.CallSiteReference;
 
 /**
- * A call vertex represents the possible callees of a function call or <code>new</code> expression.
+ * A call vertex represents the possible callees of a function call or {@code new} expression.
  * 
  * @author mschaefer
  *
@@ -49,7 +49,7 @@
 	}
 	
 	/**
-	 * Does this call vertex correspond to a <code>new</code> instruction? 
+	 * Does this call vertex correspond to a {@code new} instruction?
 	 */
 	public boolean isNew() {
 		return site.getDeclaredTarget() == JavaScriptMethods.ctorReference;
@@ -62,6 +62,6 @@
 	
 	@Override
 	public String toString() {
-		return "Callee(" + func + ", " + site + ")";
+		return "Callee(" + func + ", " + site + ')';
 	}
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/FuncVertex.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/FuncVertex.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/FuncVertex.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/FuncVertex.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,7 +52,7 @@
 	@Override
 	public String toString() {
 		String methodName = klass.getName().toString();
-    return "Func(" + methodName.substring(methodName.lastIndexOf('/')+1) + ")";
+    return "Func(" + methodName.substring(methodName.lastIndexOf('/')+1) + ')';
 	}
 
   @Override
@@ -79,7 +79,7 @@
     
     Iterator<CallSiteReference> sites = CG.getPossibleSites(caller, ctor);
     CallSiteReference site = sites.next();
-    assert !sites.hasNext() : caller + " --> " + ctor + " @ " + site + " and " + sites.next() + "\n" + caller.getIR();
+    assert !sites.hasNext() : caller + " --> " + ctor + " @ " + site + " and " + sites.next() + '\n' + caller.getIR();
     
     return NonNullSingletonIterator.make(Pair.make(caller, NewSiteReference.make(site.getProgramCounter(), klass.getReference())));
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/LexicalVarVertex.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/LexicalVarVertex.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/LexicalVarVertex.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/LexicalVarVertex.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,6 +37,6 @@
 	
 	@Override
 	public String toString() {
-		return "LexVar(" + definer.substring(definer.lastIndexOf('/')+1) + ", " + name + ")";
+		return "LexVar(" + definer.substring(definer.lastIndexOf('/')+1) + ", " + name + ')';
 	}
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/ParamVertex.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/ParamVertex.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/ParamVertex.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/ParamVertex.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,7 @@
  * 
  * <p>
  * Numbering of positional parameters is 1-based, with parameter 0 being the
- * <code>this</code> value.
+ * {@code this} value.
  * </p>
  * 
  * <p>
@@ -53,6 +53,6 @@
 	
 	@Override
 	public String toString() {
-	  return "Param(" + func + ", " + index + ")";
+	  return "Param(" + func + ", " + index + ')';
 	}
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/PropVertex.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/PropVertex.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/PropVertex.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/PropVertex.java	2019-01-29 17:08:39.000000000 +0000
@@ -36,6 +36,6 @@
 	
 	@Override
 	public String toString() {
-		return "Prop(" + propName + ")";
+		return "Prop(" + propName + ')';
 	}
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/PrototypeFieldVertex.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/PrototypeFieldVertex.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/PrototypeFieldVertex.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/PrototypeFieldVertex.java	2019-01-29 17:08:39.000000000 +0000
@@ -4,7 +4,7 @@
 
 public class PrototypeFieldVertex extends Vertex implements PointerKey {
 
-  public enum PrototypeField { __proto__, prototype };
+  public enum PrototypeField { __proto__, prototype }
 
   private final PrototypeField field;
   private final ObjectVertex type;
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/RetVertex.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/RetVertex.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/RetVertex.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/RetVertex.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,6 +37,6 @@
 	
 	@Override
 	public String toString() {
-	  return "Ret(" + func + ")";
+	  return "Ret(" + func + ')';
 	}
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/UnknownVertex.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/UnknownVertex.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/UnknownVertex.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/UnknownVertex.java	2019-01-29 17:08:39.000000000 +0000
@@ -31,4 +31,4 @@
 	public String toString() {
 		return "Unknown";
 	}
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/VarVertex.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/VarVertex.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/VarVertex.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/VarVertex.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,6 +43,6 @@
 
 	@Override
 	public String toString() {
-	  return "Var(" + func + ", " + valueNumber + ")";
+	  return "Var(" + func + ", " + valueNumber + ')';
 	}
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/VertexFactory.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/VertexFactory.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/VertexFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/vertices/VertexFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -102,6 +102,10 @@
 		return value;
 	}
 
+	public Iterable<RetVertex> getRetVertices() {
+	  return retVertexCache.values();
+	}
+	
 	public ArgVertex makeArgVertex(FuncVertex func) {
     ArgVertex value = argVertexCache.get(func);
     if(value == null)
@@ -109,6 +113,10 @@
     return value;
   }
 
+	public Iterable<ArgVertex> getArgVertices() {
+	  return argVertexCache.values();
+	}
+	
 	public UnknownVertex makeUnknownVertex() {
 		return UnknownVertex.INSTANCE;
 	}
@@ -121,6 +129,10 @@
 		return value;
 	}
 
+	 public Iterable<VarVertex> getVarVertices() {
+	    return varVertexCache.values();
+	  }
+
 	public LexicalVarVertex makeLexicalAccessVertex(String definer, String name) {
 		Pair<String, String> key = Pair.make(definer, name);
 		LexicalVarVertex value = lexicalAccessVertexCache.get(key);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/JSMethodInstructionVisitor.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/JSMethodInstructionVisitor.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/JSMethodInstructionVisitor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/JSMethodInstructionVisitor.java	2019-01-29 17:08:39.000000000 +0000
@@ -38,7 +38,7 @@
 	}
 
 	/**
-	 * Determine whether <code>invk</code> corresponds to a function declaration or function expression.
+	 * Determine whether {@code invk} corresponds to a function declaration or function expression.
 	 * 
 	 * TODO: A bit hackish. Is there a more principled way to do this?
 	 */
@@ -55,7 +55,7 @@
 			if(fndef instanceof AstGlobalRead) {
 				AstGlobalRead agr = (AstGlobalRead)fndef;
 				if(agr.getGlobalName().equals("global Function")) {
-					if(invk.getNumberOfParameters() != 2)
+					if(invk.getNumberOfPositionalParameters() != 2)
 						return false;
 					// this may be a genuine use of "new Function()", not a declaration/expression
 					if(!symtab.isStringConstant(invk.getUse(1)))
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/OptimisticCallgraphBuilder.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/OptimisticCallgraphBuilder.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/OptimisticCallgraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/OptimisticCallgraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,13 +18,10 @@
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.VarVertex;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.VertexFactory;
 import com.ibm.wala.cast.js.ipa.callgraph.JSAnalysisOptions;
-import com.ibm.wala.cast.js.ipa.summaries.JavaScriptConstructorFunctions;
 import com.ibm.wala.cast.js.ssa.JavaScriptInvoke;
 import com.ibm.wala.cast.js.types.JavaScriptMethods;
-import com.ibm.wala.cast.types.AstMethodReference;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
-import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.MonitorUtil;
@@ -46,8 +43,8 @@
 	
 	private final boolean handleCallApply;
 	
-	public OptimisticCallgraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache, boolean supportFullPointerAnalysis) {
-		super(cha, options, cache, supportFullPointerAnalysis);
+	public OptimisticCallgraphBuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView iAnalysisCacheView, boolean supportFullPointerAnalysis) {
+		super(cha, options, iAnalysisCacheView, supportFullPointerAnalysis);
 		handleCallApply = options instanceof JSAnalysisOptions && ((JSAnalysisOptions)options).handleCallApply();
 	}
 
@@ -78,7 +75,7 @@
 				
 				if(newEdge) {
 					// handle it
-					addEdge(flowgraph, edge.fst, edge.snd, monitor);
+					addEdge(flowgraph, edge.fst, edge.snd);
 				
 					// special handling of invocations of Function.prototype.call
 					// TODO: since we've just added some edges to the flow graph, its transitive closure will be
@@ -96,7 +93,7 @@
 	}
 
 	// add flow corresponding to a new call edge
-	private void addEdge(FlowGraph flowgraph, CallVertex c, FuncVertex callee, IProgressMonitor monitor) throws CancelException {
+	private static void addEdge(FlowGraph flowgraph, CallVertex c, FuncVertex callee) {
 	  VertexFactory factory = flowgraph.getVertexFactory();
 	  JavaScriptInvoke invk = c.getInstruction();
 	  FuncVertex caller = c.getCaller();
@@ -106,7 +103,7 @@
       offset = 1;
     }
     
-    for(int i=0;i<invk.getNumberOfParameters();++i) {
+    for(int i=0;i<invk.getNumberOfPositionalParameters();++i) {
       // only flow receiver into 'this' if invk is, in fact, a method call
       flowgraph.addEdge(factory.makeVarVertex(caller, invk.getUse(i)), factory.makeArgVertex(callee));
       //if(i != 1 || !invk.getDeclaredTarget().getSelector().equals(AstMethodReference.fnSelector))
@@ -119,7 +116,7 @@
 	
 	// add data flow corresponding to a reflective invocation via Function.prototype.call
 	// NB: for f.call(...), f will _not_ appear as a call target, but the appropriate argument and return data flow will be set up
-	private void addReflectiveCallEdge(FlowGraph flowgraph, CallVertex c, IProgressMonitor monitor) throws CancelException {
+	private static void addReflectiveCallEdge(FlowGraph flowgraph, CallVertex c, IProgressMonitor monitor) throws CancelException {
 	  VertexFactory factory = flowgraph.getVertexFactory();
 	  FuncVertex caller = c.getCaller();
 	  JavaScriptInvoke invk = c.getInstruction();
@@ -129,7 +126,7 @@
 	  System.err.println("callees " + realCallees + " for " + caller);
 	  for(FuncVertex realCallee: realCallees) {
 	    // flow from arguments to parameters
-	    for(int i=2;i<invk.getNumberOfParameters();++i)
+	    for(int i=2;i<invk.getNumberOfPositionalParameters();++i)
 	      flowgraph.addEdge(factory.makeVarVertex(caller, invk.getUse(i)), factory.makeParamVertex(realCallee, i-1));
 
 	    // flow from return vertex to result vertex
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/PessimisticCallGraphBuilder.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/PessimisticCallGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/PessimisticCallGraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/PessimisticCallGraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,21 +10,17 @@
  *****************************************************************************/
 package com.ibm.wala.cast.js.callgraph.fieldbased;
 
-import java.util.Iterator;
-
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.FlowGraph;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.FuncVertex;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.VertexFactory;
-import com.ibm.wala.cast.js.ipa.summaries.JavaScriptConstructorFunctions;
 import com.ibm.wala.cast.js.ssa.JavaScriptInvoke;
 import com.ibm.wala.cast.js.types.JavaScriptTypes;
 import com.ibm.wala.cast.loader.AstMethod;
 import com.ibm.wala.cast.types.AstMethodReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
-import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
@@ -32,6 +28,7 @@
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 /**
  * Call graph builder for building pessimistic call graphs, where inter-procedural flows are not
@@ -42,8 +39,8 @@
  *
  */
 public class PessimisticCallGraphBuilder extends FieldBasedCallGraphBuilder {
-	public PessimisticCallGraphBuilder(IClassHierarchy cha,	AnalysisOptions options, AnalysisCache cache, boolean supportFullPointerAnalysis) {
-		super(cha, options, cache, supportFullPointerAnalysis);
+	public PessimisticCallGraphBuilder(IClassHierarchy cha,	AnalysisOptions options, IAnalysisCacheView iAnalysisCacheView, boolean supportFullPointerAnalysis) {
+		super(cha, options, iAnalysisCacheView, supportFullPointerAnalysis);
 	}
 
 	@Override
@@ -105,15 +102,14 @@
 				FuncVertex callee = factory.makeFuncVertex(fnClass);
 				
 				// look at all uses
-				for(Iterator<SSAInstruction> uses = du.getUses(defn);uses.hasNext();) {
-					SSAInstruction use = uses.next();
+				for(SSAInstruction use : Iterator2Iterable.make(du.getUses(defn))) {
 					
 					// check whether this is a local call
 					if(use instanceof JavaScriptInvoke && ((JavaScriptInvoke)use).getFunction() == defn) {
 						JavaScriptInvoke use_invk = (JavaScriptInvoke)use;
 						
 						// yes, so add edges from arguments to parameters...
-						for(int i=2;i<use_invk.getNumberOfParameters();++i)
+						for(int i=2;i<use_invk.getNumberOfPositionalParameters();++i)
 							flowgraph.addEdge(factory.makeVarVertex(caller, use_invk.getUse(i)), factory.makeParamVertex(callee, i));
 						
 						// ...and from return to result
@@ -133,7 +129,7 @@
 				
 				// if it's not a local call, add flows from/to unknown
 				if(!(def instanceof JavaScriptInvoke) || !isFunctionConstructorInvoke((JavaScriptInvoke)def)) {
-					for(int i=1;i<invk.getNumberOfParameters();++i)
+					for(int i=1;i<invk.getNumberOfPositionalParameters();++i)
 						flowgraph.addEdge(factory.makeVarVertex(caller, invk.getUse(i)), factory.makeUnknownVertex());
 					flowgraph.addEdge(factory.makeUnknownVertex(), factory.makeVarVertex(caller, invk.getDef()));
 				}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/WorklistBasedOptimisticCallgraphBuilder.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/WorklistBasedOptimisticCallgraphBuilder.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/WorklistBasedOptimisticCallgraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/callgraph/fieldbased/WorklistBasedOptimisticCallgraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,15 +21,12 @@
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.Vertex;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.VertexFactory;
 import com.ibm.wala.cast.js.ipa.callgraph.JSAnalysisOptions;
-import com.ibm.wala.cast.js.ipa.summaries.JavaScriptConstructorFunctions;
 import com.ibm.wala.cast.js.ssa.JavaScriptInvoke;
 import com.ibm.wala.cast.js.types.JavaScriptMethods;
 import com.ibm.wala.cast.types.AstMethodReference;
-import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.ssa.IR;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.MonitorUtil;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
@@ -57,7 +54,7 @@
 	
 	private FlowGraphBuilder builder;
 	
-	public WorklistBasedOptimisticCallgraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache, boolean supportFullPointerAnalysis) {
+	public WorklistBasedOptimisticCallgraphBuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache, boolean supportFullPointerAnalysis) {
 		super(cha, options, cache, supportFullPointerAnalysis);
 		handleCallApply = options instanceof JSAnalysisOptions && ((JSAnalysisOptions)options).handleCallApply();
 	}
@@ -69,7 +66,7 @@
 	}
 
 	@Override
-  protected Set<Pair<CallVertex,FuncVertex>> extractCallGraphEdges(FlowGraph flowgraph, IProgressMonitor monitor) throws CancelException {
+  public Set<Pair<CallVertex,FuncVertex>> extractCallGraphEdges(FlowGraph flowgraph, IProgressMonitor monitor) throws CancelException {
 	  VertexFactory factory = flowgraph.getVertexFactory();
 	  Set<Vertex> worklist = HashSetFactory.make();
 	  Map<Vertex, Set<FuncVertex>> reachingFunctions = HashMapFactory.make();
@@ -128,15 +125,17 @@
 	  }
 	  
 	  Set<Pair<CallVertex, FuncVertex>> res = HashSetFactory.make();
-	  for(Vertex v : reachingFunctions.keySet())
-	    if(v instanceof CallVertex)
-	      for(FuncVertex fv : reachingFunctions.get(v))
-	        res.add(Pair.make((CallVertex)v, fv));
+	  for(Map.Entry<Vertex, Set<FuncVertex>> entry : reachingFunctions.entrySet()) {
+		  final Vertex v = entry.getKey();
+		  if(v instanceof CallVertex)
+			for(FuncVertex fv : entry.getValue())
+			  res.add(Pair.make((CallVertex) v, fv));
+	  }
 	  return res;
 	}
 
 	// add flow corresponding to a new call edge
-	private void addCallEdge(FlowGraph flowgraph, CallVertex c, FuncVertex callee, Set<Vertex> worklist) throws CancelException {
+	private void addCallEdge(FlowGraph flowgraph, CallVertex c, FuncVertex callee, Set<Vertex> worklist) {
 		VertexFactory factory = flowgraph.getVertexFactory();
 		FuncVertex caller = c.getCaller();
 		JavaScriptInvoke invk = c.getInstruction();
@@ -146,7 +145,7 @@
       offset = 1;
     }
     
-		for(int i=0;i<invk.getNumberOfParameters();++i) {
+		for(int i=0;i<invk.getNumberOfPositionalParameters();++i) {
 		  // only flow receiver into 'this' if invk is, in fact, a method call
       flowgraph.addEdge(factory.makeVarVertex(caller, invk.getUse(i)), factory.makeArgVertex(callee));
 		  if(i != 1 || !invk.getDeclaredTarget().getSelector().equals(AstMethodReference.fnSelector))
@@ -164,12 +163,12 @@
 	
 	// add data flow corresponding to a reflective invocation via Function.prototype.call
 	// NB: for f.call(...), f will _not_ appear as a call target, but the appropriate argument and return data flow will be set up
-  private void addReflectiveCallEdge(FlowGraph flowgraph, VarVertex reflectiveCallee, JavaScriptInvoke invk, FuncVertex realCallee, Set<Vertex> worklist) throws CancelException {
+  private void addReflectiveCallEdge(FlowGraph flowgraph, VarVertex reflectiveCallee, JavaScriptInvoke invk, FuncVertex realCallee, Set<Vertex> worklist) {
     VertexFactory factory = flowgraph.getVertexFactory();
     FuncVertex caller = reflectiveCallee.getFunction();
 
     // flow from arguments to parameters
-    for(int i=2;i<invk.getNumberOfParameters();++i) {
+    for(int i=2;i<invk.getNumberOfPositionalParameters();++i) {
       addFlowEdge(flowgraph, factory.makeVarVertex(caller, invk.getUse(i)), factory.makeParamVertex(realCallee, i-1), worklist);
 
       // flow from return vertex to result vertex
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/cfg/JSInducedCFG.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/cfg/JSInducedCFG.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/cfg/JSInducedCFG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/cfg/JSInducedCFG.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,8 +15,6 @@
 import com.ibm.wala.cast.js.ssa.JavaScriptCheckReference;
 import com.ibm.wala.cast.js.ssa.JavaScriptInstanceOf;
 import com.ibm.wala.cast.js.ssa.JavaScriptInvoke;
-import com.ibm.wala.cast.js.ssa.JavaScriptPropertyRead;
-import com.ibm.wala.cast.js.ssa.JavaScriptPropertyWrite;
 import com.ibm.wala.cast.js.ssa.JavaScriptTypeOfInstruction;
 import com.ibm.wala.cast.js.ssa.JavaScriptWithRegion;
 import com.ibm.wala.cast.js.ssa.PrototypeLookup;
@@ -43,14 +41,6 @@
     }
 
     @Override
-    public void visitJavaScriptPropertyRead(JavaScriptPropertyRead inst) {
-    }
-
-    @Override
-    public void visitJavaScriptPropertyWrite(JavaScriptPropertyWrite inst) {
-    }
-
-    @Override
     public void visitTypeOf(JavaScriptTypeOfInstruction inst) {
     }
 
@@ -89,14 +79,6 @@
     }
 
     @Override
-    public void visitJavaScriptPropertyRead(JavaScriptPropertyRead inst) {
-    }
-
-    @Override
-    public void visitJavaScriptPropertyWrite(JavaScriptPropertyWrite inst) {
-    }
-
-    @Override
     public void visitTypeOf(JavaScriptTypeOfInstruction inst) {
     }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/impl/OneCFABuilderFactory.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/impl/OneCFABuilderFactory.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/impl/OneCFABuilderFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/impl/OneCFABuilderFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,9 +13,9 @@
 import com.ibm.wala.cast.ipa.callgraph.StandardFunctionTargetSelector;
 import com.ibm.wala.cast.js.ipa.callgraph.JSAnalysisOptions;
 import com.ibm.wala.cast.js.ipa.callgraph.JSZeroOrOneXCFABuilder;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
-import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 
@@ -26,8 +26,7 @@
  */
 public class OneCFABuilderFactory  {
 
-  public CallGraphBuilder make(JSAnalysisOptions options, AnalysisCache cache, IClassHierarchy cha, AnalysisScope scope,
-      boolean keepPointsTo) {
+  public CallGraphBuilder<InstanceKey> make(JSAnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha) {
     com.ibm.wala.ipa.callgraph.impl.Util.addDefaultSelectors(options, cha);
     options.setSelector(new StandardFunctionTargetSelector(cha, options.getMethodTargetSelector()));
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/impl/ZeroCFABuilderFactory.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/impl/ZeroCFABuilderFactory.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/impl/ZeroCFABuilderFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/impl/ZeroCFABuilderFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,9 +13,9 @@
 import com.ibm.wala.cast.ipa.callgraph.StandardFunctionTargetSelector;
 import com.ibm.wala.cast.js.ipa.callgraph.JSAnalysisOptions;
 import com.ibm.wala.cast.js.ipa.callgraph.JSZeroOrOneXCFABuilder;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
-import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 
@@ -26,8 +26,7 @@
  */
 public class ZeroCFABuilderFactory  {
 
-  public CallGraphBuilder make(JSAnalysisOptions options, AnalysisCache cache, IClassHierarchy cha, AnalysisScope scope,
-      boolean keepPointsTo) {
+  public CallGraphBuilder<InstanceKey> make(JSAnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha) {
     com.ibm.wala.ipa.callgraph.impl.Util.addDefaultSelectors(options, cha);
     options.setSelector(new StandardFunctionTargetSelector(cha, options.getMethodTargetSelector()));
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/JavaScriptAnalysisEngine.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/JavaScriptAnalysisEngine.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/JavaScriptAnalysisEngine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/client/JavaScriptAnalysisEngine.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,14 +10,20 @@
  *****************************************************************************/
 package com.ibm.wala.cast.js.client;
 
-import java.io.IOException;
 import java.util.Collections;
+import java.util.Set;
 import java.util.jar.JarFile;
 
 import com.ibm.wala.cast.ipa.callgraph.CAstAnalysisScope;
 import com.ibm.wala.cast.ir.ssa.AstIRFactory;
+import com.ibm.wala.cast.js.callgraph.fieldbased.FieldBasedCallGraphBuilder;
+import com.ibm.wala.cast.js.callgraph.fieldbased.OptimisticCallgraphBuilder;
+import com.ibm.wala.cast.js.callgraph.fieldbased.PessimisticCallGraphBuilder;
+import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.ObjectVertex;
 import com.ibm.wala.cast.js.client.impl.ZeroCFABuilderFactory;
 import com.ibm.wala.cast.js.ipa.callgraph.JSAnalysisOptions;
+import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraph;
+import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
 import com.ibm.wala.cast.js.ipa.callgraph.JavaScriptEntryPoints;
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
 import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
@@ -26,42 +32,43 @@
 import com.ibm.wala.classLoader.Module;
 import com.ibm.wala.classLoader.SourceModule;
 import com.ibm.wala.client.AbstractAnalysisEngine;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.ipa.cha.SeqClassHierarchyFactory;
+import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
+import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.debug.Assertions;
 
-public class JavaScriptAnalysisEngine extends AbstractAnalysisEngine {
-
+public abstract class JavaScriptAnalysisEngine<I extends InstanceKey> extends AbstractAnalysisEngine<I, CallGraphBuilder<I>, Void> {
   protected JavaScriptLoaderFactory loaderFactory;
 
   protected JavaScriptTranslatorFactory translatorFactory;
 
-   public JavaScriptAnalysisEngine() {
-  }
-
   @Override
   public void buildAnalysisScope() {
-    try {
-      loaderFactory = new JavaScriptLoaderFactory(translatorFactory);
+    loaderFactory = new JavaScriptLoaderFactory(translatorFactory);
 
-      SourceModule[] files = moduleFiles.toArray(new SourceModule[moduleFiles.size()]);
+    SourceModule[] files = moduleFiles.toArray(new SourceModule[0]);
 
-      scope = new CAstAnalysisScope(files, loaderFactory, Collections.singleton(JavaScriptLoader.JS));
-    } catch (IOException e) {
-      Assertions.UNREACHABLE(e.toString());
-    }
+    scope = new CAstAnalysisScope(files, loaderFactory, Collections.singleton(JavaScriptLoader.JS));
   }
 
   @Override
   public IClassHierarchy buildClassHierarchy() {
     try {
-      return ClassHierarchy.make(getScope(), loaderFactory, JavaScriptLoader.JS);
+      return setClassHierarchy(SeqClassHierarchyFactory.make(getScope(), loaderFactory, JavaScriptLoader.JS));
     } catch (ClassHierarchyException e) {
       Assertions.UNREACHABLE(e.toString());
       return null;
@@ -88,13 +95,13 @@
   }
 
   @Override
-  public AnalysisCache makeDefaultCache() {
-    return new AnalysisCache(AstIRFactory.makeDefaultFactory());
+  public IAnalysisCacheView makeDefaultCache() {
+    return new AnalysisCacheImpl(AstIRFactory.makeDefaultFactory());
   }
 
   @Override
-  public AnalysisOptions getDefaultOptions(Iterable<Entrypoint> roots) {
-    final AnalysisOptions options = new AnalysisOptions(scope, roots);
+  public JSAnalysisOptions getDefaultOptions(Iterable<Entrypoint> roots) {
+    final JSAnalysisOptions options = new JSAnalysisOptions(scope, roots);
 
     options.setUseConstantSpecificKeys(true);
 
@@ -103,8 +110,87 @@
     return options;
   }
 
+  public static class FieldBasedJavaScriptAnalysisEngine extends JavaScriptAnalysisEngine<ObjectVertex> {
+    public enum BuilderType { PESSIMISTIC, OPTIMISTIC, REFLECTIVE }
+    
+    private BuilderType builderType = BuilderType.OPTIMISTIC;
+    
+    /**
+     * @return the builderType
+     */
+    public BuilderType getBuilderType() {
+      return builderType;
+    }
+
+    /**
+     * @param builderType the builderType to set
+     */
+    public void setBuilderType(BuilderType builderType) {
+      this.builderType = builderType;
+    }
+
+    @Override
+    public JSAnalysisOptions getDefaultOptions(Iterable<Entrypoint> roots) {
+      return JSCallGraphUtil.makeOptions(scope, getClassHierarchy(), roots);
+    }
+
+
   @Override
-  protected CallGraphBuilder getCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-    return new ZeroCFABuilderFactory().make((JSAnalysisOptions) options, cache, cha, scope, false);
+  protected CallGraphBuilder<ObjectVertex> getCallGraphBuilder(final IClassHierarchy cha, AnalysisOptions options, final IAnalysisCacheView cache) {
+    Set<Entrypoint> roots = HashSetFactory.make();
+    for(Entrypoint e : options.getEntrypoints()) {
+      roots.add(e);
+    }
+    
+    if (builderType.equals(BuilderType.OPTIMISTIC)) {
+      ((JSAnalysisOptions)options).setHandleCallApply(false);
+    }
+
+    final FieldBasedCallGraphBuilder builder = 
+      builderType.equals(BuilderType.PESSIMISTIC)? 
+          new PessimisticCallGraphBuilder(getClassHierarchy(), options, makeDefaultCache(), true) 
+        : new OptimisticCallgraphBuilder(getClassHierarchy(), options, makeDefaultCache(), true);
+  
+     return new CallGraphBuilder<ObjectVertex>() {
+      private PointerAnalysis<ObjectVertex> ptr;
+      
+      @Override
+      public CallGraph makeCallGraph(AnalysisOptions options, IProgressMonitor monitor) throws IllegalArgumentException, CallGraphBuilderCancelException {
+        Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> dat;
+        try {
+          dat = builder.buildCallGraph(options.getEntrypoints(), monitor);
+        } catch (CancelException e) {
+          throw CallGraphBuilderCancelException.createCallGraphBuilderCancelException(e, null, null);
+        }
+        ptr = dat.snd;
+        return dat.fst;
+      }
+
+      @Override
+      public PointerAnalysis<ObjectVertex> getPointerAnalysis() {
+        return ptr;
+      }
+
+      @Override
+      public IAnalysisCacheView getAnalysisCache() {
+        return cache;
+      }
+
+      @Override
+      public IClassHierarchy getClassHierarchy() {
+        return cha;
+      }
+       
+     };
+  }
+  }
+  
+  public static class PropagationJavaScriptAnalysisEngine extends JavaScriptAnalysisEngine<InstanceKey> {
+  
+    @Override
+    protected CallGraphBuilder<InstanceKey> getCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
+      return new ZeroCFABuilderFactory().make((JSAnalysisOptions) options, cache, cha);
+    }
   }
+  
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/CompositeFileMapping.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/CompositeFileMapping.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/CompositeFileMapping.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/CompositeFileMapping.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,7 +16,7 @@
 import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
 
 public class CompositeFileMapping implements FileMapping {
-  private final List<FileMapping> mappings = new ArrayList<FileMapping>(2);
+  private final List<FileMapping> mappings = new ArrayList<>(2);
     
   public CompositeFileMapping(FileMapping a, FileMapping b) {
     addMapping(a);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DefaultSourceExtractor.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DefaultSourceExtractor.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DefaultSourceExtractor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DefaultSourceExtractor.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,29 +19,24 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Stack;
+import java.util.function.Supplier;
 
 import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.functions.Function;
 
 public class DefaultSourceExtractor extends DomLessSourceExtractor{
 
-  public static Function<Void,JSSourceExtractor> factory = new Function<Void,JSSourceExtractor>() {
-    @Override
-    public JSSourceExtractor apply(Void object) {
-      return new DefaultSourceExtractor();
-    }
-  };
+  public static Supplier<JSSourceExtractor> factory = DefaultSourceExtractor::new;
   
   protected static class HtmlCallBack extends DomLessSourceExtractor.HtmlCallback{
 
     private final HashMap<String, String> constructors = HashMapFactory.make();
  
-    private final Stack<String> stack = new Stack<String>();
+    private final Stack<String> stack = new Stack<>();
 
-    private final Stack<ITag> forms = new Stack<ITag>();
-    private final Set<Pair<ITag,String>> sets = new HashSet<Pair<ITag,String>>();
+    private final Stack<ITag> forms = new Stack<>();
+    private final Set<Pair<ITag,String>> sets = new HashSet<>();
 
     public HtmlCallBack(URL entrypointUrl, IUrlResolver urlResolver) {
       super(entrypointUrl, urlResolver);
@@ -61,7 +56,7 @@
         String v = e.getValue().fst;
         if (v != null && v.startsWith("javascript:")) {
           try {
-            writeEntrypoint("           " + v.substring(11), e.getValue().snd, new URL(tag.getElementPosition().getURL().toString() + "#" + a), true);
+            writeEntrypoint("           " + v.substring(11), e.getValue().snd, new URL(tag.getElementPosition().getURL().toString() + '#' + a), true);
           } catch (MalformedURLException ex) {
             writeEntrypoint(v.substring(11), e.getValue().snd, entrypointUrl, false);
           }
@@ -100,7 +95,7 @@
       domRegion.println("");
     }
 
-    private String makeRef(String object, String property) {
+    private static String makeRef(String object, String property) {
       assert object != null && property != null;
       return object + "[\"" + property + "\"]";
     }
@@ -111,12 +106,12 @@
       printlnIndented("function make_" + varName + "(parent) {", tag);
       stack.push(varName);
 
-      printlnIndented("this.temp = " + cons + ";", tag);
+      printlnIndented("this.temp = " + cons + ';', tag);
       printlnIndented("this.temp(\"" + tag.getName() + "\");", tag);
       for (Map.Entry<String, Pair<String, Position>> e : attrs.entrySet()){
         String attr = e.getKey();
         String value = e.getValue().fst;
-        writeAttribute(tag, e.getValue().snd, attr, value, "this", varName);
+        writeAttribute(tag, attr, value, "this", varName);
       }
 
       if (tag.getName().equalsIgnoreCase("FORM")) {
@@ -131,8 +126,7 @@
           //input tags do not need to be in a form
           if (!forms.isEmpty()) {
              if (type.equalsIgnoreCase("RADIO")) {
-              if (! sets.contains(Pair.make(forms.peek(), prop))) {
-                sets.add(Pair.make(forms.peek(), prop));
+              if (sets.add(Pair.make(forms.peek(), prop))) {
                 printlnIndented("  " + makeRef("currentForm", prop) + " = new Array();", tag);
                 printlnIndented("  " + makeRef("currentForm", prop + "Counter") + " = 0;", tag);
               }
@@ -143,29 +137,29 @@
           }
         }
         
-        inputElementCallback(tag);
+        inputElementCallback();
       }
 
-      assert varName != null && !"".equals(varName);
+      assert varName != null && !varName.isEmpty();
       printlnIndented(varName + " = this;", tag);
       printlnIndented("document." + varName + " = this;", tag);
       printlnIndented("parent.appendChild(this);", tag);
     }
 
-    protected void inputElementCallback(ITag tag) {
+    protected void inputElementCallback() {
       // this space intentionally left blank 
     }
 
-    protected void writeAttribute(ITag tag, Position pos, String attr, String value, String varName, String varName2) {
+    protected void writeAttribute(ITag tag, String attr, String value, String varName, String varName2) {
       writePortletAttribute(tag, attr, value, varName);
-      writeEventAttribute(tag, pos, attr, value, varName, varName2);
+      writeEventAttribute(tag, attr, value, varName, varName2);
     }
 
-    protected void writeEventAttribute(ITag tag, Position pos, String attr, String value, String varName, String varName2){
+    protected void writeEventAttribute(ITag tag, String attr, String value, String varName, String varName2){
       //There should probably be more checking to see what the attributes are since we allow things like: ; to be used as attributes now.
       if(attr.length() >= 2 && attr.substring(0,2).equals("on")) {
-        printlnIndented(varName + "." + attr + " = function " + tag.getName().toLowerCase() + "_" + attr + "(event) {" + value + "};", tag);
-        writeEntrypoint(varName2 + "." + attr + "(null);", tag.getElementPosition(), entrypointUrl, false);
+        printlnIndented(varName + '.' + attr + " = function " + tag.getName().toLowerCase() + '_' + attr + "(event) {" + value + "};", tag);
+        writeEntrypoint(varName2 + '.' + attr + "(null);", tag.getElementPosition(), entrypointUrl, false);
       } else if (value != null) {
         
         Pair<String, Character> x = quotify(value);
@@ -176,7 +170,7 @@
           attr = attr.toLowerCase();
         }
         
-        printlnIndented(varName + "['" + attr + "'] = " + quote + value + quote + ";", tag);
+        printlnIndented(varName + "['" + attr + "'] = " + quote + value + quote + ';', tag);
       }
     }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DomLessSourceExtractor.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DomLessSourceExtractor.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DomLessSourceExtractor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/DomLessSourceExtractor.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.regex.Pattern;
 
 import org.apache.commons.io.ByteOrderMark;
@@ -32,7 +33,6 @@
 import com.ibm.wala.cast.js.html.jericho.JerichoHtmlParser;
 import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
 import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.functions.Function;
 
 /**
  * extracts JavaScript source code from HTML, with no model of the actual
@@ -42,12 +42,7 @@
   private static final Pattern LEGAL_JS_IDENTIFIER_REGEXP = Pattern.compile("^[a-zA-Z$_][a-zA-Z\\d$_]*$");
   private static final Pattern LEGAL_JS_KEYWORD_REGEXP = Pattern.compile("^((break)|(case)|(catch)|(continue)|(debugger)|(default)|(delete)|(do)|(else)|(finally)|(for)|(function)|(if)|(in)|(instanceof)|(new)|(return)|(switch)|(this)|(throw)|(try)|(typeof)|(var)|(void)|(while)|(with))$");
 
-  public static Function<Void,JSSourceExtractor> factory = new Function<Void,JSSourceExtractor>() {
-    @Override
-    public JSSourceExtractor apply(Void object) {
-      return new DomLessSourceExtractor();
-    }
-  };
+  public static Supplier<JSSourceExtractor> factory = DomLessSourceExtractor::new;
 
   protected interface IGeneratorCallback extends IHtmlCallback {
     void writeToFinalRegion(SourceRegion finalRegion);
@@ -88,11 +83,7 @@
       writeEntrypoint("window.onload();");
     }
 
-    protected Position makePos(int lineNumber, ITag governingTag) {
-      return makePos(entrypointUrl, lineNumber, governingTag);
-    }
-     
-    protected Position makePos(final URL url, final int lineNumber, ITag governingTag) {
+    protected Position makePos(ITag governingTag) {
       return governingTag.getElementPosition();
      }
     
@@ -140,7 +131,7 @@
       handleDOM(tag);
     }
 
-    private boolean isUsableIdentifier(String x) {
+    private static boolean isUsableIdentifier(String x) {
       return x != null &&
           LEGAL_JS_IDENTIFIER_REGEXP.matcher(x).matches() &&
           !LEGAL_JS_KEYWORD_REGEXP.matcher(x).matches();
@@ -186,12 +177,12 @@
       String attName = a.getKey();
       String attValue = a.getValue().fst;
       if (attName.toLowerCase().startsWith("on") || (attValue != null && attValue.toLowerCase().startsWith("javascript:"))) {
-        String fName = tag.getName().toLowerCase() + "_" + attName + "_" + funcName;
+        String fName = tag.getName().toLowerCase() + '_' + attName + '_' + funcName;
         String signatureLine = "function " + fName + "(event) {";
         // Defines the function  
-        domRegion.println(signatureLine + "\n" + extructJS(attValue) + "\n}", pos, url, true);
+        domRegion.println(signatureLine + '\n' + extructJS(attValue) + "\n}", pos, url, true);
         // Run it
-        writeEntrypoint("\t" + fName + "(null);", pos, url, true);
+        writeEntrypoint('\t' + fName + "(null);", pos, url, true);
       }
     }
 
@@ -203,7 +194,7 @@
       char quote;
       if (value.indexOf('"') < 0) {
         quote= '"';
-      } else if (value.indexOf("'") < 0) {
+      } else if (value.indexOf('\'') < 0) {
         quote= '"';
       } else {
         quote= '"';
@@ -217,7 +208,7 @@
       return Pair.make(value, quote);
     }
     
-    private String extructJS(String attValue) {
+    private static String extructJS(String attValue) {
       if (attValue == null){
         return "";
       }
@@ -251,16 +242,15 @@
 
     private void getScriptFromUrl(String urlAsString, ITag scriptTag) throws IOException, MalformedURLException {
       URL scriptSrc = new URL(entrypointUrl, urlAsString);
-      Reader scriptInputStream;
+      BOMInputStream bs;
       try {
-        BOMInputStream bs = new BOMInputStream(scriptSrc.openConnection().getInputStream(), false, 
+        bs = new BOMInputStream(scriptSrc.openConnection().getInputStream(), false,
             ByteOrderMark.UTF_8, 
             ByteOrderMark.UTF_16LE, ByteOrderMark.UTF_16BE,
             ByteOrderMark.UTF_32LE, ByteOrderMark.UTF_32BE);
         if (bs.hasBOM()) {
           System.err.println("removing BOM " + bs.getBOM());
         }
-        scriptInputStream = new InputStreamReader(bs);
       } catch (Exception e) {
         //it looks like this happens when we can't resolve the url?
         if (DEBUG) {
@@ -270,26 +260,21 @@
         }
         return;
       }
-      
-      BufferedReader scriptReader = null;
-      try {
+      try (
+        final Reader scriptInputStream = new InputStreamReader(bs);
+        final BufferedReader scriptReader = new BufferedReader(scriptInputStream);
+        ) {
         String line;
-        scriptReader = new BufferedReader(scriptInputStream);
-        StringBuffer x = new StringBuffer();
+        StringBuilder x = new StringBuilder();
         while ((line = scriptReader.readLine()) != null) {
-          x.append(line).append("\n");
+          x.append(line).append('\n');
         }
 
         scriptRegion.println(x.toString(), scriptTag.getElementPosition(), scriptSrc, false);
-
-      } finally {
-        if (scriptReader != null) {
-          scriptReader.close();
-        }
       }
     }
 
-    protected String getScriptName(URL url) throws MalformedURLException {
+    protected String getScriptName(URL url) {
       String file = url.getFile();
       int lastIdxOfSlash = file.lastIndexOf('/');
       file = (lastIdxOfSlash == (-1)) ? file : file.substring(lastIdxOfSlash + 1);
@@ -329,9 +314,11 @@
   public Set<MappedSourceModule> extractSources(URL entrypointUrl, IHtmlParser htmlParser, IUrlResolver urlResolver)
   throws IOException, Error {
 
-    Reader inputStreamReader = WebUtil.getStream(entrypointUrl);
-    IGeneratorCallback htmlCallback = createHtmlCallback(entrypointUrl, urlResolver); 
-    htmlParser.parse(entrypointUrl, inputStreamReader, htmlCallback, entrypointUrl.getFile());
+    IGeneratorCallback htmlCallback;
+    try (Reader inputStreamReader = WebUtil.getStream(entrypointUrl)) {
+      htmlCallback = createHtmlCallback(entrypointUrl, urlResolver);
+      htmlParser.parse(entrypointUrl, inputStreamReader, htmlCallback, entrypointUrl.getFile());
+    }
 
     SourceRegion finalRegion = new SourceRegion();
     htmlCallback.writeToFinalRegion(finalRegion);
@@ -339,7 +326,10 @@
     // writing the final region into one SourceFileModule.
     File outputFile = createOutputFile(entrypointUrl, DELETE_UPON_EXIT, USE_TEMP_NAME);
     tempFile = outputFile;
-    FileMapping fileMapping = finalRegion.writeToFile(new PrintWriter(new FileWriter(outputFile)));
+    FileMapping fileMapping;
+    try (final PrintWriter printer = new PrintWriter(new FileWriter(outputFile))) {
+      fileMapping = finalRegion.writeToFile(printer);
+    }
     if (fileMapping == null) {
       fileMapping = new EmptyFileMapping();
     }
@@ -351,7 +341,7 @@
     return new HtmlCallback(entrypointUrl, urlResolver);
   }
 
-  private File createOutputFile(URL url, boolean delete, boolean useTempName) throws IOException {
+  private static File createOutputFile(URL url, boolean delete, boolean useTempName) throws IOException {
     File outputFile;
     String fileName = new File(url.getFile()).getName();
     if (fileName.length() < 5) {
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/FileMapping.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/FileMapping.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/FileMapping.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/FileMapping.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,9 +15,8 @@
 public interface FileMapping {
 
   /**
-   * @param line
    * @return Null if no mapping for the given line.
    */
   public abstract IncludedPosition getIncludedPosition(Position line);
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IHtmlParserFactory.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IHtmlParserFactory.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IHtmlParserFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IHtmlParserFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 
 package com.ibm.wala.cast.js.html;
 
+@FunctionalInterface
 public interface IHtmlParserFactory {
 
   IHtmlParser getParser();
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IHtmlParser.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IHtmlParser.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IHtmlParser.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IHtmlParser.java	2019-01-29 17:08:39.000000000 +0000
@@ -24,10 +24,6 @@
 
     /**
      * Parses a given HTML, calling the given callback.
-     * @param reader
-     * @param callback
-     * @param fileName
-     * @throws Error 
      */
     public void parse(URL url, Reader reader, IHtmlCallback callback, String fileName) throws Error;
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IncludedPosition.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IncludedPosition.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IncludedPosition.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IncludedPosition.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,7 +21,7 @@
   /**
    * get the position of the containing script within the enclosing file. E.g.,
    * for a position in JavaScript code included in an HTML file, returns the
-   * position of the relevant <code>&lt;script&gt;</code> tag in the HTML
+   * position of the relevant {@code <script>} tag in the HTML
    */
   Position getIncludePosition();
   
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/ITag.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/ITag.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/ITag.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/ITag.java	2019-01-29 17:08:39.000000000 +0000
@@ -28,7 +28,6 @@
 
 	/**
 	 * Retrieves a specific attribute 
-	 * @param name
 	 * @return null if there is no such attribute
 	 */
 	public Pair<String, Position> getAttributeByName(String name);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IUrlResolver.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IUrlResolver.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IUrlResolver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/IUrlResolver.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,15 +21,11 @@
 public interface IUrlResolver {
   /**
    * From Internet to local
-   * @param input
-   * @return
    */
   public URL resolve(URL input);
   
   /**
    * From local to Internet
-   * @param input
-   * @return
    */
   public URL deResolve(URL input);
   
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoHtmlParser.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoHtmlParser.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoHtmlParser.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoHtmlParser.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,22 +13,21 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.net.URL;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import net.htmlparser.jericho.Config;
-import net.htmlparser.jericho.Element;
-import net.htmlparser.jericho.Logger;
-import net.htmlparser.jericho.LoggerProvider;
-import net.htmlparser.jericho.Source;
-
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
 import com.ibm.wala.cast.js.html.IHtmlCallback;
 import com.ibm.wala.cast.js.html.IHtmlParser;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.warnings.Warning;
 
+import net.htmlparser.jericho.Config;
+import net.htmlparser.jericho.Element;
+import net.htmlparser.jericho.Logger;
+import net.htmlparser.jericho.LoggerProvider;
+import net.htmlparser.jericho.Source;
+
 
 /**
  * @author danielk
@@ -110,8 +109,7 @@
 			src = new Source(reader);
 			src.setLogger(Config.LoggerProvider.getLogger(fileName));
 			List<Element> childElements = src.getChildElements();
-			for (Iterator<Element> nodeIterator = childElements.iterator(); nodeIterator.hasNext();) {
-				Element e = nodeIterator.next();
+			for (Element e : childElements) {
 				parser.parse(e);
 			}
 			if (! warnings.isEmpty()) {
@@ -139,8 +137,7 @@
 			handler.handleStartTag(tag);
 			handler.handleText(tag.getElementPosition(), tag.getBodyText().snd);
 			List<Element> childElements = root.getChildElements();
-			for (Iterator<Element> nodeIterator = childElements.iterator(); nodeIterator.hasNext();) {
-				Element child = nodeIterator.next();
+			for (Element child : childElements) {
 				parse(child);
 			}
 			handler.handleEndTag(tag);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoTag.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoTag.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoTag.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/jericho/JerichoTag.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,16 +17,16 @@
 import java.net.URL;
 import java.util.Map;
 
-import net.htmlparser.jericho.Attribute;
-import net.htmlparser.jericho.Element;
-import net.htmlparser.jericho.Segment;
-
 import com.ibm.wala.cast.js.html.ITag;
 import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
 import com.ibm.wala.cast.tree.impl.AbstractSourcePosition;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.Pair;
 
+import net.htmlparser.jericho.Attribute;
+import net.htmlparser.jericho.Element;
+import net.htmlparser.jericho.Segment;
+
 /**
  * ITag impel for Jericho generated tags
  * @author danielk 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/JSSourceExtractor.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/JSSourceExtractor.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/JSSourceExtractor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/JSSourceExtractor.java	2019-01-29 17:08:39.000000000 +0000
@@ -35,7 +35,7 @@
   /**
    * Returns the temporary file created by a call to
    * {@link #extractSources(URL, IHtmlParser, IUrlResolver)} which holds all the
-   * discovered JS source. If no such file exists, returns <code>null</code>
+   * discovered JS source. If no such file exists, returns {@code null}
    */
   public abstract File getTempFile();
   
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/NestedRangeMapping.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/NestedRangeMapping.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/NestedRangeMapping.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/NestedRangeMapping.java	2019-01-29 17:08:39.000000000 +0000
@@ -80,6 +80,6 @@
 
   @Override
   public String toString() {
-    return range + "(" + innerMapping + ")";
+    return range + "(" + innerMapping + ')';
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/RangeFileMapping.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/RangeFileMapping.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/RangeFileMapping.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/RangeFileMapping.java	2019-01-29 17:08:39.000000000 +0000
@@ -60,7 +60,7 @@
      
     @Override
     public String toString() {
-      return "{"+rangeStart+"->"+rangeEnd+"}";
+      return "{"+rangeStart+"->"+rangeEnd+ '}';
     }
   }
 
@@ -123,9 +123,9 @@
         }
         @Override
         public String toString() {
-          return "[include:"+includePosition+"]"+super.toString();
+          return "[include:"+includePosition+ ']' +super.toString();
         }
-      };
+      }
       
       return new Pos();
     } else {
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/SourceRegion.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/SourceRegion.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/SourceRegion.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/SourceRegion.java	2019-01-29 17:08:39.000000000 +0000
@@ -66,7 +66,7 @@
   }
 
   public void println(String text, Position originalPos, URL url, boolean bogusURL){
-    print(text + "\n", originalPos, url, bogusURL);
+    print(text + '\n', originalPos, url, bogusURL);
   }
   
   public void print(String text){
@@ -74,7 +74,7 @@
   }
 
   public void println(String text){
-    print(text + "\n");
+    print(text + '\n');
   }
   
   public FileMapping writeToFile(PrintWriter ps){
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/UrlManipulator.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/UrlManipulator.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/UrlManipulator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/UrlManipulator.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,8 +19,6 @@
   /**
    * @param urlFound the link as appear
    * @param context the URL in which the link appeared
-   * @return
-   * @throws MalformedURLException
    */
   public static URL relativeToAbsoluteUrl(String urlFound, URL context) throws MalformedURLException {
     urlFound = urlFound.replace("\\", "/").toLowerCase();
@@ -32,7 +30,7 @@
         String origHostAndPath = urlFound.substring(2);// removing "//"
         String host;
         String path;
-        int indexOf = origHostAndPath.indexOf("/");
+        int indexOf = origHostAndPath.indexOf('/');
         if (indexOf > 0) {
           host = origHostAndPath.substring(0, indexOf);
           path = origHostAndPath.substring(indexOf);
@@ -60,9 +58,9 @@
 
         for (int i = 0; i < split.length - rightTrimFromPath; i++) {
           contextPath.append(split[i]);
-          contextPath.append("/");
+          contextPath.append('/');
         }
-        absoluteUrl = new URL(context.getProtocol(), context.getHost(), contextPath.toString() + urlFound);
+        absoluteUrl = new URL(context.getProtocol(), context.getHost(), contextPath + urlFound);
       }
     } else{
       absoluteUrl = new URL(urlFound);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/WebPageLoaderFactory.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/WebPageLoaderFactory.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/WebPageLoaderFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/WebPageLoaderFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,7 +34,7 @@
     super(factory);
   }
   
-  public WebPageLoaderFactory(JavaScriptTranslatorFactory factory, CAstRewriterFactory preprocessor) {
+  public WebPageLoaderFactory(JavaScriptTranslatorFactory factory, CAstRewriterFactory<?, ?> preprocessor) {
    super(factory, preprocessor); 
   }
 
@@ -69,7 +69,7 @@
                       translateConditionOpcode(CAstOperator.OP_NE), 
                       null, 
                       isDefined, 
-                      context.currentScope().getConstantValue(new Integer(0)),
+                      context.currentScope().getConstantValue(Integer.valueOf(0)),
                       -1));
               PreBasicBlock srcB = context.cfg().getCurrentBlock();       
               
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/WebUtil.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/WebUtil.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/WebUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/html/WebUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,22 +18,18 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Set;
+import java.util.function.Supplier;
 
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst.Error;
 import com.ibm.wala.cast.js.html.jericho.JerichoHtmlParser;
 import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.functions.Function;
 
 public class WebUtil { 
 
   public static final String preamble = "preamble.js";
 
-  private static IHtmlParserFactory factory = new IHtmlParserFactory() {
-    @Override
-    public IHtmlParser getParser() {
-      return new JerichoHtmlParser();
-    }
-  };
+  private static IHtmlParserFactory factory = () -> { return new JerichoHtmlParser(); };
+  
   
   public static void setFactory(IHtmlParserFactory factory) {
     WebUtil.factory = factory;
@@ -41,15 +37,13 @@
 
   /**
    * 
-   * @param url
    * @return a pair (S,F), where S is a set of extracted sources, and F is the
-   *         temp file holding the combined sources (or <code>null</code> if no
+   *         temp file holding the combined sources (or {@code null} if no
    *         such file exists)
-   * @throws Error
    */
-  public static Pair<Set<MappedSourceModule>,File> extractScriptFromHTML(URL url, Function<Void,JSSourceExtractor> fSourceExtractor) throws Error {
+  public static Pair<Set<MappedSourceModule>,File> extractScriptFromHTML(URL url, Supplier<JSSourceExtractor> fSourceExtractor) throws Error {
     try {
-      JSSourceExtractor extractor = fSourceExtractor.apply(null);
+      JSSourceExtractor extractor = fSourceExtractor.get();
       Set<MappedSourceModule> sources = extractor.extractSources(url, factory.getParser(), new IdentityUrlResolver());
       return Pair.make(sources, extractor.getTempFile());
     } catch (IOException e) {
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/ArgumentSpecialization.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/ArgumentSpecialization.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/ArgumentSpecialization.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/ArgumentSpecialization.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,6 +27,7 @@
 import com.ibm.wala.cast.tree.CAstNode;
 import com.ibm.wala.cast.tree.impl.CAstImpl;
 import com.ibm.wala.cast.tree.rewrite.CAstBasicRewriter;
+import com.ibm.wala.cast.tree.rewrite.CAstBasicRewriter.NonCopyingContext;
 import com.ibm.wala.cast.util.CAstPattern;
 import com.ibm.wala.cast.util.CAstPattern.Segments;
 import com.ibm.wala.cfg.AbstractCFG;
@@ -34,7 +35,6 @@
 import com.ibm.wala.cfg.IBasicBlock;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
@@ -42,10 +42,12 @@
 import com.ibm.wala.ipa.callgraph.ContextItem.Value;
 import com.ibm.wala.ipa.callgraph.ContextKey;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
+import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAOptions;
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.types.TypeReference;
@@ -57,14 +59,14 @@
 
   public static class ArgumentSpecializationContextIntepreter extends AstContextInsensitiveSSAContextInterpreter {
 
-    public ArgumentSpecializationContextIntepreter(AnalysisOptions options, AnalysisCache cache) {
+    public ArgumentSpecializationContextIntepreter(AnalysisOptions options, IAnalysisCacheView cache) {
       super(options, cache);
     }
 
     @Override
     public IR getIR(CGNode node) {
       if (node.getMethod() instanceof Retranslatable) {
-        return getAnalysisCache().getSSACache().findOrCreateIR(node.getMethod(), node.getContext(), options.getSSAOptions());
+        return getAnalysisCache().getIR(node.getMethod(), node.getContext());
       } else {
         return super.getIR(node);
       }
@@ -73,7 +75,7 @@
     @Override
     public DefUse getDU(CGNode node) {
       if (node.getMethod() instanceof Retranslatable) {
-        return getAnalysisCache().getSSACache().findOrCreateDU(node.getMethod(), node.getContext(), options.getSSAOptions());
+        return getAnalysisCache().getDefUse(getIR(node));
       } else {
         return super.getDU(node);
       }
@@ -116,7 +118,7 @@
 
     @Override
     public String toString() {
-      return base.toString() + "(nargs:" + argumentCount + ")";
+      return base.toString() + "(nargs:" + argumentCount + ')';
     }
   }
 
@@ -134,9 +136,9 @@
         int v = -1;
         for (SSAAbstractInvokeInstruction x : caller.getIR().getCalls(site)) {
           if (v == -1) {
-            v = x.getNumberOfParameters();
+            v = x.getNumberOfPositionalParameters();
           } else {
-            if (v != x.getNumberOfParameters()) {
+            if (v != x.getNumberOfPositionalParameters()) {
               return baseContext; 
             }
           }
@@ -155,7 +157,7 @@
 
   }
 
-  public static class ArgumentCountIRFactory extends AstIRFactory.AstDefaultIRFactory {
+  public static class ArgumentCountIRFactory extends AstIRFactory.AstDefaultIRFactory<IMethod> {
     private static final CAstPattern directAccessPattern = CAstPattern.parse("|(ARRAY_REF(VAR(\"arguments\"),<value>*)||OBJECT_REF(VAR(\"arguments\"),<value>*))|");
 
     private static final CAstPattern destructuredAccessPattern = CAstPattern.parse("BLOCK_EXPR(ASSIGN(VAR(/[$][$]destructure[$]rcvr[0-9]+/),VAR(\"arguments\")),ASSIGN(VAR(<name>/[$][$]destructure[$]elt[0-9]+/),<value>*))");
@@ -182,12 +184,12 @@
         if (v != null) {
           final JavaScriptLoader myloader = (JavaScriptLoader) method.getDeclaringClass().getClassLoader();
                     
-          class FixedArgumentsRewriter extends CAstBasicRewriter {
+          class FixedArgumentsRewriter extends CAstBasicRewriter<NonCopyingContext> {
             private final CAstEntity e;
             private final Map<String, CAstNode> argRefs = HashMapFactory.make();
  
             public FixedArgumentsRewriter(CAst Ast) {
-              super(Ast, false);
+              super(Ast, new NonCopyingContext(), false);
               this.e = m.getEntity();
               for(Segments s : CAstPattern.findAll(destructuredAccessPattern, m.getEntity())) {
                 argRefs.put(s.getSingle("name").getValue().toString(), s.getSingle("value"));
@@ -226,7 +228,7 @@
 
               } else if ((s = CAstPattern.match(destructuredCallPattern, root)) != null) {
                 if (argRefs.containsKey(s.getSingle("name").getValue().toString())) {
-                 List<CAstNode> x = new ArrayList<CAstNode>();
+                 List<CAstNode> x = new ArrayList<>();
                  CAstNode ref = handleArgumentRef(argRefs.get(s.getSingle("name").getValue().toString()));
                  if (ref != null) {
                    x.add(ref);
@@ -235,7 +237,7 @@
                    for (CAstNode c : s.getMultiple("args")) {
                      x.add(copyNodes(c, cfg, context, nodeMap));
                    }
-                   result = Ast.makeNode(CAstNode.CALL, x.toArray(new CAstNode[ x.size() ]));
+                   result = Ast.makeNode(CAstNode.CALL, x.toArray(new CAstNode[0]));
                  }
                 }
                
@@ -302,15 +304,15 @@
             @Override
             protected String composeEntityName(WalkContext parent, CAstEntity f) {
               if (f == codeBodyEntity) {
-                return super.composeEntityName(parent, f) + "_" + v.getValue().intValue();                
+                return super.composeEntityName(parent, f) + '_' + v.getValue().intValue();
               } else {
                 return super.composeEntityName(parent, f);
               }
             }
 
             @Override
-            protected void defineFunction(CAstEntity N, WalkContext definingContext, AbstractCFG cfg, SymbolTable symtab,
-                boolean hasCatchBlock, Map<IBasicBlock,TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation LI,
+            protected void defineFunction(CAstEntity N, WalkContext definingContext, AbstractCFG<SSAInstruction, ? extends IBasicBlock<SSAInstruction>> cfg, SymbolTable symtab,
+                boolean hasCatchBlock, Map<IBasicBlock<SSAInstruction>,TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation LI,
                 DebuggingInformation debugInfo) {
               if (N == codeBodyEntity) {
                 specializedCode = myloader.makeCodeBodyCode(cfg, symtab, hasCatchBlock, caughtTypes, hasMonitorOp, LI, debugInfo, method.getDeclaringClass());
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationFinder.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,6 @@
 package com.ibm.wala.cast.js.ipa.callgraph.correlations;
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -36,7 +35,6 @@
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
 import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
 import com.ibm.wala.cast.js.translator.JavaScriptTranslatorFactory;
-import com.ibm.wala.cast.js.util.Util;
 import com.ibm.wala.cast.loader.AstMethod;
 import com.ibm.wala.cast.loader.AstMethod.LexicalInformation;
 import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
@@ -45,8 +43,8 @@
 import com.ibm.wala.classLoader.SourceModule;
 import com.ibm.wala.classLoader.SourceURLModule;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeBT.IBinaryOpInstruction;
 import com.ibm.wala.shrikeBT.IBinaryOpInstruction.IOperator;
@@ -86,14 +84,15 @@
     this.translatorFactory = translatorFactory;
   }
 
+  @SuppressWarnings("unused")
   public static CorrelationSummary findCorrelatedAccesses(IMethod method, IR ir) {
     AstMethod astMethod = (AstMethod)method;
     DefUse du = new DefUse(ir);
-    OrdinalSetMapping<SSAInstruction> instrIndices = new ObjectArrayMapping<SSAInstruction>(ir.getInstructions());
+    OrdinalSetMapping<SSAInstruction> instrIndices = new ObjectArrayMapping<>(ir.getInstructions());
     CorrelationSummary summary = new CorrelationSummary(method, instrIndices);
 
     // collect all dynamic property writes in the method
-    LinkedList<AbstractReflectivePut> puts = new LinkedList<AbstractReflectivePut>();
+    LinkedList<AbstractReflectivePut> puts = new LinkedList<>();
     for(SSAInstruction inst : Iterator2Iterable.make(ir.iterateNormalInstructions()))
       if(inst instanceof AbstractReflectivePut)
         puts.addFirst((AbstractReflectivePut)inst);
@@ -133,7 +132,7 @@
         MutableIntSet reached = new BitVectorIntSet();
         reached.add(get.getDef());
         // saturate reached by following def-use chains through phi instructions and across function calls
-        LinkedList<Integer> worklist = new LinkedList<Integer>();
+        LinkedList<Integer> worklist = new LinkedList<>();
         MutableIntSet done = new BitVectorIntSet();
         worklist.add(get.getDef());
         while(!worklist.isEmpty()) {
@@ -192,7 +191,7 @@
   }
   
   private static Set<String> getSourceLevelNames(IR ir, int index, IntSet vs) {
-    Set<String> res = new HashSet<String>();
+    Set<String> res = new HashSet<>();
     for(IntIterator iter=vs.intIterator();iter.hasNext();) {
       String name = getSourceLevelName(ir, index, iter.next());
       if(name != null)
@@ -203,7 +202,7 @@
 
   // checks whether the given SSA variable must always be assigned a numeric value
   private static boolean mustBeNumeric(IR ir, DefUse du, int v) {
-    LinkedList<Integer> worklist = new LinkedList<Integer>();
+    LinkedList<Integer> worklist = new LinkedList<>();
     MutableIntSet done = new BitVectorIntSet();
     worklist.add(v);
     while(!worklist.isEmpty()) {
@@ -239,12 +238,12 @@
   }
 
   @SuppressWarnings("unused")
-  private void printCorrelatedAccesses(URL url) throws IOException, ClassHierarchyException {
+  private void printCorrelatedAccesses(URL url) throws ClassHierarchyException {
     printCorrelatedAccesses(findCorrelatedAccesses(url));
   }
 
-  private void printCorrelatedAccesses(Map<IMethod, CorrelationSummary> summaries) {
-    List<Pair<Position, String>> correlations = new ArrayList<Pair<Position,String>>();
+  private static void printCorrelatedAccesses(Map<IMethod, CorrelationSummary> summaries) {
+    List<Pair<Position, String>> correlations = new ArrayList<>();
     for(CorrelationSummary summary : summaries.values())
       correlations.addAll(summary.pp());
 
@@ -260,7 +259,7 @@
       System.out.println((i++) + " -- " + p.fst + ": " + p.snd);
   }
 
-  public Map<IMethod, CorrelationSummary> findCorrelatedAccesses(URL url) throws IOException, ClassHierarchyException {
+  public Map<IMethod, CorrelationSummary> findCorrelatedAccesses(URL url) throws ClassHierarchyException {
     Set<? extends SourceModule> scripts = null;
     if(url.getPath().endsWith(".js")) {
       scripts = Collections.singleton(new SourceURLModule(url));
@@ -277,19 +276,17 @@
     return summaries;
   }
 
-  public Map<IMethod, CorrelationSummary> findCorrelatedAccesses(Collection<? extends SourceModule> scripts) throws IOException,
-      ClassHierarchyException {
-    return findCorrelatedAccesses(scripts.toArray(new SourceModule[scripts.size()]));
+  public Map<IMethod, CorrelationSummary> findCorrelatedAccesses(Collection<? extends SourceModule> scripts) throws ClassHierarchyException {
+    return findCorrelatedAccesses(scripts.toArray(new SourceModule[0]));
   }
 
-  public Map<IMethod, CorrelationSummary> findCorrelatedAccesses(SourceModule[] scripts_array) throws IOException,
-      ClassHierarchyException {
+  public Map<IMethod, CorrelationSummary> findCorrelatedAccesses(SourceModule[] scripts_array) throws ClassHierarchyException {
     JSCallGraphUtil.setTranslatorFactory(translatorFactory);
     JavaScriptLoaderFactory loaders = JSCallGraphUtil.makeLoaders(null);
     CAstAnalysisScope scope = new CAstAnalysisScope(scripts_array, loaders, Collections.singleton(JavaScriptLoader.JS));
-    IClassHierarchy cha = ClassHierarchy.make(scope, loaders, JavaScriptLoader.JS);
+    IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, JavaScriptLoader.JS);
     try {
-      Util.checkForFrontEndErrors(cha);
+      com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha);
     } catch (WalaException e) {
       return Collections.emptyMap();
     }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/Correlation.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/Correlation.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/Correlation.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/Correlation.java	2019-01-29 17:08:39.000000000 +0000
@@ -32,7 +32,7 @@
   
   protected Correlation(String indexName, Set<String> flownThroughLocals) {
     this.indexName = indexName;
-    this.flownThroughLocals = new HashSet<String>(flownThroughLocals);
+    this.flownThroughLocals = new HashSet<>(flownThroughLocals);
   }
   
   public String getIndexName() {
@@ -47,4 +47,4 @@
 	public abstract Position getEndPosition(SSASourcePositionMap positions);
 	public abstract String pp(SSASourcePositionMap positions);
 	public abstract <T> T accept(CorrelationVisitor<T> visitor);
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationSummary.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationSummary.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationSummary.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationSummary.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,7 +42,7 @@
   }
 
   public List<Pair<Position, String>> pp() {
-    List<Pair<Position, String>> res = new ArrayList<Pair<Position, String>>();
+    List<Pair<Position, String>> res = new ArrayList<>();
     for(Correlation correlation : correlations) {
       res.add(Pair.make(correlation.getStartPosition(positions), correlation.pp(positions)));
     }
@@ -60,4 +60,4 @@
   public SSASourcePositionMap getPositions() {
     return positions;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationVisitor.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationVisitor.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationVisitor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/CorrelationVisitor.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,8 +15,6 @@
  * Visitor class for performing case analysis on {@link Correlation}s.
  * 
  * @author mschaefer
- *
- * @param <T>
  */
 public interface CorrelationVisitor<T> {
   public T visitReadWriteCorrelation(ReadWriteCorrelation rwc);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/EscapeCorrelation.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/EscapeCorrelation.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/EscapeCorrelation.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/EscapeCorrelation.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,9 +19,9 @@
 
 /**
  * An escape correlation conservatively captures inter-procedural correlated pairs: for a dynamic property
- * read <i>r</i> of the form <code>e[p]</code>, if both the result of <i>r</i> and the value of <code>p</code>
+ * read <i>r</i> of the form {@code e[p]}, if both the result of <i>r</i> and the value of {@code p}
  * flow into a function call <i>c</i>, we consider <i>r</i> and <i>c</i> to be a correlated pair to account
- * for the fact that the function called by <i>c</i> may perform a write of property <code>p</code>. 
+ * for the fact that the function called by <i>c</i> may perform a write of property {@code p}.
  * 
  * @author mschaefer
  *
@@ -48,16 +48,16 @@
 	}
 	
 	public int getNumberOfArguments() {
-	  return invoke.getNumberOfParameters() - 2; // deduct one for the function object, one for the receiver
+	  return invoke.getNumberOfPositionalParameters() - 2; // deduct one for the function object, one for the receiver
 	}
 	
 	@Override
 	public String pp(SSASourcePositionMap positions) {
-		return get + "@" + positions.getPosition(get) + " [" + getIndexName() + "] ->? " + invoke + "@" + positions.getPosition(invoke);
+		return get + "@" + positions.getPosition(get) + " [" + getIndexName() + "] ->? " + invoke + '@' + positions.getPosition(invoke);
 	}
 	
 	@Override
 	public <T> T accept(CorrelationVisitor<T> visitor) {
 	  return visitor.visitEscapeCorrelation(this);
 	}
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/CAstRewriterExt.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/CAstRewriterExt.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/CAstRewriterExt.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/CAstRewriterExt.java	2019-01-29 17:08:39.000000000 +0000
@@ -24,8 +24,8 @@
 import com.ibm.wala.cast.tree.CAstNode;
 import com.ibm.wala.cast.tree.CAstSourcePositionMap;
 import com.ibm.wala.cast.tree.impl.CAstControlFlowRecorder;
-import com.ibm.wala.cast.tree.rewrite.CAstRewriter;
 import com.ibm.wala.cast.tree.rewrite.CAstBasicRewriter.NoKey;
+import com.ibm.wala.cast.tree.rewrite.CAstRewriter;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Pair;
@@ -102,7 +102,7 @@
 		}
 	}
 	private final HashSet<Entity> entities_to_add = HashSetFactory.make();
-	private final Stack<CAstEntity> entities = new Stack<CAstEntity>();
+	private final Stack<CAstEntity> entities = new Stack<>();
 	
 	public CAstNode addNode(CAstNode node, CAstControlFlowMap flow) {
 	  Set<CAstNode> nodes = extra_nodes.get(flow);
@@ -229,17 +229,17 @@
 			enterEntity(root);
 			CAstEntity entity = super.rewrite(root);
 			rewrite_cache.put(root, entity);
-			leaveEntity(root);
+			leaveEntity();
 			entities.pop();
 			return entity;
 		}
 	}
 	
-	protected void enterEntity(CAstEntity entity) {}
-	protected void leaveEntity(CAstEntity entity) {}
+	protected void enterEntity(@SuppressWarnings("unused") CAstEntity entity) {}
+	protected void leaveEntity() {}
 
 	public CAstRewriterExt(CAst Ast, boolean recursive,	NodePos rootContext) {
 		super(Ast, recursive, rootContext);
 	}
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ClosureExtractor.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ClosureExtractor.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ClosureExtractor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ClosureExtractor.java	2019-01-29 17:08:39.000000000 +0000
@@ -31,6 +31,7 @@
 import static com.ibm.wala.cast.tree.CAstNode.VAR;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -83,11 +84,11 @@
  * 
  * <p>There are four issues to be considered here.</p>
  * <ul>
- * <li><b>References to <code>this</code></b>: 
- *   <p>If the code to extract contains references to <code>this</code>, these references have to be 
+ * <li><b>References to {@code this}</b>:
+ *   <p>If the code to extract contains references to {@code this}, these references have to be
  *   rewritten; otherwise they would refer to the global object in the transformed code.</p>
- *   <p>We do this by giving the extracted function an extra parameter <code>thi$</code>, and rewriting
- *   <code>this</code> to <code>thi$</code> within the extracted code.</p>
+ *   <p>We do this by giving the extracted function an extra parameter {@code thi$}, and rewriting
+ *   {@code this} to {@code thi$} within the extracted code.</p>
  *   <p>For instance,</p>
  *   <pre>
  *   Object.prototype.extend = function(src) {
@@ -111,23 +112,23 @@
  *   <p>This is already taken care of by the translation from Rhino's AST to CAst.</p>
  *   <p>Optionally, the policy can request that one local variable of the surrounding function be turned into 
  *   a local variable of the extracted closure. The rewriter checks that this is possible: the code to extract
- *   must not contain function calls or <code>new</code> expressions, and it must not contain <code>break</code>,
- *   <code>continue</code>, or <code>return</code> statements. The former requirement prevents a called function
+ *   must not contain function calls or {@code new} expressions, and it must not contain {@code break},
+ *   {@code continue}, or {@code return} statements. The former requirement prevents a called function
  *   from observing a different value of the local variable than before. The latter requirement is necessary
  *   because the final value of the localised variable needs to be returned and assigned to its counterpart in
  *   the surrounding function; since non-local jumps are encoded by special return values (see next item),
  *   this would no longer be possible.</p>
  * </li>
- * <li><b><code>break</code>, <code>continue</code>, <code>return</code></b>:
- *   <p>A <code>break</code> or <code>continue</code> statement within the extracted loop body that refers
- *   to the loop itself or an enclosing loop would become invalid in the transformed code. A <code>return</code>
+ * <li><b>{@code break}, {@code continue}, {@code return}</b>:
+ *   <p>A {@code break} or {@code continue} statement within the extracted loop body that refers
+ *   to the loop itself or an enclosing loop would become invalid in the transformed code. A {@code return}
  *   statement would no longer return from the enclosing function, but instead from the extracted function.</p>
- *   <p>We transform all three statements into <code>return</code> statements returning an object literal with a
- *   property <code>type</code> indicating whether this is a 'goto' (i.e., <code>break</code> or <code>return</code>)
+ *   <p>We transform all three statements into {@code return} statements returning an object literal with a
+ *   property {@code type} indicating whether this is a 'goto' (i.e., {@code break} or {@code return})
  *   or a 'return'. In the former case, the 'target' property contains an integer identifying the jump target; in
  *   the latter case, the 'value' property contains the value to return.</p>
  *   <p>The return value of the extracted function is then examined to determine whether it completed normally
- *   (i.e., returned <code>undefined</code>), or whether it returned an object indicating special control flow.</p>
+ *   (i.e., returned {@code undefined}), or whether it returned an object indicating special control flow.</p>
  *   <p>For example, consider this code from MooTools:</p>
  *   <pre>
  *   for(var style in Element.ShortStyles) {
@@ -162,7 +163,7 @@
  *     }
  *   }
  *   </pre>
- *   <p>Note that at the CAst level, <code>break</code> and <code>continue</code> are represented as <code>goto</code>
+ *   <p>Note that at the CAst level, {@code break} and {@code continue} are represented as {@code goto}
  *   statements, which simplifies the translation somewhat. The numerical encoding of jump targets does not matter
  *   as long as the extracted function and the fixup code agree on which number represents which label.</p>
  * </li>
@@ -179,7 +180,7 @@
  *
  */
 public class ClosureExtractor extends CAstRewriterExt {
-  private LinkedList<ExtractionPolicy> policies = new LinkedList<ExtractionPolicy>();
+  private LinkedList<ExtractionPolicy> policies = new LinkedList<>();
   private final ExtractionPolicyFactory policyFactory;
   
   private static final boolean LOCALISE = true;
@@ -200,7 +201,7 @@
   }
   
   @Override
-  protected void leaveEntity(CAstEntity entity) {
+  protected void leaveEntity() {
     policies.pop();
   }
 
@@ -210,7 +211,7 @@
     case OPERATOR:
       return root;
     case CONSTANT:
-      return copyConstant(root, cfg, context, nodeMap);
+      return copyConstant(root, context, nodeMap);
     case BLOCK_STMT:
       return copyBlock(root, cfg, context, nodeMap);
     case RETURN: 
@@ -225,7 +226,7 @@
   }
 
   /* Constants are not affected by the rewriting, they are just copied. */
-  private CAstNode copyConstant(CAstNode root, CAstControlFlowMap cfg, NodePos context, Map<Pair<CAstNode, NoKey>, CAstNode> nodeMap) {
+  private CAstNode copyConstant(CAstNode root, NodePos context, Map<Pair<CAstNode, NoKey>, CAstNode> nodeMap) {
     CAstNode newNode = Ast.makeConstant(root.getValue());
     nodeMap.put(Pair.make(root, context.key()), newNode);
     return newNode;
@@ -237,14 +238,13 @@
     if(regions == null || usesArguments(root)) {
       return copyNode(root, cfg, context, nodeMap);
     } else {
-      ArrayList<CAstNode> copied_children = new ArrayList<CAstNode>();
+      ArrayList<CAstNode> copied_children = new ArrayList<>();
       int next_child = 0;
       // code in between regions is handled by invoking copyNodes, the regions themselves by extractRegion
       for(ExtractionRegion region : regions) {
         for(;next_child<region.getStart();++next_child)
           copied_children.add(copyNodes(root.getChild(next_child), cfg, new ChildPos(root, next_child, context), nodeMap));
-        for(CAstNode stmt : extractRegion(root, cfg, new ExtractionPos(root, region, context), nodeMap))
-          copied_children.add(stmt);
+        copied_children.addAll(extractRegion(root, cfg, new ExtractionPos(root, region, context), nodeMap));
         next_child = region.getEnd();
       }
       for(;next_child<root.getChildCount();++next_child)
@@ -306,7 +306,7 @@
           Ast.makeConstant("type"),
           Ast.makeConstant("goto"),
           Ast.makeConstant("target"),
-          Ast.makeConstant(((double)label)+"")),
+          Ast.makeConstant(String.valueOf((double) label))),
           getCurrentEntity().getControlFlow());
 
       addNode(returnLit, getCurrentEntity().getControlFlow());
@@ -445,8 +445,8 @@
      * 
      * The whole thing is then wrapped into a block.
      */
-    ArrayList<CAstNode> prologue = new ArrayList<CAstNode>();
-    ArrayList<CAstNode> fun_body_stmts = new ArrayList<CAstNode>();
+    ArrayList<CAstNode> prologue = new ArrayList<>();
+    ArrayList<CAstNode> fun_body_stmts = new ArrayList<>();
 
     // if we are extracting a block, unwrap it
     if(extractingBlock) {
@@ -464,18 +464,14 @@
           CAstNode[] before = new CAstNode[tler.getStartInner()];
           for(i=0;i<tler.getStartInner();++i)
             before[i] = copyNodes(start.getChild(i), cfg, context, nodeMap);
-          for(int x = 0; x < before.length; x++) {
-            prologue.add(before[x]);
-          }
+          prologue.addAll(Arrays.asList(before));
           if(i+1 == start.getChildCount()) {
             fun_body_stmts.add(addSpuriousExnFlow(start.getChild(i), cfg));            
           } else {
             CAstNode[] after = new CAstNode[start.getChildCount()-i];
             for(int j=0;j+i<start.getChildCount();++j)
               after[j] = addSpuriousExnFlow(start.getChild(j+i), cfg);
-            for(int x = 0; x < after.length; x++) {
-              fun_body_stmts.add(after[x]);
-            }
+            fun_body_stmts.addAll(Arrays.asList(after));
           }
           for(i=context.getStart()+1;i<context.getEnd();++i)
             fun_body_stmts.add(root.getChild(i));
@@ -562,6 +558,10 @@
       public CAstNodeTypeMap newTypes() { return theTypes; }
       @Override
       public Map<CAstNode, Collection<CAstEntity>> newChildren() { return theChildren; }
+      @Override
+      public CAstNode[] newDefaults() {
+        return null;
+      }
     };
     new_entity.setRewrite(rw);
 
@@ -588,7 +588,7 @@
      * a null pointer exception on the call; these are infeasible, but we add them anyway to get the same AST 
      * as with a manual extraction.
      */
-    List<CAstNode> args = new ArrayList<CAstNode>();
+    List<CAstNode> args = new ArrayList<>();
     CAstNode funExpr = Ast.makeNode(FUNCTION_EXPR, Ast.makeConstant(new_entity));
     args.add(funExpr);
     context.setCallSite(funExpr);
@@ -609,7 +609,7 @@
     addExnFlow(call, null, entity, context);
 
     // if the extracted code contains jumps, we need to insert some fix-up code
-    List<CAstNode> stmts = new ArrayList<CAstNode>(prologue);
+    List<CAstNode> stmts = new ArrayList<>(prologue);
     if(context.containsJump()) {
       CAstNode decl = Ast.makeNode(ASSIGN,
           addExnFlow(makeVarRef("re$"), JavaScriptTypes.ReferenceError, entity, context),
@@ -666,7 +666,7 @@
     return stmts;
   }
   
-  private CAstNode addSpuriousExnFlow(CAstNode node, CAstControlFlowMap cfg) {
+  private static CAstNode addSpuriousExnFlow(CAstNode node, CAstControlFlowMap cfg) {
     CAstControlFlowRecorder flow = (CAstControlFlowRecorder)cfg;
     if(node.getKind() == ASSIGN) {
       if(node.getChild(0).getKind() == VAR) {
@@ -704,7 +704,7 @@
           addExnFlow(Ast.makeNode(OBJECT_REF,
               addExnFlow(makeVarRef("re$"), JavaScriptTypes.ReferenceError, entity, context),
               Ast.makeConstant("target")), JavaScriptTypes.TypeError, entity, context),
-          Ast.makeConstant((double)labeller.getLabel(goto_target.snd)+""));
+          Ast.makeConstant(String.valueOf((double) labeller.getLabel(goto_target.snd))));
       CAstNode then_branch;
       if(goto_target.fst != null)
         then_branch = Ast.makeNode(GOTO, Ast.makeConstant(goto_target.fst));
@@ -816,6 +816,8 @@
     case CAstNode.CALL:
     case CAstNode.NEW:
       return false;
+    default:
+      // fall through to generic handlers below
     }
     for(int i=0;i<node.getChildCount();++i)
       if(!noJumpsAndNoCalls(node.getChild(i)))
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/CorrelatedPairExtractionPolicy.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/CorrelatedPairExtractionPolicy.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/CorrelatedPairExtractionPolicy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/CorrelatedPairExtractionPolicy.java	2019-01-29 17:08:39.000000000 +0000
@@ -151,7 +151,7 @@
     
     List<ExtractionRegion> regions = region_map.get(region_info.fst);
     if(regions == null)
-      region_map.put(region_info.fst, regions = new LinkedList<ExtractionRegion>());
+      region_map.put(region_info.fst, regions = new LinkedList<>());
     for(int i=0;i<regions.size();++i) {
       ExtractionRegion region2 = regions.get(i);
       if(region2.getEnd() <= region_info.snd.getStart())
@@ -179,7 +179,7 @@
     return true;
   }
   
-  private void filterNames(Set<ChildPos> nodes, String indexName) {
+  private static void filterNames(Set<ChildPos> nodes, String indexName) {
     for(Iterator<ChildPos> iter=nodes.iterator();iter.hasNext();) {
       CAstNode node = iter.next().getChild();
       if(node.getKind() == CAstNode.OBJECT_REF) {
@@ -191,7 +191,7 @@
     }
   }
 
-  private Pair<CAstNode, ? extends ExtractionRegion> findClosestContainingBlock(CAstEntity entity, ChildPos startNode, ChildPos endNode, String parmName, List<String> locals) {
+  private static Pair<CAstNode, ? extends ExtractionRegion> findClosestContainingBlock(CAstEntity entity, ChildPos startNode, ChildPos endNode, String parmName, List<String> locals) {
     ChildPos pos = startNode;
     CAstNode block = null;
     int start = -1, end = 0;
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/CorrelatedPairExtractorFactory.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/CorrelatedPairExtractorFactory.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/CorrelatedPairExtractorFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/CorrelatedPairExtractorFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,6 @@
 
 package com.ibm.wala.cast.js.ipa.callgraph.correlations.extraction;
 
-import java.io.IOException;
 import java.net.URL;
 import java.util.Map;
 
@@ -29,11 +28,11 @@
 public class CorrelatedPairExtractorFactory implements CAstRewriterFactory<NodePos, NoKey> {
   private final Map<IMethod, CorrelationSummary> summaries;
 
-  public CorrelatedPairExtractorFactory(JavaScriptTranslatorFactory translatorFactory, URL entryPoint) throws ClassHierarchyException, IOException {
+  public CorrelatedPairExtractorFactory(JavaScriptTranslatorFactory translatorFactory, URL entryPoint) throws ClassHierarchyException {
     this(new CorrelationFinder(translatorFactory).findCorrelatedAccesses(entryPoint));
   }
   
-  public CorrelatedPairExtractorFactory(JavaScriptTranslatorFactory translatorFactory, SourceModule[] scripts) throws ClassHierarchyException, IOException {
+  public CorrelatedPairExtractorFactory(JavaScriptTranslatorFactory translatorFactory, SourceModule[] scripts) throws ClassHierarchyException {
     this(new CorrelationFinder(translatorFactory).findCorrelatedAccesses(scripts));
   }
   
@@ -53,4 +52,4 @@
     };
     return new ClosureExtractor(ast, policyFactory);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ExtractedFunction.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ExtractedFunction.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ExtractedFunction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ExtractedFunction.java	2019-01-29 17:08:39.000000000 +0000
@@ -30,6 +30,7 @@
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 /**
  * A simple implementation of {@link CAstEntity} used by the {@link ClosureExtractor}.
@@ -96,7 +97,7 @@
 	
 	private void computeParms() {
 		if(this.parms == null) {
-		  ArrayList<String> parms = new ArrayList<String>();
+		  ArrayList<String> parms = new ArrayList<>();
 		  parms.add(name);
 		  parms.add("this");
 		  parms.addAll(pos.getParameters());
@@ -120,8 +121,7 @@
 				}
 			}
 			// now, add all new entities which arise from extracted nested for-in loops
-			for(Iterator<ExtractionPos> iter=pos.getNestedLoops(); iter.hasNext();) {
-				ExtractionPos nested_loop = iter.next();
+			for(ExtractionPos nested_loop : Iterator2Iterable.make(pos.getNestedLoops())) {
 				CAstNode callsite = nested_loop.getCallSite();
 				CAstEntity scoped_entity = nested_loop.getExtractedEntity();
 				Collection<CAstEntity> c = scopedEntities.get(callsite);
@@ -184,6 +184,16 @@
 
   @Override
 	public String toString() {
-		return "<JS function " + name + ">";
+		return "<JS function " + name + '>';
 	}
-}
\ No newline at end of file
+
+  @Override
+  public Position getPosition(int arg) {
+    return null;
+  }
+
+  @Override
+  public Position getNamePosition() {
+    return null;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ExtractionPos.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ExtractionPos.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ExtractionPos.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/ExtractionPos.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,7 +25,7 @@
  * A special {@link ChildPos} representing the position of a node which is the body of a for-in loop.
  * 
  * <p>This also stores some additional data obtained while rewriting the loop body, such as whether
- * <code>return</code> statements were encountered.</p>
+ * {@code return} statements were encountered.</p>
  * 
  * @author mschaefer
  *
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/NodeLabeller.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/NodeLabeller.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/NodeLabeller.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/NodeLabeller.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,7 +22,7 @@
  *
  */
 public class NodeLabeller {
-	private ArrayList<CAstNode> nodes = new ArrayList<CAstNode>();
+	private ArrayList<CAstNode> nodes = new ArrayList<>();
 	
 	/**
 	 * Adds a node to the mapping if it is not present yet.
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/NodePos.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/NodePos.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/NodePos.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/extraction/NodePos.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,8 +13,8 @@
 
 import com.ibm.wala.cast.tree.CAstNode;
 import com.ibm.wala.cast.tree.rewrite.CAstBasicRewriter;
-import com.ibm.wala.cast.tree.rewrite.CAstRewriter;
 import com.ibm.wala.cast.tree.rewrite.CAstBasicRewriter.NoKey;
+import com.ibm.wala.cast.tree.rewrite.CAstRewriter;
 
 /**
  * Representation of a node's position in a CAst entity's syntax tree. The position is stored as a zipper
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/ReadWriteCorrelation.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/ReadWriteCorrelation.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/ReadWriteCorrelation.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/ReadWriteCorrelation.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,11 +47,11 @@
 	
 	@Override
 	public String pp(SSASourcePositionMap positions) {
-		return get + "@" + positions.getPosition(get) + " [" + getIndexName() + "]-> " + put + "@" + positions.getPosition(put);
+		return get + "@" + positions.getPosition(get) + " [" + getIndexName() + "]-> " + put + '@' + positions.getPosition(put);
 	}
 	
 	@Override
 	public <T> T accept(CorrelationVisitor<T> visitor) {
 	  return visitor.visitReadWriteCorrelation(this);
 	}
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/SSASourcePositionMap.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/SSASourcePositionMap.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/SSASourcePositionMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/correlations/SSASourcePositionMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,4 +34,4 @@
 	public Position getPosition(SSAInstruction inst) {
 		return method.getSourcePosition(instrIndices.getMappedIndex(inst));
 	}
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptConstructTargetSelector.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptConstructTargetSelector.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptConstructTargetSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptConstructTargetSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,6 @@
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
-import com.ibm.wala.types.MethodReference;
 
 /**
  * generates instructions to simulate the semantics of JS constructor invocations
@@ -47,18 +46,14 @@
       IR callerIR = caller.getIR();
       SSAAbstractInvokeInstruction callStmts[] = callerIR.getCalls(site);
       assert callStmts.length == 1;
-      int nargs = callStmts[0].getNumberOfParameters();
+      int nargs = callStmts[0].getNumberOfPositionalParameters();
       return constructors.findOrCreateConstructorMethod(callerIR, callStmts[0], receiver, nargs - 1);
     } else {
       return base.getCalleeTarget(caller, site, receiver);
     }
   }
 
-  public boolean mightReturnSyntheticMethod(CGNode caller, CallSiteReference site) {
-    return true;
-  }
-
-  public boolean mightReturnSyntheticMethod(MethodReference declaredTarget) {
+  public boolean mightReturnSyntheticMethod() {
     return true;
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptEntryPoints.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptEntryPoints.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptEntryPoints.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptEntryPoints.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,8 +11,8 @@
 package com.ibm.wala.cast.js.ipa.callgraph;
 
 import com.ibm.wala.cast.ipa.callgraph.ScriptEntryPoints;
-import com.ibm.wala.cast.js.loader.JSCallSiteReference;
 import com.ibm.wala.cast.js.types.JavaScriptTypes;
+import com.ibm.wala.cast.loader.DynamicCallSiteReference;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClassLoader;
 import com.ibm.wala.classLoader.IMethod;
@@ -22,7 +22,7 @@
 
   @Override
   protected CallSiteReference makeScriptSite(IMethod m, int pc) {
-    return new JSCallSiteReference(pc);
+    return new DynamicCallSiteReference(JavaScriptTypes.CodeBody, pc);
   }
 
   public JavaScriptEntryPoints(IClassHierarchy cha, IClassLoader loader) {
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextInterpreter.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,14 +13,15 @@
 import com.ibm.wala.cast.ipa.callgraph.AstContextInsensitiveSSAContextInterpreter;
 import com.ibm.wala.cast.js.ipa.summaries.JavaScriptSummarizedFunction;
 import com.ibm.wala.cast.js.ipa.summaries.JavaScriptSummary;
-import com.ibm.wala.cast.js.loader.JSCallSiteReference;
 import com.ibm.wala.cast.js.ssa.JSInstructionFactory;
+import com.ibm.wala.cast.js.types.JavaScriptTypes;
+import com.ibm.wala.cast.loader.DynamicCallSiteReference;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.ContextItem;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ssa.ConstantValue;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
@@ -30,15 +31,13 @@
 /**
  * TODO cache generated IRs
  * 
- * @see <a
- *      href="https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Function/Apply">MDN
- *      Function.apply() docs</a> *
+ * @see <a href="https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Function/Apply">MDN Function.apply() docs</a>
  */
 public class JavaScriptFunctionApplyContextInterpreter extends AstContextInsensitiveSSAContextInterpreter {
 
   private static final TypeName APPLY_TYPE_NAME = TypeName.findOrCreate("Lprologue.js/Function_prototype_apply");
 
-  public JavaScriptFunctionApplyContextInterpreter(AnalysisOptions options, AnalysisCache cache) {
+  public JavaScriptFunctionApplyContextInterpreter(AnalysisOptions options, IAnalysisCacheView cache) {
     super(options, cache);
   }
 
@@ -61,7 +60,7 @@
     }
   }
 
-  private IR makeIRForArgList(CGNode node) {
+  private static IR makeIRForArgList(CGNode node) {
     // we have: v1 is dummy apply method
     // v2 is function to be invoked
     // v3 is argument to be passed as 'this'
@@ -105,7 +104,7 @@
 //    int curValNum = passArbitraryPropertyValAsParams(insts, nargs, S, paramsToPassToInvoked);
     int curValNum = passActualPropertyValsAsParams(insts, nargs, S, paramsToPassToInvoked);
     
-    CallSiteReference cs = new JSCallSiteReference(S.getNextProgramCounter());
+    CallSiteReference cs = new DynamicCallSiteReference(JavaScriptTypes.CodeBody, S.getNextProgramCounter());
 
     // function being invoked is in v2
     int resultVal = curValNum++;
@@ -121,7 +120,7 @@
   }
 
   @SuppressWarnings("unused")
-  private int passArbitraryPropertyValAsParams(JSInstructionFactory insts, int nargs, JavaScriptSummary S, int[] paramsToPassToInvoked) {
+  private static int passArbitraryPropertyValAsParams(JSInstructionFactory insts, int nargs, JavaScriptSummary S, int[] paramsToPassToInvoked) {
     // read an arbitrary property name via EachElementGet
     int curValNum = nargs + 2;
     int eachElementGetResult = curValNum++;
@@ -139,27 +138,33 @@
     return curValNum;
   }
   
-  private int passActualPropertyValsAsParams(JSInstructionFactory insts, int nargs, JavaScriptSummary S, int[] paramsToPassToInvoked) {
+  private static int passActualPropertyValsAsParams(JSInstructionFactory insts, int nargs, JavaScriptSummary S, int[] paramsToPassToInvoked) {
     // read an arbitrary property name via EachElementGet
-    int curValNum = nargs + 2;
+    int nullVn = nargs + 2;
+    S.addConstant(nullVn, new ConstantValue(null));
+    int curValNum = nargs + 3;
     for (int i = 1; i < paramsToPassToInvoked.length; i++) {
       // create a String constant for i-1
       final int constVN = curValNum++;
       // the commented line is correct, but it doesn't work because
       // of our broken handling of int constants as properties.
       // TODO fix property handling, and then fix this
-//      S.addConstant(constVN, new ConstantValue(Integer.toString(i-1)));
-      S.addConstant(constVN, new ConstantValue(i-1));
+      S.addConstant(constVN, new ConstantValue(Integer.toString(i-1)));
+      //S.addConstant(constVN, new ConstantValue(i-1));
       int propertyReadResult = curValNum++;
       // 4 is position of arguments array
+      S.addStatement(insts.PropertyWrite(S.getNumberOfStatements(), 4, constVN, nullVn));
+      S.getNextProgramCounter();
+      
       S.addStatement(insts.PropertyRead(S.getNumberOfStatements(), propertyReadResult, 4, constVN));
       S.getNextProgramCounter();
+     
       paramsToPassToInvoked[i] = propertyReadResult;
     }
     return curValNum;
   }
 
-  private IR makeIRForNoArgList(CGNode node) {
+  private static IR makeIRForNoArgList(CGNode node) {
     // kind of a hack; re-use the summarized function infrastructure
     MethodReference ref = node.getMethod().getReference();
     IClass declaringClass = node.getMethod().getDeclaringClass();
@@ -171,7 +176,7 @@
 
     // generate invocation instruction for the real method being invoked
     int resultVal = nargs + 2;
-    CallSiteReference cs = new JSCallSiteReference(S.getNextProgramCounter());
+    CallSiteReference cs = new DynamicCallSiteReference(JavaScriptTypes.CodeBody, S.getNextProgramCounter());
     int[] params = new int[1];
     params[0] = 3;
     // function being invoked is in v2
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextSelector.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextSelector.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,6 +25,7 @@
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.util.intset.IntSet;
 import com.ibm.wala.util.intset.IntSetUtil;
+import com.ibm.wala.util.intset.MutableIntSet;
 
 /**
  * 
@@ -57,11 +58,11 @@
     // 0 for function (synthetic apply), 1 for this (function being invoked), 2
     // for this arg of function being invoked,
     // 3 for arguments array
-    if (caller.getIR().getCalls(site)[0].getNumberOfUses() >= 4) {
-      return IntSetUtil.make(new int[] { 3 }).union(base.getRelevantParameters(caller, site));
-    } else {
-      return base.getRelevantParameters(caller, site);
+    MutableIntSet params = IntSetUtil.make();
+    for(int i = 0; i < 4 && i < caller.getIR().getCalls(site)[0].getNumberOfUses(); i++) {
+      params.add(i);
     }
+    return params.union(base.getRelevantParameters(caller, site));
   }
 
   public static class ApplyContext implements Context {
@@ -72,7 +73,6 @@
      */
     private final ContextItem.Value<Boolean> isNonNullArray;
 
-    @SuppressWarnings("unchecked")
     ApplyContext(Context delegate, boolean isNonNullArray) {
       this.delegate = delegate;
       this.isNonNullArray = ContextItem.Value.make(isNonNullArray);
@@ -114,7 +114,7 @@
 
     @Override
     public String toString() {
-      return "ApplyContext [delegate=" + delegate + ", isNonNullArray=" + isNonNullArray + "]";
+      return "ApplyContext [delegate=" + delegate + ", isNonNullArray=" + isNonNullArray + ']';
     }
 
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyTargetSelector.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyTargetSelector.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyTargetSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionApplyTargetSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,7 +42,7 @@
     this.base = base;
   }
 
-  private IMethod createApplyDummyMethod(IClass declaringClass) {
+  private static IMethod createApplyDummyMethod(IClass declaringClass) {
     final MethodReference ref = genSyntheticMethodRef(declaringClass);
     // number of args doesn't matter
     JavaScriptSummary S = new JavaScriptSummary(ref, 1);
@@ -51,7 +51,7 @@
 
   public static final String SYNTHETIC_APPLY_METHOD_PREFIX = "$$ apply_dummy";
 
-  private MethodReference genSyntheticMethodRef(IClass receiver) {
+  private static MethodReference genSyntheticMethodRef(IClass receiver) {
     Atom atom = Atom.findOrCreateUnicodeAtom(SYNTHETIC_APPLY_METHOD_PREFIX);
     Descriptor desc = Descriptor.findOrCreateUTF8(JavaScriptLoader.JS, "()LRoot;");
     MethodReference ref = MethodReference.findOrCreate(receiver.getReference(), atom, desc);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionDotCallTargetSelector.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionDotCallTargetSelector.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionDotCallTargetSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptFunctionDotCallTargetSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,13 +12,15 @@
 
 import java.util.Map;
 
+import com.ibm.wala.cast.ipa.callgraph.CAstCallGraphUtil;
 import com.ibm.wala.cast.js.ipa.summaries.JavaScriptSummarizedFunction;
 import com.ibm.wala.cast.js.ipa.summaries.JavaScriptSummary;
-import com.ibm.wala.cast.js.loader.JSCallSiteReference;
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
 import com.ibm.wala.cast.js.ssa.JSInstructionFactory;
 import com.ibm.wala.cast.js.types.JavaScriptMethods;
+import com.ibm.wala.cast.js.types.JavaScriptTypes;
 import com.ibm.wala.cast.loader.AstMethod;
+import com.ibm.wala.cast.loader.DynamicCallSiteReference;
 import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
 import com.ibm.wala.cast.types.AstMethodReference;
 import com.ibm.wala.classLoader.CallSiteReference;
@@ -63,7 +65,6 @@
 
   public JavaScriptFunctionDotCallTargetSelector(MethodTargetSelector base) {
     this.base = base;
-
   }
 
   /*
@@ -120,11 +121,6 @@
   /**
    * generate a synthetic method modeling the invocation of Function.call() at
    * the site
-   * 
-   * @param caller
-   * @param site
-   * @param receiver
-   * @return
    */
   private IMethod getFunctionCallTarget(CGNode caller, CallSiteReference site, IClass receiver) {
     int nargs = getNumberOfArgsPassed(caller, site);
@@ -135,7 +131,7 @@
       return callModels.get(key);
     }
     JSInstructionFactory insts = (JSInstructionFactory) receiver.getClassLoader().getInstructionFactory();
-    MethodReference ref = genSyntheticMethodRef(receiver, nargs, key);
+    MethodReference ref = genSyntheticMethodRef(receiver, key);
     JavaScriptSummary S = new JavaScriptSummary(ref, nargs);
     
     if(WARN_ABOUT_IMPRECISE_CALLGRAPH && caller.getMethod().getName().toString().contains(SYNTHETIC_CALL_METHOD_PREFIX))
@@ -154,7 +150,7 @@
 
     // generate invocation instruction for the real method being invoked
     int resultVal = nargs + 2;
-    CallSiteReference cs = new JSCallSiteReference(S.getNextProgramCounter());
+    CallSiteReference cs = new DynamicCallSiteReference(JavaScriptTypes.CodeBody, S.getNextProgramCounter());
     int[] params = new int[nargs - 2];
     for (int i = 0; i < params.length; i++) {
       // add 3 to skip v1 (which points to Function.call() itself) and v2 (the
@@ -175,26 +171,26 @@
 
   public static final String SYNTHETIC_CALL_METHOD_PREFIX = "$$ call_";
 
-  private MethodReference genSyntheticMethodRef(IClass receiver, int nargs, String key) {
+  private static MethodReference genSyntheticMethodRef(IClass receiver, String key) {
     Atom atom = Atom.findOrCreateUnicodeAtom(SYNTHETIC_CALL_METHOD_PREFIX + key);
     Descriptor desc = Descriptor.findOrCreateUTF8(JavaScriptLoader.JS, "()LRoot;");
     MethodReference ref = MethodReference.findOrCreate(receiver.getReference(), atom, desc);
     return ref;
   }
 
-  private String getKey(int nargs, CGNode caller, CallSiteReference site) {
+  private static String getKey(int nargs, CGNode caller, CallSiteReference site) {
     if (SEPARATE_SYNTHETIC_METHOD_PER_SITE) {
-      return JSCallGraphUtil.getShortName(caller) + "_" + caller.getGraphNodeId() + "_" + site.getProgramCounter();
+      return CAstCallGraphUtil.getShortName(caller) + '_' + caller.getGraphNodeId() + '_' + site.getProgramCounter();
     } else {
-      return ""+nargs;
+      return String.valueOf(nargs);
     }
   }
 
-  private int getNumberOfArgsPassed(CGNode caller, CallSiteReference site) {
+  private static int getNumberOfArgsPassed(CGNode caller, CallSiteReference site) {
     IR callerIR = caller.getIR();
     SSAAbstractInvokeInstruction callStmts[] = callerIR.getCalls(site);
     assert callStmts.length == 1;
-    int nargs = callStmts[0].getNumberOfParameters();
+    int nargs = callStmts[0].getNumberOfPositionalParameters();
     return nargs;
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptScopeMappingInstanceKeys.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptScopeMappingInstanceKeys.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptScopeMappingInstanceKeys.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JavaScriptScopeMappingInstanceKeys.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,9 +15,9 @@
 
 import com.ibm.wala.cast.ipa.callgraph.ScopeMappingInstanceKeys;
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
-import com.ibm.wala.cast.js.loader.JavaScriptLoader.JavaScriptMethodObject;
 import com.ibm.wala.cast.js.types.JavaScriptTypes;
 import com.ibm.wala.cast.loader.AstMethod.LexicalParent;
+import com.ibm.wala.cast.loader.CAstAbstractModuleLoader.DynamicMethodObject;
 import com.ibm.wala.cast.types.AstMethodReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
@@ -50,7 +50,7 @@
   }
 
   protected LexicalParent[] getParents(InstanceKey base) {
-    JavaScriptMethodObject function = (JavaScriptMethodObject)
+    DynamicMethodObject function = (DynamicMethodObject)
       base.getConcreteType().getMethod(AstMethodReference.fnSelector);
 
     return function==null? new LexicalParent[0]: function.getParents();
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCallGraph.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCallGraph.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,31 +14,28 @@
 
 import com.ibm.wala.cast.ipa.callgraph.AstCallGraph;
 import com.ibm.wala.cast.js.cfg.JSInducedCFG;
-import com.ibm.wala.cast.js.loader.JSCallSiteReference;
 import com.ibm.wala.cast.js.ssa.JavaScriptInvoke;
 import com.ibm.wala.cast.js.types.JavaScriptMethods;
 import com.ibm.wala.cast.js.types.JavaScriptTypes;
+import com.ibm.wala.cast.loader.DynamicCallSiteReference;
 import com.ibm.wala.cfg.InducedCFG;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.classLoader.NewSiteReference;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.callgraph.impl.FakeRootMethod;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
-import com.ibm.wala.ssa.SSANewInstruction;
 import com.ibm.wala.types.MethodReference;
-import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.HashSetFactory;
 
 public class JSCallGraph extends AstCallGraph {
 
-  public JSCallGraph(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-    super(cha, options, cache);
+  public JSCallGraph(IMethod fakeRootClass, AnalysisOptions options, IAnalysisCacheView cache) {
+    super(fakeRootClass, options, cache);
   }
 
   public final static MethodReference fakeRoot = MethodReference.findOrCreate(JavaScriptTypes.FakeRoot, FakeRootMethod.name,
@@ -46,7 +43,7 @@
 
   public static class JSFakeRoot extends ScriptFakeRoot {
 
-    public JSFakeRoot(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
+    public JSFakeRoot(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
       super(fakeRoot, cha.lookupClass(JavaScriptTypes.FakeRoot), cha, options, cache);
     }
 
@@ -56,21 +53,8 @@
     }
 
     @Override
-    public SSANewInstruction addAllocation(TypeReference T) {
-      if (cha.isSubclassOf(cha.lookupClass(T), cha.lookupClass(JavaScriptTypes.Root))) {
-        int instance = nextLocal++;
-        NewSiteReference ref = NewSiteReference.make(statements.size(), T);
-        SSANewInstruction result = getDeclaringClass().getClassLoader().getInstructionFactory().NewInstruction(statements.size(), instance, ref);
-        statements.add(result);
-        return result;
-      } else {
-        return super.addAllocation(T);
-      }
-    }
-
-    @Override
     public SSAAbstractInvokeInstruction addDirectCall(int function, int[] params, CallSiteReference site) {
-      CallSiteReference newSite = new JSCallSiteReference(statements.size());
+      CallSiteReference newSite = new DynamicCallSiteReference(JavaScriptTypes.CodeBody, statements.size());
 
       JavaScriptInvoke s = new JavaScriptInvoke(statements.size(), function, nextLocal++, params, nextLocal++, newSite);
       statements.add(s);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCallGraphUtil.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCallGraphUtil.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCallGraphUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCallGraphUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,11 +11,14 @@
 package com.ibm.wala.cast.js.ipa.callgraph;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
+import java.io.Reader;
 import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -41,19 +44,25 @@
 import com.ibm.wala.cfg.IBasicBlock;
 import com.ibm.wala.classLoader.ClassLoaderFactory;
 import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.Module;
+import com.ibm.wala.classLoader.ModuleEntry;
 import com.ibm.wala.classLoader.SourceModule;
 import com.ibm.wala.classLoader.SourceURLModule;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.callgraph.impl.ClassHierarchyClassTargetSelector;
+import com.ibm.wala.ipa.callgraph.impl.ClassHierarchyMethodTargetSelector;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.collections.NonNullSingletonIterator;
 
 public class JSCallGraphUtil extends com.ibm.wala.cast.ipa.callgraph.CAstCallGraphUtil {
 
@@ -84,7 +93,9 @@
                                                                 * (keepIRs),
                                                                 */roots);
 
-    com.ibm.wala.ipa.callgraph.impl.Util.addDefaultSelectors(options, cha);
+    options.setSelector(new ClassHierarchyMethodTargetSelector(cha));
+    options.setSelector(new ClassHierarchyClassTargetSelector(cha));
+
     options.setSelector(new StandardFunctionTargetSelector(cha, options.getMethodTargetSelector()));
 
     options.setUseConstantSpecificKeys(true);
@@ -96,9 +107,8 @@
 
   /**
    * @param preprocessor CAst rewriter to use for preprocessing JavaScript source files; may be null
-   * @return
    */
-  public static JavaScriptLoaderFactory makeLoaders(CAstRewriterFactory preprocessor) {
+  public static JavaScriptLoaderFactory makeLoaders(CAstRewriterFactory<?, ?> preprocessor) {
     if (translatorFactory == null) {
       throw new IllegalStateException("com.ibm.wala.cast.js.ipa.callgraph.Util.setTranslatorFactory() must be invoked before makeLoaders()");
     }
@@ -109,13 +119,13 @@
     return makeLoaders(null);
   }
 
-  public static IClassHierarchy makeHierarchyForScripts(String... scriptFiles) throws IOException, ClassHierarchyException {
+  public static IClassHierarchy makeHierarchyForScripts(String... scriptFiles) throws ClassHierarchyException {
     JavaScriptLoaderFactory loaders = makeLoaders();
     AnalysisScope scope = CAstCallGraphUtil.makeScope(scriptFiles, loaders, JavaScriptLoader.JS);
     return makeHierarchy(scope, loaders);
   }
   public static IClassHierarchy makeHierarchy(AnalysisScope scope, ClassLoaderFactory loaders) throws ClassHierarchyException {
-    return ClassHierarchy.make(scope, loaders, JavaScriptLoader.JS);
+    return ClassHierarchyFactory.make(scope, loaders, JavaScriptLoader.JS);
   }
 
   public static JavaScriptEntryPoints makeScriptRoots(IClassHierarchy cha) {
@@ -124,17 +134,17 @@
 
   /**
    * Get all the nodes in CG with name funName. If funName is of the form
-   * <code>"ctor:nm"</code>, return nodes corresponding to constructor function
-   * for <code>nm</code>. If funName is of the form <code>"suffix:nm"</code>,
+   * {@code "ctor:nm"}, return nodes corresponding to constructor function
+   * for {@code nm}. If funName is of the form {@code "suffix:nm"},
    * return nodes corresponding to functions whose names end with
-   * <code>nm</code>. Otherwise, return nodes for functions whose name matches
+   * {@code nm}. Otherwise, return nodes for functions whose name matches
    * funName exactly.
    */
   public static Collection<CGNode> getNodes(CallGraph CG, String funName) {
     boolean suffix = funName.startsWith("suffix:");
     
     if (suffix) {
-      Set<CGNode> nodes = new HashSet<CGNode>();
+      Set<CGNode> nodes = new HashSet<>();
       String tail = funName.substring(7);
       for (CGNode n : CG) {
         if (n.getMethod().getReference().getDeclaringClass().getName().toString().endsWith(tail)) {
@@ -153,36 +163,35 @@
     boolean ctor = funName.startsWith("ctor:");
     MethodReference MR;
     if (ctor) {
-      TypeReference TR = TypeReference.findOrCreate(JavaScriptTypes.jsLoader, TypeName.string2TypeName("L" + funName.substring(5)));
+      TypeReference TR = TypeReference.findOrCreate(JavaScriptTypes.jsLoader, TypeName.string2TypeName('L' + funName.substring(5)));
       MR = JavaScriptMethods.makeCtorReference(TR);
     } else {
-      TypeReference TR = TypeReference.findOrCreate(JavaScriptTypes.jsLoader, TypeName.string2TypeName("L" + funName));
+      TypeReference TR = TypeReference.findOrCreate(JavaScriptTypes.jsLoader, TypeName.string2TypeName('L' + funName));
       MR = AstMethodReference.fnReference(TR);
     }
     return MR;
   }
 
   /**
-   * @param cha
-   * @param cl
-   * @param fileName
-   * @param url
    * @return The set of class names that where defined in the CHA as a result
    *         loading process.
-   * @throws IOException
    */
-  public static Set<String> loadAdditionalFile(IClassHierarchy cha, JavaScriptLoader cl, String fileName, URL url)
+  public static Set<String> loadAdditionalFile(IClassHierarchy cha, JavaScriptLoader cl, URL url)
+      throws IOException {
+    return loadAdditionalFile(cha, cl, new SourceURLModule(url));
+  }
+  
+  public static Set<String> loadAdditionalFile(IClassHierarchy cha, JavaScriptLoader cl, ModuleEntry M)
       throws IOException {
     try {
-      SourceURLModule M = new SourceURLModule(url);
       TranslatorToCAst toCAst = getTranslatorFactory().make(new CAstImpl(), M);
-      final Set<String> names = new HashSet<String>();
+      final Set<String> names = new HashSet<>();
       JSAstTranslator toIR = new JSAstTranslator(cl) {
         @Override
-        protected void defineFunction(CAstEntity N, WalkContext definingContext, AbstractCFG cfg, SymbolTable symtab,
-            boolean hasCatchBlock, Map<IBasicBlock,TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation LI,
+        protected void defineFunction(CAstEntity N, WalkContext definingContext, AbstractCFG<SSAInstruction, ? extends IBasicBlock<SSAInstruction>> cfg, SymbolTable symtab,
+            boolean hasCatchBlock, Map<IBasicBlock<SSAInstruction>,TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation LI,
             DebuggingInformation debugInfo) {
-          String fnName = "L" + composeEntityName(definingContext, N);
+          String fnName = 'L' + composeEntityName(definingContext, N);
           names.add(fnName);
           super.defineFunction(N, definingContext, cfg, symtab, hasCatchBlock, caughtTypes, hasMonitorOp, LI, debugInfo);
         }
@@ -226,7 +235,7 @@
       return (String)v;
     } else if (v instanceof Double) {
       String result = v.toString();
-      if (((double) Math.round((Double)v)) == ((Double)v).doubleValue()) {
+      if ((Math.round((Double)v)) == ((Double)v).doubleValue()) {
         result = Long.toString(Math.round((Double)v));
       }
       return result;
@@ -241,13 +250,76 @@
     }
   }
 
-  public static SourceModule getPrologueFile(final String name) {
-    return new SourceURLModule(JSCallGraphUtil.class.getClassLoader().getResource(name)) {
-      @Override
-      public String getName() {
-        return name;
-      }      
-    };
+  public static class Bootstrap implements SourceModule {
+    private String name;
+    private InputStream stream;
+    private final URL url;
+    
+    public Bootstrap(String name, InputStream stream, URL url) {
+       this.name = name;
+       this.stream = stream;
+       this.url = url;
+    }
+
+    @Override
+    public Iterator<? extends ModuleEntry> getEntries() {
+      return new NonNullSingletonIterator<>(this);
+    }
+
+    @Override
+    public boolean isClassFile() {
+      return false;
+    }
+
+    @Override
+    public boolean isSourceFile() {
+      return true;
+    }
+
+    @Override
+    public InputStream getInputStream() {
+      return stream;
+    }
+
+    @Override
+    public boolean isModuleFile() {
+      return false;
+    }
+
+    @Override
+    public Module asModule() {
+      return this;
+    }
+
+    @Override
+    public String getClassName() {
+      return getName();
+    }
+
+    @Override
+    public Module getContainer() {
+      return null;
+    }
+
+    @Override
+    public String getName() {
+      return name;
+    }
+
+    @Override
+    public Reader getInputReader() {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    @Override
+    public URL getURL() {
+      return url;
+    }      
+  }
+  
+  public static Module getPrologueFile(final String name) {
+    return new Bootstrap(name, JSCallGraphUtil.class.getClassLoader().getResourceAsStream(name), JSCallGraphUtil.class.getClassLoader().getResource(name));
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCFABuilder.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCFABuilder.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCFABuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSCFABuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,11 +14,12 @@
 
 import com.ibm.wala.cast.ipa.callgraph.AstCFAPointerKeys;
 import com.ibm.wala.cast.ipa.callgraph.ReflectedFieldPointerKey;
+import com.ibm.wala.cast.js.loader.JavaScriptLoader;
 import com.ibm.wala.cast.js.types.JavaScriptTypes;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IField;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.ConcreteTypeKey;
 import com.ibm.wala.ipa.callgraph.propagation.ConstantKey;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
@@ -33,8 +34,8 @@
  */
 public abstract class JSCFABuilder extends JSSSAPropagationCallGraphBuilder {
 
-  public JSCFABuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-    super(cha, options, cache, new AstCFAPointerKeys() {
+  public JSCFABuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
+    super(JavaScriptLoader.JS.getFakeRootMethod(cha, options, cache), options, cache, new AstCFAPointerKeys() {
 
       private boolean isBogusKey(InstanceKey K) {
         TypeReference t = K.getConcreteType().getReference();
@@ -87,7 +88,7 @@
       }
 
       @Override
-      protected PointerKey getInstanceFieldPointerKeyForConstant(InstanceKey I, ConstantKey F) {
+      protected PointerKey getInstanceFieldPointerKeyForConstant(InstanceKey I, ConstantKey<?> F) {
         Object v = F.getValue();
         String strVal = JSCallGraphUtil.simulateToStringForPropertyNames(v);
         // if we know the string representation of the constant, use it...
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSSAPropagationCallGraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,6 +20,7 @@
 import com.ibm.wala.cast.ir.ssa.AstGlobalRead;
 import com.ibm.wala.cast.ir.ssa.AstGlobalWrite;
 import com.ibm.wala.cast.ir.ssa.AstIsDefinedInstruction;
+import com.ibm.wala.cast.ir.ssa.CAstUnaryOp;
 import com.ibm.wala.cast.ir.ssa.EachElementHasNextInstruction;
 import com.ibm.wala.cast.js.analysis.typeInference.JSTypeInference;
 import com.ibm.wala.cast.js.ipa.callgraph.JSSSAPropagationCallGraphBuilder.JSPointerAnalysisImpl.JSImplicitPointsToSetVisitor;
@@ -27,8 +28,6 @@
 import com.ibm.wala.cast.js.ssa.JavaScriptCheckReference;
 import com.ibm.wala.cast.js.ssa.JavaScriptInstanceOf;
 import com.ibm.wala.cast.js.ssa.JavaScriptInvoke;
-import com.ibm.wala.cast.js.ssa.JavaScriptPropertyRead;
-import com.ibm.wala.cast.js.ssa.JavaScriptPropertyWrite;
 import com.ibm.wala.cast.js.ssa.JavaScriptTypeOfInstruction;
 import com.ibm.wala.cast.js.ssa.JavaScriptWithRegion;
 import com.ibm.wala.cast.js.ssa.PrototypeLookup;
@@ -43,10 +42,11 @@
 import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.fixpoint.AbstractOperator;
 import com.ibm.wala.fixpoint.UnaryOperator;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.impl.AbstractRootMethod;
 import com.ibm.wala.ipa.callgraph.impl.ExplicitCallGraph;
 import com.ibm.wala.ipa.callgraph.propagation.AbstractFieldPointerKey;
 import com.ibm.wala.ipa.callgraph.propagation.ConcreteTypeKey;
@@ -67,6 +67,7 @@
 import com.ibm.wala.shrikeBT.IUnaryOpInstruction;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.SSAAbstractBinaryInstruction;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSABinaryOpInstruction;
@@ -81,6 +82,8 @@
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.intset.IntSet;
 import com.ibm.wala.util.intset.IntSetAction;
+import com.ibm.wala.util.intset.IntSetUtil;
+import com.ibm.wala.util.intset.MutableIntSet;
 import com.ibm.wala.util.intset.MutableMapping;
 import com.ibm.wala.util.intset.MutableSparseIntSet;
 import com.ibm.wala.util.intset.OrdinalSet;
@@ -99,10 +102,11 @@
  * {@link JSImplicitPointsToSetVisitor#visitAstGlobalRead(AstGlobalRead)}.
  * Finally, we need to represent direct flow of the global object to handle
  * receiver argument semantics (see
- * {@link org.mozilla.javascript.RhinoToAstTranslator}). To do so, we create a
+ * {@link com.ibm.wala.cast.js.translator.RhinoToAstTranslator}). To do so, we create a
  * reference to a global named {@link #GLOBAL_OBJ_VAR_NAME}, which is handled
  * specially in {@link JSConstraintVisitor#visitAstGlobalRead(AstGlobalRead)}.
  */
+@SuppressWarnings({"javadoc", "JavadocReference"})
 public class JSSSAPropagationCallGraphBuilder extends AstSSAPropagationCallGraphBuilder {
 
   public static final boolean DEBUG_LEXICAL = false;
@@ -146,9 +150,9 @@
     this.scriptBaseURL = url;
   }
 
-  protected JSSSAPropagationCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache,
+  protected JSSSAPropagationCallGraphBuilder(AbstractRootMethod abstractRootMethod, AnalysisOptions options, IAnalysisCacheView cache,
       PointerKeyFactory pointerKeyFactory) {
-    super(cha, options, cache, pointerKeyFactory);
+    super(abstractRootMethod, options, cache, pointerKeyFactory);
     globalObject = new GlobalObjectKey(cha.lookupClass(JavaScriptTypes.Root));
   }
 
@@ -213,8 +217,8 @@
     return getPointerKeyForInstanceField(getGlobalObject(JavaScriptTypes.jsName), f);
   }
   @Override
-  protected ExplicitCallGraph createEmptyCallGraph(IClassHierarchy cha, AnalysisOptions options) {
-    return new JSCallGraph(cha, options, getAnalysisCache());
+  protected ExplicitCallGraph createEmptyCallGraph(IMethod fakeRootClass, AnalysisOptions options) {
+    return new JSCallGraph(fakeRootClass, options, getAnalysisCache());
   }
 
   protected TypeInference makeTypeInference(IR ir, IClassHierarchy cha) {
@@ -237,7 +241,7 @@
   }
 
   @Override
-  protected void addAssignmentsForCatchPointerKey(PointerKey exceptionVar, Set catchClasses, PointerKey e) {
+  protected void addAssignmentsForCatchPointerKey(PointerKey exceptionVar, Set<IClass> catchClasses, PointerKey e) {
     system.newConstraint(exceptionVar, assignOperator, e);
   }
 
@@ -257,16 +261,6 @@
     }
 
     @Override
-    public void visitJavaScriptPropertyRead(JavaScriptPropertyRead instruction) {
-      bingo = true;
-    }
-
-    @Override
-    public void visitJavaScriptPropertyWrite(JavaScriptPropertyWrite instruction) {
-      bingo = true;
-    }
-
-    @Override
     public void visitTypeOf(JavaScriptTypeOfInstruction inst) {
       bingo = true;
     }
@@ -301,7 +295,7 @@
   protected InterestingVisitor makeInterestingVisitor(CGNode node, int vn) {
     return new JSInterestingVisitor(vn);
   }
-
+  
   // ///////////////////////////////////////////////////////////////////////////
   //
   // specialized pointer analysis
@@ -333,16 +327,6 @@
       }
 
       @Override
-      public void visitJavaScriptPropertyRead(JavaScriptPropertyRead instruction) {
-
-      }
-
-      @Override
-      public void visitJavaScriptPropertyWrite(JavaScriptPropertyWrite instruction) {
-
-      }
-
-      @Override
       public void visitJavaScriptInstanceOf(JavaScriptInstanceOf instruction) {
 
       }
@@ -368,13 +352,13 @@
         InstanceKey globalObj = ((AstSSAPropagationCallGraphBuilder) jsAnalysis.builder).getGlobalObject(JavaScriptTypes.jsName);
         PointerKey fkey = analysis.getHeapModel().getPointerKeyForInstanceField(globalObj, f);
         if (fkey != null) {
-          OrdinalSet pointees = analysis.getPointsToSet(fkey);
+          OrdinalSet<InstanceKey> pointees = analysis.getPointsToSet(fkey);
           IntSet set = pointees.getBackingSet();
           if (set != null) {
             S.addAll(set);
           }
         }
-        pointsToSet = new OrdinalSet<InstanceKey>(S, analysis.getInstanceKeyMapping());
+        pointsToSet = new OrdinalSet<>(S, analysis.getInstanceKeyMapping());
       }
 
       @Override
@@ -385,13 +369,13 @@
       public void visitPrototypeLookup(PrototypeLookup instruction) {
       }
 
-    };
+    }
 
     @Override
     protected ImplicitPointsToSetVisitor makeImplicitPointsToVisitor(LocalPointerKey lpk) {
       return new JSImplicitPointsToSetVisitor(this, lpk);
     }
-  };
+  }
 
   @Override
   protected PropagationSystem makeSystem(AnalysisOptions options) {
@@ -444,6 +428,8 @@
     public void visitUnaryOp(SSAUnaryOpInstruction inst) {
       if (inst.getOpcode() == IUnaryOpInstruction.Operator.NEG) {
         addLvalTypeKeyConstraint(inst, JavaScriptTypes.Boolean);
+      } else if (inst.getOpcode() == CAstUnaryOp.MINUS) {
+        addLvalTypeKeyConstraint(inst, JavaScriptTypes.Number);        
       }
     }
 
@@ -521,8 +507,8 @@
       if (contentsAreInvariant(symbolTable, du, rval)) {
         system.recordImplicitPointsToSet(rvalKey);
         InstanceKey[] ik = getInvariantContents(rval);
-        for (int i = 0; i < ik.length; i++) {
-          system.newConstraint(p, ik[i]);
+        for (InstanceKey element : ik) {
+          system.newConstraint(p, element);
         }
       } else {
         system.newConstraint(p, assignOperator, rvalKey);
@@ -536,41 +522,6 @@
     }
 
     @Override
-    public void visitJavaScriptPropertyRead(JavaScriptPropertyRead instruction) {
-      if (AstSSAPropagationCallGraphBuilder.DEBUG_PROPERTIES) {
-        Position instructionPosition = getInstructionPosition(instruction);
-        if (instructionPosition != null) {
-          System.err.println("processing read instruction " + instruction + ", position " + instructionPosition);
-        }
-      }
-      newFieldRead(node, instruction.getUse(0), instruction.getUse(1), instruction.getDef(0));
-    }
-
-    private Position getInstructionPosition(SSAInstruction instruction) {
-      IMethod method = node.getMethod();
-      if (method instanceof AstMethod) {
-        SSAInstruction[] instructions = ir.getInstructions();
-        for (int ind = basicBlock.getFirstInstructionIndex(); ind <= basicBlock.getLastInstructionIndex(); ind++) {
-          if (instruction.equals(instructions[ind])) {
-            return ((AstMethod) method).getSourcePosition(ind);
-          }
-        }
-      }
-      return null;
-    }
-
-    @Override
-    public void visitJavaScriptPropertyWrite(JavaScriptPropertyWrite instruction) {
-      if (AstSSAPropagationCallGraphBuilder.DEBUG_PROPERTIES) {
-        Position instructionPosition = getInstructionPosition(instruction);
-        if (instructionPosition != null) {
-          System.err.println("processing write instruction " + instruction + ", position " + instructionPosition);
-        }
-      }
-      newFieldWrite(node, instruction.getUse(0), instruction.getUse(1), instruction.getUse(2));
-    }
-
-    @Override
     public void visitJavaScriptInvoke(JavaScriptInvoke instruction) {
       if (instruction.getDeclaredTarget().equals(JavaScriptMethods.dispatchReference)) {
         handleJavascriptDispatch(instruction);
@@ -594,27 +545,27 @@
               private AbstractFieldPointerKey getProperty() { return fieldKey; }
               private CGNode getNode() { return node; }
               
+              private MutableIntSet previous = IntSetUtil.make();
+              
               @Override
               public byte evaluate(PointsToSetVariable lhs, PointsToSetVariable ptrs) {
                 if (ptrs.getValue() != null) {
-                  ptrs.getValue().foreach(new IntSetAction() {
-                    @Override
-                    public void act(int x) {
-                      final InstanceKey functionObj = system.getInstanceKey(x);
-                      visitInvokeInternal(instruction, new DefaultInvariantComputer() {
-                        @Override
-                        public InstanceKey[][] computeInvariantParameters(SSAAbstractInvokeInstruction call) {
-                          InstanceKey[][] x = super.computeInvariantParameters(call);
-                          if (x == null) {
-                            x = new InstanceKey[call.getNumberOfUses()][];
-                          }
-                          x[0] = new InstanceKey[]{ functionObj };
-                          x[1] = new InstanceKey[]{ receiverType };
-                          return x;
+                  ptrs.getValue().foreachExcluding(previous, x -> {
+                    final InstanceKey functionObj = system.getInstanceKey(x);
+                    visitInvokeInternal(instruction, new DefaultInvariantComputer() {
+                      @Override
+                      public InstanceKey[][] computeInvariantParameters(SSAAbstractInvokeInstruction call) {
+                        InstanceKey[][] x = super.computeInvariantParameters(call);
+                        if (x == null) {
+                          x = new InstanceKey[call.getNumberOfUses()][];
                         }
-                      });
-                    } 
+                        x[0] = new InstanceKey[]{ functionObj };
+                        x[1] = new InstanceKey[]{ receiverType };
+                        return x;
+                      }
+                    });
                   });
+                  previous.addAll(ptrs.getValue());
                 }
                 return NOT_CHANGED;
               }
@@ -634,13 +585,13 @@
               public String toString() {
                 return "sub-dispatch for " + instruction + ": " + receiverType + ", " + fieldKey;
               } 
-            };
+            }
           
             system.newSideEffect(new FieldValueDispatch(), fieldKey);
         }
         @Override
         public void dump(AbstractFieldPointerKey fieldKey, boolean constObj, boolean constProp) {
-          System.err.println("dispatch to " + receiverType + "." + fieldKey + " for " + instruction);
+          System.err.println("dispatch to " + receiverType + '.' + fieldKey + " for " + instruction);
         }
       };
 
@@ -663,11 +614,13 @@
       if (contentsAreInvariant(symbolTable, du, receiverVn)) {
           system.recordImplicitPointsToSet(receiverKey);
           InstanceKey[] ik = getInvariantContents(receiverVn);
-          for (int i = 0; i < ik.length; i++) {
-            handleJavascriptDispatch(instruction, ik[i]);
+          for (InstanceKey element : ik) {
+            handleJavascriptDispatch(instruction, element);
           }
       } else {
         class ReceiverForDispatchOp extends UnaryOperator<PointsToSetVariable> {
+          MutableIntSet previous = IntSetUtil.make();
+          
           private JavaScriptInvoke getInstruction() {
             return instruction;
           }
@@ -675,18 +628,16 @@
           @Override
           public byte evaluate(PointsToSetVariable lhs, PointsToSetVariable rhs) {
             if (rhs.getValue() != null) {
-              rhs.getValue().foreach(new IntSetAction() {
-                @Override
-                public void act(int x) {
-                  try {
-                    MonitorUtil.throwExceptionIfCanceled(getBuilder().monitor);
-                  } catch (CancelException e) {
-                    throw new CancelRuntimeException(e);
-                  }
-                  InstanceKey ik = system.getInstanceKey(x);
-                  handleJavascriptDispatch(instruction, ik);
+              rhs.getValue().foreachExcluding(previous, x -> {
+                try {
+                  MonitorUtil.throwExceptionIfCanceled(getBuilder().monitor);
+                } catch (CancelException e) {
+                  throw new CancelRuntimeException(e);
                 }
+                InstanceKey ik = system.getInstanceKey(x);
+                handleJavascriptDispatch(instruction, ik);
               });
+              previous.addAll(rhs.getValue());
             }
             return NOT_CHANGED;
           }
@@ -767,14 +718,9 @@
               return new InstanceKey[0];
             } else {
               final Set<InstanceKey> temp = HashSetFactory.make();
-              v.getValue().foreach(new IntSetAction() {
-                @Override
-                public void act(int keyIndex) {
-                  temp.add(system.getInstanceKey(keyIndex));
-                }
-              });
+              v.getValue().foreach(keyIndex -> temp.add(system.getInstanceKey(keyIndex)));
 
-              return temp.toArray(new InstanceKey[temp.size()]);
+              return temp.toArray(new InstanceKey[0]);
             }
           }
         }
@@ -785,12 +731,7 @@
 
         private boolean addKey(InstanceKey k) {
           int n = system.findOrCreateIndexForInstanceKey(k);
-          if (!lv.contains(n)) {
-            lv.add(n);
-            return true;
-          } else {
-            return false;
-          }
+          return lv.add(n);
         }
 
         @Override
@@ -802,17 +743,17 @@
           InstanceKey[] iks2 = getInstancesArray(arg2);
 
           if ((instruction.getOperator() == BinaryOpInstruction.Operator.ADD) && (getOptions().getTraceStringConstants())) {
-            for (int i = 0; i < iks1.length; i++) {
-              if (isStringConstant(iks1[i])) {
-                for (int j = 0; j < iks2.length; j++) {
-                  if (isStringConstant(iks2[j])) {
+            for (InstanceKey element : iks1) {
+              if (isStringConstant(element)) {
+                for (InstanceKey element2 : iks2) {
+                  if (isStringConstant(element2)) {
                     try {
                       MonitorUtil.throwExceptionIfCanceled(builder.monitor);
                     } catch (CancelException e) {
                       throw new CancelRuntimeException(e);
                     }
-                    String v1 = (String) ((ConstantKey) iks1[i]).getValue();
-                    String v2 = (String) ((ConstantKey) iks2[j]).getValue();
+                    String v1 = (String) ((ConstantKey<?>) element).getValue();
+                    String v2 = (String) ((ConstantKey<?>) element2).getValue();
                     if (v1.indexOf(v2) == -1 && v2.indexOf(v1) == -1) {
                       InstanceKey lvalKey = getInstanceKeyForConstant(v1 + v2);
                       if (addKey(lvalKey)) {
@@ -834,20 +775,39 @@
           }
 
           if (doDefault) {
-              for (int i = 0; i < iks1.length; i++) {
-                for (int j = 0; j < iks2.length; j++) {
+              for (InstanceKey element : iks1) {
+                for (InstanceKey element2 : iks2) {
                   try {
                     MonitorUtil.throwExceptionIfCanceled(builder.monitor);
                   } catch (CancelException e) {
                     throw new CancelRuntimeException(e);
                   }
-                  if (handleBinaryOperatorArgs(iks1[i], iks2[j])) {
+                  if (handleBinaryOperatorArgs(element, element2)) {
                     changed = CHANGED;
                   }
                 }
               }
           }
           
+          if (iks1 == null || iks1.length == 0 || iks2 == null || iks2.length == 0) {
+            if (iks1 != null) {
+              for(InstanceKey ik : iks1) {
+                if (addKey(ik)) {
+                  changed = CHANGED;
+                }
+              }
+            }
+            if (iks2 != null) {
+              for(InstanceKey ik : iks2) {
+                if (addKey(ik)) {
+                  changed = CHANGED;
+                }
+              }
+            }
+            
+            System.err.println(instruction);
+          }
+          
           return changed;
         }
         
@@ -994,12 +954,14 @@
     processCallingConstraintsInternal(this, caller, instruction, target, constParams, uniqueCatchKey);
   }
 
+  @SuppressWarnings("unused")
   public static void processCallingConstraintsInternal(AstSSAPropagationCallGraphBuilder builder, CGNode caller, SSAAbstractInvokeInstruction instruction, CGNode target,
       InstanceKey[][] constParams, PointerKey uniqueCatchKey) {
-    IR sourceIR = builder.getCFAContextInterpreter().getIR(caller);
+        
+    IRView sourceIR = builder.getCFAContextInterpreter().getIRView(caller);
     SymbolTable sourceST = sourceIR.getSymbolTable();
 
-    IR targetIR = builder.getCFAContextInterpreter().getIR(target);
+    IRView targetIR = builder.getCFAContextInterpreter().getIRView(target);
     SymbolTable targetST = targetIR.getSymbolTable();
 
     JSConstraintVisitor targetVisitor = null;
@@ -1016,7 +978,7 @@
     }
 
     int paramCount = targetST.getParameterValueNumbers().length;
-    int argCount = instruction.getNumberOfParameters();
+    int argCount = instruction.getNumberOfPositionalParameters();
     
     // the first two arguments are the function object and the receiver, neither of which
     // should become part of the arguments array
@@ -1024,7 +986,7 @@
 
     // pass actual arguments to formals in the normal way
     for (int i = 0; i < Math.min(paramCount, argCount); i++) {
-      InstanceKey[] fn = new InstanceKey[] { builder.getInstanceKeyForConstant(JavaScriptTypes.String, ""+(i-num_pseudoargs)) };
+      InstanceKey[] fn = new InstanceKey[] { builder.getInstanceKeyForConstant(JavaScriptTypes.String, String.valueOf(i - num_pseudoargs)) };
       PointerKey F = builder.getTargetPointerKey(target, i);
 
       if (constParams != null && constParams[i] != null) {
@@ -1050,7 +1012,7 @@
     if (paramCount < argCount) {
       if (av != -1) {
         for (int i = paramCount; i < argCount; i++) {
-          InstanceKey[] fn = new InstanceKey[] { builder.getInstanceKeyForConstant(JavaScriptTypes.String, ""+(i-num_pseudoargs)) };
+          InstanceKey[] fn = new InstanceKey[] { builder.getInstanceKeyForConstant(JavaScriptTypes.String, String.valueOf(i - num_pseudoargs)) };
           if (constParams != null && constParams[i] != null && i >= num_pseudoargs) {
               targetVisitor.newFieldWrite(target, av, fn, constParams[i]);
           } else if(i >= num_pseudoargs) {
@@ -1068,8 +1030,8 @@
       InstanceKey[] nullkeys = builder.getInvariantContents(sourceST, sourceDU, caller, nullvn, builder);
       for (int i = argCount; i < paramCount; i++) {
         PointerKey F = builder.getPointerKeyForLocal(target, targetST.getParameter(i));
-        for (int k = 0; k < nullkeys.length; k++) {
-          builder.getSystem().newConstraint(F, nullkeys[k]);
+        for (InstanceKey nullkey : nullkeys) {
+          builder.getSystem().newConstraint(F, nullkey);
         }
       }
     }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSyntheticParameterKey.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSyntheticParameterKey.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSyntheticParameterKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSSyntheticParameterKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,7 +37,7 @@
 
   @Override
   public String toString() {
-    return "p" + param + ":" +  getNode().getMethod().getName();
+    return "p" + param + ':' +  getNode().getMethod().getName();
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSZeroOrOneXCFABuilder.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSZeroOrOneXCFABuilder.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSZeroOrOneXCFABuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/JSZeroOrOneXCFABuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,10 +10,9 @@
  *****************************************************************************/
 package com.ibm.wala.cast.js.ipa.callgraph;
 
-import com.ibm.wala.cast.ipa.callgraph.OneLevelForLexicalAccessFunctions;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
 import com.ibm.wala.ipa.callgraph.impl.ContextInsensitiveSelector;
 import com.ibm.wala.ipa.callgraph.impl.DelegatingContextSelector;
@@ -32,7 +31,7 @@
   private static final boolean USE_OBJECT_SENSITIVITY = false;
   
 
-  public JSZeroOrOneXCFABuilder(IClassHierarchy cha, JSAnalysisOptions options, AnalysisCache cache,
+  public JSZeroOrOneXCFABuilder(IClassHierarchy cha, JSAnalysisOptions options, IAnalysisCacheView cache,
       ContextSelector appContextSelector, SSAContextInterpreter appContextInterpreter, int instancePolicy, boolean doOneCFA) {
     super(cha, options, cache);
 
@@ -83,7 +82,7 @@
     options.setSelector(targetSelector);
   }
 
-  private SSAContextInterpreter setupSSAContextInterpreter(IClassHierarchy cha, JSAnalysisOptions options, AnalysisCache cache,
+  private SSAContextInterpreter setupSSAContextInterpreter(IClassHierarchy cha, JSAnalysisOptions options, IAnalysisCacheView cache,
       SSAContextInterpreter appContextInterpreter) {
     SSAContextInterpreter contextInterpreter = makeDefaultContextInterpreters(appContextInterpreter, options, cha);
     if (options.handleCallApply()) {
@@ -108,11 +107,11 @@
    *          specifications.
    * @return a 0-1-Opt-CFA Call Graph Builder.
    */
-  public static JSCFABuilder make(JSAnalysisOptions options, AnalysisCache cache, IClassHierarchy cha, ClassLoader cl,
+  public static JSCFABuilder make(JSAnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha, ClassLoader cl,
       AnalysisScope scope, String[] xmlFiles, byte instancePolicy, boolean doOneCFA) {
     com.ibm.wala.ipa.callgraph.impl.Util.addDefaultSelectors(options, cha);
-    for (int i = 0; i < xmlFiles.length; i++) {
-      com.ibm.wala.ipa.callgraph.impl.Util.addBypassLogic(options, scope, cl, xmlFiles[i], cha);
+    for (String xmlFile : xmlFiles) {
+      com.ibm.wala.ipa.callgraph.impl.Util.addBypassLogic(options, scope, cl, xmlFile, cha);
     }
 
     return new JSZeroOrOneXCFABuilder(cha, options, cache, null, null, instancePolicy, doOneCFA);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/LoadFileTargetSelector.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/LoadFileTargetSelector.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/LoadFileTargetSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/LoadFileTargetSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,7 +18,6 @@
 import java.util.Set;
 
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
-import com.ibm.wala.cast.js.types.JavaScriptMethods;
 import com.ibm.wala.cast.js.types.JavaScriptTypes;
 import com.ibm.wala.cast.types.AstMethodReference;
 import com.ibm.wala.classLoader.CallSiteReference;
@@ -52,44 +51,46 @@
   public IMethod getCalleeTarget(CGNode caller, CallSiteReference site, IClass receiver) {
     IMethod target = base.getCalleeTarget(caller, site, receiver);
     if (target != null && target.getReference().equals(loadFileFunRef)) {
-      
-      Set<String> names = new HashSet<String>();
+
+      Set<String> names = new HashSet<>();
       SSAInstruction call = caller.getIR().getInstructions()[caller.getIR().getCallInstructionIndices(site).intIterator().next()];
-      LocalPointerKey fileNameV = new LocalPointerKey(caller, call.getUse(1));
-      OrdinalSet<InstanceKey> ptrs = builder.getPointerAnalysis().getPointsToSet(fileNameV);
-      for(InstanceKey k : ptrs) {
-        if (k instanceof ConstantKey) {
-          Object v = ((ConstantKey)k).getValue();
-          if (v instanceof String) {
-            names.add((String)v);
+      if (call.getNumberOfUses() > 1) {
+        LocalPointerKey fileNameV = new LocalPointerKey(caller, call.getUse(1));
+        OrdinalSet<InstanceKey> ptrs = builder.getPointerAnalysis().getPointsToSet(fileNameV);
+        for(InstanceKey k : ptrs) {
+          if (k instanceof ConstantKey) {
+            Object v = ((ConstantKey<?>)k).getValue();
+            if (v instanceof String) {
+              names.add((String)v);
+            }
           }
         }
-      }
-      
-      if (names.size() == 1) {
-        String str = names.iterator().next();
-        try {
-          JavaScriptLoader cl = (JavaScriptLoader) builder.getClassHierarchy().getLoader(JavaScriptTypes.jsLoader);
-          URL url = new URL(builder.getBaseURL(), str);
-          if(!loadedFiles.contains(url)) {
-            // try to open the input stream for the URL.  if it fails, we'll get an IOException and fall through to default case
-            InputStream inputStream = url.openConnection().getInputStream();
-            inputStream.close();
-            JSCallGraphUtil.loadAdditionalFile(builder.getClassHierarchy() , cl, str, url);
-            loadedFiles.add(url);
-            IClass script = builder.getClassHierarchy().lookupClass(TypeReference.findOrCreate(cl.getReference(), "L" + url.getFile()));
-            return script.getMethod(JavaScriptMethods.fnSelector);
+
+        if (names.size() == 1) {
+          String str = names.iterator().next();
+          try {
+            JavaScriptLoader cl = (JavaScriptLoader) builder.getClassHierarchy().getLoader(JavaScriptTypes.jsLoader);
+            URL url = new URL(builder.getBaseURL(), str);
+            if(!loadedFiles.contains(url)) {
+              // try to open the input stream for the URL.  if it fails, we'll get an IOException and fall through to default case
+              try (InputStream inputStream = url.openConnection().getInputStream()) {
+              }
+              JSCallGraphUtil.loadAdditionalFile(builder.getClassHierarchy() , cl, url);
+              loadedFiles.add(url);
+              IClass script = builder.getClassHierarchy().lookupClass(TypeReference.findOrCreate(cl.getReference(), 'L' + url.getFile()));
+              return script.getMethod(AstMethodReference.fnSelector);
+            }
+          } catch (MalformedURLException e1) {
+            // do nothing, fall through and return 'target'
+          } catch (IOException e) {
+            // do nothing, fall through and return 'target'
+          } catch (RuntimeException e) {
+            // do nothing, fall through and return 'target'
           }
-        } catch (MalformedURLException e1) {
-          // do nothing, fall through and return 'target'
-        } catch (IOException e) {
-          // do nothing, fall through and return 'target'
-        } catch (RuntimeException e) {
-          // do nothing, fall through and return 'target'
         }
       }
     }
-    
+
     return target;
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/ObjectSensitivityContextSelector.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/ObjectSensitivityContextSelector.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/ObjectSensitivityContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/ObjectSensitivityContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -82,4 +82,4 @@
     }
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/PropertyNameContextSelector.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/PropertyNameContextSelector.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/PropertyNameContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/PropertyNameContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,16 +19,16 @@
 import com.ibm.wala.cast.js.ipa.callgraph.correlations.extraction.ClosureExtractor;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ipa.callgraph.ContextItem;
 import com.ibm.wala.ipa.callgraph.ContextKey;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.ConstantKey;
-import com.ibm.wala.ipa.callgraph.propagation.SelectiveCPAContext;
 import com.ibm.wala.ipa.callgraph.propagation.FilteredPointerKey.SingleInstanceFilter;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.SelectiveCPAContext;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.ReflectiveMemberAccess;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
@@ -51,8 +51,8 @@
 public class PropertyNameContextSelector implements ContextSelector {
   public final static ContextKey PROPNAME_KEY = new ContextKey() { };
   public static final ContextItem PROPNAME_MARKER = new ContextItem() { };
-
   public final static ContextKey PROPNAME_PARM_INDEX = new ContextKey() { };
+  public final static ContextKey INSTANCE_KEY_KEY = new ContextKey() { };
   
   /** Context representing a particular name accessed by a correlated read/write pair. */
   public class PropNameContext extends SelectiveCPAContext {
@@ -66,6 +66,8 @@
         return PROPNAME_MARKER;
       } else if(PROPNAME_PARM_INDEX.equals(key)) {
         return ContextItem.Value.make(index);
+      } else if(INSTANCE_KEY_KEY.equals(key)) {
+        return ContextItem.Value.make(((SingleInstanceFilter)get(ContextKey.PARAMETERS[index])).getInstance());
       } else {
         return super.get(key);
       }
@@ -75,13 +77,6 @@
     public String toString() {
       return "property name context for " + get(ContextKey.PARAMETERS[index]) + " over " + this.base;
     }
-
-    /**
-     * get the {@link InstanceKey} used to distinguish this context 
-     */
-    public InstanceKey getInstanceKey() {
-      return ((SingleInstanceFilter)get(ContextKey.PARAMETERS[index])).getInstance();
-    }
   }
    
   /**
@@ -103,24 +98,16 @@
      */
     @Override
     public ContextItem get(ContextKey key) {
-      final ContextItem contextItem = super.get(key);
-      return (contextItem instanceof SingleInstanceFilter) ? null : contextItem;
-    }
-
-    /**
-     * we need to override this method since
-     * {@link MarkerForInContext#get(ContextKey)} does not return the
-     * {@link SingleInstanceFilter} containing the {@link InstanceKey}. Instead,
-     * we invoke {@link PropNameContext#get(ContextKey)} from the superclass.
-     */
-    @Override
-    public InstanceKey getInstanceKey() {
-      return ((SingleInstanceFilter)super.get(ContextKey.PARAMETERS[index])).getInstance();
-    }
-    
+      if (INSTANCE_KEY_KEY.equals(key)) {
+        return ContextItem.Value.make(((SingleInstanceFilter)super.get(ContextKey.PARAMETERS[index])).getInstance());        
+      } else {
+        final ContextItem contextItem = super.get(key);
+        return (contextItem instanceof SingleInstanceFilter) ? null : contextItem;
+      }
+    }    
   }
   
-  private final AnalysisCache cache;
+  private final IAnalysisCacheView cache;
   private final ContextSelector base;
   private final int index;
   
@@ -145,7 +132,7 @@
     SSAAbstractInvokeInstruction inst = caller.getIR().getCalls(site)[0];
     DefUse du = caller.getDU();
     
-    for(int i = 0; i < inst.getNumberOfParameters(); i++) {
+    for(int i = 0; i < inst.getNumberOfPositionalParameters(); i++) {
       MutableIntSet values = IntSetUtil.make();
       values.add(inst.getUse(i));
       collectValues(du, du.getDef(inst.getUse(i)), values);
@@ -156,17 +143,17 @@
     return dependentParameters;
   }
   
-  public PropertyNameContextSelector(AnalysisCache cache, ContextSelector base) {
+  public PropertyNameContextSelector(IAnalysisCacheView cache, ContextSelector base) {
     this(cache, 2, base);
   }
   
-  public PropertyNameContextSelector(AnalysisCache cache, int index, ContextSelector base) {
+  public PropertyNameContextSelector(IAnalysisCacheView cache, int index, ContextSelector base) {
     this.cache = cache;
     this.index = index;
     this.base = base;
   }
   
-  private enum Frequency { NEVER, SOMETIMES, ALWAYS };
+  private enum Frequency { NEVER, SOMETIMES, ALWAYS }
   private final HashMap<MethodReference, Frequency> usesFirstArgAsPropertyName_cache = HashMapFactory.make();
   
   /** Determine whether the method never/sometimes/always uses its first argument as a property name. */
@@ -218,8 +205,8 @@
     if (PROPNAME_MARKER.equals(caller.getContext().get(PROPNAME_KEY))) {
       if (!identifyDependentParameters(caller, site).isEmpty()) {
         // use a MarkerForInContext to clone based on the InstanceKey used in the caller context
-        // TODO the cast below isn't safe; fix
-        InstanceKey callerIk = ((PropNameContext)caller.getContext()).getInstanceKey();
+        @SuppressWarnings("unchecked")
+        InstanceKey callerIk = ((ContextItem.Value<InstanceKey>)caller.getContext().get(INSTANCE_KEY_KEY)).getValue();
         return new MarkerForInContext(baseContext, callerIk);
       } else {
         return baseContext;
@@ -238,4 +225,4 @@
     }
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/RecursionBoundContextSelector.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/RecursionBoundContextSelector.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/RecursionBoundContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/RecursionBoundContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,6 @@
   private static final int MAX_INTERESTING_PARAM = 5;
 
   /**
-   * @param base
    * @param recursionBound
    *          bound on recursion depth, with the top level of the context
    *          returned by the base selector being depth 0. The
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/RecursionCheckContextSelector.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/RecursionCheckContextSelector.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/RecursionCheckContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/RecursionCheckContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -61,11 +61,11 @@
     return baseContext;
   }
 
-  private boolean recursiveContext(Context baseContext, IMethod callee) {
+  private static boolean recursiveContext(Context baseContext, IMethod callee) {
     if (!recursionPossible(callee)) {
       return false;
     }
-    LinkedList<Pair<Context,Collection<IMethod>>> worklist = new LinkedList<Pair<Context,Collection<IMethod>>>();
+    LinkedList<Pair<Context,Collection<IMethod>>> worklist = new LinkedList<>();
     worklist.push(Pair.make(baseContext, (Collection<IMethod>)Collections.singleton(callee)));
     while (!worklist.isEmpty()) {
       Pair<Context, Collection<IMethod>> p = worklist.removeFirst();
@@ -100,7 +100,7 @@
     return false;
   }
 
-  private boolean updateForNode(Context baseContext, Collection<IMethod> curEncountered, LinkedList<Pair<Context, Collection<IMethod>>> worklist, CGNode callerNode) {
+  private static boolean updateForNode(Context baseContext, Collection<IMethod> curEncountered, LinkedList<Pair<Context, Collection<IMethod>>> worklist, CGNode callerNode) {
     final IMethod method = callerNode.getMethod();
     if (!recursionPossible(method)) {
       assert !curEncountered.contains(method);
@@ -115,7 +115,7 @@
       System.err.println("context " + baseContext);
       return false;
     }    
-    Collection<IMethod> newEncountered = new ArrayList<IMethod>(curEncountered);
+    Collection<IMethod> newEncountered = new ArrayList<>(curEncountered);
     newEncountered.add(method);
     worklist.add(Pair.make(callerNode.getContext(),newEncountered));
     return true;
@@ -129,10 +129,8 @@
 
   /**
    * is it possible for m to be involved in a recursive cycle?
-   * @param m
-   * @return
    */
-  private boolean recursionPossible(IMethod m) {
+  private static boolean recursionPossible(IMethod m) {
     // object or array constructors cannot be involved
     if (m.getReference().getName().equals(JavaScriptMethods.ctorAtom)) {
       TypeReference declaringClass = m.getReference().getDeclaringClass();
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/TransitivePrototypeKey.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/TransitivePrototypeKey.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/TransitivePrototypeKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/callgraph/TransitivePrototypeKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -36,6 +36,6 @@
 
   @Override
   public String toString() {
-    return "<proto:" + getName() + ">";
+    return "<proto:" + getName() + '>';
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/modref/JavaScriptModRef.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/modref/JavaScriptModRef.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/modref/JavaScriptModRef.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/modref/JavaScriptModRef.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,6 @@
 package com.ibm.wala.cast.js.ipa.modref;
 
 import java.util.Collection;
-import java.util.Iterator;
 
 import com.ibm.wala.cast.ipa.callgraph.AstHeapModel;
 import com.ibm.wala.cast.ipa.modref.AstModRef;
@@ -20,8 +19,6 @@
 import com.ibm.wala.cast.js.ssa.JavaScriptCheckReference;
 import com.ibm.wala.cast.js.ssa.JavaScriptInstanceOf;
 import com.ibm.wala.cast.js.ssa.JavaScriptInvoke;
-import com.ibm.wala.cast.js.ssa.JavaScriptPropertyRead;
-import com.ibm.wala.cast.js.ssa.JavaScriptPropertyWrite;
 import com.ibm.wala.cast.js.ssa.JavaScriptTypeOfInstruction;
 import com.ibm.wala.cast.js.ssa.JavaScriptWithRegion;
 import com.ibm.wala.cast.js.ssa.PrototypeLookup;
@@ -34,9 +31,9 @@
 
 public class JavaScriptModRef<T extends InstanceKey> extends AstModRef<T> {
 
-  protected static class JavaScriptRefVisitor<T extends InstanceKey> extends AstRefVisitor<T> implements JSInstructionVisitor {
+  public static class JavaScriptRefVisitor<T extends InstanceKey> extends AstRefVisitor<T> implements JSInstructionVisitor {
 
-    protected JavaScriptRefVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h) {
+    public JavaScriptRefVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h) {
       super(n, result, pa, (AstHeapModel)h);
     }
 
@@ -51,26 +48,6 @@
     }
 
     @Override
-    public void visitJavaScriptPropertyRead(JavaScriptPropertyRead instruction) {
-      PointerKey obj = h.getPointerKeyForLocal(n, instruction.getObjectRef());
-      PointerKey prop = h.getPointerKeyForLocal(n, instruction.getMemberRef());
-      for(InstanceKey o : pa.getPointsToSet(obj)) {
-        for(InstanceKey p : pa.getPointsToSet(prop)) {
-          for(Iterator<PointerKey> keys = h.getPointerKeysForReflectedFieldRead(o, p); keys.hasNext(); ) {
-            PointerKey x = keys.next();
-            assert x != null : instruction;
-            result.add(x);
-          }
-        }
-      }
-    }
-
-    @Override
-    public void visitJavaScriptPropertyWrite(JavaScriptPropertyWrite instruction) {
-      // do nothing
-    }
-
-    @Override
     public void visitJavaScriptInstanceOf(JavaScriptInstanceOf instruction) {
       // do nothing
     }
@@ -99,13 +76,13 @@
   }
 
   @Override
-  protected RefVisitor makeRefVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h) {
-    return new JavaScriptRefVisitor(n, result, pa, h);
+  protected RefVisitor<T, ? extends ExtendedHeapModel> makeRefVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h) {
+    return new JavaScriptRefVisitor<>(n, result, pa, h);
   }
 
-  protected static class JavaScriptModVisitor<T extends InstanceKey> extends AstModVisitor<T> implements JSInstructionVisitor {
+  public static class JavaScriptModVisitor<T extends InstanceKey> extends AstModVisitor<T> implements JSInstructionVisitor {
 
-    protected JavaScriptModVisitor(CGNode n, Collection<PointerKey> result, ExtendedHeapModel h, PointerAnalysis<T> pa) {
+    public JavaScriptModVisitor(CGNode n, Collection<PointerKey> result, ExtendedHeapModel h, PointerAnalysis<T> pa) {
       super(n, result, (AstHeapModel)h, pa);
     }
 
@@ -119,25 +96,6 @@
       // do nothing
     }
 
-    @Override
-    public void visitJavaScriptPropertyRead(JavaScriptPropertyRead instruction) {
-      // do nothing
-    }
-
-    @Override
-    public void visitJavaScriptPropertyWrite(JavaScriptPropertyWrite instruction) {
-      PointerKey obj = h.getPointerKeyForLocal(n, instruction.getObjectRef());
-      PointerKey prop = h.getPointerKeyForLocal(n, instruction.getMemberRef());
-      for(T o : pa.getPointsToSet(obj)) {
-        for(T p : pa.getPointsToSet(prop)) {
-          for(Iterator<PointerKey> keys = h.getPointerKeysForReflectedFieldWrite(o, p); keys.hasNext(); ) {
-            PointerKey x = keys.next();
-            assert x != null : instruction;
-            result.add(x);
-          }
-        }
-      }
-    }
 
     @Override
     public void visitJavaScriptInstanceOf(JavaScriptInstanceOf instruction) {
@@ -168,7 +126,7 @@
   }
 
   @Override
-  protected ModVisitor makeModVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h, boolean ignoreAllocHeapDefs) {
-    return new JavaScriptModVisitor<T>(n, result, h, pa);
+  protected ModVisitor<T, ? extends ExtendedHeapModel> makeModVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h, boolean ignoreAllocHeapDefs) {
+    return new JavaScriptModVisitor<>(n, result, h, pa);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/summaries/JavaScriptConstructorFunctions.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/summaries/JavaScriptConstructorFunctions.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/summaries/JavaScriptConstructorFunctions.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ipa/summaries/JavaScriptConstructorFunctions.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,26 +11,32 @@
 
 package com.ibm.wala.cast.js.ipa.summaries;
 
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
 import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
-import com.ibm.wala.cast.js.loader.JSCallSiteReference;
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
 import com.ibm.wala.cast.js.ssa.JSInstructionFactory;
 import com.ibm.wala.cast.js.types.JavaScriptMethods;
 import com.ibm.wala.cast.js.types.JavaScriptTypes;
+import com.ibm.wala.cast.loader.DynamicCallSiteReference;
 import com.ibm.wala.cast.types.AstMethodReference;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.classLoader.Module;
+import com.ibm.wala.classLoader.ModuleEntry;
 import com.ibm.wala.classLoader.NewSiteReference;
+import com.ibm.wala.classLoader.SourceModule;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.MethodSummary;
-import com.ibm.wala.shrikeBT.IConditionalBranchInstruction.IOperator;
 import com.ibm.wala.shrikeBT.IConditionalBranchInstruction.Operator;
 import com.ibm.wala.ssa.ConstantValue;
 import com.ibm.wala.ssa.IR;
@@ -40,6 +46,7 @@
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.NonNullSingletonIterator;
 import com.ibm.wala.util.collections.Pair;
 
 public class JavaScriptConstructorFunctions {
@@ -68,7 +75,7 @@
 
     @Override
     public String toString() {
-      return "<ctor for " + getReference().getDeclaringClass() + toStringExtra + ">";
+      return "<ctor for " + getReference().getDeclaringClass() + toStringExtra + '>';
     }
     
     public IClass constructedType() {
@@ -81,7 +88,7 @@
     return m;
   }
 
-  private IMethod makeNullaryValueConstructor(IClass cls, Object value) {
+  private static IMethod makeNullaryValueConstructor(IClass cls, Object value) {
     JSInstructionFactory insts = (JSInstructionFactory)cls.getClassLoader().getInstructionFactory();
     MethodReference ref = JavaScriptMethods.makeCtorReference(cls.getReference());
     JavaScriptSummary S = new JavaScriptSummary(ref, 1);
@@ -95,8 +102,12 @@
     //S.addStatement(insts.PutInstruction(5, 4, "__proto__"));
     S.getNextProgramCounter();
     
-    S.addConstant(new Integer(8), new ConstantValue(value));
+    S.addConstant(Integer.valueOf(8), new ConstantValue(value));
     S.addStatement(insts.PutInstruction(S.getNumberOfStatements(), 5, 8, "$value"));
+    if (value instanceof String) {
+      S.addConstant(9, new ConstantValue(0));
+      S.addStatement(insts.PutInstruction(S.getNumberOfStatements(), 5, 9, "length"));
+    }
     S.getNextProgramCounter();
     
     S.addStatement(insts.ReturnInstruction(S.getNumberOfStatements(), 5, false));
@@ -107,7 +118,7 @@
     return new JavaScriptConstructor(ref, S, cls, cls);
   }
 
-  private IMethod makeUnaryValueConstructor(IClass cls) {
+  private static IMethod makeUnaryValueConstructor(IClass cls) {
     JSInstructionFactory insts = (JSInstructionFactory)cls.getClassLoader().getInstructionFactory();
    MethodReference ref = JavaScriptMethods.makeCtorReference(cls.getReference());
     JavaScriptSummary S = new JavaScriptSummary(ref, 2);
@@ -135,7 +146,7 @@
   private IMethod makeValueConstructor(IClass cls, int nargs, Object value) {
     if (nargs == 0 || nargs == 1) {
 
-      Object key = Pair.make(cls, new Integer(nargs));
+      Object key = Pair.make(cls, Integer.valueOf(nargs));
       if (constructors.containsKey(key))
         return constructors.get(key);
 
@@ -186,7 +197,7 @@
   private IMethod makeObjectConstructor(IClass cls, int nargs) {
     if (nargs == 0 || nargs == 1) {
 
-      Object key = Pair.make(cls, new Integer(nargs));
+      Object key = Pair.make(cls, Integer.valueOf(nargs));
       if (constructors.containsKey(key))
         return constructors.get(key);
 
@@ -202,7 +213,7 @@
   private IMethod makeObjectCall(IClass cls, int nargs) {
     assert nargs == 0;
 
-    Object key = Pair.make(cls, new Integer(nargs));
+    Object key = Pair.make(cls, Integer.valueOf(nargs));
     if (constructors.containsKey(key))
       return constructors.get(key);
 
@@ -240,7 +251,7 @@
     MethodReference ref = JavaScriptMethods.makeCtorReference(JavaScriptTypes.Array);
     JavaScriptSummary S = new JavaScriptSummary(ref, nargs + 1);
 
-    S.addConstant(new Integer(nargs + 3), new ConstantValue("prototype"));
+    S.addConstant(Integer.valueOf(nargs + 3), new ConstantValue("prototype"));
     S.addStatement(insts.PropertyRead(S.getNumberOfStatements(), nargs + 4, 1, nargs + 3));
     S.getNextProgramCounter();
     
@@ -252,13 +263,13 @@
     //S.addStatement(insts.PutInstruction(nargs + 5, nargs + 4, "__proto__"));
     S.getNextProgramCounter();
     
-    S.addConstant(new Integer(nargs + 7), new ConstantValue(nargs));
+    S.addConstant(Integer.valueOf(nargs + 7), new ConstantValue(nargs));
     S.addStatement(insts.PutInstruction(S.getNumberOfStatements(), nargs + 5, nargs + 7, "length"));
     S.getNextProgramCounter();
     
     int vn = nargs + 9;
     for (int i = 0; i < nargs; i++, vn += 2) {
-      S.addConstant(new Integer(vn), new ConstantValue(i));
+      S.addConstant(Integer.valueOf(vn), new ConstantValue(i));
       S.addStatement(insts.PropertyWrite(S.getNumberOfStatements(), nargs + 5, vn, i + 1));
       S.getNextProgramCounter();
       }
@@ -272,7 +283,7 @@
   }
 
   private IMethod makeArrayConstructor(IClass cls, int nargs) {
-    Object key = Pair.make(cls, new Integer(nargs));
+    Object key = Pair.make(cls, Integer.valueOf(nargs));
     if (constructors.containsKey(key))
       return constructors.get(key);
 
@@ -285,7 +296,12 @@
     MethodReference ref = AstMethodReference.fnReference(JavaScriptTypes.String);
     JavaScriptSummary S = new JavaScriptSummary(ref, 1);
 
-    S.addConstant(new Integer(2), new ConstantValue(""));
+    S.addConstant(Integer.valueOf(2), new ConstantValue(""));
+
+    S.addConstant(Integer.valueOf(3), new ConstantValue(0));
+    S.addStatement(insts.PutInstruction(S.getNumberOfStatements(), 2, 3, "length"));
+    S.getNextProgramCounter();
+
     S.addStatement(insts.ReturnInstruction(S.getNumberOfStatements(), 2, false));
     S.getNextProgramCounter();
     
@@ -300,7 +316,7 @@
     S.addStatement(insts.GetInstruction(S.getNumberOfStatements(), 4, 2, "toString"));
     S.getNextProgramCounter();
     
-    CallSiteReference cs = new JSCallSiteReference(S.getNextProgramCounter());
+    CallSiteReference cs = new DynamicCallSiteReference(JavaScriptTypes.CodeBody, S.getNextProgramCounter());
     S.addStatement(insts.Invoke(S.getNumberOfStatements(), 4, 5, new int[] { 2 }, 6, cs));
 
     S.addStatement(insts.ReturnInstruction(S.getNumberOfStatements(), 5, false));
@@ -312,7 +328,7 @@
   private IMethod makeStringCall(IClass cls, int nargs) {
     assert nargs == 0 || nargs == 1;
 
-    Object key = Pair.make(cls, new Integer(nargs));
+    Object key = Pair.make(cls, Integer.valueOf(nargs));
     if (constructors.containsKey(key))
       return constructors.get(key);
 
@@ -325,7 +341,7 @@
     MethodReference ref = AstMethodReference.fnReference(JavaScriptTypes.Number);
     JavaScriptSummary S = new JavaScriptSummary(ref, 1);
 
-    S.addConstant(new Integer(2), new ConstantValue(0.0));
+    S.addConstant(Integer.valueOf(2), new ConstantValue(0.0));
     S.addStatement(insts.ReturnInstruction(S.getNumberOfStatements(), 2, false));
     S.getNextProgramCounter();
     
@@ -340,7 +356,7 @@
     S.addStatement(insts.GetInstruction(S.getNumberOfStatements(), 4, 2, "toNumber"));
     S.getNextProgramCounter();
     
-    CallSiteReference cs = new JSCallSiteReference(S.getNextProgramCounter());
+    CallSiteReference cs = new DynamicCallSiteReference(JavaScriptTypes.CodeBody, S.getNextProgramCounter());
     S.addStatement(insts.Invoke(S.getNumberOfStatements(), 4, 5, new int[] { 2 }, 6, cs));
 
     S.addStatement(insts.ReturnInstruction(S.getNumberOfStatements(), 5, false));
@@ -352,7 +368,7 @@
   private IMethod makeNumberCall(IClass cls, int nargs) {
     assert nargs == 0 || nargs == 1;
 
-    Object key = Pair.make(cls, new Integer(nargs));
+    Object key = Pair.make(cls, Integer.valueOf(nargs));
     if (constructors.containsKey(key))
       return constructors.get(key);
 
@@ -393,7 +409,7 @@
     //S.addConstant(8, new ConstantValue("__proto__"));
 
     if (receiver != cls)
-      return record(tableKey, new JavaScriptConstructor(ref, S, receiver, cls, "(" + cls.getReference().getName() + ")"));
+      return record(tableKey, new JavaScriptConstructor(ref, S, receiver, cls, "(" + cls.getReference().getName() + ')'));
     else
       return record(tableKey, new JavaScriptConstructor(ref, S, receiver, cls));
   }
@@ -425,25 +441,95 @@
         if (!ST.isStringConstant(callStmt.getUse(i)))
           return makeFunctionConstructor(cls, cls);
 
-      StringBuffer fun = new StringBuffer("function _fromctor (");
+      final StringBuilder fun = new StringBuilder("function _fromctor (");
       for (int j = 1; j < callStmt.getNumberOfUses() - 1; j++) {
         if (j != 1)
-          fun.append(",");
+          fun.append(',');
         fun.append(ST.getStringValue(callStmt.getUse(j)));
       }
 
       fun.append(") {");
       fun.append(ST.getStringValue(callStmt.getUse(callStmt.getNumberOfUses() - 1)));
-      fun.append("}");
+      fun.append('}');
 
       try {
-        String fileName = "ctor$" + ++ctorCount;
-        File f = new File(System.getProperty("java.io.tmpdir") + File.separator + fileName);
-        FileWriter FO = new FileWriter(f);
-        FO.write(fun.toString());
-        FO.close();
-        
-        Set<String> fnNames = JSCallGraphUtil.loadAdditionalFile(cha, cl, fileName, f.toURI().toURL());
+        final String fileName = "ctor$" + ++ctorCount;
+        ModuleEntry ME = new SourceModule() {
+
+          @Override
+          public String getName() {
+            return fileName;
+          }
+
+          @Override
+          public boolean isClassFile() {
+            return false;
+          }
+
+          @Override
+          public boolean isSourceFile() {
+            return true;
+          }
+
+          @Override
+          public InputStream getInputStream() {
+            return new InputStream() {
+              private int i = 0;
+              @Override
+              public int read() throws IOException {
+                if (i >= fun.length()) {
+                  return -1;
+                } else {
+                  return fun.codePointAt(i++);
+                }
+              }
+              
+            };
+          }
+
+          @Override
+          public boolean isModuleFile() {
+            return false;
+          }
+
+          @Override
+          public Module asModule() {
+            return null;
+          }
+
+          @Override
+          public String getClassName() {
+            return fileName;
+          }
+
+          @Override
+          public Module getContainer() {
+             return null;
+          }
+
+          @Override
+          public Iterator<? extends ModuleEntry> getEntries() {
+            return new NonNullSingletonIterator<ModuleEntry>(this);
+          }
+
+          @Override
+          public Reader getInputReader() {
+             return new StringReader(fun.toString());
+          }
+
+          @Override
+          public URL getURL() {
+            try {
+              return new URL("file://" + fileName);
+            } catch (MalformedURLException e) {
+              assert false;
+              return null;
+            }
+          }
+          
+        };
+         
+        Set<String> fnNames = JSCallGraphUtil.loadAdditionalFile(cha, cl, ME);
         IClass fcls = null;
         for(String nm : fnNames) {
           if (nm.endsWith("_fromctor")) {
@@ -451,12 +537,9 @@
           }
         }
 
-        assert fcls != null : "cannot find class for " + fileName + " in " + f;
+        assert fcls != null : "cannot find class for " + fileName;
         
-        f.delete();
-
-        if (fcls != null)
-          return makeFunctionConstructor(cls, fcls);
+        return makeFunctionConstructor(cls, fcls);
 
       } catch (IOException e) {
 
@@ -469,7 +552,7 @@
  
   private IMethod makeFunctionObjectConstructor(IClass cls, int nargs) {
     JSInstructionFactory insts = (JSInstructionFactory)cls.getClassLoader().getInstructionFactory();
-   Object key = Pair.make(cls, new Integer(nargs));
+   Object key = Pair.make(cls, Integer.valueOf(nargs));
     if (constructors.containsKey(key))
       return constructors.get(key);
     
@@ -486,7 +569,7 @@
     S.addStatement(insts.SetPrototype(S.getNumberOfStatements(), nargs + 5, nargs + 4));
     S.getNextProgramCounter();
     
-    CallSiteReference cs = new JSCallSiteReference(S.getNextProgramCounter());
+    CallSiteReference cs = new DynamicCallSiteReference(JavaScriptTypes.CodeBody, S.getNextProgramCounter());
     int[] args = new int[nargs + 1];
     args[0] = nargs + 5;
     for (int i = 0; i < nargs; i++)
@@ -518,7 +601,7 @@
       assert nargs == 1;
       return makeValueConstructor(receiver, nargs, null);
     } else if (receiver.getReference().equals(JavaScriptTypes.NumberObject))
-      return makeValueConstructor(receiver, nargs, new Integer(0));
+      return makeValueConstructor(receiver, nargs, Integer.valueOf(0));
     else if (receiver.getReference().equals(JavaScriptTypes.Function))
       return makeFunctionConstructor(callerIR, callStmt, receiver, nargs);
     else if (cha.isSubclassOf(receiver, cha.lookupClass(JavaScriptTypes.CodeBody)))
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoaderFactory.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoaderFactory.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoaderFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoaderFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,13 +23,13 @@
  */
 public class JavaScriptLoaderFactory extends SingleClassLoaderFactory {
   protected final JavaScriptTranslatorFactory translatorFactory;
-  protected final CAstRewriterFactory preprocessor;
+  protected final CAstRewriterFactory<?, ?> preprocessor;
   
   public JavaScriptLoaderFactory(JavaScriptTranslatorFactory factory) {
     this(factory, null);
   }
 
-  public JavaScriptLoaderFactory(JavaScriptTranslatorFactory factory, CAstRewriterFactory preprocessor) {
+  public JavaScriptLoaderFactory(JavaScriptTranslatorFactory factory, CAstRewriterFactory<?, ?> preprocessor) {
     this.translatorFactory = factory;
     this.preprocessor = preprocessor;
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JavaScriptLoader.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,14 +26,19 @@
 import com.ibm.wala.cast.ir.ssa.AstLexicalAccess.Access;
 import com.ibm.wala.cast.ir.ssa.AstLexicalRead;
 import com.ibm.wala.cast.ir.ssa.AstLexicalWrite;
+import com.ibm.wala.cast.ir.ssa.AstPropertyRead;
+import com.ibm.wala.cast.ir.ssa.AstPropertyWrite;
+import com.ibm.wala.cast.ir.ssa.AstYieldInstruction;
 import com.ibm.wala.cast.ir.ssa.EachElementGetInstruction;
 import com.ibm.wala.cast.ir.ssa.EachElementHasNextInstruction;
-import com.ibm.wala.cast.ir.translator.AstTranslator;
 import com.ibm.wala.cast.ir.translator.AstTranslator.AstLexicalInformation;
 import com.ibm.wala.cast.ir.translator.AstTranslator.WalkContext;
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
 import com.ibm.wala.cast.ir.translator.TranslatorToIR;
 import com.ibm.wala.cast.js.analysis.typeInference.JSPrimitiveType;
+import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraph.JSFakeRoot;
+import com.ibm.wala.cast.js.ipa.modref.JavaScriptModRef;
+import com.ibm.wala.cast.js.ipa.modref.JavaScriptModRef.JavaScriptRefVisitor;
 import com.ibm.wala.cast.js.ssa.JSInstructionFactory;
 import com.ibm.wala.cast.js.ssa.JavaScriptCheckReference;
 import com.ibm.wala.cast.js.ssa.JavaScriptInstanceOf;
@@ -47,31 +52,34 @@
 import com.ibm.wala.cast.js.translator.JSAstTranslator;
 import com.ibm.wala.cast.js.translator.JavaScriptTranslatorFactory;
 import com.ibm.wala.cast.js.types.JavaScriptTypes;
-import com.ibm.wala.cast.loader.AstClass;
-import com.ibm.wala.cast.loader.AstDynamicPropertyClass;
-import com.ibm.wala.cast.loader.AstFunctionClass;
-import com.ibm.wala.cast.loader.AstMethod;
 import com.ibm.wala.cast.loader.AstMethod.DebuggingInformation;
-import com.ibm.wala.cast.loader.AstMethod.Retranslatable;
 import com.ibm.wala.cast.loader.CAstAbstractModuleLoader;
 import com.ibm.wala.cast.tree.CAst;
 import com.ibm.wala.cast.tree.CAstEntity;
 import com.ibm.wala.cast.tree.CAstQualifier;
 import com.ibm.wala.cast.tree.CAstSourcePositionMap;
 import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
-import com.ibm.wala.cast.types.AstMethodReference;
+import com.ibm.wala.cast.types.AstTypeReference;
 import com.ibm.wala.cfg.AbstractCFG;
 import com.ibm.wala.cfg.IBasicBlock;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
-import com.ibm.wala.classLoader.IClassLoader;
-import com.ibm.wala.classLoader.IField;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.classLoader.LanguageImpl;
+import com.ibm.wala.classLoader.ModuleEntry;
 import com.ibm.wala.classLoader.NewSiteReference;
-import com.ibm.wala.classLoader.SourceModule;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.impl.AbstractRootMethod;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.ipa.modref.ExtendedHeapModel;
+import com.ibm.wala.ipa.modref.ModRef.ModVisitor;
+import com.ibm.wala.ipa.modref.ModRef.RefVisitor;
 import com.ibm.wala.shrikeBT.IBinaryOpInstruction.IOperator;
 import com.ibm.wala.shrikeBT.IComparisonInstruction.Operator;
 import com.ibm.wala.shrikeCT.BootstrapMethodsReader.BootstrapMethod;
@@ -109,10 +117,8 @@
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.MethodReference;
-import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.types.annotations.Annotation;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.strings.Atom;
@@ -145,7 +151,7 @@
       if (o == null) {
         return JavaScriptTypes.Null;
       } else {
-        Class c = o.getClass();
+        Class<?> c = o.getClass();
         if (c == Boolean.class) {
           return JavaScriptTypes.Boolean;
         } else if (c == String.class) {
@@ -207,6 +213,11 @@
     }
 
     @Override
+    public boolean methodsHaveDeclaredParameterTypes() {
+      return false;
+    }
+
+    @Override
     public JSInstructionFactory instructionFactory() {
       return new JSInstructionFactory() {
 
@@ -242,12 +253,12 @@
         }
 
         @Override
-        public JavaScriptPropertyRead PropertyRead(int iindex, int result, int objectRef, int memberRef) {
+        public AstPropertyRead PropertyRead(int iindex, int result, int objectRef, int memberRef) {
           return new JavaScriptPropertyRead(iindex, result, objectRef, memberRef);
         }
 
         @Override
-        public JavaScriptPropertyWrite PropertyWrite(int iindex, int objectRef, int memberRef, int value) {
+        public AstPropertyWrite PropertyWrite(int iindex, int objectRef, int memberRef, int value) {
           return new JavaScriptPropertyWrite(iindex, objectRef, memberRef, value);
         }
 
@@ -299,6 +310,11 @@
         }
 
         @Override
+        public AstYieldInstruction YieldInstruction(int iindex, int[] rvals) {
+          return new AstYieldInstruction(iindex, rvals);
+        }
+
+        @Override
         public AstGlobalRead GlobalRead(int iindex, int lhs, FieldReference global) {
           return new AstGlobalRead(iindex, lhs, global);
         }
@@ -648,7 +664,6 @@
       return JavaScriptTypes.String;
     }
 
-    @SuppressWarnings("static-access")
     @Override
     public PrimitiveType getPrimitive(TypeReference reference) {
       return PrimitiveType.getPrimitive(reference);
@@ -664,126 +679,39 @@
       return false;
     }
 
-  };
+    @Override
+    public AbstractRootMethod getFakeRootMethod(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
+      return new JSFakeRoot(cha, options, cache);
+    }
 
-  private static final Map<Selector, IMethod> emptyMap1 = Collections.emptyMap();
+    @Override
+    public <T extends InstanceKey> RefVisitor<T, ? extends ExtendedHeapModel> makeRefVisitor(CGNode n,
+        Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h) {
+      return new JavaScriptRefVisitor<>(n, result, pa, h);
+    }
 
-  private static final Map<Atom, IField> emptyMap2 = Collections.emptyMap();
+    @Override
+    public <T extends InstanceKey> ModVisitor<T, ? extends ExtendedHeapModel> makeModVisitor(CGNode n, Collection<PointerKey> result,
+        PointerAnalysis<T> pa, ExtendedHeapModel h, boolean ignoreAllocHeapDefs) {
+      return new JavaScriptModRef.JavaScriptModVisitor<>(n, result, h, pa);
+    }
+
+  };
 
   private final JavaScriptTranslatorFactory translatorFactory;
   
-  private final CAstRewriterFactory preprocessor;
+  private final CAstRewriterFactory<?, ?> preprocessor;
   
   public JavaScriptLoader(IClassHierarchy cha, JavaScriptTranslatorFactory translatorFactory) {
     this(cha, translatorFactory, null);
   }
 
-  public JavaScriptLoader(IClassHierarchy cha, JavaScriptTranslatorFactory translatorFactory, CAstRewriterFactory preprocessor) {
+  public JavaScriptLoader(IClassHierarchy cha, JavaScriptTranslatorFactory translatorFactory, CAstRewriterFactory<?, ?> preprocessor) {
     super(cha);
     this.translatorFactory = translatorFactory;
     this.preprocessor = preprocessor;
   }
 
-  class JavaScriptClass extends AstClass {
-    private IClass superClass;
-
-    private JavaScriptClass(IClassLoader loader, TypeReference classRef, TypeReference superRef,
-        CAstSourcePositionMap.Position sourcePosition) {
-      super(sourcePosition, classRef.getName(), loader, (short) 0, emptyMap2, emptyMap1);
-      types.put(classRef.getName(), this);
-      superClass = superRef == null ? null : loader.lookupClass(superRef.getName());
-    }
-
-    @Override
-    public IClassHierarchy getClassHierarchy() {
-      return cha;
-    }
-
-    @Override
-    public String toString() {
-      return "JS:" + getReference().toString();
-    }
-
-    @Override
-    public Collection<IClass> getDirectInterfaces() {
-      return Collections.emptySet();
-    }
-
-    @Override
-    public IClass getSuperclass() {
-      return superClass;
-    }
-
-    @Override
-    public Collection<Annotation> getAnnotations() {
-      return Collections.emptySet();
-    }
-  }
-
-  class JavaScriptRootClass extends AstDynamicPropertyClass {
-
-    private JavaScriptRootClass(IClassLoader loader, CAstSourcePositionMap.Position sourcePosition) {
-      super(sourcePosition, JavaScriptTypes.Root.getName(), loader, (short) 0, emptyMap1, JavaScriptTypes.Root);
-
-      types.put(JavaScriptTypes.Root.getName(), this);
-    }
-
-    @Override
-    public IClassHierarchy getClassHierarchy() {
-      return cha;
-    }
-
-    @Override
-    public String toString() {
-      return "JS Root:" + getReference().toString();
-    }
-
-    @Override
-    public Collection<IClass> getDirectInterfaces() {
-      return Collections.emptySet();
-    }
-
-    @Override
-    public IClass getSuperclass() {
-      return null;
-    }
-    
-    @Override
-    public Collection<Annotation> getAnnotations() {
-      return Collections.emptySet();
-    }
-  }
-
-  class JavaScriptCodeBody extends AstFunctionClass {
-    private final WalkContext translationContext;
-    private final CAstEntity entity;
-    
-    public JavaScriptCodeBody(TypeReference codeName, TypeReference parent, IClassLoader loader,
-        CAstSourcePositionMap.Position sourcePosition, CAstEntity entity, WalkContext context) {
-      super(codeName, parent, loader, sourcePosition);
-      types.put(codeName.getName(), this);
-      this.translationContext = context;
-      this.entity = entity;
-    }
-
-    @Override
-    public IClassHierarchy getClassHierarchy() {
-      return cha;
-    }
-    
-    private IMethod setCodeBody(JavaScriptMethodObject codeBody) {
-      this.functionBody = codeBody;
-      codeBody.entity = entity;
-      codeBody.translationContext = translationContext;
-      return codeBody;
-    }
-    
-    @Override
-    public Collection<Annotation> getAnnotations() {
-      return Collections.emptySet();
-    }
-  }
-
   private static final Set<CAstQualifier> functionQualifiers;
 
   static {
@@ -792,113 +720,8 @@
     functionQualifiers.add(CAstQualifier.FINAL);
   }
 
-  public class JavaScriptMethodObject extends AstMethod implements Retranslatable {
-    private WalkContext translationContext;
-    private CAstEntity entity;
-
-    JavaScriptMethodObject(IClass cls, AbstractCFG cfg, SymbolTable symtab, boolean hasCatchBlock,
-        Map<IBasicBlock, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo) {
-      super(cls, functionQualifiers, cfg, symtab, AstMethodReference.fnReference(cls.getReference()), hasCatchBlock, caughtTypes,
-          hasMonitorOp, lexicalInfo, debugInfo, null);
-
-      // force creation of these constants by calling the getter methods
-      symtab.getNullConstant();
-    }
-
-    
-    @Override
-    public CAstEntity getEntity() {
-      return entity;
-    }
-
-
-    @Override
-    public void retranslate(AstTranslator xlator) {
-      xlator.translate(entity, translationContext);
-    }
-
-    @Override
-    public IClassHierarchy getClassHierarchy() {
-      return cha;
-    }
-
-    @Override
-    public String toString() {
-      return "<Code body of " + cls + ">";
-    }
-
-    @Override
-    public TypeReference[] getDeclaredExceptions() {
-      return null;
-    }
-
-    @Override
-    public LexicalParent[] getParents() {
-      if (lexicalInfo() == null)
-        return new LexicalParent[0];
-
-      final String[] parents = lexicalInfo().getScopingParents();
-
-      if (parents == null)
-        return new LexicalParent[0];
-
-      LexicalParent result[] = new LexicalParent[parents.length];
-
-      for (int i = 0; i < parents.length; i++) {
-        final int hack = i;
-        final AstMethod method = (AstMethod) lookupClass(parents[i], cha).getMethod(AstMethodReference.fnSelector);
-        result[i] = new LexicalParent() {
-          @Override
-          public String getName() {
-            return parents[hack];
-          }
-
-          @Override
-          public AstMethod getMethod() {
-            return method;
-          }
-        };
-
-        if (AstTranslator.DEBUG_LEXICAL) {
-          System.err.println(("parent " + result[i].getName() + " is " + result[i].getMethod()));
-        }
-      }
-
-      return result;
-    }
-
-    @Override
-    public String getLocalVariableName(int bcIndex, int localNumber) {
-      return null;
-    }
-
-    @Override
-    public boolean hasLocalVariableTable() {
-      return false;
-    }
-
-    public int getMaxLocals() {
-      Assertions.UNREACHABLE();
-      return -1;
-    }
-
-    public int getMaxStackHeight() {
-      Assertions.UNREACHABLE();
-      return -1;
-    }
-
-    @Override
-    public TypeReference getParameterType(int i) {
-      if (i == 0) {
-        return getDeclaringClass().getReference();
-      } else {
-        return JavaScriptTypes.Root;
-      }
-    }
-  }
-
   public IClass makeCodeBodyType(String name, TypeReference P, CAstSourcePositionMap.Position sourcePosition, CAstEntity entity, WalkContext context) {
-    return new JavaScriptCodeBody(TypeReference.findOrCreate(JavaScriptTypes.jsLoader, TypeName.string2TypeName(name)), P, this,
+    return new DynamicCodeBody(TypeReference.findOrCreate(JavaScriptTypes.jsLoader, TypeName.string2TypeName(name)), P, this,
         sourcePosition, entity, context);
   }
 
@@ -910,61 +733,61 @@
     return makeCodeBodyType(name, JavaScriptTypes.Script, pos, entity, context);
   }
 
-  public IMethod defineCodeBodyCode(String clsName, AbstractCFG cfg, SymbolTable symtab, boolean hasCatchBlock,
-      Map<IBasicBlock, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo) {
-    JavaScriptCodeBody C = (JavaScriptCodeBody) lookupClass(clsName, cha);
+  public IMethod defineCodeBodyCode(String clsName, AbstractCFG<?, ?> cfg, SymbolTable symtab, boolean hasCatchBlock,
+      Map<IBasicBlock<SSAInstruction>, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo) {
+    DynamicCodeBody C = (DynamicCodeBody) lookupClass(clsName, cha);
     assert C != null : clsName;
     return C.setCodeBody(makeCodeBodyCode(cfg, symtab, hasCatchBlock, caughtTypes, hasMonitorOp, lexicalInfo, debugInfo, C));
   }
 
-  public JavaScriptMethodObject makeCodeBodyCode(AbstractCFG cfg, SymbolTable symtab, boolean hasCatchBlock,
-      Map<IBasicBlock, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo,
+  public DynamicMethodObject makeCodeBodyCode(AbstractCFG<?, ?> cfg, SymbolTable symtab, boolean hasCatchBlock,
+      Map<IBasicBlock<SSAInstruction>, TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation lexicalInfo, DebuggingInformation debugInfo,
       IClass C) {
-    return new JavaScriptMethodObject(C, cfg, symtab, hasCatchBlock, caughtTypes, hasMonitorOp, lexicalInfo,
+    return new DynamicMethodObject(C, functionQualifiers, cfg, symtab, hasCatchBlock, caughtTypes, hasMonitorOp, lexicalInfo,
         debugInfo);
   }
 
-  final JavaScriptRootClass ROOT = new JavaScriptRootClass(this, null);
+  final CoreClass ROOT = new CoreClass(AstTypeReference.rootTypeName, null, this, null);
 
-  final JavaScriptClass UNDEFINED = new JavaScriptClass(this, JavaScriptTypes.Undefined, JavaScriptTypes.Root, null);
+  final CoreClass UNDEFINED = new CoreClass(JavaScriptTypes.Undefined.getName(), JavaScriptTypes.Root.getName(), this, null);
 
-  final JavaScriptClass PRIMITIVES = new JavaScriptClass(this, JavaScriptTypes.Primitives, JavaScriptTypes.Root, null);
+  final CoreClass PRIMITIVES = new CoreClass(JavaScriptTypes.Primitives.getName(), JavaScriptTypes.Root.getName(), this, null);
 
-  final JavaScriptClass FAKEROOT = new JavaScriptClass(this, JavaScriptTypes.FakeRoot, JavaScriptTypes.Root, null);
+  final CoreClass FAKEROOT = new CoreClass(JavaScriptTypes.FakeRoot.getName(), JavaScriptTypes.Root.getName(), this, null);
 
-  final JavaScriptClass STRING = new JavaScriptClass(this, JavaScriptTypes.String, JavaScriptTypes.Root, null);
+  final CoreClass STRING = new CoreClass(JavaScriptTypes.String.getName(), JavaScriptTypes.Root.getName(), this, null);
 
-  final JavaScriptClass NULL = new JavaScriptClass(this, JavaScriptTypes.Null, JavaScriptTypes.Root, null);
+  final CoreClass NULL = new CoreClass(JavaScriptTypes.Null.getName(), JavaScriptTypes.Root.getName(), this, null);
 
-  final JavaScriptClass ARRAY = new JavaScriptClass(this, JavaScriptTypes.Array, JavaScriptTypes.Root, null);
+  final CoreClass ARRAY = new CoreClass(JavaScriptTypes.Array.getName(), JavaScriptTypes.Root.getName(), this, null);
 
-  final JavaScriptClass OBJECT = new JavaScriptClass(this, JavaScriptTypes.Object, JavaScriptTypes.Root, null);
+  final CoreClass OBJECT = new CoreClass(JavaScriptTypes.Object.getName(), JavaScriptTypes.Root.getName(), this, null);
 
-  final JavaScriptClass TYPE_ERROR = new JavaScriptClass(this, JavaScriptTypes.TypeError, JavaScriptTypes.Root, null);
+  final CoreClass TYPE_ERROR = new CoreClass(JavaScriptTypes.TypeError.getName(), JavaScriptTypes.Root.getName(), this, null);
 
-  final JavaScriptClass CODE_BODY = new JavaScriptClass(this, JavaScriptTypes.CodeBody, JavaScriptTypes.Root, null);
+  final CoreClass CODE_BODY = new CoreClass(JavaScriptTypes.CodeBody.getName(), JavaScriptTypes.Root.getName(), this, null);
 
-  final JavaScriptClass FUNCTION = new JavaScriptClass(this, JavaScriptTypes.Function, JavaScriptTypes.CodeBody, null);
+  final CoreClass FUNCTION = new CoreClass(JavaScriptTypes.Function.getName(), JavaScriptTypes.CodeBody.getName(), this, null);
 
-  final JavaScriptClass SCRIPT = new JavaScriptClass(this, JavaScriptTypes.Script, JavaScriptTypes.CodeBody, null);
+  final CoreClass SCRIPT = new CoreClass(JavaScriptTypes.Script.getName(), JavaScriptTypes.CodeBody.getName(), this, null);
 
-  final JavaScriptClass BOOLEAN = new JavaScriptClass(this, JavaScriptTypes.Boolean, JavaScriptTypes.Root, null);
+  final CoreClass BOOLEAN = new CoreClass(JavaScriptTypes.Boolean.getName(), JavaScriptTypes.Root.getName(), this, null);
 
-  final JavaScriptClass NUMBER = new JavaScriptClass(this, JavaScriptTypes.Number, JavaScriptTypes.Root, null);
+  final CoreClass NUMBER = new CoreClass(JavaScriptTypes.Number.getName(), JavaScriptTypes.Root.getName(), this, null);
 
-  final JavaScriptClass DATE = new JavaScriptClass(this, JavaScriptTypes.Date, JavaScriptTypes.Root, null);
+  final CoreClass DATE = new CoreClass(JavaScriptTypes.Date.getName(), JavaScriptTypes.Root.getName(), this, null);
 
-  final JavaScriptClass REGEXP = new JavaScriptClass(this, JavaScriptTypes.RegExp, JavaScriptTypes.Root, null);
+  final CoreClass REGEXP = new CoreClass(JavaScriptTypes.RegExp.getName(), JavaScriptTypes.Root.getName(), this, null);
 
-  final JavaScriptClass BOOLEAN_OBJECT = new JavaScriptClass(this, JavaScriptTypes.BooleanObject, JavaScriptTypes.Object, null);
+  final CoreClass BOOLEAN_OBJECT = new CoreClass(JavaScriptTypes.BooleanObject.getName(), JavaScriptTypes.Object.getName(), this, null);
 
-  final JavaScriptClass NUMBER_OBJECT = new JavaScriptClass(this, JavaScriptTypes.NumberObject, JavaScriptTypes.Object, null);
+  final CoreClass NUMBER_OBJECT = new CoreClass(JavaScriptTypes.NumberObject.getName(), JavaScriptTypes.Object.getName(), this, null);
 
-  final JavaScriptClass DATE_OBJECT = new JavaScriptClass(this, JavaScriptTypes.DateObject, JavaScriptTypes.Object, null);
+  final CoreClass DATE_OBJECT = new CoreClass(JavaScriptTypes.DateObject.getName(), JavaScriptTypes.Object.getName(), this, null);
 
-  final JavaScriptClass REGEXP_OBJECT = new JavaScriptClass(this, JavaScriptTypes.RegExpObject, JavaScriptTypes.Object, null);
+  final CoreClass REGEXP_OBJECT = new CoreClass(JavaScriptTypes.RegExpObject.getName(), JavaScriptTypes.Object.getName(), this, null);
 
-  final JavaScriptClass STRING_OBJECT = new JavaScriptClass(this, JavaScriptTypes.StringObject, JavaScriptTypes.Object, null);
+  final CoreClass STRING_OBJECT = new CoreClass(JavaScriptTypes.StringObject.getName(), JavaScriptTypes.Object.getName(), this, null);
 
   @Override
   public Language getLanguage() {
@@ -1006,9 +829,8 @@
     bootstrapFileNames.add(prologueFileName);
   }
 
-  @SuppressWarnings("unchecked")
   @Override
-  protected TranslatorToCAst getTranslatorToCAst(final CAst ast, SourceModule module) {
+  protected TranslatorToCAst getTranslatorToCAst(final CAst ast, ModuleEntry module) {
     TranslatorToCAst translator = translatorFactory.make(ast, module);
     if(preprocessor != null)
       translator.addRewriter(preprocessor, true);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JSCallSiteReference.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JSCallSiteReference.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JSCallSiteReference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/loader/JSCallSiteReference.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-package com.ibm.wala.cast.js.loader;
-
-import com.ibm.wala.cast.js.types.JavaScriptTypes;
-import com.ibm.wala.cast.types.AstMethodReference;
-import com.ibm.wala.classLoader.CallSiteReference;
-import com.ibm.wala.shrikeBT.IInvokeInstruction;
-import com.ibm.wala.types.MethodReference;
-
-public class JSCallSiteReference extends CallSiteReference {
-
-  // this must be distinct from java invoke codes.
-  // see com.ibm.shrikeBT.BytecodeConstants
-  public static enum Dispatch implements IInvokeInstruction.IDispatch {
-    JS_CALL;
-
-    @Override
-    public boolean hasImplicitThis() {
-      return false;
-    }
-  }
-
-  public JSCallSiteReference(MethodReference ref, int pc) {
-    super(pc, ref);
-  }
-
-  public JSCallSiteReference(int pc) {
-    this(AstMethodReference.fnReference(JavaScriptTypes.CodeBody), pc);
-  }
-
-  @Override
-  public IInvokeInstruction.IDispatch getInvocationCode() {
-    return Dispatch.JS_CALL;
-  }
-
-  @Override
-  public String toString() {
-    return "JSCall@" + getProgramCounter();
-  }
-
-  public CallSiteReference cloneReference(int pc) {
-    return new JSCallSiteReference(pc);
-  }
-
-  @Override
-  public boolean isDispatch() {
-    return true;
-  }
-
-  @Override
-  public boolean isStatic() {
-    return false;
-  }
-
-  @Override
-  public boolean isFixed() {
-    return false;
-  }
-
-  
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptInvoke.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptInvoke.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptInvoke.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptInvoke.java	2019-01-29 17:08:39.000000000 +0000
@@ -58,8 +58,7 @@
 
     }
 
-    int newLvals[] = new int[results.length];
-    System.arraycopy(results, 0, newLvals, 0, results.length);
+    int[] newLvals = results.clone();
     int newExp = exception;
 
     if (defs != null) {
@@ -80,12 +79,12 @@
   
   @Override
   public int getNumberOfUses() {
-    return getNumberOfParameters();
+    return getNumberOfPositionalParameters();
   }
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    StringBuffer s = new StringBuffer();
+    StringBuilder s = new StringBuilder();
     if (getNumberOfReturnValues() > 0) {
       s.append(getValueString(symbolTable, getReturnValue(0)));
       s.append(" = ");
@@ -99,14 +98,14 @@
     s.append(getValueString(symbolTable, function));
 
     if (site != null)
-      s.append("@").append(site.getProgramCounter());
+      s.append('@').append(site.getProgramCounter());
 
     if (params != null) {
       if (params.length > 0) {
-        s.append(" ").append(getValueString(symbolTable, params[0]));
+        s.append(' ').append(getValueString(symbolTable, params[0]));
       }
       for (int i = 1; i < params.length; i++) {
-        s.append(",").append(getValueString(symbolTable, params[i]));
+        s.append(',').append(getValueString(symbolTable, params[i]));
       }
     }
 
@@ -126,7 +125,7 @@
   }
 
   @Override
-  public int getNumberOfParameters() {
+  public int getNumberOfPositionalParameters() {
     if (params == null) {
       return 1;
     } else {
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptPropertyRead.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptPropertyRead.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptPropertyRead.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptPropertyRead.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,33 +12,14 @@
 
 import java.util.Collection;
 
-import com.ibm.wala.cast.ir.ssa.AbstractReflectiveGet;
-import com.ibm.wala.ssa.SSAInstruction;
-import com.ibm.wala.ssa.SSAInstructionFactory;
+import com.ibm.wala.cast.ir.ssa.AstPropertyRead;
 import com.ibm.wala.types.TypeReference;
 
-public class JavaScriptPropertyRead extends AbstractReflectiveGet {
+public class JavaScriptPropertyRead extends AstPropertyRead {
   public JavaScriptPropertyRead(int iindex, int result, int objectRef, int memberRef) {
     super(iindex, result, objectRef, memberRef);
   }
 
-  @Override
-  public SSAInstruction copyForSSA(SSAInstructionFactory insts, int[] defs, int[] uses) {
-    return
-      ((JSInstructionFactory)insts).PropertyRead(iindex,
-        defs==null? getDef(): defs[0],
-	uses==null? getObjectRef(): uses[0],
-	uses==null? getMemberRef(): uses[1]);
-  }
-
-  /* (non-Javadoc)
-   * @see com.ibm.domo.ssa.Instruction#isPEI()
-   */
-  @Override
-  public boolean isPEI() {
-    return true;
-  }
-
   /* (non-Javadoc)
    * @see com.ibm.domo.ssa.Instruction#getExceptionTypes()
    */
@@ -46,14 +27,4 @@
   public Collection<TypeReference> getExceptionTypes() {
     return Util.typeErrorExceptions();
   }
-
-  /**
-  /* (non-Javadoc)
-   * @see com.ibm.domo.ssa.SSAInstruction#visit(com.ibm.domo.ssa.SSAInstruction.Visitor)
-   */
-  @Override
-  public void visit(IVisitor v) {
-    assert v instanceof JSInstructionVisitor;
-    ((JSInstructionVisitor)v).visitJavaScriptPropertyRead(this);
-  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptPropertyWrite.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptPropertyWrite.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptPropertyWrite.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptPropertyWrite.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,47 +12,15 @@
 
 import java.util.Collection;
 
-import com.ibm.wala.cast.ir.ssa.AbstractReflectivePut;
-import com.ibm.wala.ssa.SSAInstruction;
-import com.ibm.wala.ssa.SSAInstructionFactory;
-import com.ibm.wala.ssa.SymbolTable;
+import com.ibm.wala.cast.ir.ssa.AstPropertyWrite;
 import com.ibm.wala.types.TypeReference;
 
-public class JavaScriptPropertyWrite extends AbstractReflectivePut {
+public class JavaScriptPropertyWrite extends AstPropertyWrite {
 
   public JavaScriptPropertyWrite(int iindex, int objectRef, int memberRef, int value) {
     super(iindex, objectRef, memberRef, value);
   }
 
-  @Override
-  public SSAInstruction copyForSSA(SSAInstructionFactory insts, int[] defs, int[] uses) {
-    return ((JSInstructionFactory)insts).PropertyWrite(iindex, uses == null ? getObjectRef() : uses[0], uses == null ? getMemberRef() : uses[1],
-        uses == null ? getValue() : uses[2]);
-  }
-
-  @Override
-  public String toString(SymbolTable symbolTable) {
-    return super.toString(symbolTable) + " = " + getValueString(symbolTable, getValue());
-  }
-
-  /**
-   * @see com.ibm.domo.ssa.Instruction#visit(Visitor)
-   */
-  @Override
-  public void visit(IVisitor v) {
-    assert v instanceof JSInstructionVisitor;
-    ((JSInstructionVisitor) v).visitJavaScriptPropertyWrite(this);
-  }
-
-  /*
-   * (non-Javadoc)
-   * @see com.ibm.domo.ssa.Instruction#isPEI()
-   */
-  @Override
-  public boolean isPEI() {
-    return true;
-  }
-
   /*
    * (non-Javadoc)
    * @see com.ibm.domo.ssa.Instruction#getExceptionTypes()
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptTypeOfInstruction.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptTypeOfInstruction.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptTypeOfInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JavaScriptTypeOfInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -31,7 +31,7 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return getValueString(symbolTable, getDef(0)) + " = typeof(" + getValueString(symbolTable, getUse(0)) + ")";
+    return getValueString(symbolTable, getDef(0)) + " = typeof(" + getValueString(symbolTable, getUse(0)) + ')';
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JSAbstractInstructionVisitor.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JSAbstractInstructionVisitor.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JSAbstractInstructionVisitor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JSAbstractInstructionVisitor.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,8 @@
 package com.ibm.wala.cast.js.ssa;
 
 import com.ibm.wala.cast.ir.ssa.AstAbstractInstructionVisitor;
+import com.ibm.wala.cast.ir.ssa.AstPropertyRead;
+import com.ibm.wala.cast.ir.ssa.AstPropertyWrite;
 
 public class JSAbstractInstructionVisitor 
     extends AstAbstractInstructionVisitor 
@@ -23,12 +25,12 @@
   }
     
   @Override
-  public void visitJavaScriptPropertyRead(JavaScriptPropertyRead instruction) {
+  public void visitPropertyRead(AstPropertyRead instruction) {
   
   }
   
   @Override
-  public void visitJavaScriptPropertyWrite(JavaScriptPropertyWrite instruction) {
+  public void visitPropertyWrite(AstPropertyWrite instruction) {
   
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JSInstructionFactory.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JSInstructionFactory.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JSInstructionFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JSInstructionFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -29,10 +29,6 @@
   
   JavaScriptInvoke Invoke(int iindex, int function, int[] params, int exception, CallSiteReference site);
  
-  JavaScriptPropertyRead PropertyRead(int iindex, int result, int objectRef, int memberRef);
-  
-  JavaScriptPropertyWrite PropertyWrite(int iindex, int objectRef, int memberRef, int value);
-
   SSAPutInstruction PutInstruction(int iindex, int ref, int value, String field);
   
   JavaScriptTypeOfInstruction TypeOfInstruction(int iindex, int lval, int object);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JSInstructionVisitor.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JSInstructionVisitor.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JSInstructionVisitor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/JSInstructionVisitor.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,11 +17,7 @@
   public void visitJavaScriptInvoke(JavaScriptInvoke instruction);
     
   public void visitTypeOf(JavaScriptTypeOfInstruction instruction);
-    
-  public void visitJavaScriptPropertyRead(JavaScriptPropertyRead instruction);
-  
-  public void visitJavaScriptPropertyWrite(JavaScriptPropertyWrite instruction);
-  
+      
   public void visitJavaScriptInstanceOf(JavaScriptInstanceOf instruction);
   
   public void visitWithRegion(JavaScriptWithRegion instruction);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/PrototypeLookup.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/PrototypeLookup.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/PrototypeLookup.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/PrototypeLookup.java	2019-01-29 17:08:39.000000000 +0000
@@ -32,7 +32,7 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return getValueString(symbolTable, getDef(0)) + " = prototype_values(" + getValueString(symbolTable, getUse(0)) + ")";
+    return getValueString(symbolTable, getDef(0)) + " = prototype_values(" + getValueString(symbolTable, getUse(0)) + ')';
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/SetPrototype.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/SetPrototype.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/SetPrototype.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/ssa/SetPrototype.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,7 +42,7 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return "set_prototype(" + getValueString(symbolTable, object) + ", " + getValueString(symbolTable, prototype) + ")";
+    return "set_prototype(" + getValueString(symbolTable, object) + ", " + getValueString(symbolTable, prototype) + ')';
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JavaScriptLoopUnwindingTranslatorFactory.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JavaScriptLoopUnwindingTranslatorFactory.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JavaScriptLoopUnwindingTranslatorFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JavaScriptLoopUnwindingTranslatorFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,10 +13,7 @@
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
 import com.ibm.wala.cast.tree.CAst;
 import com.ibm.wala.cast.tree.rewrite.AstLoopUnwinder;
-import com.ibm.wala.cast.tree.rewrite.AstLoopUnwinder.UnwindKey;
-import com.ibm.wala.cast.tree.rewrite.CAstRewriter;
-import com.ibm.wala.cast.tree.rewrite.CAstRewriter.RewriteContext;
-import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
+import com.ibm.wala.classLoader.ModuleEntry;
 import com.ibm.wala.classLoader.SourceFileModule;
 import com.ibm.wala.classLoader.SourceModule;
 
@@ -36,7 +33,7 @@
   protected abstract TranslatorToCAst translateInternal(CAst Ast, SourceModule M, String N);
 
   @Override
-  public TranslatorToCAst make(CAst ast, final SourceModule M) {
+  public TranslatorToCAst make(CAst ast, final ModuleEntry M) {
 	  String N;
 	  if (M instanceof SourceFileModule) {
 		  N = ((SourceFileModule) M).getClassName();
@@ -44,13 +41,8 @@
 	      N = M.getName();
 	  }
 
-	  TranslatorToCAst xlator = translateInternal(ast, M, N);
-	  xlator.addRewriter(new CAstRewriterFactory<CAstRewriter.RewriteContext<AstLoopUnwinder.UnwindKey>,AstLoopUnwinder.UnwindKey>() {
-		@Override
-    public CAstRewriter<RewriteContext<UnwindKey>, UnwindKey> createCAstRewriter(CAst ast) {
-			return new AstLoopUnwinder(ast, true, unwindFactor);
-		}		  
-	  }, false);
+	  TranslatorToCAst xlator = translateInternal(ast, (SourceModule)M, N);
+	  xlator.addRewriter(ast1 -> new AstLoopUnwinder(ast1, true, unwindFactor), false);
 	  
 	  return xlator;
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JavaScriptTranslatorFactory.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JavaScriptTranslatorFactory.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JavaScriptTranslatorFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JavaScriptTranslatorFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,7 @@
 
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
 import com.ibm.wala.cast.tree.CAst;
-import com.ibm.wala.classLoader.SourceModule;
+import com.ibm.wala.classLoader.ModuleEntry;
 
 /**
  * Factory interface for creating translators that generate the CAst for some
@@ -21,6 +21,6 @@
  */
 public interface JavaScriptTranslatorFactory {
 
-  TranslatorToCAst make(CAst ast, SourceModule M);
+  TranslatorToCAst make(CAst ast, ModuleEntry M);
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JavaScriptTranslatorToCAst.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JavaScriptTranslatorToCAst.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JavaScriptTranslatorToCAst.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JavaScriptTranslatorToCAst.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,26 +12,24 @@
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
 
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
 import com.ibm.wala.cast.tree.CAstControlFlowMap;
-import com.ibm.wala.cast.tree.CAstEntity;
 import com.ibm.wala.cast.tree.CAstNode;
-import com.ibm.wala.cast.tree.impl.CAstControlFlowRecorder;
-import com.ibm.wala.cast.tree.impl.CAstSourcePositionRecorder;
-import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.debug.Assertions;
 
 public interface JavaScriptTranslatorToCAst extends TranslatorToCAst {
 
   interface WalkContext<C extends WalkContext<C, T>, T> extends TranslatorToCAst.WalkContext<C, T> {
 
-    String script();
+    @Override
+    WalkContext<C, T> getParent();    
 
-    T top();
+    default String script()  {
+      return getParent().script();
+    }
 
     /**
      * Add a name declaration to this context. For variables or constants, n
@@ -39,23 +37,36 @@
      * variable (if any) may occur in a separate assignment. For functions, n
      * should be a {@link CAstNode#FUNCTION_STMT}, including the function body.
      */
-    void addNameDecl(CAstNode n);
-
-    Collection<CAstNode> getNameDecls();
-
-    CAstNode getCatchTarget();
+    default void addNameDecl(CAstNode n) {
+      getParent().addNameDecl(n);
+    }
 
-    int setOperation(T node);
+    default Collection<CAstNode> getNameDecls() {
+      return getParent().getNameDecls();
+    }
 
-    boolean foundMemberOperation(T node);
+    default int setOperation(T node) {
+      return getParent().setOperation(node);
+    }
 
-    void copyOperation(T from, T to);
+    default boolean foundMemberOperation(T node) {
+      return getParent().foundMemberOperation(node);
+    }
 
+    default void copyOperation(T from, T to) {
+      getParent().copyOperation(from, to);
+    }
   }
 
   public static class RootContext<C extends WalkContext<C, T>, T> extends TranslatorToCAst.RootContext<C, T> implements WalkContext<C,T> {
 
     @Override
+    public WalkContext<C, T> getParent() {
+      assert false;
+      return null;
+    }
+
+    @Override
     public String script() { return null; }
 
     @Override
@@ -98,35 +109,34 @@
 
   }
 
-  class DelegatingContext<C extends WalkContext<C, T>, T> extends TranslatorToCAst.DelegatingContext<C, T> implements WalkContext<C,T> {
+   public static class FunctionContext<C extends WalkContext<C, T>, T> extends TranslatorToCAst.FunctionContext<C, T> implements WalkContext<C,T> {
 
-    protected DelegatingContext(C parent) {
-      super(parent);
-    }
+    private final Vector<CAstNode> initializers = new Vector<>();
 
+    
     @Override
-    public String script() {
-      return parent.script();
+    public WalkContext<C, T> getParent() {
+      return (WalkContext<C, T>) super.getParent();
     }
 
-    @Override
-    public T top() {
-      return parent.top();
+    protected FunctionContext(C parent, T s) {
+      super(parent, s);
     }
 
     @Override
-    public void addNameDecl(CAstNode n) {
-      parent.addNameDecl(n);
-    }
+    public void addNameDecl(CAstNode v) { initializers.add(v); }
 
     @Override
-    public Collection<CAstNode> getNameDecls() {
-      return parent.getNameDecls();
+    public Collection<CAstNode> getNameDecls() { return initializers; }
+
+    @Override
+    public String script() {
+      return parent.script();
     }
 
     @Override
     public CAstNode getCatchTarget() {
-      return parent.getCatchTarget();
+      return CAstControlFlowMap.EXCEPTION_TO_EXIT;
     }
 
     @Override
@@ -143,51 +153,6 @@
     public void copyOperation(T from, T to) {
       parent.copyOperation(from, to);
     }
-
-  }
-
-  public static class FunctionContext<C extends WalkContext<C, T>, T> extends DelegatingContext<C,T> {
-    private final T topNode;
-    private final CAstSourcePositionRecorder pos = new CAstSourcePositionRecorder();
-    private final CAstControlFlowRecorder cfg = new CAstControlFlowRecorder(pos);
-    private final Map<CAstNode, Collection<CAstEntity>> scopedEntities = HashMapFactory.make();
-    private final Vector<CAstNode> initializers = new Vector<CAstNode>();
-
-    protected FunctionContext(C parent, T s) {
-      super(parent);
-      this.topNode = s;
-    }
-
-    @Override
-    public T top() { return topNode; }
-
-    @Override
-    public CAstNode getCatchTarget() { return CAstControlFlowMap.EXCEPTION_TO_EXIT; }
-
-    @Override
-    public void addScopedEntity(CAstNode construct, CAstEntity e) {
-      if (! scopedEntities.containsKey(construct)) {
-        scopedEntities.put(construct, new HashSet<CAstEntity>(1));
-      }
-      scopedEntities.get(construct).add(e);
-    }
-
-    @Override
-    public Map<CAstNode, Collection<CAstEntity>> getScopedEntities() {
-      return scopedEntities;
-    }
-
-    @Override
-    public void addNameDecl(CAstNode v) { initializers.add(v); }
-
-    @Override
-    public Collection<CAstNode> getNameDecls() { return initializers; }
-
-    @Override
-    public CAstControlFlowRecorder cfg() { return cfg; }
-
-    @Override
-    public CAstSourcePositionRecorder pos() { return pos; }
   }
 
   public static class ScriptContext<C extends WalkContext<C, T>, T> extends FunctionContext<C,T> {
@@ -202,48 +167,6 @@
     public String script() { return script; }
   }
 
-  public static class TryCatchContext<C extends WalkContext<C, T>, T> extends DelegatingContext<C,T> {
-    private final CAstNode catchNode;
-
-    protected TryCatchContext(C parent, CAstNode catchNode) {
-      super(parent);
-      this.catchNode = catchNode;
-    }
-
-    @Override
-    public CAstNode getCatchTarget() { return catchNode; }
-  }
- 
-  class BreakContext<C extends WalkContext<C, T>, T> extends DelegatingContext<C,T> {
-    private final T breakTarget;
-    protected final String label;
-
-    protected BreakContext(C parent, T breakTarget, String label) {
-      super(parent);
-      this.breakTarget = breakTarget;
-      this.label = label;
-    }
-
-    @Override
-    public T getBreakFor(String l) {
-      return (l == null || l.equals(label))? breakTarget: super.getBreakFor(l);
-    }
-  }
-
-  public class LoopContext<C extends WalkContext<C, T>, T> extends BreakContext<C,T> {
-    private final T continueTo;
-
-    protected LoopContext(C parent, T breakTo, T continueTo, String label) {
-      super(parent, breakTo, label);
-      this.continueTo = continueTo;
-    }
-
-    @Override
-    public T getContinueFor(String l) {
-      return (l == null || l.equals(label))? continueTo: super.getContinueFor(l);
-    }
-  }
-
   /**
    * Used to determine the value to be passed as the 'this' argument for a
    * function call. This is needed since in JavaScript, you can write a call
@@ -255,14 +178,15 @@
    * 'this' parameter in baseVar, and then to use baseVar as the actual argument
    * sub-node for the CAst call node
    */
-  public class MemberDestructuringContext<C extends WalkContext<C, T>, T> extends DelegatingContext<C,T> {
+  public class MemberDestructuringContext<C extends WalkContext<C, T>, T> implements WalkContext<C,T> {
+    private final WalkContext<C, T> parent;
     
     /**
      * node for which we actually care about what the base pointer is. this
      * helps to handle cases like x.y.f(), where we would like to store x.y in
      * baseVar, but not x when we recurse.
      */
-    private final Set<T> baseFor = new HashSet<T>();
+    private final Set<T> baseFor = new HashSet<>();
 
     private int operationIndex;
     
@@ -272,7 +196,7 @@
     private boolean foundBase = false;
 
     protected MemberDestructuringContext(C parent, T initialBaseFor, int operationIndex) {
-      super(parent);
+      this.parent = parent;
       baseFor.add( initialBaseFor );
       this.operationIndex = operationIndex;
     }
@@ -296,6 +220,11 @@
     public void copyOperation(T from, T to) {
       if (baseFor.contains(from)) baseFor.add(to);
     }
+
+    @Override
+    public WalkContext<C, T> getParent() {
+      return parent;
+    }
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JSAstTranslator.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JSAstTranslator.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JSAstTranslator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JSAstTranslator.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,16 +16,17 @@
 import java.util.Set;
 
 import com.ibm.wala.cast.ir.translator.AstTranslator;
-import com.ibm.wala.cast.js.loader.JSCallSiteReference;
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
 import com.ibm.wala.cast.js.ssa.JSInstructionFactory;
 import com.ibm.wala.cast.js.ssa.JavaScriptInstanceOf;
 import com.ibm.wala.cast.js.ssa.PrototypeLookup;
 import com.ibm.wala.cast.js.types.JavaScriptMethods;
 import com.ibm.wala.cast.js.types.JavaScriptTypes;
+import com.ibm.wala.cast.loader.DynamicCallSiteReference;
 import com.ibm.wala.cast.loader.AstMethod.DebuggingInformation;
 import com.ibm.wala.cast.tree.CAstEntity;
 import com.ibm.wala.cast.tree.CAstNode;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
 import com.ibm.wala.cast.tree.CAstSymbol;
 import com.ibm.wala.cast.tree.CAstType;
 import com.ibm.wala.cast.tree.impl.CAstSymbolImpl;
@@ -54,7 +55,7 @@
     super(loader);
   }
 
-  private boolean isPrologueScript(WalkContext context) {
+  private static boolean isPrologueScript(WalkContext context) {
     return JavaScriptLoader.bootstrapFileNames.contains( context.getModule().getName() );
   }
 
@@ -152,24 +153,24 @@
     if (f.getKind() == CAstEntity.SCRIPT_ENTITY)
       return f.getName();
     else
-      return parent.getName() + "/" + f.getName();
+      return parent.getName() + '/' + f.getName();
   }
 
   @Override
   protected void declareFunction(CAstEntity N, WalkContext context) {
     String fnName = composeEntityName(context, N);
     if (N.getKind() == CAstEntity.SCRIPT_ENTITY) {
-      ((JavaScriptLoader) loader).defineScriptType("L" + fnName, N.getPosition(), N, context);
+      ((JavaScriptLoader) loader).defineScriptType('L' + fnName, N.getPosition(), N, context);
     } else if (N.getKind() == CAstEntity.FUNCTION_ENTITY) {
-      ((JavaScriptLoader) loader).defineFunctionType("L" + fnName, N.getPosition(), N, context);
+      ((JavaScriptLoader) loader).defineFunctionType('L' + fnName, N.getPosition(), N, context);
     } else {
       Assertions.UNREACHABLE();
     }
   }
 
   @Override
-  protected void defineFunction(CAstEntity N, WalkContext definingContext, AbstractCFG cfg, SymbolTable symtab,
-      boolean hasCatchBlock, Map<IBasicBlock,TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation LI,
+  protected void defineFunction(CAstEntity N, WalkContext definingContext, AbstractCFG<SSAInstruction, ? extends IBasicBlock<SSAInstruction>> cfg, SymbolTable symtab,
+      boolean hasCatchBlock, Map<IBasicBlock<SSAInstruction>,TypeReference[]> caughtTypes, boolean hasMonitorOp, AstLexicalInformation LI,
       DebuggingInformation debugInfo) {
     if (DEBUG)
       System.err.println(("\n\nAdding code for " + N));
@@ -178,7 +179,7 @@
     if (DEBUG)
       System.err.println(cfg);
  
-    ((JavaScriptLoader) loader).defineCodeBodyCode("L" + fnName, cfg, symtab, hasCatchBlock, caughtTypes, hasMonitorOp, LI,
+    ((JavaScriptLoader) loader).defineCodeBodyCode('L' + fnName, cfg, symtab, hasCatchBlock, caughtTypes, hasMonitorOp, LI,
         debugInfo);
   }
 
@@ -196,7 +197,7 @@
 
     context.cfg().addInstruction(
         ((JSInstructionFactory) insts).Invoke(context.cfg().getCurrentInstruction(), receiver, result, arguments, exception, 
-            new JSCallSiteReference(ref, context.cfg().getCurrentInstruction())));
+            new DynamicCallSiteReference(ref, context.cfg().getCurrentInstruction())));
 
     context.cfg().addPreNode(call, context.getUnwindState());
 
@@ -221,12 +222,12 @@
 
   @Override
   protected void doMaterializeFunction(CAstNode n, WalkContext context, int result, int exception, CAstEntity fn) {
-    int nm = context.currentScope().getConstantValue("L" + composeEntityName(context, fn));
+    int nm = context.currentScope().getConstantValue('L' + composeEntityName(context, fn));
     // "Function" is the name we use to model the constructor of function values
     int tmp = super.doGlobalRead(n, context, "Function", JavaScriptTypes.Function);
     context.cfg().addInstruction(
       ((JSInstructionFactory)insts).Invoke(context.cfg().getCurrentInstruction(), tmp, result, new int[]{ nm }, exception,
-        new JSCallSiteReference(JavaScriptMethods.ctorReference, context.cfg().getCurrentInstruction())));
+        new DynamicCallSiteReference(JavaScriptMethods.ctorReference, context.cfg().getCurrentInstruction())));
   }
 
   @Override
@@ -321,35 +322,35 @@
       if (name.equals("GlobalNaN")) {
 	context.cfg().addInstruction(
 	    ((JSInstructionFactory)insts).AssignInstruction(context.cfg().getCurrentInstruction(), 
-	    resultVal, context.currentScope().getConstantValue(new Float(Float.NaN))));
+	    resultVal, context.currentScope().getConstantValue(Float.valueOf(Float.NaN))));
       } else if (name.equals("GlobalInfinity")) {
         context.cfg().addInstruction(
             ((JSInstructionFactory)insts).AssignInstruction(context.cfg().getCurrentInstruction(), 
-            resultVal, context.currentScope().getConstantValue(new Float(Float.POSITIVE_INFINITY))));
+            resultVal, context.currentScope().getConstantValue(Float.valueOf(Float.POSITIVE_INFINITY))));
       } else if (name.equals("MathE")) {
         context.cfg().addInstruction(
             ((JSInstructionFactory)insts).AssignInstruction(context.cfg().getCurrentInstruction(), 
-            resultVal, context.currentScope().getConstantValue(new Double(Math.E))));
+            resultVal, context.currentScope().getConstantValue(Double.valueOf(Math.E))));
       } else if (name.equals("MathPI")) {
         context.cfg().addInstruction(
             ((JSInstructionFactory)insts).AssignInstruction(context.cfg().getCurrentInstruction(), 
-            resultVal, context.currentScope().getConstantValue(new Double(Math.PI))));
+            resultVal, context.currentScope().getConstantValue(Double.valueOf(Math.PI))));
       } else if (name.equals("MathSQRT1_2")) {
         context.cfg().addInstruction(
             ((JSInstructionFactory)insts).AssignInstruction(context.cfg().getCurrentInstruction(), 
-            resultVal, context.currentScope().getConstantValue(new Double(Math.sqrt(.5)))));
+            resultVal, context.currentScope().getConstantValue(Double.valueOf(Math.sqrt(.5)))));
       } else if (name.equals("MathSQRT2")) {
         context.cfg().addInstruction(
             ((JSInstructionFactory)insts).AssignInstruction(context.cfg().getCurrentInstruction(), 
-            resultVal, context.currentScope().getConstantValue(new Double(Math.sqrt(2)))));
+            resultVal, context.currentScope().getConstantValue(Double.valueOf(Math.sqrt(2)))));
       } else if (name.equals("MathLN2")) {
         context.cfg().addInstruction(
             ((JSInstructionFactory)insts).AssignInstruction(context.cfg().getCurrentInstruction(), 
-            resultVal, context.currentScope().getConstantValue(new Double(Math.log(2)))));
+            resultVal, context.currentScope().getConstantValue(Double.valueOf(Math.log(2)))));
       } else if (name.equals("MathLN10")) {
         context.cfg().addInstruction(
             ((JSInstructionFactory)insts).AssignInstruction(context.cfg().getCurrentInstruction(), 
-            resultVal, context.currentScope().getConstantValue(new Double(Math.log(10)))));
+            resultVal, context.currentScope().getConstantValue(Double.valueOf(Math.log(10)))));
       } else if (name.equals("NewObject")) {
         doNewObject(context, null, resultVal, "Object", null);
 
@@ -377,7 +378,7 @@
             resultVal, context.currentScope().getConstantValue( null )));
       }
     } catch (ClassCastException e) {
-      throw new RuntimeException("Cannot translate primitive " + primitiveCall.getChild(0).getValue());
+      throw new RuntimeException("Cannot translate primitive " + primitiveCall.getChild(0).getValue(), e);
     }
   }
 
@@ -470,7 +471,7 @@
     }
 
     @Override
-    public Collection getSupertypes() {
+    public Collection<CAstType> getSupertypes() {
       return Collections.EMPTY_SET;
     }
   };
@@ -485,4 +486,17 @@
     return Any;
   }
 
+  @Override
+  protected Position[] getParameterPositions(CAstEntity e) {
+    if (e.getKind() == CAstEntity.SCRIPT_ENTITY) {
+      return new Position[0];
+    } else {
+      Position[] ps = new Position[ e.getArgumentCount() ];
+      for(int i = 2; i < e.getArgumentCount(); i++) {
+        ps[i] = e.getPosition(i-2);
+      }
+      return ps;
+    }
+  }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JSConstantFoldingRewriter.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JSConstantFoldingRewriter.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JSConstantFoldingRewriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/JSConstantFoldingRewriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -24,9 +24,9 @@
   protected Object eval(CAstOperator op, Object lhs, Object rhs) {
     if (op == CAstOperator.OP_ADD) {
       if (lhs instanceof String || rhs instanceof String) {
-        return "" + lhs + rhs;
+        return String.valueOf(lhs) + rhs;
       } else if (lhs instanceof Number && rhs instanceof Number) {
-        return new Double(((Number)lhs).doubleValue() + ((Number)rhs).doubleValue());
+        return Double.valueOf(((Number)lhs).doubleValue() + ((Number)rhs).doubleValue());
       } 
     } else if (op == CAstOperator.OP_BIT_AND) {
 
@@ -38,12 +38,12 @@
 
     } else if (op == CAstOperator.OP_CONCAT) {
       if (lhs instanceof String || rhs instanceof String) {
-        return "" + lhs + rhs;
+        return String.valueOf(lhs) + rhs;
       }
       
     } else if (op == CAstOperator.OP_DIV) {
       if (lhs instanceof Number && rhs instanceof Number) {
-        return new Double(((Number)lhs).doubleValue() / ((Number)rhs).doubleValue());
+        return Double.valueOf(((Number)lhs).doubleValue() / ((Number)rhs).doubleValue());
       } 
       
     } else if (op == CAstOperator.OP_EQ) {
@@ -72,12 +72,12 @@
 
     } else if (op == CAstOperator.OP_MOD) {
       if (lhs instanceof Number && rhs instanceof Number) {
-        return new Double(((Number)lhs).doubleValue() % ((Number)rhs).doubleValue());
+        return Double.valueOf(((Number)lhs).doubleValue() % ((Number)rhs).doubleValue());
       } 
       
     } else if (op == CAstOperator.OP_MUL) {
       if (lhs instanceof Number && rhs instanceof Number) {
-        return new Double(((Number)lhs).doubleValue() * ((Number)rhs).doubleValue());
+        return Double.valueOf(((Number)lhs).doubleValue() * ((Number)rhs).doubleValue());
       } 
       
     } else if (op == CAstOperator.OP_NE) {
@@ -98,7 +98,7 @@
 
     } else if (op == CAstOperator.OP_SUB) {
       if (lhs instanceof Number && rhs instanceof Number) {
-        return new Double(((Number)lhs).doubleValue() - ((Number)rhs).doubleValue());
+        return Double.valueOf(((Number)lhs).doubleValue() - ((Number)rhs).doubleValue());
       } 
       
     } else if (op == CAstOperator.OP_URSH) {
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/PropertyReadExpander.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/PropertyReadExpander.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/PropertyReadExpander.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/translator/PropertyReadExpander.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,7 +18,6 @@
 import com.ibm.wala.cast.tree.CAstNode;
 import com.ibm.wala.cast.tree.impl.CAstOperator;
 import com.ibm.wala.cast.tree.rewrite.CAstRewriter;
-import com.ibm.wala.cast.tree.rewrite.CAstRewriter.CopyKey;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.debug.Assertions;
 
@@ -29,7 +28,7 @@
  */
 public class PropertyReadExpander extends CAstRewriter<PropertyReadExpander.RewriteContext, PropertyReadExpander.ExpanderKey> {
 
-  static enum ExpanderKey implements CopyKey<ExpanderKey> {
+  static enum ExpanderKey implements com.ibm.wala.cast.tree.rewrite.CAstRewriter.CopyKey<ExpanderKey> {
     EVERYWHERE, EXTRA {
       @Override
       public ExpanderKey parent() { return EVERYWHERE; }
@@ -96,7 +95,7 @@
       this.elementTemp = elementTemp;
     }
 
-  };
+  }
 
   private final static RewriteContext READ = new RewriteContext() {
     @Override
@@ -140,13 +139,6 @@
    * create a CAstNode l representing a loop that traverses the prototype chain
    * from receiver searching for the constant property element. update nodeMap
    * to map root to an expression that reads the property from the right node.
-   * 
-   * @param root
-   * @param receiver
-   * @param element
-   * @param context
-   * @param nodeMap
-   * @return
    */
   private CAstNode makeConstRead(CAstNode root, CAstNode receiver, CAstNode element, RewriteContext context,
       Map<Pair<CAstNode, ExpanderKey>, CAstNode> nodeMap) {
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/types/JavaScriptTypes.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/types/JavaScriptTypes.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/types/JavaScriptTypes.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/types/JavaScriptTypes.java	2019-01-29 17:08:39.000000000 +0000
@@ -71,4 +71,4 @@
 
   public static final TypeReference RegExpObject = TypeReference.findOrCreate(jsLoader, "LRegExpObject");
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/util/CallGraph2JSON.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/util/CallGraph2JSON.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/util/CallGraph2JSON.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/util/CallGraph2JSON.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *****************************************************************************/
 package com.ibm.wala.cast.js.util;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -24,9 +23,9 @@
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.MapUtil;
 import com.ibm.wala.util.collections.Util;
-import com.ibm.wala.util.functions.Function;
 
 /**
  * Utility class to serialize call graphs as JSON objects.
@@ -47,9 +46,9 @@
  * "&lt;filename&gt;@&lt;lineno&gt;:&lt;beginoff&gt;-&lt;endoff&gt;"
  * </pre>
  * 
- * Here, <code>filename</code> is the name of the containing
+ * Here, {@code filename} is the name of the containing
  * JavaScript file (not including its directory), and
- * <code>lineno</code>, <code>beginoff</code> and <code>endoff</code>
+ * {@code lineno}, {@code beginoff} and {@code endoff}
  * encode the source position of the call expression (for
  * call sites) or the function declaration/expression (for
  * callees) inside the file in terms of its starting line,
@@ -73,14 +72,8 @@
 				continue;
 			AstMethod method = (AstMethod)nd.getMethod();
 
-			for(Iterator<CallSiteReference> iter = nd.iterateCallSites(); iter.hasNext();) {
-				CallSiteReference callsite = iter.next();
-        Set<IMethod> targets = Util.mapToSet(cg.getPossibleTargets(nd, callsite), new Function<CGNode, IMethod>() {
-          @Override
-          public IMethod apply(CGNode nd) {
-            return nd.getMethod();
-          }
-        });
+			for(CallSiteReference callsite : Iterator2Iterable.make(nd.iterateCallSites())) {
+        Set<IMethod> targets = Util.mapToSet(cg.getPossibleTargets(nd, callsite), CGNode::getMethod);
 				serializeCallSite(method, callsite, targets, edges);
 			}
 		}
@@ -89,12 +82,12 @@
 	
   public static void serializeCallSite(AstMethod method, CallSiteReference callsite, Set<IMethod> targets,
       Map<String, Set<String>> edges) {
-    Set<String> targetNames = MapUtil.findOrCreateSet(edges, ppPos(method, method.getSourcePosition(callsite.getProgramCounter())));
+    Set<String> targetNames = MapUtil.findOrCreateSet(edges, ppPos(method.getSourcePosition(callsite.getProgramCounter())));
     for(IMethod target : targets) {
       target = getCallTargetMethod(target);
     	if(!isRealFunction(target))
     		continue;
-    	targetNames.add(ppPos((AstMethod)target, ((AstMethod)target).getSourcePosition()));
+    	targetNames.add(ppPos(((AstMethod)target).getSourcePosition()));
     }
   }
 	
@@ -117,7 +110,7 @@
 
       if(IGNORE_HARNESS) {
         for(String bootstrapFile : JavaScriptLoader.bootstrapFileNames)
-          if(methodName.startsWith("L" + bootstrapFile + "/"))
+          if(methodName.startsWith('L' + bootstrapFile + '/'))
             return false;
       }
  
@@ -126,41 +119,33 @@
 		return false;
 	}
 	
-	private static String ppPos(AstMethod method, Position pos) {
+	private static String ppPos(Position pos) {
 		String file = pos.getURL().getFile();
 		file = file.substring(file.lastIndexOf('/')+1);
 		
 		int line = pos.getFirstLine(), start_offset = pos.getFirstOffset(), end_offset = pos.getLastOffset();
-		return file + "@" + line + ":" + start_offset + "-" + end_offset;
+		return file + '@' + line + ':' + start_offset + '-' + end_offset;
 	}
 	
 	public static String toJSON(Map<String, Set<String>> map) {
-		StringBuffer res = new StringBuffer();
+		StringBuilder res = new StringBuilder();
 		res.append("{\n");
-		res.append(joinWith(Util.mapToSet(map.entrySet(), new Function<Map.Entry<String, Set<String>>, String>() {
-		  @Override
-		  public String apply(Map.Entry<String, Set<String>> e) {
-		    StringBuffer res = new StringBuffer();
-		    if(e.getValue().size() > 0) {
-		      res.append("    \"" + e.getKey() + "\": [\n");
-		      res.append(joinWith(Util.mapToSet(e.getValue(), new Function<String, String>() {
-		          @Override
-              public String apply(String str) {
-                return "        \"" + str + "\"";
-		          }
-			      }), ",\n"));
-		      res.append("\n    ]");
-		    }
-		    return res.length() == 0 ? null : res.toString();
-			}
-		}), ",\n"));
+		res.append(joinWith(Util.mapToSet(map.entrySet(), e -> {
+      StringBuilder res1 = new StringBuilder();
+      if(e.getValue().size() > 0) {
+        res1.append("    \"").append(e.getKey()).append("\": [\n");
+        res1.append(joinWith(Util.mapToSet(e.getValue(), str -> "        \"" + str + '"'), ",\n"));
+        res1.append("\n    ]");
+      }
+      return res1.length() == 0 ? null : res1.toString();
+    }), ",\n"));
 		res.append("\n}");
 		return res.toString();
 	}
 	
 	private static String joinWith(Iterable<String> lst, String sep) {
-	  StringBuffer res = new StringBuffer();
-	  ArrayList<String> strings = new ArrayList<String>();
+	  StringBuilder res = new StringBuilder();
+	  ArrayList<String> strings = new ArrayList<>();
 	  for(String s : lst)
 	    if(s != null)
 	      strings.add(s);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/util/Util.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/util/Util.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/util/Util.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/util/Util.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,53 +10,18 @@
  *******************************************************************************/
 package com.ibm.wala.cast.js.util;
 
-import java.util.Iterator;
-
 import com.ibm.wala.cast.js.ssa.PrototypeLookup;
-import com.ibm.wala.cast.loader.CAstAbstractLoader;
-import com.ibm.wala.classLoader.IClassLoader;
-import com.ibm.wala.classLoader.ModuleEntry;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAPhiInstruction;
-import com.ibm.wala.util.WalaException;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.intset.IntSet;
-import com.ibm.wala.util.intset.IntSetAction;
 import com.ibm.wala.util.intset.IntSetUtil;
 import com.ibm.wala.util.intset.MutableIntSet;
-import com.ibm.wala.util.warnings.Warning;
 
 public class Util {
 
-  public static void checkForFrontEndErrors(IClassHierarchy cha) throws WalaException {
-    StringBuffer message = null;
-    for(IClassLoader loader : cha.getLoaders()) {
-      if (loader instanceof CAstAbstractLoader) {
-        Iterator<ModuleEntry> errors = ((CAstAbstractLoader)loader).getModulesWithParseErrors();
-        if (errors.hasNext()) {
-          if (message == null) {
-            message = new StringBuffer("front end errors:\n");
-          }
-          while (errors.hasNext()) {
-            ModuleEntry errorModule = errors.next();
-            for(Warning w : (((CAstAbstractLoader)loader).getMessages(errorModule))) {
-              message.append("error in ").append(errorModule.getName()).append(":\n");
-              message.append(w.toString()).append("\n");
-            }
-          }
-        }
-        // clear out the errors to free some memory
-        ((CAstAbstractLoader)loader).clearMessages();
-      }
-    }
-    if (message != null) {
-      message.append("end of front end errors\n");
-      throw new WalaException(String.valueOf(message));
-    }
-  }
-
   public static IntSet getArgumentsArrayVns(IR ir, final DefUse du) {
     int originalArgsVn = getArgumentsArrayVn(ir);
     final MutableIntSet result = IntSetUtil.make();
@@ -68,14 +33,10 @@
     int size; 
     do {
       size = result.size();
-      result.foreach(new IntSetAction() {
-        @Override
-        public void act(int vn) {
-          for(Iterator<SSAInstruction> insts = du.getUses(vn); insts.hasNext(); ) {
-            SSAInstruction inst = insts.next();
-            if (inst instanceof PrototypeLookup || inst instanceof SSAPhiInstruction) {
-              result.add(inst.getDef());
-            }
+      result.foreach(vn -> {
+        for(SSAInstruction inst : Iterator2Iterable.make(du.getUses(vn))) {
+          if (inst instanceof PrototypeLookup || inst instanceof SSAPhiInstruction) {
+            result.add(inst.getDef());
           }
         }
       });
diff -Nru wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/vis/JsPaPanel.java wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/vis/JsPaPanel.java
--- wala-1.3.9/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/vis/JsPaPanel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js/source/com/ibm/wala/cast/js/vis/JsPaPanel.java	2019-01-29 17:08:39.000000000 +0000
@@ -35,7 +35,7 @@
 	private static final long serialVersionUID = 1L;
 
 	private MutableMapping<List<ObjectPropertyCatalogKey>> instanceKeyIdToObjectPropertyCatalogKey = MutableMapping.<List<ObjectPropertyCatalogKey>> make();
-	private List<AstGlobalPointerKey> globalsPointerKeys = new ArrayList<AstGlobalPointerKey>();
+	private List<AstGlobalPointerKey> globalsPointerKeys = new ArrayList<>();
 
 	public JsPaPanel(CallGraph cg, PointerAnalysis<InstanceKey> pa) {
 		super(cg, pa);
@@ -43,7 +43,7 @@
 	}
 
 	private void initDataStructures(PointerAnalysis<InstanceKey> pa) {
-		HeapGraph heapGraph = pa.getHeapGraph();
+		HeapGraph<InstanceKey> heapGraph = pa.getHeapGraph();
 		OrdinalSetMapping<InstanceKey> instanceKeyMapping = pa.getInstanceKeyMapping();
 		for (Object n : heapGraph){
 			if (heapGraph.getPredNodeCount(n) == 0){
@@ -65,8 +65,7 @@
 
 	@Override
   protected List<PointerKey> getPointerKeysUnderInstanceKey(InstanceKey ik) {
-		List<PointerKey> ret = new ArrayList<PointerKey>();
-		ret.addAll(super.getPointerKeysUnderInstanceKey(ik));
+		List<PointerKey> ret = new ArrayList<>(super.getPointerKeysUnderInstanceKey(ik));
 		int ikIndex = pa.getInstanceKeyMapping().getMappedIndex(ik);
 		ret.addAll(nonNullList(instanceKeyIdToObjectPropertyCatalogKey.getMappedObject(ikIndex)));
 		return ret;
@@ -77,7 +76,7 @@
 	
 	@Override
 	protected List<Object> getRootNodes() {
-		List<Object> ret = new ArrayList<Object>(2);
+		List<Object> ret = new ArrayList<>(2);
 		ret.add(cgNodesRoot);
 		ret.add(globalsRoot);
 		return ret;
@@ -85,7 +84,7 @@
 
 	@Override
 	protected List<Object> getChildrenFor(Object node) {
-		List<Object> ret = new ArrayList<Object>();
+		List<Object> ret = new ArrayList<>();
 		if (node == cgNodesRoot){
 	    for (int nodeId = 0 ; nodeId < cg.getNumberOfNodes(); nodeId++){
 	      CGNode cgNode = cg.getNode(nodeId);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/build.gradle wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/build.gradle
--- wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,29 @@
+sourceSets {
+	main.java.srcDirs = ['src']
+	test.java.srcDirs = ['tests']
+}
+
+dependencies {
+	compile(
+		'nu.validator.htmlparser:htmlparser:1.4',
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.cast.js'),
+		project(':com.ibm.wala.util'),
+		)
+	testCompile(
+		project(':com.ibm.wala.cast.test'),
+		project(':com.ibm.wala.core.tests'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.cast.js.rhino.test'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.cast.js.test'),
+		)
+}
+
+processTestResources {
+	def data = project(':com.ibm.wala.cast.js.test.data')
+	dependsOn data.processTestResources
+	from data.sourceSets.test.resources
+}
+
+test {
+	maxHeapSize = '800M'
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/build.properties wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/build.properties
--- wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -2,6 +2,10 @@
            tests/
 bin.includes = META-INF/,\
                .,\
-               lib/htmlparser-1.4.jar
+               lib/htmlparser-1.4.jar,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 jars.extra.classpath = lib/htmlparser-1.4.jar
-               
\ No newline at end of file
+javacProjectSettings = true
+output.. = bin/
+               
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/build.xml wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/build.xml
--- wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/build.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.ibm.wala.cast.js.html.nu_validator" default="getJars" basedir=".">
-
-  <property name="basews" value="${ws}"/>
-  <property name="baseos" value="${os}"/>
-  <property name="basearch" value="${arch}"/>
-  <property name="basenl" value="${nl}"/>
-  
-  <!-- Compiler settings. -->
-  <property name="javacFailOnError" value="true"/>
-  <property name="javacDebugInfo" value="on"/>
-  <property name="javacVerbose" value="false"/>
-  <property name="logExtension" value=".log"/>
-  <property name="compilerArg" value=""/>
-  <property name="javacSource" value="1.5"/>
-  <property name="javacTarget" value="1.5"/>
-  <!-- This property has been updated to correspond to the paths used by the latest Java update
-       on Mac OS X 10.6 (Java version 1.6.0_22).  If you are not using this version of Mac OS X or Java,
-       try changing the value of the property to "${java.home}/../../../Classes" -->
-  <condition property="dir_bootclasspath" value="${java.home}/../Classes">
-    <os family="mac"/>
-  </condition>
-  <property name="dir_bootclasspath" value="${java.home}/lib"/>
-  <path id="path_bootclasspath">
-    <fileset dir="${dir_bootclasspath}">
-      
-      <include name="*.jar"/>
-    </fileset>
-  </path>	
-  <property name="bootclasspath" refid="path_bootclasspath"/>
-  <property name="bundleJavacSource" value="${javacSource}"/>
-  <property name="bundleJavacTarget" value="${javacTarget}"/>
-  <property name="bundleBootClasspath" value="${bootclasspath}"/>
-  
-  <target name="NuPresent" depends="init">
-    <available file="${plugin.destination}/lib/htmlparser-1.4.jar" property="nu.present"/>
-  </target>
-  
-  <target name="fetchNu" depends="NuPresent" unless="nu.present">
-    <delete dir="${temp.folder}"/>
-    <mkdir dir="${temp.folder}"/>
-    <get src="http://about.validator.nu/htmlparser/htmlparser-1.4.zip" dest="${temp.folder}/htmlparser-1.4.zip"/>
-    <unzip src="${temp.folder}/htmlparser-1.4.zip" dest="${temp.folder}"/>
-    <copy file="${temp.folder}/htmlparser-1.4/htmlparser-1.4.jar" tofile="${plugin.destination}/lib/htmlparser-1.4.jar" />
-    <delete dir="${temp.folder}"/>
-  </target>
-
-  <target name="getJars" depends="fetchNu" />
-  
-  <target name="init" depends="properties">
-    <condition property="pluginTemp" value="${buildTempFolder}/plugins">
-      <isset property="buildTempFolder"/>
-    </condition>
-    <property name="pluginTemp" value="${basedir}"/>
-    <condition property="build.result.folder" value="${pluginTemp}/com.ibm.wala.core.testdata">
-      <isset property="buildTempFolder"/>
-    </condition>
-    <property name="build.result.folder" value="${basedir}"/>
-    <property name="temp.folder" value="${basedir}/temp.folder"/>
-    <property name="plugin.destination" value="${basedir}"/>
-  </target>
-  
-  <target name="properties" if="eclipse.running">
-    <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-  </target>
-  
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/.classpath wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/.classpath
--- wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="tests"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="lib/htmlparser-1.4.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/.gitignore wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/.gitignore
--- wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/.gitignore	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1 @@
+/*.html
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,9 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Nu_validator
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js.html.nu_validator
-Bundle-Version: 1.3.9
-Export-Package: com.ibm.wala.cast.js.html.nu_validator
+Bundle-Version: 1.5.1
+Export-Package: com.ibm.wala.cast.js.html.nu_validator,
+ com.ibm.wala.cast.js.test
 Require-Bundle: com.ibm.wala.cast.js;bundle-version="1.0.0",
  com.ibm.wala.cast.js.rhino.test;bundle-version="1.0.0",
  com.ibm.wala.cast.js.test;bundle-version="1.0.0",
@@ -12,6 +13,6 @@
  com.ibm.wala.core.tests;bundle-version="1.1.3",
  com.ibm.wala.core;bundle-version="1.1.3",
  org.junit;bundle-version="4.8.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,
  lib/htmlparser-1.4.jar
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+#Properties file for com.ibm.wala.cast.js.html.nu_validator
+Bundle-Name = Nu_validator
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/pom.xml wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.9</version>
+    <version>1.5.1</version>
   </parent>
   <artifactId>com.ibm.wala.cast.js.html.nu_validator</artifactId>
   <packaging>eclipse-plugin</packaging>
@@ -61,8 +61,13 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>nu.validator.htmlparser</groupId>
+      <artifactId>htmlparser</artifactId>
+      <version>1.4</version>
+    </dependency>
   </dependencies> 
 </project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/.project wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/.project
--- wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.cast.js.html.nu_validator</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,78 +1,125 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=error
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=error
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=0
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude08113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T02111contentType133org.eclipse.jdt.junit.JUnitResultF04file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/src/com/ibm/wala/cast/js/html/nu_validator/NuValidatorHtmlParser.java wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/src/com/ibm/wala/cast/js/html/nu_validator/NuValidatorHtmlParser.java
--- wala-1.3.9/com.ibm.wala.cast.js.html.nu_validator/src/com/ibm/wala/cast/js/html/nu_validator/NuValidatorHtmlParser.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.html.nu_validator/src/com/ibm/wala/cast/js/html/nu_validator/NuValidatorHtmlParser.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,9 +23,6 @@
 import java.util.Set;
 import java.util.Stack;
 
-import nu.validator.htmlparser.common.XmlViolationPolicy;
-import nu.validator.htmlparser.sax.HtmlParser;
-
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
@@ -39,6 +36,9 @@
 import com.ibm.wala.cast.tree.impl.LineNumberPosition;
 import com.ibm.wala.util.collections.Pair;
 
+import nu.validator.htmlparser.common.XmlViolationPolicy;
+import nu.validator.htmlparser.sax.HtmlParser;
+
 public class NuValidatorHtmlParser implements IHtmlParser {
 
   @Override
@@ -55,7 +55,7 @@
     parser.setXmlPolicy(XmlViolationPolicy.ALLOW);
     parser.setContentHandler(new ContentHandler() {
       private Locator locator;
-      private Stack<ITag> tags = new Stack<ITag>();;
+      private Stack<ITag> tags = new Stack<>();
       
       private int countLines(char[] ch, int start, int length) {
         LineNumberReader r = new LineNumberReader(new StringReader (new String(ch, start, length)));  
@@ -99,7 +99,7 @@
               @Override
               public Set<java.util.Map.Entry<String, Pair<String,Position>>> entrySet() {
                 if (es == null) {
-                  es = new HashSet<Map.Entry<String,Pair<String,Position>>>();
+                  es = new HashSet<>();
                   for(int i = 0; i < atts.getLength(); i++) {
                     final int index = i;
                     es.add(new Map.Entry<String,Pair<String,Position>>() {
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/build.gradle wala-1.5.1/com.ibm.wala.cast.js.nodejs/build.gradle
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,41 @@
+dependencies {
+	compile(
+		'commons-io:commons-io:2.4',
+		'org.json:json:20160212',
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.cast.js'),
+		project(':com.ibm.wala.cast.js.rhino'),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.util'),
+		)
+}
+
+task downloadNodeJS(type: VerifiedDownload) {
+	src 'https://api.github.com/repos/nodejs/node/zipball/0a604e92e258c5ee2752d763e50721e35053f135'
+	dest "$temporaryDir/nodejs.zip"
+	checksum '33c5ba7a5d45644e70d268d8ad3e57df'
+}
+
+task unpackNodeJSLib(type: Copy, dependsOn: downloadNodeJS) {
+	from(zipTree(downloadNodeJS.dest)) {
+		include 'nodejs-node-0a604e9/lib/*.js'
+		eachFile {
+			relativePath new RelativePath(!directory, relativePath.lastName)
+		}
+	}
+
+	into 'dat/core-modules'
+	includeEmptyDirs false
+}
+
+task cleanUnpackNodeJSLib(type: Delete) {
+	delete fileTree(dir: 'dat/core-modules', include: '*.js')
+}
+
+processResources.dependsOn unpackNodeJSLib
+clean.dependsOn cleanUnpackNodeJSLib
+
+sourceSets.main {
+	java.srcDirs = ['src']
+	resources.srcDirs = ['dat']
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/build.properties wala-1.5.1/com.ibm.wala.cast.js.nodejs/build.properties
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/build.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,14 @@
+bin.includes = META-INF/,\
+               .,\
+               lib/json-20160212.jar,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/,\
+               dat/
+output.. = bin/
+source.. = dat/,\
+           src/
+javacProjectSettings = true
+bin.excludes = dat/core-modules/.eslintrc,\
+               dat/core-modules/.gitignore,\
+               dat/core-modules/.gitkeep
+javacDefaultEncoding.. = UTF-8
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/build.xml wala-1.5.1/com.ibm.wala.cast.js.nodejs/build.xml
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/build.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/build.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,43 @@
+<project name="com.ibm.wala.cast.js.nodejs" default="download-core-libs" basedir=".">
+	<description>
+		WALA Nodejs Front-end
+	</description>
+	<property name="nodejs-release" location="nodejs.zip" />
+	<property name="core-modules" location="dat/core-modules" />
+
+        <target name="core-libs-present">
+        <available file="${core-modules}/_debugger.js" property="corelibs.present"/>
+     </target>
+
+	<target name="download-core-libs" depends="core-libs-present" unless="corelibs.present">
+		<!-- 0a604e92e258c5ee2752d763e50721e35053f135 is v0.12.4-release -->
+		<get src="https://api.github.com/repos/nodejs/node/zipball/0a604e92e258c5ee2752d763e50721e35053f135"
+				dest="${nodejs-release}" />
+		
+		<tempfile property="unzip-dest" />
+		
+		<unzip src="${nodejs-release}"
+				dest="${unzip-dest}">
+			
+			<patternset>
+				<include name="*/lib/**" />
+			</patternset>
+		</unzip>
+		
+		<mkdir dir="${core-modules}" />
+		
+		<move todir="${core-modules}"
+				flatten="true">
+			
+			<fileset dir="${unzip-dest}">
+				<include name="*/lib/*.js" />
+			</fileset>
+		</move>
+		
+		<!-- Cleanup -->
+		<delete includeemptydirs="true">
+			<fileset dir="${unzip-dest}" includes="**" />
+			<fileset file="${nodejs-release}" />
+		</delete>
+	</target>
+</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/dat/core-modules/.eslintrc wala-1.5.1/com.ibm.wala.cast.js.nodejs/dat/core-modules/.eslintrc
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/dat/core-modules/.eslintrc	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/dat/core-modules/.eslintrc	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,4 @@
+rules:
+  # Custom rules in tools/eslint-rules
+  require-buffer: 2
+  buffer-constructor: 2
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/dat/core-modules/.gitignore wala-1.5.1/com.ibm.wala.cast.js.nodejs/dat/core-modules/.gitignore
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/dat/core-modules/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/dat/core-modules/.gitignore	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1 @@
+*.js
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/dat/extended-prologue.js wala-1.5.1/com.ibm.wala.cast.js.nodejs/dat/extended-prologue.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/dat/extended-prologue.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/dat/extended-prologue.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,13 @@
+var timerId = 0;
+
+function setTimeout(cb, t) {
+	cb();
+	return timerId++;
+}
+
+function setInterval(cb, t) {
+	return setTimeout(function () {
+		cb();
+		setInterval(cb, t);
+	}, t);
+}
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/dat/json-wrapper.js wala-1.5.1/com.ibm.wala.cast.js.nodejs/dat/json-wrapper.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/dat/json-wrapper.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/dat/json-wrapper.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+(function jsonModule() {
+	return /*/ WALA-INSERT-CODE-HERE /*/;
+})();
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/dat/module-wrapper.js wala-1.5.1/com.ibm.wala.cast.js.nodejs/dat/module-wrapper.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/dat/module-wrapper.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/dat/module-wrapper.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,12 @@
+(function nodejsModule() {
+	var module = {
+		require: function __WALA__require(id) {},
+		exports: {}
+	};
+	
+	(function moduleSource(exports, require, module, __filename, __dirname) {
+		/*/ WALA-INSERT-CODE-HERE /*/
+	})(module.exports, module.require, module, '/*/ WALA-INSERT-FILENAME-HERE /*/', '/*/ WALA-INSERT-DIRNAME-HERE /*/');
+	
+	return module.exports;
+})();
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: com.ibm.wala.cast.js.nodejs
+Bundle-Version: 1.5.1
+Export-Package: com.ibm.wala.cast.js.nodejs,
+ org.json
+Require-Bundle: com.ibm.wala.cast.js;bundle-version="1.3.10",
+ com.ibm.wala.cast.js.rhino;bundle-version="1.3.10"
+Bundle-ClassPath: lib/json-20160212.jar,
+ .
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast.js.nodejs/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+#Properties file for com.ibm.wala.cast.js.nodejs
+Bundle-Name = Nodejs
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/pom.xml wala-1.5.1/com.ibm.wala.cast.js.nodejs/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/pom.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.ibm.wala</groupId>
+        <artifactId>WALA</artifactId>
+        <version>1.5.1</version>
+    </parent>
+    <packaging>eclipse-plugin</packaging>
+    <artifactId>com.ibm.wala.cast.js.nodejs</artifactId>
+    <build>
+      <plugins>
+	<plugin>
+	  <artifactId>maven-antrun-plugin</artifactId>
+	  <version>1.7</version>
+	  <executions>
+	    <execution>
+	      <phase>process-resources</phase>
+	      <configuration>
+		<tasks>
+		  <property name="compile_classpath" refid="maven.compile.classpath" />
+		  <ant antfile="${basedir}/build.xml" target="download-core-libs" />
+		</tasks>
+	      </configuration>
+	      <goals>
+		<goal>run</goal>
+	      </goals>
+	    </execution>
+	  </executions>
+	</plugin>
+        <plugin>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <executions>
+            <execution>
+              <goals>
+                <goal>copy</goal>
+              </goals>
+              <configuration>
+                <artifactItems>
+                  <artifactItem>
+                    <groupId>org.mozilla</groupId>
+                    <artifactId>rhino</artifactId>
+                    <version>1.7.6</version>
+                    <type>jar</type>
+                    <overWrite>false</overWrite>
+                  </artifactItem>
+                  <artifactItem>
+  	            <groupId>org.json</groupId>
+  	            <artifactId>json</artifactId>
+  	            <version>20160212</version>
+                  </artifactItem>  
+                </artifactItems>  
+                <outputDirectory>${basedir}/lib</outputDirectory>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </build>
+</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.js.nodejs/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/.settings/org.eclipse.jdt.core.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,394 @@
+eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=error
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=2
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=132
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=2
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast.js.nodejs/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=0
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java wala-1.5.1/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,114 @@
+/******************************************************************************
+ * Copyright (c) 2002 - 2016 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Brian Pfretzschner - initial implementation
+ *****************************************************************************/
+package com.ibm.wala.cast.js.nodejs;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+
+import com.ibm.wala.cast.ipa.callgraph.CAstAnalysisScope;
+import com.ibm.wala.cast.ipa.callgraph.CAstCallGraphUtil;
+import com.ibm.wala.cast.ipa.callgraph.StandardFunctionTargetSelector;
+import com.ibm.wala.cast.ir.ssa.AstIRFactory;
+import com.ibm.wala.cast.js.ipa.callgraph.JSAnalysisOptions;
+import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder;
+import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
+import com.ibm.wala.cast.js.ipa.callgraph.JSZeroOrOneXCFABuilder;
+import com.ibm.wala.cast.js.ipa.callgraph.JavaScriptEntryPoints;
+import com.ibm.wala.cast.js.ipa.callgraph.PropertyNameContextSelector;
+import com.ibm.wala.cast.js.loader.JavaScriptLoader;
+import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
+import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory;
+import com.ibm.wala.cast.js.translator.JavaScriptTranslatorFactory;
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.classLoader.Language;
+import com.ibm.wala.classLoader.Module;
+import com.ibm.wala.classLoader.SourceFileModule;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
+import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
+import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.ssa.IRFactory;
+import com.ibm.wala.util.WalaException;
+
+/**
+ * @author Brian Pfretzschner &lt;brian.pfretzschner@gmail.com&gt;
+ */
+public class NodejsCallGraphBuilderUtil extends JSCallGraphUtil {
+
+	public static PropagationCallGraphBuilder makeCGBuilder(File mainFile)
+			throws IOException, IllegalArgumentException, WalaException {
+		return makeCGBuilder(mainFile.getParentFile(), mainFile);
+	}
+
+	public static PropagationCallGraphBuilder makeCGBuilder(File workingDir, File mainFile)
+			throws IOException, IllegalArgumentException, WalaException {
+		JavaScriptTranslatorFactory translatorFactory = new CAstRhinoTranslatorFactory();
+		JSCallGraphUtil.setTranslatorFactory(translatorFactory);
+
+		Language language = JavaScriptLoader.JS;
+		Collection<Language> languages = Collections.singleton(language);
+
+		IRFactory<IMethod> irFactory = new AstIRFactory.AstDefaultIRFactory<>();
+		IAnalysisCacheView cache = new AnalysisCacheImpl(irFactory);
+
+		JavaScriptLoaderFactory loaders = new JavaScriptLoaderFactory(translatorFactory, null);
+
+		SourceFileModule mainSourceModule = CAstCallGraphUtil.makeSourceModule(mainFile.toURI().toURL(),
+				mainFile.getName());
+		String mainFileClassName = NodejsRequiredSourceModule.convertFileToClassName(workingDir, mainFile);
+
+		Module[] files = new Module[] {
+				JSCallGraphUtil.getPrologueFile("prologue.js"),
+				JSCallGraphUtil.getPrologueFile("extended-prologue.js"),
+				new NodejsRequiredSourceModule(mainFileClassName, mainFile, mainSourceModule) };
+
+		CAstAnalysisScope scope = new CAstAnalysisScope(files, loaders, languages);
+
+		IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, language, null);
+		com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha);
+
+		// Make Script Roots
+		Iterable<Entrypoint> roots = new JavaScriptEntryPoints(cha, loaders.getTheLoader());
+
+		// Make Options
+		JSAnalysisOptions options = new JSAnalysisOptions(scope, roots);
+		options.setUseConstantSpecificKeys(true);
+		options.setUseStacksForLexicalScoping(true);
+		options.setHandleCallApply(true);
+		// Important to be able to identify what file are required
+		options.setTraceStringConstants(true);
+
+		com.ibm.wala.ipa.callgraph.impl.Util.addDefaultSelectors(options, cha);
+
+		MethodTargetSelector baseSelector = new StandardFunctionTargetSelector(cha, options.getMethodTargetSelector());
+		NodejsRequireTargetSelector requireTargetSelector = new NodejsRequireTargetSelector(workingDir, baseSelector);
+		options.setSelector(requireTargetSelector);
+
+		JSCFABuilder builder = new JSZeroOrOneXCFABuilder(cha, options, cache, null, null,
+				ZeroXInstanceKeys.ALLOCATIONS, true);
+
+		// A little hacky, but the instance of RequireTargetSelector is required to build the CallGraphBuilder
+		// and the RequireTargetSelector also needs the CallGraphBuilder instance.
+		requireTargetSelector.setCallGraphBuilder(builder);
+
+		ContextSelector contextSelector = new PropertyNameContextSelector(cache, 2, builder.getContextSelector());
+		builder.setContextSelector(contextSelector);
+
+		return builder;
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredCoreModule.java wala-1.5.1/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredCoreModule.java
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredCoreModule.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredCoreModule.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,78 @@
+/******************************************************************************
+ * Copyright (c) 2002 - 2016 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Brian Pfretzschner - initial implementation
+ *****************************************************************************/
+package com.ibm.wala.cast.js.nodejs;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.io.FilenameUtils;
+
+import com.ibm.wala.cast.ipa.callgraph.CAstCallGraphUtil;
+import com.ibm.wala.classLoader.SourceFileModule;
+import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.io.TemporaryFile;
+
+/**
+ * @author Brian Pfretzschner &lt;brian.pfretzschner@gmail.com&gt;
+ */
+public class NodejsRequiredCoreModule extends NodejsRequiredSourceModule {
+
+	/**
+	 * Core modules list for Nodejs v6.2.2
+	 * https://github.com/nodejs/node/blob/v6.2.2/lib/internal/module.js 
+	 */
+	private static final Set<String> CORE_MODULES = HashSetFactory.make(Arrays.asList(
+			"assert", "buffer", "child_process", "cluster", "crypto", "dgram", "dns", "domain", "events", "fs", "http",
+			"https", "net", "os", "path", "punycode", "querystring", "readline", "repl", "stream", "string_decoder",
+			"tls", "tty", "url", "util", "v8", "vm", "zlib",
+			
+			// Non-public files
+			"timers", "constants", "freelist", "smalloc", 
+			"_debugger", "_http_agent", "_http_client", "_http_common", "_http_incoming", "_http_outgoing",
+			"_http_server", "_linklist", "_stream_duplex", "_stream_passthrough", "_stream_readable",
+			"_stream_transform", "_stream_writable", "_tls_common", "_tls_legacy", "_tls_wrap"));
+	
+	protected NodejsRequiredCoreModule(File f, SourceFileModule clonedFrom) throws IOException {
+		super(FilenameUtils.getBaseName(f.getName()), f, clonedFrom);
+	}
+
+	private static InputStream getModule(String name) {
+	  return NodejsRequiredCoreModule.class.getClassLoader().getResourceAsStream("core-modules/" + name + ".js");
+
+	}
+	       
+	private static final Map<String,File> names = HashMapFactory.make();
+	       
+	public static NodejsRequiredCoreModule make(String name) throws IOException {
+	  if (! names.containsKey(name)) {
+	    java.nio.file.Path p = Files.createTempDirectory("nodejs");
+	    File f = new File(p.toFile(), name + ".js");
+	    f.deleteOnExit();
+	    p.toFile().deleteOnExit();
+      names.put(name,  f);
+	  }
+	  File file = names.get(name);
+		TemporaryFile.streamToFile(file, getModule(name));
+		SourceFileModule sourceFileModule = CAstCallGraphUtil.makeSourceModule(file.toURI().toURL(), file.getName());
+		return new NodejsRequiredCoreModule(file, sourceFileModule);
+	}
+	
+	public static boolean isCoreModule(String name) {
+		return CORE_MODULES.contains(name);
+	}
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredSourceModule.java wala-1.5.1/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredSourceModule.java
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredSourceModule.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredSourceModule.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,140 @@
+/******************************************************************************
+ * Copyright (c) 2002 - 2016 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Brian Pfretzschner - initial implementation
+ *****************************************************************************/
+package com.ibm.wala.cast.js.nodejs;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+
+import com.ibm.wala.cast.ipa.callgraph.CAstCallGraphUtil;
+import com.ibm.wala.classLoader.SourceFileModule;
+import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.io.Streams;
+
+/**
+ * This class is intended to be used whenever a JavaScript module is dynamically
+ * required by JavaScript (CommonJS). The required file will be loaded and
+ * wrapped in a function call to simulate the real behavior of a CommonJS
+ * environment. The resulting function will be named GLOBAL_PREFIX + relative
+ * file-name. To retrieve the final function name, use getFunctioName().
+ * 
+ * @author Brian Pfretzschner &lt;brian.pfretzschner@gmail.com&gt;
+ */
+public class NodejsRequiredSourceModule extends SourceFileModule {
+
+	private final static String MODULE_WRAPPER_FILENAME = "module-wrapper.js";
+	private final static String JSON_WRAPPER_FILENAME = "json-wrapper.js";
+	
+	private final static String FILENAME_PLACEHOLDER = "/*/ WALA-INSERT-FILENAME-HERE /*/";
+	private final static String DIRNAME_PLACEHOLDER = "/*/ WALA-INSERT-DIRNAME-HERE /*/";
+	private final static String CODE_PLACEHOLDER = "/*/ WALA-INSERT-CODE-HERE /*/";
+
+	private static String MODULE_WRAPPER_SOURCE = null;
+	private static String JSON_WRAPPER_SOURCE = null;
+
+	private final String className;
+
+	/**
+	 * @param f
+	 *            Must be a file located below folder workingDir.
+	 */
+	protected NodejsRequiredSourceModule(String className, File f, SourceFileModule clonedFrom) throws IOException {
+		super(f, clonedFrom);
+
+		// Generate className based on the given file name
+		this.className = className;
+		assert className.matches("[a-zA-Z_$][0-9a-zA-Z_$]*") : "Invalid className: " + className;
+
+		if (MODULE_WRAPPER_SOURCE == null || JSON_WRAPPER_SOURCE == null) {
+			// Populate the cache that hold the module wrapper source code
+			loadWrapperSources();
+		}
+	}
+
+	@Override
+	public InputStream getInputStream() {
+		String moduleSource = null;
+		try (final InputStream inputStream = super.getInputStream()) {
+			moduleSource = IOUtils.toString(inputStream);
+		} catch (IOException e) {
+			Assertions.UNREACHABLE(e.getMessage());
+		}
+		
+		String wrapperSource = null;
+		String ext = FilenameUtils.getExtension(getFile().toString()).toLowerCase();
+		if (ext.equals("js")) {
+			// JS file -> use module wrapper
+			wrapperSource = MODULE_WRAPPER_SOURCE;
+		}
+		else if (ext.equals("json")) {
+			// JSON file -> use JSON wrapper
+			wrapperSource = JSON_WRAPPER_SOURCE;
+		}
+		else {
+			// No clue -> try module wrapper
+			System.err.println("NodejsRequiredSourceModule: Unsupported file type ("+ext+"), continue anyway.");
+			wrapperSource = MODULE_WRAPPER_SOURCE;
+		}
+
+		String wrappedModuleSource = wrapperSource
+				.replace(FILENAME_PLACEHOLDER, getFile().getName())
+				.replace(DIRNAME_PLACEHOLDER, getFile().getParent())
+				.replace(CODE_PLACEHOLDER, moduleSource);
+
+		return IOUtils.toInputStream(wrappedModuleSource);
+	}
+
+	@Override
+	public String getClassName() {
+		return className;
+	}
+
+	 @Override
+	  public String getName() {
+	    return className;
+	  }
+
+	private static void loadWrapperSources() throws IOException {
+		MODULE_WRAPPER_SOURCE = loadWrapperSource(MODULE_WRAPPER_FILENAME);
+		JSON_WRAPPER_SOURCE = loadWrapperSource(JSON_WRAPPER_FILENAME);
+	}
+	
+	private static String loadWrapperSource(String filename) throws IOException {
+		try (final InputStream url = NodejsRequiredSourceModule.class.getClassLoader().getResourceAsStream(filename)) {
+		  return new String(Streams.inputStream2ByteArray(url));
+		}
+	}
+
+	/**
+	 * Generate a className based on the file name and path of the module file.
+	 * The path should be encoded in the className since the file name is not unique.
+	 */
+	public static String convertFileToClassName(File rootDir, File file) {
+		URI normalizedWorkingDirURI = rootDir.getAbsoluteFile().toURI().normalize();
+		URI normalizedFileURI = file.getAbsoluteFile().toURI().normalize();
+		String relativePath = normalizedWorkingDirURI.relativize(normalizedFileURI).getPath();
+		
+		return FilenameUtils.removeExtension(relativePath)
+				.replace("/", "_")
+				.replace("-", "__")
+				.replace(".", "__");
+	}
+	
+	public static NodejsRequiredSourceModule make(File rootDir, File file) throws IOException {
+		String className = convertFileToClassName(rootDir, file);
+		SourceFileModule sourceFileModule = CAstCallGraphUtil.makeSourceModule(file.toURI().toURL(), file.getName());
+		return new NodejsRequiredSourceModule(className, file, sourceFileModule);
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequireTargetSelector.java wala-1.5.1/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequireTargetSelector.java
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequireTargetSelector.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequireTargetSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,324 @@
+/******************************************************************************
+ * Copyright (c) 2002 - 2016 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Brian Pfretzschner - initial implementation
+ *****************************************************************************/
+package com.ibm.wala.cast.js.nodejs;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.io.FileUtils;
+import org.json.JSONObject;
+
+import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
+import com.ibm.wala.cast.js.loader.JavaScriptLoader;
+import com.ibm.wala.cast.js.ssa.JavaScriptInvoke;
+import com.ibm.wala.cast.js.types.JavaScriptTypes;
+import com.ibm.wala.cast.types.AstMethodReference;
+import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.classLoader.SourceFileModule;
+import com.ibm.wala.classLoader.SourceModule;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
+import com.ibm.wala.ipa.callgraph.propagation.ConcreteTypeKey;
+import com.ibm.wala.ipa.callgraph.propagation.ConstantKey;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
+import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.intset.OrdinalSet;
+import com.ibm.wala.util.ssa.ClassLookupException;
+
+/**
+ * This class is used by WALA internals to resolve to what functions a call
+ * could potentially invoke.
+ * 
+ * @author Brian Pfretzschner &lt;brian.pfretzschner@gmail.com&gt;
+ */
+public class NodejsRequireTargetSelector implements MethodTargetSelector {
+
+	private File rootDir;
+	private MethodTargetSelector base;
+	private PropagationCallGraphBuilder builder;
+	
+	private HashMap<String, IMethod> previouslyRequired = HashMapFactory.make();
+
+	public NodejsRequireTargetSelector(File rootDir, MethodTargetSelector base) {
+		this.rootDir = rootDir;
+		this.base = base;
+	}
+
+	public void setCallGraphBuilder(PropagationCallGraphBuilder builder) {
+		this.builder = builder;
+	}
+
+	/**
+	 * Basic idea: If the called method is named "__WALA__require", it is most likely
+	 * the require-function mock from the module-wrapper. To figure out what file
+	 * shall be required, pointer analysis is used to identify strings that can
+	 * flow into the require call. That file is than loaded, wrapped into the
+	 * module wrapper and returned as method that will be invoked. Therefore,
+	 * there will never be an call graph edge to the require function call,
+	 * the require function is replaced by the file that is included through
+	 * the require call.
+	 * 
+	 * {@inheritDoc}
+	 */
+	@Override
+	public IMethod getCalleeTarget(CGNode caller, CallSiteReference site, IClass receiver) {
+		PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+		JavaScriptLoader jsLoader = (JavaScriptLoader) builder.getClassHierarchy().getLoader(JavaScriptTypes.jsLoader);
+		
+		IMethod calledMethod = base.getCalleeTarget(caller, site, receiver);
+		
+		if (calledMethod != null && calledMethod.getDeclaringClass().toString().endsWith("/__WALA__require")) {
+			JavaScriptInvoke callInstr = getInvokeInstruction(caller, site);
+
+			Set<String> targets = getRequireTargets(pointerAnalysis, caller, callInstr);
+			if (targets.size() == 0) {
+				// There is no possible call target
+				throw new RuntimeException("No require target found in method: "+caller.getMethod());
+			}
+			
+			for (String target : targets) {
+				try {
+					File workingDir = new File(receiver.getSourceFileName()).getParentFile();
+					SourceModule sourceModule = resolve(rootDir, workingDir, target);
+					if (previouslyRequired.containsKey(sourceModule.getClassName())) {
+						return previouslyRequired.get(sourceModule.getClassName());
+					}
+					
+					String className = 'L' + sourceModule.getClassName() + "/nodejsModule";
+					if (sourceModule instanceof NodejsRequiredSourceModule
+							&& ((NodejsRequiredSourceModule) sourceModule).getFile().toString().endsWith(".json")) {
+						className = 'L' + sourceModule.getClassName() + "/jsonModule";
+					}
+					
+					JSCallGraphUtil.loadAdditionalFile(builder.getClassHierarchy(), jsLoader, sourceModule);
+					IClass script = builder.getClassHierarchy()
+							.lookupClass(TypeReference.findOrCreate(jsLoader.getReference(), className));
+					
+					IMethod method = script.getMethod(AstMethodReference.fnSelector);
+					previouslyRequired.put(sourceModule.getClassName(), method);
+					
+					return method;
+				}
+				catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+		
+		return calledMethod;
+	}
+
+	private static JavaScriptInvoke getInvokeInstruction(CGNode caller, CallSiteReference site) {
+		IR callerIR = caller.getIR();
+		SSAAbstractInvokeInstruction callInstrs[] = callerIR.getCalls(site);
+		assert callInstrs.length == 1;
+		return (JavaScriptInvoke) callInstrs[0];
+	}
+
+	private Set<String> getRequireTargets(PointerAnalysis<InstanceKey> pointerAnalysis, CGNode caller,
+			JavaScriptInvoke callInstr) {
+		HashSet<String> set = HashSetFactory.make();
+
+		PointerKey pk = builder.getPointerKeyForLocal(caller, callInstr.getUse(2));
+		OrdinalSet<InstanceKey> instanceKeys = pointerAnalysis.getPointsToSet(pk);
+
+		for (InstanceKey instanceKey : instanceKeys) {
+			if (instanceKey instanceof ConstantKey<?>) {
+				Object value = ((ConstantKey<?>) instanceKey).getValue();
+				if (value instanceof String) {
+					set.add((String) value);
+				}
+				else {
+					System.err.println("NodejsRequireTargetSelector: Unexpected value: " + value);
+					return HashSetFactory.make();
+				}
+			}
+			else if (instanceKey instanceof ConcreteTypeKey) {
+				// Cannot do anything with this information...
+			}
+			else {
+				System.err.println("NodejsRequireTargetSelector: Unexpected instanceKey: " + instanceKey.getClass() + " -- " + instanceKey);
+				return HashSetFactory.make();
+			}
+		}
+
+		return set;
+	}
+
+	/**
+	 * Implements the Nodejs require.resolve algorithm,
+	 * see https://nodejs.org/api/modules.html#modules_all_together
+	 * 
+	 * require(X) from module at path Y
+	 * 1. If X is a core module,
+	 *    a. return the core module
+	 *    b. STOP
+	 * 2. If X begins with './' or '/' or '../'
+	 *    a. LOAD_AS_FILE(Y + X)
+	 *    b. LOAD_AS_DIRECTORY(Y + X)
+	 * 3. LOAD_NODE_MODULES(X, dirname(Y))
+	 * 4. THROW "not found"
+	 * 
+	 * @param dir Y in the pseudo algorithm
+	 * @param target X in the pseudo algorithm
+	 */
+	public static SourceFileModule resolve(File rootDir, File dir, String target) throws IOException {
+		if (NodejsRequiredCoreModule.isCoreModule(target))
+			return NodejsRequiredCoreModule.make(target);
+		
+		if (target.startsWith("./") || target.startsWith("/") || target.startsWith("../")) {
+			SourceFileModule module = loadAsFile(rootDir, new File(dir, target));
+			if (module != null) return module;
+			
+			module = loadAsDirectory(rootDir, new File(dir, target));
+			if (module != null) return module;
+		}
+		
+		SourceFileModule module = loadNodeModules(rootDir, dir, target);
+		if (module != null) return module;
+		
+		throw new ClassLookupException("Required module not found: "+target+" in "+dir);
+	}
+
+	/**
+	 * LOAD_AS_FILE(X)
+	 * 1. If X is a file, load X as JavaScript text.  STOP
+	 * 2. If X.js is a file, load X.js as JavaScript text.  STOP
+	 * 3. If X.json is a file, parse X.json to a JavaScript Object.  STOP
+	 * 4. If X.node is a file, load X.node as binary addon.  STOP
+	 */
+	private static SourceFileModule loadAsFile(File rootDir, File f) throws IOException {
+		// 1.
+		if (f.isFile())
+			return NodejsRequiredSourceModule.make(rootDir, f);
+		
+		// 2.
+		File jsFile = new File(f+".js");
+		if (jsFile.isFile())
+			return NodejsRequiredSourceModule.make(rootDir, jsFile);
+		
+		// 3.
+		File jsonFile = new File(f+".json");
+		if (jsonFile.isFile())
+			return NodejsRequiredSourceModule.make(rootDir, jsonFile);
+		
+		// Skip 4. step
+		
+		return null;
+	}
+	
+	/**
+	 * LOAD_AS_DIRECTORY(X)
+	 * 1. If X/package.json is a file,
+	 *    a. Parse X/package.json, and look for "main" field.
+	 *    b. let M = X + (json main field)
+	 *    c. LOAD_AS_FILE(M)
+	 * 2. If X/index.js is a file, load X/index.js as JavaScript text.  STOP
+	 * 3. If X/index.json is a file, parse X/index.json to a JavaScript object. STOP
+	 * 4. If X/index.node is a file, load X/index.node as binary addon.  STOP
+	 */
+	private static SourceFileModule loadAsDirectory(File rootDir, File d) throws IOException {
+		// 1.
+		File packageJsonFile = new File(d, "package.json");
+		if (packageJsonFile.isFile()) {
+			// 1.a.
+			String packageJsonContent = FileUtils.readFileToString(packageJsonFile);
+			JSONObject packageJson = new JSONObject(packageJsonContent);
+			if (packageJson.has("main")) {
+				String mainFileName = packageJson.getString("main");
+				
+				// 1.b.
+				File mainFile = new File(d, mainFileName);
+				
+				// 1.c.
+				return loadAsFile(rootDir, mainFile);
+			}
+		}
+		
+		// 2.
+		File jsFile = new File(d, "index.js");
+		if (jsFile.isFile())
+			return NodejsRequiredSourceModule.make(rootDir, jsFile);
+		
+		// 3.
+		File jsonFile = new File(d, "index.json");
+		if (jsonFile.isFile())
+			return NodejsRequiredSourceModule.make(rootDir, jsonFile);
+
+		// Skip 4. step
+		
+		return null;
+	}
+	
+	/**
+	 * LOAD_NODE_MODULES(X, START)
+	 * 1. let DIRS=NODE_MODULES_PATHS(START)
+	 * 2. for each DIR in DIRS:
+	 *    a. LOAD_AS_FILE(DIR/X)
+	 *    b. LOAD_AS_DIRECTORY(DIR/X)
+	 */
+	private static SourceFileModule loadNodeModules(File rootDir, File d, String target) throws IOException {
+		List<File> dirs = nodeModulePaths(rootDir, d);
+		for (File dir : dirs) {
+			SourceFileModule module = loadAsFile(rootDir, new File(dir, target));
+			if (module != null) return module;
+			
+			module = loadAsDirectory(rootDir, new File(dir, target));
+			if (module != null) return module;
+		}
+		
+		return null;
+	}
+
+	/**
+	 * NODE_MODULES_PATHS(START)
+	 * 1. let PARTS = path split(START)
+	 * 2. let I = count of PARTS - 1
+	 * 3. let DIRS = []
+	 * 4. while I &gt;= 0,
+	 *    a. if PARTS[I] = "node_modules" CONTINUE
+	 *    b. DIR = path join(PARTS[0 .. I] + "node_modules")
+	 *    c. DIRS = DIRS + DIR
+	 *    d. let I = I - 1
+	 * 5. return DIRS
+	 */
+	private static List<File> nodeModulePaths(File rootDir, File d) throws IOException {
+		LinkedList<File> dirs = new LinkedList<>();
+		
+		while (d.getCanonicalPath().startsWith(rootDir.getCanonicalPath()) && d.toPath().getNameCount() > 0) {
+			// 4.a.
+			if (!d.getName().equals("node_modules")) {
+				// 4.b. and 4.c.
+				dirs.add(new File(d, "node_modules"));
+			}
+			
+			// 4.d.
+			d = d.getParentFile();
+		}
+		
+		return dirs;
+	}
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/build.gradle wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/build.gradle
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,19 @@
+sourceSets.test {
+	java.srcDirs = ['src']
+	resources.srcDirs = ['testdata']
+}
+
+dependencies {
+	testCompile(
+		'junit:junit:4.12',
+		project(':com.ibm.wala.cast.js.nodejs'),
+		project(':com.ibm.wala.core'),
+		)
+}
+
+test {
+	maxHeapSize = '800M'
+
+	// fails with java.lang.OutOfMemoryError for unknown reasons
+	exclude '**/NodejsRequireTargetSelectorResolveTest.class'
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/build.properties wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/build.properties
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/build.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,8 @@
+source.. = src/,\
+           testdata/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
+javacProjectSettings = true
+output.. = bin/
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/META-INF/MANIFEST.MF	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: com.ibm.wala.cast.js.nodejs.test
+Bundle-Version: 1.5.1
+Export-Package: NodejsRequireJsonTest,
+ NodejsRequireTargetSelectorResolve,
+ NodejsRequireTargetSelectorResolve.requireDynamic,
+ NodejsRequireTargetSelectorResolve.requireNodeModules,
+ NodejsRequireTargetSelectorResolve.requireNodeModules.node_modules.lib,
+ NodejsRequireTargetSelectorResolve.requireNodeModules.node_modules.lib.node_modules.sublib,
+ NodejsRequireTargetSelectorResolve.requireNodeModules.node_modules.lib2,
+ NodejsRequireTargetSelectorResolve.requireSimple,
+ NodejsRequireTargetSelectorResolve.requireStaticCircular,
+ com.ibm.wala.cast.js.nodejs.test
+Require-Bundle: com.ibm.wala.cast.js.nodejs;bundle-version="1.3.10",
+ com.ibm.wala.cast.js;bundle-version="1.3.10",
+ com.ibm.wala.cast.js.rhino;bundle-version="1.3.10",
+ com.ibm.wala.core;bundle-version="1.3.10",
+ org.junit
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+#Properties file for com.ibm.wala.cast.js.nodejs.test
+Bundle-Name = Test
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/pom.xml wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/pom.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>WALA</artifactId>
+      <version>1.5.1</version>
+  </parent>
+  <artifactId>com.ibm.wala.cast.js.nodejs.test</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test</id>
+            <phase>test</phase>
+            <configuration>
+              <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+              <argLine>-Xmx800M -ea</argLine>
+              <redirectTestOutputToFile>true</redirectTestOutputToFile>
+            </configuration>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <version>20160212</version>
+    </dependency>
+  </dependencies> 
+</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/.settings/org.eclipse.jdt.core.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,393 @@
+eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=error
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=error
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=2
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=132
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=2
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireJsonTest.java wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireJsonTest.java
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireJsonTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireJsonTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * Copyright (c) 2002 - 2016 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Brian Pfretzschner - initial implementation
+ *****************************************************************************/
+package com.ibm.wala.cast.js.nodejs.test;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.net.URL;
+
+import org.junit.Test;
+
+import com.ibm.wala.cast.js.nodejs.NodejsCallGraphBuilderUtil;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder;
+
+/**
+ * @author Brian Pfretzschner &lt;brian.pfretzschner@gmail.com&gt;
+ */
+public class NodejsRequireJsonTest {
+
+	@Test
+	public void test() throws Exception {
+		URL fileUrl = getClass().getClassLoader().getResource("NodejsRequireJsonTest/index.js");
+		File file = new File(fileUrl.toURI());
+
+		PropagationCallGraphBuilder builder = NodejsCallGraphBuilderUtil.makeCGBuilder(file);
+		CallGraph CG = builder.makeCallGraph(builder.getOptions());
+		String cgString = CG.toString();
+		
+		assertTrue(cgString.contains("Lempty/jsonModule>"));
+		assertTrue(cgString.contains("Lnested/jsonModule>"));
+		assertTrue(cgString.contains("Lpackage/jsonModule>"));
+		assertTrue(!cgString.contains("?"));
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireTargetSelectorResolveTest.java wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireTargetSelectorResolveTest.java
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireTargetSelectorResolveTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireTargetSelectorResolveTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,98 @@
+/******************************************************************************
+ * Copyright (c) 2002 - 2016 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Brian Pfretzschner - initial implementation
+ *****************************************************************************/
+package com.ibm.wala.cast.js.nodejs.test;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.net.URL;
+
+import org.junit.Test;
+
+import com.ibm.wala.cast.js.nodejs.NodejsCallGraphBuilderUtil;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder;
+
+/**
+ * @author Brian Pfretzschner &lt;brian.pfretzschner@gmail.com&gt;
+ */
+public class NodejsRequireTargetSelectorResolveTest {
+
+	@Test
+	public void testRequireSimple() throws Exception {
+		URL fileUrl = getClass().getClassLoader().getResource("NodejsRequireTargetSelectorResolve/requireSimple/index.js");
+		File file = new File(fileUrl.toURI());
+
+		PropagationCallGraphBuilder builder = NodejsCallGraphBuilderUtil.makeCGBuilder(file);
+		CallGraph CG = builder.makeCallGraph(builder.getOptions());
+		String cgString = CG.toString();
+		
+		assertTrue(cgString.contains("Lmod/nodejsModule/moduleSource/exec>"));
+		assertTrue(cgString.contains("Lmod/nodejsModule/moduleSource/SomeClass/hello>"));
+		assertTrue(!cgString.contains("?"));
+	}
+	
+	@Test
+	public void testRequireStaticCircular() throws Exception {
+		URL fileUrl = getClass().getClassLoader().getResource("NodejsRequireTargetSelectorResolve/requireStaticCircular/index.js");
+		File file = new File(fileUrl.toURI());
+
+		PropagationCallGraphBuilder builder = NodejsCallGraphBuilderUtil.makeCGBuilder(file);
+		CallGraph CG = builder.makeCallGraph(builder.getOptions());
+		String cgString = CG.toString();
+		
+		assertTrue(cgString.contains("Llib1/nodejsModule/moduleSource/lib1>"));
+		assertTrue(cgString.contains("Llib2/nodejsModule/moduleSource/lib2>"));
+		assertTrue(!cgString.contains("?"));
+	}
+
+	@Test
+	public void testRequireDynamic() throws Exception {
+		URL fileUrl = getClass().getClassLoader().getResource("NodejsRequireTargetSelectorResolve/requireDynamic/index.js");
+		File file = new File(fileUrl.toURI());
+
+		PropagationCallGraphBuilder builder = NodejsCallGraphBuilderUtil.makeCGBuilder(file);
+		CallGraph CG = builder.makeCallGraph(builder.getOptions());
+		String cgString = CG.toString();
+		
+		assertTrue(cgString.contains("Llib1/nodejsModule/moduleSource/lib1>"));
+		assertTrue(cgString.contains("Llib2/nodejsModule/moduleSource/lib2>"));
+		assertTrue(!cgString.contains("?"));
+	}
+	
+	@Test
+	public void testRequireNodeModules() throws Exception {
+		URL fileUrl = getClass().getClassLoader().getResource("NodejsRequireTargetSelectorResolve/requireNodeModules/index.js");
+		File file = new File(fileUrl.toURI());
+
+		PropagationCallGraphBuilder builder = NodejsCallGraphBuilderUtil.makeCGBuilder(file);
+		CallGraph CG = builder.makeCallGraph(builder.getOptions());
+		String cgString = CG.toString();
+		
+		assertTrue(cgString.contains("Lnode_modules_lib_node_modules_sublib_sublib/nodejsModule/moduleSource"));
+		assertTrue(!cgString.contains("?"));
+	}
+	
+	@Test
+	public void testRequireCoreModules() throws Exception {
+		URL fileUrl = getClass().getClassLoader().getResource("NodejsRequireTargetSelectorResolve/requireCoreModules.js");
+		File file = new File(fileUrl.toURI());
+
+		PropagationCallGraphBuilder builder = NodejsCallGraphBuilderUtil.makeCGBuilder(file);
+		CallGraph CG = builder.makeCallGraph(builder.getOptions());
+		String cgString = CG.toString();
+		
+		assertTrue(cgString.contains("Lutil/nodejsModule/moduleSource/util"));
+		assertTrue(cgString.contains("Lhttps/nodejsModule/moduleSource/https"));
+		assertTrue(cgString.contains("Lhttp/nodejsModule/moduleSource/http"));
+	}
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/empty.json wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/empty.json
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/empty.json	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/empty.json	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/index.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/index.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/index.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/index.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+var empty = require('./empty.json');
+var empty = require('./nested.json');
+var empty = require('./package.json');
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/nested.json wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/nested.json
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/nested.json	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/nested.json	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1 @@
+{ num: 7, obj: { val1: "hello", num: 77 } }
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/package.json wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/package.json
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/package.json	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireJsonTest/package.json	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,15 @@
+{
+  "name": "test2",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "poc-lettersonly-gm": "^1.0.1",
+    "validator": "^5.5.0"
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireCoreModules.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireCoreModules.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireCoreModules.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireCoreModules.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+var util = require('util');
+var util = require('https');
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireDynamic/index.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireDynamic/index.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireDynamic/index.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireDynamic/index.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,9 @@
+var lib1 = myRequire('lib1', true);
+lib1();
+
+function myRequire(name, local) {
+	var prefix = '';
+	if (local) prefix = './';
+	
+	return require(prefix+name);
+}
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireDynamic/lib1.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireDynamic/lib1.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireDynamic/lib1.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireDynamic/lib1.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,5 @@
+var lib2 = require('./lib2');
+
+module.exports = function lib1() {
+	lib2();
+};
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireDynamic/lib2.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireDynamic/lib2.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireDynamic/lib2.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireDynamic/lib2.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,5 @@
+var lib1 = require('./lib1');
+
+module.exports = function lib2() {
+	lib1();
+};
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/index.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/index.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/index.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/index.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1 @@
+require('lib');
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib/index.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib/index.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib/index.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib/index.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+require('./helper');
+require('sublib');
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib/node_modules/sublib/package.json wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib/node_modules/sublib/package.json
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib/node_modules/sublib/package.json	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib/node_modules/sublib/package.json	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+{
+  "main": "sublib.js"
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib/node_modules/sublib/sublib.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib/node_modules/sublib/sublib.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib/node_modules/sublib/sublib.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib/node_modules/sublib/sublib.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1 @@
+require('lib2');
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib2/index.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib2/index.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib2/index.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireNodeModules/node_modules/lib2/index.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+module.exports = function lib2() {
+};
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireSimple/index.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireSimple/index.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireSimple/index.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireSimple/index.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+var mod = require('./mod');
+mod.exec();
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireSimple/mod.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireSimple/mod.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireSimple/mod.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireSimple/mod.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,8 @@
+function SomeClass() {
+	this.hello = function hello() {}
+}
+
+exports.exec = function exec() {
+	var c = new SomeClass();
+	c.hello();
+};
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireStaticCircular/index.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireStaticCircular/index.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireStaticCircular/index.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireStaticCircular/index.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+var lib1 = require('./lib1');
+lib1();
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireStaticCircular/lib1.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireStaticCircular/lib1.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireStaticCircular/lib1.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireStaticCircular/lib1.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,5 @@
+var lib2 = require('./lib2');
+
+module.exports = function lib1() {
+	lib2();
+};
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireStaticCircular/lib2.js wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireStaticCircular/lib2.js
--- wala-1.3.9/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireStaticCircular/lib2.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.nodejs.test/testdata/NodejsRequireTargetSelectorResolve/requireStaticCircular/lib2.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,5 @@
+var lib1 = require('./lib1');
+
+module.exports = function lib2() {
+	lib1();
+};
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/build.gradle wala-1.5.1/com.ibm.wala.cast.js.rhino/build.gradle
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,11 @@
+sourceSets.main.java.srcDirs = ['source']
+
+dependencies {
+	compile(
+		'org.mozilla:rhino:1.7.10',
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.cast.js'),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.util'),
+		)
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/build.properties wala-1.5.1/com.ibm.wala.cast.js.rhino/build.properties
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -2,5 +2,8 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               lib/rhino-1.7.6.jar
-jars.extra.classpath = lib/rhino-1.7.6.jar
+               lib/rhino-1.7.10.jar,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
+jars.extra.classpath = lib/rhino-1.7.10.jar
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/build.xml wala-1.5.1/com.ibm.wala.cast.js.rhino/build.xml
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/build.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.ibm.wala.cast.js.rhino" default="getJars" basedir=".">
-
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="true"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="javacSource" value="1.5"/>
-	<property name="javacTarget" value="1.5"/>
-
-	<target name="RhinoPresent" depends="init">
-        <available file="${plugin.destination}/lib/rhino-1.7.6.jar" property="rhino.present"/>
-     </target>
-
-   <target name="fetchRhino" depends="RhinoPresent" unless="rhino.present">
-     <get src="http://central.maven.org/maven2/org/mozilla/rhino/1.7.6/rhino-1.7.6.jar" dest="${plugin.destination}/lib/rhino-1.7.6.jar" />
-   </target>
-	
-	<target name="getJars" depends="fetchRhino" />
-
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/com.ibm.wala.core.testdata">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/.classpath wala-1.5.1/com.ibm.wala.cast.js.rhino/.classpath
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="source"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/rhino-1.7.6.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,13 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Rhino Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js.rhino
-Bundle-Version: 1.3.9
-Bundle-Vendor: IBM
-Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",
- com.ibm.wala.cast.js;bundle-version="1.0.0",
- com.ibm.wala.core;bundle-version="1.1.3"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Version: 1.5.1
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: com.ibm.wala.cast;bundle-version="1.5.1",
+ com.ibm.wala.cast.js;bundle-version="1.5.1",
+ com.ibm.wala.core;bundle-version="1.5.1",
+ com.ibm.wala.util;bundle-version="1.5.1"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: com.ibm.wala.cast.js.translator,
  org.mozilla.classfile,
@@ -32,4 +33,4 @@
  org.mozilla.javascript.xml,
  org.mozilla.javascript.xmlimpl
 Bundle-ClassPath: .,
- lib/rhino-1.7.6.jar
+ lib/rhino-1.7.10.jar
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/mvncentral.xml wala-1.5.1/com.ibm.wala.cast.js.rhino/mvncentral.xml
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/mvncentral.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/mvncentral.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.wala</groupId>
   <artifactId>com.ibm.wala.cast.js.rhino</artifactId>
-  <version>1.3.9</version>  
+  <version>1.5.1</version>
   <packaging>jar</packaging>
   <name>WALA CAst JS Rhino</name>
   <description>WALA JS Rhino adapter</description>
@@ -42,20 +42,25 @@
   </distributionManagement>
 
   <dependencies>
+   <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.util</artifactId>
+      <version>1.5.1</version>
+    </dependency>
     <dependency>
       <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.core</artifactId>
-      <version>1.3.9</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.cast</artifactId>
-      <version>1.3.9</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.cast.js</artifactId>
-      <version>1.3.9</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>org.mozilla</groupId>
@@ -70,6 +75,18 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </repository>
   </repositories>  
+
+  <profiles>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
   
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
@@ -79,8 +96,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.2</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
 
@@ -112,6 +129,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <additionalparam>${javadoc.options}</additionalparam>
+        </configuration>        
         <version>2.9.1</version>
         <executions>
           <execution>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast.js.rhino/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.js.rhino
+Bundle-Vendor = IBM
+Bundle-Name = Rhino Plug-in
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/pom.xml wala-1.5.1/com.ibm.wala.cast.js.rhino/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>WALA</artifactId>
 		<groupId>com.ibm.wala</groupId>
-		<version>1.3.9</version>
+		<version>1.5.1</version>
 	</parent>
 	<artifactId>com.ibm.wala.cast.js.rhino</artifactId>
 	<packaging>eclipse-plugin</packaging>
@@ -24,7 +24,7 @@
                                           <artifactItem>
                                             <groupId>org.mozilla</groupId>
                                             <artifactId>rhino</artifactId>
-                                            <version>1.7.6</version>
+                                            <version>1.7.10</version>
                                             <type>jar</type>
                                             <overWrite>false</overWrite>
                                           </artifactItem>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/.project wala-1.5.1/com.ibm.wala.cast.js.rhino/.project
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.cast.js.rhino</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,78 +1,126 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=error
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=error
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=2
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoLoopUnwindingTranslatorFactory.java wala-1.5.1/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoLoopUnwindingTranslatorFactory.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoLoopUnwindingTranslatorFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoLoopUnwindingTranslatorFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,6 @@
 package com.ibm.wala.cast.js.translator;
 
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
-import com.ibm.wala.cast.js.translator.JavaScriptLoopUnwindingTranslatorFactory;
 import com.ibm.wala.cast.tree.CAst;
 import com.ibm.wala.classLoader.SourceModule;
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoTranslatorFactory.java wala-1.5.1/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoTranslatorFactory.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoTranslatorFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoTranslatorFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,12 +12,12 @@
 
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
 import com.ibm.wala.cast.tree.CAst;
-import com.ibm.wala.classLoader.SourceModule;
+import com.ibm.wala.classLoader.ModuleEntry;
 
 public class CAstRhinoTranslatorFactory implements JavaScriptTranslatorFactory {
 
 	@Override
-  public TranslatorToCAst make(CAst ast, SourceModule M) {
+  public TranslatorToCAst make(CAst ast, ModuleEntry M) {
 		return new CAstRhinoTranslator(M, false);
 	}
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoTranslator.java wala-1.5.1/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoTranslator.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoTranslator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/CAstRhinoTranslator.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,51 +10,12 @@
  *****************************************************************************/
 package com.ibm.wala.cast.js.translator;
 
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
-import com.ibm.wala.cast.tree.CAstEntity;
+import com.ibm.wala.cast.ir.translator.RewritingTranslatorToCAst;
 import com.ibm.wala.cast.tree.impl.CAstImpl;
-import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
-import com.ibm.wala.cast.tree.rewrite.CAstRewriter.CopyKey;
-import com.ibm.wala.cast.tree.rewrite.CAstRewriter.RewriteContext;
-import com.ibm.wala.classLoader.SourceFileModule;
-import com.ibm.wala.classLoader.SourceModule;
+import com.ibm.wala.classLoader.ModuleEntry;
 
-public class CAstRhinoTranslator implements TranslatorToCAst {
-  private final List<CAstRewriterFactory> rewriters = new LinkedList<CAstRewriterFactory>();
-  private final SourceModule M;
-  private final boolean replicateForDoLoops;
-    
-  public CAstRhinoTranslator(SourceModule M, boolean replicateForDoLoops) {
-    this.M = M;
-    this.replicateForDoLoops = replicateForDoLoops;
+public class CAstRhinoTranslator extends RewritingTranslatorToCAst {    
+  public CAstRhinoTranslator(ModuleEntry m, boolean replicateForDoLoops) {
+    super(m, new RhinoToAstTranslator(new CAstImpl(), m, m.getName(), replicateForDoLoops));
    }
-
-  @Override
-  public <C extends RewriteContext<K>, K extends CopyKey<K>> void addRewriter(CAstRewriterFactory<C, K> factory, boolean prepend) {
-    if(prepend)
-      rewriters.add(0, factory);
-    else
-      rewriters.add(factory);
-  }  
-
-  @Override
-  public CAstEntity translateToCAst() throws IOException, Error {
-    String N;
-    if (M instanceof SourceFileModule) {
-      N = ((SourceFileModule) M).getClassName();
-    } else {
-      N = M.getName();
-    }
-
-    CAstImpl Ast = new CAstImpl();
-    CAstEntity entity = new RhinoToAstTranslator(Ast, M, N, replicateForDoLoops).translateToCAst();
-    for(CAstRewriterFactory rwf : rewriters)
-      entity = rwf.createCAstRewriter(Ast).rewrite(entity);
-    return entity;
-  }
-
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/RhinoToAstTranslator.java wala-1.5.1/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/RhinoToAstTranslator.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/RhinoToAstTranslator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino/source/com/ibm/wala/cast/js/translator/RhinoToAstTranslator.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.cast.js.translator;
 
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URL;
 import java.util.ArrayList;
@@ -90,7 +91,6 @@
 import org.mozilla.javascript.ast.Yield;
 
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
-import com.ibm.wala.cast.ir.translator.TranslatorToCAst.DoLoopTranslator;
 import com.ibm.wala.cast.js.html.MappedSourceModule;
 import com.ibm.wala.cast.js.ipa.callgraph.JSSSAPropagationCallGraphBuilder;
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
@@ -108,8 +108,12 @@
 import com.ibm.wala.cast.tree.impl.CAstOperator;
 import com.ibm.wala.cast.tree.impl.CAstSymbolImpl;
 import com.ibm.wala.cast.tree.impl.RangePosition;
+import com.ibm.wala.cast.tree.rewrite.CAstRewriter.CopyKey;
+import com.ibm.wala.cast.tree.rewrite.CAstRewriter.RewriteContext;
+import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
 import com.ibm.wala.cast.tree.visit.CAstVisitor;
 import com.ibm.wala.cast.util.CAstPattern;
+import com.ibm.wala.classLoader.ModuleEntry;
 import com.ibm.wala.classLoader.SourceModule;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
@@ -117,7 +121,7 @@
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.warnings.Warning;
 
-public class RhinoToAstTranslator {
+public class RhinoToAstTranslator implements TranslatorToCAst {
 
   /**
    * a dummy name to use for standard function calls, only used to distinguish
@@ -155,10 +159,9 @@
    */
   private static class FunctionContext extends JavaScriptTranslatorToCAst.FunctionContext<WalkContext,Node> implements WalkContext {
     FunctionContext(WalkContext parent, Node s) {
-		super(parent, s);
-	}
-
-   }
+      super(parent, s);
+    }
+  }
 
   /**
    * context used for top-level script declarations
@@ -187,29 +190,44 @@
 
   private static class BreakContext extends JavaScriptTranslatorToCAst.BreakContext<WalkContext, Node> implements WalkContext {
 
+    @Override
+    public WalkContext getParent() {
+      return (WalkContext) super.getParent();
+    }
+
     BreakContext(WalkContext parent, Node breakTo, String label) {
       super(parent, breakTo, label);
     }
 
   }
 
-  private static class LoopContext extends JavaScriptTranslatorToCAst.LoopContext<WalkContext, Node> implements WalkContext {
+  private static class LoopContext extends TranslatorToCAst.LoopContext<WalkContext, Node> implements WalkContext {
 
 	LoopContext(WalkContext parent, Node breakTo, Node continueTo, String label) {
 		super(parent, breakTo, continueTo, label);
 	}
 
+  @Override
+  public WalkContext getParent() {
+    return (WalkContext) super.getParent();
   }
 
-  private static class TryCatchContext extends JavaScriptTranslatorToCAst.TryCatchContext<WalkContext, Node> implements WalkContext {
+  }
+
+  private static class TryCatchContext extends TranslatorToCAst.TryCatchContext<WalkContext, Node> implements WalkContext {
 
 	TryCatchContext(WalkContext parent, CAstNode catchNode) {
 		super(parent, catchNode);
 	}
 
+  @Override
+  public WalkContext getParent() {
+    return (WalkContext) super.getParent();
   }
 
-  private String operationReceiverName(int operationIndex) {
+  }
+
+  private static String operationReceiverName(int operationIndex) {
     return "$$destructure$rcvr" + operationIndex;
   }
 
@@ -217,7 +235,7 @@
     return Ast.makeNode(CAstNode.VAR, Ast.makeConstant(operationReceiverName(operationIndex)));
   }
   
-  private String operationElementName(int operationIndex) {
+  private static String operationElementName(int operationIndex) {
     return "$$destructure$elt" + operationIndex;
   }
 
@@ -225,7 +243,7 @@
     return Ast.makeNode(CAstNode.VAR, Ast.makeConstant(operationElementName(operationIndex)));
   }
 
-  private CAstNode translateOpcode(int nodeType) {
+  private static CAstNode translateOpcode(int nodeType) {
     switch (nodeType) {
     case Token.POS:
     case Token.ADD:
@@ -307,26 +325,26 @@
     return makeCtorCall(value, arguments, context);
   }
 
-  private boolean isPrologueScript(WalkContext context) {
+  private static boolean isPrologueScript(WalkContext context) {
     return JavaScriptLoader.bootstrapFileNames.contains(context.script());
   }
 
-  private Node getCallTarget(FunctionCall n) {
+  private static Node getCallTarget(FunctionCall n) {
 	  return n.getTarget();
   }
   /**
    * is n a call to "primitive" within our synthetic modeling code?
    */
-  private boolean isPrimitiveCall(WalkContext context, FunctionCall n) {
+  private static boolean isPrimitiveCall(WalkContext context, FunctionCall n) {
     return isPrologueScript(context) && n.getType() == Token.CALL && getCallTarget(n).getType() == Token.NAME
         && getCallTarget(n).getString().equals("primitive");
   }
 
-  private Node getNewTarget(NewExpression n) {
+  private static Node getNewTarget(NewExpression n) {
 	  return n.getTarget();
   }
   
-  private boolean isPrimitiveCreation(WalkContext context, NewExpression n) {
+  private static boolean isPrimitiveCreation(WalkContext context, NewExpression n) {
 	  Node target = getNewTarget(n);
     return isPrologueScript(context) && n.getType() == Token.NEW && target.getType() == Token.NAME
         && target.getString().equals("Primitives");
@@ -375,7 +393,7 @@
    * Used to represent a script or function in the CAst; see walkEntity().
    * 
    */
-  private static class ScriptOrFnEntity implements CAstEntity {
+  private class ScriptOrFnEntity implements CAstEntity {
     private final String[] arguments;
 
     private final String name;
@@ -391,6 +409,10 @@
     private final CAstSourcePositionMap pos;
     
     private final Position entityPosition;
+
+    private final Position namePosition;
+
+    private final Position[] paramPositions;
     
     private ScriptOrFnEntity(AstNode n, Map<CAstNode, Collection<CAstEntity>> subs, CAstNode ast, CAstControlFlowMap map, CAstSourcePositionMap pos, String name) {
       this.name = name;
@@ -398,6 +420,7 @@
 
       if (n instanceof FunctionNode) {
         FunctionNode f = (FunctionNode) n;
+        namePosition = makePosition(f.getFunctionName());
         f.flattenSymbolTable(false);
         int i = 0;
         arguments = new String[f.getParamCount() + 2];
@@ -406,8 +429,17 @@
         for (int j = 0; j < f.getParamCount(); j++) {
           arguments[i++] = f.getParamOrVarName(j);
         }
+   
+        List<AstNode> params = f.getParams();
+        paramPositions = new Position[ params.size() ];
+        for(int pi = 0; pi < params.size(); pi++) {
+          paramPositions[pi] = makePosition(params.get(pi));
+        }
+        
       } else {
+        paramPositions = new Position[0];
         arguments = new String[0];
+        namePosition = null;
       }
       kind = (n instanceof FunctionNode) ? CAstEntity.FUNCTION_ENTITY : CAstEntity.SCRIPT_ENTITY;
       this.subs = subs;
@@ -418,7 +450,7 @@
 
     @Override
     public String toString() {
-      return "<JS function " + getName() + ">";
+      return "<JS function " + getName() + '>';
     }
 
     @Override
@@ -505,10 +537,20 @@
     public CAstType getType() {
       return JSAstTranslator.Any;
     }
+
+    @Override
+    public Position getPosition(int arg) {
+      return paramPositions[arg];
+    }
+
+    @Override
+    public Position getNamePosition() {
+      return namePosition;
+    }
   }
 
   private CAstEntity walkEntity(final AstNode n, List<CAstNode> body, String name, WalkContext child) {
-    CAstNode[] stmts = body.toArray(new CAstNode[body.size()]);
+    CAstNode[] stmts = body.toArray(new CAstNode[0]);
 
     // add variable / constant / function declarations, if any
     if (!child.getNameDecls().isEmpty()) {
@@ -518,7 +560,7 @@
       if (child.getNameDecls().size() == 1) {
         newStmts[0] = child.getNameDecls().iterator().next();
       } else {
-        newStmts[0] = Ast.makeNode(CAstNode.BLOCK_STMT, child.getNameDecls().toArray(new CAstNode[child.getNameDecls().size()]));
+        newStmts[0] = Ast.makeNode(CAstNode.BLOCK_STMT, child.getNameDecls().toArray(new CAstNode[0]));
       }
       System.arraycopy(stmts, 0, newStmts, 1, stmts.length);
 
@@ -536,29 +578,25 @@
   }
     
   private Position makePosition(AstNode n) {
-    URL url = sourceModule.getURL();
-    int line = n.getLineno(); 
-    Position pos = new RangePosition(url, line, n.getAbsolutePosition(), n.getAbsolutePosition()+n.getLength());
-
-    if (sourceModule instanceof MappedSourceModule) {
-      Position np = ((MappedSourceModule) sourceModule).getMapping().getIncludedPosition(pos);
-      if (np != null) {
-        return np;
+    if (n != null) {
+      URL url = ((SourceModule)sourceModule).getURL();
+      int line = n.getLineno(); 
+      Position pos = new RangePosition(url, line, n.getAbsolutePosition(), n.getAbsolutePosition()+n.getLength());
+
+      if (sourceModule instanceof MappedSourceModule) {
+        Position np = ((MappedSourceModule) sourceModule).getMapping().getIncludedPosition(pos);
+        if (np != null) {
+          return np;
+        }
       }
-    }
         
-    return pos;
+      return pos;
+    } else {
+      return null;
+    }
   }
 
-  private void pushSourcePosition(WalkContext context, CAstNode n, Position p) {
-	  if (context.pos().getPosition(n) == null && !(n.getKind()==CAstNode.FUNCTION_EXPR || n.getKind()==CAstNode.FUNCTION_STMT)) {
-	      context.pos().setPosition(n, p);
-	      for(int i = 0; i < n.getChildCount(); i++) {
-	    	  pushSourcePosition(context, n.getChild(i), p);
-	      }
-	  }
-  }
-  private CAstNode noteSourcePosition(WalkContext context, CAstNode n, AstNode p) {
+  protected CAstNode noteSourcePosition(WalkContext context, CAstNode n, AstNode p) {
     if (p.getLineno() != -1 && context.pos().getPosition(n) == null) {
       pushSourcePosition(context, n, makePosition(p));
     }
@@ -581,14 +619,14 @@
     return cn;
   }
   
-  private List<Label> getLabels(AstNode node) {
+  private static List<Label> getLabels(AstNode node) {
 	  if (node instanceof LabeledStatement || ((node = node.getParent()) instanceof LabeledStatement)) {
 		  return ((LabeledStatement)node).getLabels();
 	  } else {
 		  return null;
 	  }
   }
-  private AstNode makeEmptyLabelStmt(String label) {
+  private static AstNode makeEmptyLabelStmt(String label) {
 	  Label l = new Label();
 	  l.setName(label);
 	  LabeledStatement st = new LabeledStatement();
@@ -599,7 +637,7 @@
 	  return st;
   }
   
-  private WalkContext makeLoopContext(AstNode node, WalkContext arg,
+  private static WalkContext makeLoopContext(AstNode node, WalkContext arg,
 			AstNode breakStmt, AstNode contStmt) {
 	  WalkContext loopContext = arg;
 	  List<Label> labels = getLabels(node);
@@ -613,7 +651,7 @@
 	  return loopContext;
   }
 
-  private WalkContext makeBreakContext(AstNode node, WalkContext arg,
+  private static WalkContext makeBreakContext(AstNode node, WalkContext arg,
       AstNode breakStmt) {
     WalkContext loopContext = arg;
     List<Label> labels = getLabels(node);
@@ -654,18 +692,18 @@
 	@Override
 	public CAstNode visitArrayLiteral(ArrayLiteral node, WalkContext arg) {
 		int index = 0;
-		List<CAstNode> eltNodes = new ArrayList<CAstNode>(2 * node.getElements().size());
+		List<CAstNode> eltNodes = new ArrayList<>(2 * node.getElements().size());
     	eltNodes.add(((isPrologueScript(arg)) ? makeBuiltinNew("Array") : handleNew(arg, "Array", null)));
 		for(AstNode elt : node.getElements()) {
 			if (elt instanceof EmptyExpression) {
 				index++;
 			} else {
-				eltNodes.add(Ast.makeConstant("" + (index++)));
+				eltNodes.add(Ast.makeConstant(String.valueOf(index++)));
 				eltNodes.add(visit(elt, arg));
 			}
 		}
 		
-		CAstNode lit = Ast.makeNode(CAstNode.OBJECT_LITERAL, eltNodes.toArray(new CAstNode[eltNodes.size()]));
+		CAstNode lit = Ast.makeNode(CAstNode.OBJECT_LITERAL, eltNodes.toArray(new CAstNode[0]));
 		arg.cfg().map(node, lit);
 		return lit;
 	}
@@ -691,14 +729,14 @@
 
 	@Override
 	public CAstNode visitBlock(Block node, WalkContext arg) {
-		List<CAstNode> nodes = new ArrayList<CAstNode>();
+		List<CAstNode> nodes = new ArrayList<>();
 		for(Node child : node) {
 			nodes.add(visit((AstNode)child, arg));
 		}
 		if (nodes.isEmpty()) {
 			return Ast.makeNode(CAstNode.EMPTY);
 		} else {
-			return Ast.makeNode(CAstNode.BLOCK_STMT, nodes.toArray(new CAstNode[ nodes.size() ]));
+			return Ast.makeNode(CAstNode.BLOCK_STMT, nodes.toArray(new CAstNode[0]));
 		}
 	}
 
@@ -827,87 +865,173 @@
 			WalkContext arg) {
 		return visit(node.getExpression(), arg);
 	}
-
+	
 	@Override
 	public CAstNode visitForInLoop(ForInLoop node, WalkContext arg) {		
-		// set up 		
-		CAstNode object = visit(node.getIteratedObject(), arg);
-    String tempName = "for in loop temp";   
-		CAstNode[] loopHeader = new CAstNode[]{
-		    Ast.makeNode(CAstNode.DECL_STMT, Ast.makeConstant(new CAstSymbolImpl(tempName, JSAstTranslator.Any)), readName(arg, null, "$$undefined")),
-        Ast.makeNode(CAstNode.ASSIGN, Ast.makeNode(CAstNode.VAR, Ast.makeConstant(tempName)), object)
-		};
-		
-		CAstNode initNode;
-		String name;
-		AstNode var = node.getIterator();
-		assert var instanceof Name || var instanceof VariableDeclaration || var instanceof LetNode : var.getClass()  + " " + var;
-		if (var instanceof Name) {
-		  name = ((Name)var).getString();
-      initNode = 
-        Ast.makeNode(CAstNode.ASSIGN, 
-          Ast.makeNode(CAstNode.VAR, Ast.makeConstant(name)),
-          Ast.makeNode(CAstNode.EACH_ELEMENT_GET, 
-              Ast.makeNode(CAstNode.VAR, Ast.makeConstant(tempName)),
-              readName(arg, null, name)));
-		  
-		} else {
-		  VariableDeclaration decl;
-		  if (var instanceof LetNode) {
-		    decl = ((LetNode)var).getVariables();
-		  } else {
-		    decl = (VariableDeclaration)var;
-		  }
-		  assert decl.getVariables().size() == 1;
-		  VariableInitializer init = decl.getVariables().iterator().next();
+	  CAstNode loop;
+	  CAstNode get;
+	  // TODO: fix the correlation-tracking rewriters, and kill the old for..in translation
+	  if (useNewForIn) {
+	    // set up 		
+	    CAstNode object = visit(node.getIteratedObject(), arg);
+	    String tempName = "for in loop temp";   
+	    CAstNode[] loopHeader = new CAstNode[]{
+	        Ast.makeNode(CAstNode.DECL_STMT, Ast.makeConstant(new CAstSymbolImpl(tempName, JSAstTranslator.Any)), readName(arg, null, "$$undefined")),
+	        Ast.makeNode(CAstNode.ASSIGN, Ast.makeNode(CAstNode.VAR, Ast.makeConstant(tempName)), object)
+	    };
 
-      name = init.getTarget().getString();
+	    String name;
+	    AstNode var = node.getIterator();
+	    assert var instanceof Name || var instanceof VariableDeclaration || var instanceof LetNode : var.getClass()  + " " + var;
+	    if (var instanceof Name) {
+	      name = ((Name)var).getString();		  
+	    } else {
+	      VariableDeclaration decl;
+	      if (var instanceof LetNode) {
+	        decl = ((LetNode)var).getVariables();
+	      } else {
+	        decl = (VariableDeclaration)var;
+	      }
+	      assert decl.getVariables().size() == 1;
+	      VariableInitializer init = decl.getVariables().iterator().next();
 
-	    arg.addNameDecl(
-	        Ast.makeNode(CAstNode.DECL_STMT, Ast.makeConstant(new CAstSymbolImpl(name, JSAstTranslator.Any)),
-	            readName(arg, null, "$$undefined")));
-	    		  
-      initNode = 
-          Ast.makeNode(CAstNode.ASSIGN, 
-              Ast.makeNode(CAstNode.VAR, Ast.makeConstant(name)),
-		          Ast.makeNode(CAstNode.EACH_ELEMENT_GET, 
-		              Ast.makeNode(CAstNode.VAR, Ast.makeConstant(tempName)),
-		              readName(arg, null, name)));
+	      name = init.getTarget().getString();
 
-		}
-		
-		// body
-		AstNode breakStmt = makeEmptyLabelStmt("breakLabel");
-		CAstNode breakLabel = visit(breakStmt, arg);
-		AstNode contStmt = makeEmptyLabelStmt("contLabel");
-		CAstNode contLabel = visit(contStmt, arg);
-		// TODO: Figure out why this is needed to make the correlation extraction tests pass
-		// TODO: remove this silly label
-    AstNode garbageStmt = makeEmptyLabelStmt("garbageLabel");
-    CAstNode garbageLabel = visit(garbageStmt, arg);
-		WalkContext loopContext = makeLoopContext(node, arg, breakStmt, contStmt);
-		CAstNode body = Ast.makeNode(CAstNode.BLOCK_STMT,
-				initNode,
-				visit(node.getBody(), loopContext),
-				garbageLabel);
-		
-		CAstNode loop = Ast.makeNode(CAstNode.LOCAL_SCOPE,
-				Ast.makeNode(CAstNode.BLOCK_STMT,
-						loopHeader[0],
-						loopHeader[1],
-						contLabel,
-						Ast.makeNode(CAstNode.LOOP,
-								Ast.makeNode(CAstNode.BINARY_EXPR,
-								    CAstOperator.OP_NE,
-										Ast.makeConstant(null),
-				            Ast.makeNode(CAstNode.EACH_ELEMENT_GET, 
-			                  Ast.makeNode(CAstNode.VAR, Ast.makeConstant(tempName)),
-			                  readName(arg, null, name))),
-								body),
-						breakLabel));
-		arg.cfg().map(node, loop);
-		return loop;
-	}
+	      arg.addNameDecl(
+	          Ast.makeNode(CAstNode.DECL_STMT, Ast.makeConstant(new CAstSymbolImpl(name, JSAstTranslator.Any)),
+	              readName(arg, null, "$$undefined")));
+	    }
+
+	    // body
+	    AstNode breakStmt = makeEmptyLabelStmt("breakLabel");
+	    CAstNode breakLabel = visit(breakStmt, arg);
+	    AstNode contStmt = makeEmptyLabelStmt("contLabel");
+	    CAstNode contLabel = visit(contStmt, arg);
+	    // TODO: Figure out why this is needed to make the correlation extraction tests pass
+	    // TODO: remove this silly label
+	    AstNode garbageStmt = makeEmptyLabelStmt("garbageLabel");
+	    CAstNode garbageLabel = visit(garbageStmt, arg);
+	    WalkContext loopContext = makeLoopContext(node, arg, breakStmt, contStmt);
+	    CAstNode body = Ast.makeNode(CAstNode.BLOCK_STMT,
+	        //initNode,
+	        visit(node.getBody(), loopContext),
+	        garbageLabel);
+
+	    loop = Ast.makeNode(CAstNode.LOCAL_SCOPE,
+	        Ast.makeNode(CAstNode.BLOCK_STMT,
+	            loopHeader[0],
+	            loopHeader[1],
+	            contLabel,
+	            Ast.makeNode(CAstNode.LOOP,
+	                Ast.makeNode(CAstNode.BINARY_EXPR,
+	                    CAstOperator.OP_NE,
+	                    Ast.makeConstant(null),
+	                    Ast.makeNode(CAstNode.BLOCK_EXPR,
+	                        Ast.makeNode(CAstNode.ASSIGN, 
+	                            Ast.makeNode(CAstNode.VAR, Ast.makeConstant(name)),
+	                            get = Ast.makeNode(CAstNode.EACH_ELEMENT_GET,   
+	                                Ast.makeNode(CAstNode.VAR, Ast.makeConstant(tempName)),
+	                                readName(arg, null, name))),
+	                        readName(arg, null, name))),
+	                body),
+	            breakLabel));
+	    arg.cfg().map(node, loop);
+	  } else {
+	    CAstNode object = visit(node.getIteratedObject(), arg);
+	    String tempName = "for in loop temp";   
+	    CAstNode[] loopHeader = new CAstNode[]{
+	        Ast.makeNode(CAstNode.DECL_STMT, Ast.makeConstant(new CAstSymbolImpl(tempName, JSAstTranslator.Any)), readName(arg, null, "$$undefined")),
+	        Ast.makeNode(CAstNode.ASSIGN, Ast.makeNode(CAstNode.VAR, Ast.makeConstant(tempName)), object)
+	    };
+
+	    CAstNode initNode;
+	    String name;
+	    AstNode var = node.getIterator();
+	    assert var instanceof Name || var instanceof VariableDeclaration || var instanceof LetNode : var.getClass()  + " " + var;
+	    if (var instanceof Name) {
+	      name = ((Name)var).getString();
+	      initNode = 
+	          Ast.makeNode(CAstNode.ASSIGN, 
+	              Ast.makeNode(CAstNode.VAR, Ast.makeConstant(name)),
+	              get = Ast.makeNode(CAstNode.EACH_ELEMENT_GET, 
+	                  Ast.makeNode(CAstNode.VAR, Ast.makeConstant(tempName)),
+	                  readName(arg, null, name)));
+
+	    } else {
+	      VariableDeclaration decl;
+	      if (var instanceof LetNode) {
+	        decl = ((LetNode)var).getVariables();
+	      } else {
+	        decl = (VariableDeclaration)var;
+	      }
+	      assert decl.getVariables().size() == 1;
+	      VariableInitializer init = decl.getVariables().iterator().next();
+
+	      name = init.getTarget().getString();
+
+	      arg.addNameDecl(
+	          Ast.makeNode(CAstNode.DECL_STMT, Ast.makeConstant(new CAstSymbolImpl(name, JSAstTranslator.Any)),
+	              readName(arg, null, "$$undefined")));
+
+	      initNode = 
+	          Ast.makeNode(CAstNode.ASSIGN, 
+	              Ast.makeNode(CAstNode.VAR, Ast.makeConstant(name)),
+	              get = Ast.makeNode(CAstNode.EACH_ELEMENT_GET, 
+	                  Ast.makeNode(CAstNode.VAR, Ast.makeConstant(tempName)),
+	                  readName(arg, null, name)));
+
+	    }
+
+      arg.cfg().map(get, get);
+	    CAstNode ctch = arg.getCatchTarget();
+	    if (ctch != null) {
+	      arg.cfg().add(get, ctch, JavaScriptTypes.ReferenceError);
+	    } else {
+	      arg.cfg().add(get, CAstControlFlowMap.EXCEPTION_TO_EXIT, JavaScriptTypes.ReferenceError);       
+	    }
+
+	    // body
+	    AstNode breakStmt = makeEmptyLabelStmt("breakLabel");
+	    CAstNode breakLabel = visit(breakStmt, arg);
+	    AstNode contStmt = makeEmptyLabelStmt("contLabel");
+	    CAstNode contLabel = visit(contStmt, arg);
+	    // TODO: Figure out why this is needed to make the correlation extraction tests pass
+	    // TODO: remove this silly label
+	    AstNode garbageStmt = makeEmptyLabelStmt("garbageLabel");
+	    CAstNode garbageLabel = visit(garbageStmt, arg);
+	    WalkContext loopContext = makeLoopContext(node, arg, breakStmt, contStmt);
+	    CAstNode body = Ast.makeNode(CAstNode.BLOCK_STMT,
+	        initNode,
+	        visit(node.getBody(), loopContext),
+	        garbageLabel);
+
+	    loop = Ast.makeNode(CAstNode.LOCAL_SCOPE,
+	        Ast.makeNode(CAstNode.BLOCK_STMT,
+	            loopHeader[0],
+	            loopHeader[1],
+	            contLabel,
+	            Ast.makeNode(CAstNode.LOOP,
+	                Ast.makeNode(CAstNode.BINARY_EXPR,
+	                    CAstOperator.OP_NE,
+	                    Ast.makeConstant(null),
+	                    get = Ast.makeNode(CAstNode.EACH_ELEMENT_GET, 
+	                        Ast.makeNode(CAstNode.VAR, Ast.makeConstant(tempName)),
+	                        readName(arg, null, name))),
+	                body),
+	            breakLabel));
+	    arg.cfg().map(node, loop);
+	  }
+    
+    arg.cfg().map(get, get);
+    CAstNode ctch = arg.getCatchTarget();
+    if (ctch != null) {
+      arg.cfg().add(get, ctch, JavaScriptTypes.ReferenceError);
+    } else {
+      arg.cfg().add(get, CAstControlFlowMap.EXCEPTION_TO_EXIT, JavaScriptTypes.ReferenceError);       
+    }
+
+	  return loop;
+  }
 
 	@Override
 	public CAstNode visitForLoop(ForLoop node, WalkContext arg) {
@@ -991,23 +1115,23 @@
 	@Override
 	public CAstNode visitFunctionNode(FunctionNode fn, WalkContext context) {
 		WalkContext child = new FunctionContext(context, fn);
-	    List<CAstNode> body = new ArrayList<CAstNode>();
+	    List<CAstNode> body = new ArrayList<>();
 	    body.add(visit(fn.getBody(), child));
 
 	    String name;
 	    Name x = fn.getFunctionName();
-	    if (x == null || x.getIdentifier() == null || "".equals(x.getIdentifier())) {
-	    	name = scriptName + "@" + fn.getAbsolutePosition();
+	    if (x == null || x.getIdentifier() == null || x.getIdentifier().isEmpty()) {
+	    	name = scriptName + '@' + fn.getAbsolutePosition();
 	    	String label = getParentName(fn);
 	    	if (label != null) {
-	    	  name = name + ":" + label;
+	    	  name = name + ':' + label;
 	    	}
 	    } else {
 	    	name = fn.getFunctionName().getIdentifier();
 	    }
 
 	    if(DEBUG)
-	      System.err.println(name + "\n" + body);
+	      System.err.println(name + '\n' + body);
 
 		CAstEntity fne = walkEntity(fn, body, name, child);
 
@@ -1113,8 +1237,9 @@
     case Token.DEBUGGER: {
       return Ast.makeConstant(null);
     }
+    default:
+      throw new RuntimeException("unexpected keyword literal " + node + " (" + node.getType() + ')');
 		}
-		throw new RuntimeException("unexpected keyword literal " + node + " (" + node.getType() +")");
 	}
 
 	@Override
@@ -1234,7 +1359,7 @@
 
 	@Override
 	public CAstNode visitScope(Scope node, WalkContext arg) {
-		List<CAstNode> nodes = new ArrayList<CAstNode>();
+		List<CAstNode> nodes = new ArrayList<>();
 		for(Node child : node) {
 			nodes.add(visit((AstNode)child, arg));
 		}
@@ -1243,7 +1368,7 @@
 		} else {
 			return 
 				Ast.makeNode(CAstNode.LOCAL_SCOPE,
-					Ast.makeNode(CAstNode.BLOCK_STMT, nodes.toArray(new CAstNode[ nodes.size() ])));
+					Ast.makeNode(CAstNode.BLOCK_STMT, nodes.toArray(new CAstNode[0])));
 		}
 	}
 
@@ -1623,8 +1748,8 @@
       if (finallyNode != null) {
         int i = 0;
         CAstNode[] finallyAsts = new CAstNode[finallyList.size()];
-        for (Iterator<Node> fns = finallyList.iterator(); fns.hasNext();) {
-          finallyAsts[i++] = walkNodes(fns.next(), context);
+        for (Node fn : finallyList) {
+          finallyAsts[i++] = walkNodes(fn, context);
         }
         finallyBlock = Ast.makeNode(CAstNode.BLOCK_STMT, finallyAsts);
       }
@@ -1634,8 +1759,8 @@
         int i = 0;
         WalkContext catchChild = new CatchBlockContext(context);
         CAstNode[] catchAsts = new CAstNode[catchList.size()];
-        for (Iterator<Node> cns = catchList.iterator(); cns.hasNext();) {
-          catchAsts[i++] = walkNodes(cns.next(), catchChild);
+        for (Node cn : catchList.iterator()) {
+          catchAsts[i++] = walkNodes(cn, catchChild);
         }
         CAstNode catchBlock = Ast.makeNode(CAstNode.CATCH, Ast.makeConstant(catchChild.getCatchVar()),
             Ast.makeNode(CAstNode.BLOCK_STMT, catchAsts));
@@ -1644,8 +1769,8 @@
         i = 0;
         WalkContext tryChild = new TryBlockContext(context, catchBlock);
         CAstNode[] tryAsts = new CAstNode[tryList.size()];
-        for (Iterator<Node> tns = tryList.iterator(); tns.hasNext();) {
-          tryAsts[i++] = walkNodes(tns.next(), tryChild);
+        for (Node tn : tryList) {
+          tryAsts[i++] = walkNodes(tn, tryChild);
         }
         CAstNode tryBlock = Ast.makeNode(CAstNode.BLOCK_STMT, tryAsts);
 
@@ -1659,8 +1784,8 @@
       } else {
         int i = 0;
         CAstNode[] tryAsts = new CAstNode[tryList.size()];
-        for (Iterator<Node> tns = tryList.iterator(); tns.hasNext();) {
-          tryAsts[i++] = walkNodes(tns.next(), context);
+        for (Node tn : tryList) {
+          tryAsts[i++] = walkNodes(tn, context);
         }
         CAstNode tryBlock = Ast.makeNode(CAstNode.BLOCK_STMT, tryAsts);
 
@@ -2363,8 +2488,8 @@
   /**
    * parse the JavaScript code using Rhino, and then translate the resulting AST
    * to CAst
-   * @throws com.ibm.wala.cast.ir.translator.TranslatorToCAst.Error 
    */
+  @Override
   public CAstEntity translateToCAst() throws Error, IOException, com.ibm.wala.cast.ir.translator.TranslatorToCAst.Error {
     class CAstErrorReporter implements ErrorReporter {
       private Set<Warning> w = HashSetFactory.make();
@@ -2374,7 +2499,7 @@
         w.add(new Warning(Warning.SEVERE) {
           @Override
           public String getMsg() {
-            return arg0 + ": " + arg1 + "@" + arg2 + ": " + arg3;
+            return arg0 + ": " + arg1 + '@' + arg2 + ": " + arg3;
           }
         });
       }
@@ -2389,7 +2514,7 @@
       public void warning(String arg0, String arg1, int arg2, String arg3, int arg4) {
         // ignore warnings
       } 
-    };
+    }
     
     CAstErrorReporter reporter = new CAstErrorReporter();
     CompilerEnvirons compilerEnv = new CompilerEnvirons();
@@ -2411,7 +2536,7 @@
     
     final FunctionContext child = new ScriptContext(new RootContext(), top, top.getSourceName());
     TranslatingVisitor tv = new TranslatingVisitor();
-    List<CAstNode> body = new ArrayList<CAstNode>();
+    List<CAstNode> body = new ArrayList<>();
     for(Node bn : top) {
     	body.add(tv.visit((AstNode)bn, child));
     }
@@ -2423,20 +2548,32 @@
 
   private final String scriptName;
 
-  private final SourceModule sourceModule;
+  private final ModuleEntry sourceModule;
 
   final private Reader sourceReader;
 
   private int tempVarNum = 0;
 
   private final DoLoopTranslator doLoopTranslator;
+
+  private final boolean useNewForIn;
+
+  public RhinoToAstTranslator(CAst Ast, ModuleEntry m, String scriptName, boolean replicateForDoLoops) {
+    this(Ast, m, scriptName, replicateForDoLoops, false);
+  }
   
-  public RhinoToAstTranslator(CAst Ast, SourceModule M, String scriptName, boolean replicateForDoLoops) {
+  public RhinoToAstTranslator(CAst Ast, ModuleEntry m, String scriptName, boolean replicateForDoLoops, boolean useNewForIn) {
     this.Ast = Ast;
     this.scriptName = scriptName;
-    this.sourceModule = M;
-    this.sourceReader = sourceModule.getInputReader();
+    this.sourceModule = m;
+    this.sourceReader = new InputStreamReader(sourceModule.getInputStream());
     this.doLoopTranslator = new DoLoopTranslator(replicateForDoLoops, Ast);
+    this.useNewForIn = useNewForIn;
+  }
+
+  @Override
+  public <C extends RewriteContext<K>, K extends CopyKey<K>> void addRewriter(CAstRewriterFactory<C, K> factory, boolean prepend) {
+    assert false;
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/build.gradle wala-1.5.1/com.ibm.wala.cast.js.rhino.test/build.gradle
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,47 @@
+plugins {
+	id 'com.github.hauner.jarTest'
+}
+
+sourceSets.test.java.srcDirs = ['harness-src']
+
+publishing.publications {
+	mavenJava(MavenPublication) {
+		artifact jarTest
+	}
+}
+
+dependencies {
+	testCompile(
+		'junit:junit:4.12',
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.cast.js'),
+		project(':com.ibm.wala.cast.js.rhino'),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.shrike'),
+		project(':com.ibm.wala.util'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.cast.js.test'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.cast.test'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
+		)
+}
+
+processTestResources {
+	def data = project(':com.ibm.wala.cast.js.test.data')
+	dependsOn data.processTestResources
+	from data.sourceSets.test.resources
+}
+
+test {
+	environment 'TRAVIS', 1
+	maxHeapSize = '800M'
+
+	if (gradle.startParameter.offline)
+		exclude '**/FieldBasedJQueryTest.class'
+}
+
+task cleanTestExtras(type: Delete) {
+	delete 'actual.dump'
+	delete 'expected.dump'
+}
+
+cleanTest.dependsOn cleanTestExtras
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/build.properties wala-1.5.1/com.ibm.wala.cast.js.rhino.test/build.properties
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 source.. = harness-src/
-output.. = bin/,\
-           /com.ibm.wala.cast.js.test.data/examples-src/
+output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/.classpath wala-1.5.1/com.ibm.wala.cast.js.rhino.test/.classpath
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="harness-src"/>
-	<classpathentry kind="lib" path="/com.ibm.wala.cast.js.test.data/examples-src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/examples/hybrid/Driver.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/examples/hybrid/Driver.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/examples/hybrid/Driver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/examples/hybrid/Driver.java	2019-01-29 17:08:39.000000000 +0000
@@ -4,6 +4,7 @@
 import java.net.URL;
 import java.util.Map;
 
+import com.ibm.wala.cast.ipa.callgraph.CrossLanguageCallGraph;
 import com.ibm.wala.cast.ipa.callgraph.CrossLanguageMethodTargetSelector;
 import com.ibm.wala.cast.ipa.callgraph.StandardFunctionTargetSelector;
 import com.ibm.wala.cast.ipa.cha.CrossLanguageClassHierarchy;
@@ -12,17 +13,18 @@
 import com.ibm.wala.cast.js.ipa.callgraph.JavaScriptConstructTargetSelector;
 import com.ibm.wala.cast.js.ipa.callgraph.JavaScriptEntryPoints;
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
-import com.ibm.wala.cast.js.test.JSCallGraphBuilderUtil;
 import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.classLoader.SourceURLModule;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
-import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
 import com.ibm.wala.ipa.callgraph.impl.ComposedEntrypoints;
+import com.ibm.wala.ipa.callgraph.impl.FakeRootClass;
+import com.ibm.wala.ipa.callgraph.impl.FakeRootMethod;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.IRFactory;
@@ -34,7 +36,7 @@
 
 public class Driver {
 
-  public static void addDefaultDispatchLogic(AnalysisOptions options, AnalysisScope scope, IClassHierarchy cha) {
+  public static void addDefaultDispatchLogic(AnalysisOptions options, IClassHierarchy cha) {
     com.ibm.wala.ipa.callgraph.impl.Util.addDefaultSelectors(options, cha);
 
     Map<Atom,MethodTargetSelector> methodTargetSelectors = HashMapFactory.make();
@@ -52,11 +54,11 @@
 
     HybridAnalysisScope scope = new HybridAnalysisScope();
     FileProvider files = new FileProvider();
-    AnalysisScopeReader.read(scope, args[0], files.getFile("Java60RegressionExclusions.txt"), Driver.class.getClassLoader(), files);
+    AnalysisScopeReader.read(scope, args[0], files.getFile("Java60RegressionExclusions.txt"), Driver.class.getClassLoader());
 
     scope.addToScope(
         scope.getJavaScriptLoader(),
-        JSCallGraphBuilderUtil.getPrologueFile("prologue.js"));
+        JSCallGraphUtil.getPrologueFile("prologue.js"));
     for(int i = 1; i < args.length; i++) {
       URL script = Driver.class.getClassLoader().getResource(args[i]);
       scope.addToScope(
@@ -77,13 +79,13 @@
 
     AnalysisOptions options = new AnalysisOptions(scope, roots);
     
-    addDefaultDispatchLogic(options, scope, cha);
-
     IRFactory<IMethod> factory = AstIRFactory.makeDefaultFactory();
 
-    AnalysisCache cache = new AnalysisCache(factory);
+    IAnalysisCacheView cache = new AnalysisCacheImpl(factory);
+
+    addDefaultDispatchLogic(options, cha);
 
-    JavaJavaScriptHybridCallGraphBuilder b = new JavaJavaScriptHybridCallGraphBuilder(cha, options, cache);
+    JavaJavaScriptHybridCallGraphBuilder b = new JavaJavaScriptHybridCallGraphBuilder(new FakeRootMethod(new FakeRootClass(CrossLanguageCallGraph.crossCoreLoader, cha), options, cache), options, cache);
     
     System.err.println(b.makeCallGraph(options));
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/examples/hybrid/JavaJavaScriptHybridCallGraphBuilder.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/examples/hybrid/JavaJavaScriptHybridCallGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/examples/hybrid/JavaJavaScriptHybridCallGraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/examples/hybrid/JavaJavaScriptHybridCallGraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -9,7 +9,6 @@
 import com.ibm.wala.cast.ipa.callgraph.CrossLanguageInstanceKeys;
 import com.ibm.wala.cast.ipa.callgraph.CrossLanguageSSAPropagationCallGraphBuilder;
 import com.ibm.wala.cast.ipa.callgraph.GlobalObjectKey;
-import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraph.JSFakeRoot;
 import com.ibm.wala.cast.js.ipa.callgraph.JSSSAPropagationCallGraphBuilder;
 import com.ibm.wala.cast.js.ipa.callgraph.JSSSAPropagationCallGraphBuilder.JSConstraintVisitor;
 import com.ibm.wala.cast.js.ipa.callgraph.JSSSAPropagationCallGraphBuilder.JSInterestingVisitor;
@@ -21,14 +20,14 @@
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
 import com.ibm.wala.cast.js.types.JavaScriptTypes;
 import com.ibm.wala.cast.util.TargetLanguageSelector;
+import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.Language;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.AbstractRootMethod;
 import com.ibm.wala.ipa.callgraph.impl.DefaultContextSelector;
-import com.ibm.wala.ipa.callgraph.impl.FakeRootMethod;
 import com.ibm.wala.ipa.callgraph.propagation.AbstractFieldPointerKey;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKeyFactory;
@@ -36,15 +35,14 @@
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.strings.Atom;
 
 public class JavaJavaScriptHybridCallGraphBuilder extends CrossLanguageSSAPropagationCallGraphBuilder {
 
-  public JavaJavaScriptHybridCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-    super(cha, options, cache, new AstCFAPointerKeys());
+  public JavaJavaScriptHybridCallGraphBuilder(IMethod fakeRootClass, AnalysisOptions options, IAnalysisCacheView cache) {
+    super(fakeRootClass, options, cache, new AstCFAPointerKeys());
     globalObject = new GlobalObjectKey(cha.lookupClass(JavaScriptTypes.Root));
     
     SSAContextInterpreter contextInterpreter = makeDefaultContextInterpreters(null, options, cha);
@@ -78,28 +76,22 @@
 
   @Override
   protected TargetLanguageSelector<ConstraintVisitor, CGNode> makeMainVisitorSelector() {
-    return new TargetLanguageSelector<ConstraintVisitor, CGNode>() {
-      @Override
-      public ConstraintVisitor get(Atom language, CGNode construct) {
-        if (JavaScriptTypes.jsName.equals(language)) {
-          return new JSConstraintVisitor(JavaJavaScriptHybridCallGraphBuilder.this, construct);
-        } else {
-          return new ConstraintVisitor(JavaJavaScriptHybridCallGraphBuilder.this, construct);
-        }
+    return (language, construct) -> {
+      if (JavaScriptTypes.jsName.equals(language)) {
+        return new JSConstraintVisitor(JavaJavaScriptHybridCallGraphBuilder.this, construct);
+      } else {
+        return new ConstraintVisitor(JavaJavaScriptHybridCallGraphBuilder.this, construct);
       }
     };
   }
 
   @Override
   protected TargetLanguageSelector<InterestingVisitor, Integer> makeInterestingVisitorSelector() {
-    return new TargetLanguageSelector<InterestingVisitor, Integer>() {
-      @Override
-      public InterestingVisitor get(Atom language, Integer construct) {
-        if (JavaScriptTypes.jsName.equals(language)) {
-          return new JSInterestingVisitor(construct);
-        } else {
-          return new InterestingVisitor(construct);
-        }
+    return (language, construct) -> {
+      if (JavaScriptTypes.jsName.equals(language)) {
+        return new JSInterestingVisitor(construct);
+      } else {
+        return new InterestingVisitor(construct);
       }
     };
   }
@@ -107,29 +99,19 @@
   @Override
   protected TargetLanguageSelector<AstImplicitPointsToSetVisitor, LocalPointerKey> makeImplicitVisitorSelector(
       CrossLanguagePointerAnalysisImpl analysis) {
-    return new TargetLanguageSelector<AstImplicitPointsToSetVisitor, LocalPointerKey>() {
-      @Override
-      public AstImplicitPointsToSetVisitor get(Atom language, LocalPointerKey construct) {
-        if (JavaScriptTypes.jsName.equals(language)) {
-          return new JSImplicitPointsToSetVisitor((AstPointerAnalysisImpl) getPointerAnalysis(), construct);
-        } else {
-          return new AstImplicitPointsToSetVisitor((AstPointerAnalysisImpl) getPointerAnalysis(), construct);
-        }
+    return (language, construct) -> {
+      if (JavaScriptTypes.jsName.equals(language)) {
+        return new JSImplicitPointsToSetVisitor((AstPointerAnalysisImpl) getPointerAnalysis(), construct);
+      } else {
+        return new AstImplicitPointsToSetVisitor((AstPointerAnalysisImpl) getPointerAnalysis(), construct);
       }
     };
   }
 
   @Override
   protected TargetLanguageSelector<AbstractRootMethod, CrossLanguageCallGraph> makeRootNodeSelector() {
-    return new TargetLanguageSelector<AbstractRootMethod, CrossLanguageCallGraph>() {
-      @Override
-      public AbstractRootMethod get(Atom language, CrossLanguageCallGraph construct) {
-        if (JavaScriptTypes.jsName.equals(language)) {
-          return new JSFakeRoot(getClassHierarchy(), getOptions(), getAnalysisCache());
-        } else {
-          return new FakeRootMethod(getClassHierarchy(), getOptions(), getAnalysisCache());
-        }
-      }
+    return (language, construct) -> {
+        return getOptions().getAnalysisScope().getLanguage(language).getFakeRootMethod(getClassHierarchy(), getOptions(), getAnalysisCache());
     };
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/AbstractFieldBasedTest.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/AbstractFieldBasedTest.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/AbstractFieldBasedTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/AbstractFieldBasedTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,20 +1,19 @@
 package com.ibm.wala.cast.js.rhino.callgraph.fieldbased.test;
 
-import java.io.IOException;
 import java.net.URL;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.AssertionFailedError;
-
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assume.*;
 import org.junit.Before;
 
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst.Error;
 import com.ibm.wala.cast.js.html.DefaultSourceExtractor;
 import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraph;
 import com.ibm.wala.cast.js.test.FieldBasedCGUtil;
-import com.ibm.wala.cast.js.test.TestJSCallGraphShape;
 import com.ibm.wala.cast.js.test.FieldBasedCGUtil.BuilderType;
+import com.ibm.wala.cast.js.test.TestJSCallGraphShape;
 import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory;
 import com.ibm.wala.cast.js.util.CallGraph2JSON;
 import com.ibm.wala.util.CancelException;
@@ -36,11 +35,11 @@
   	util = new FieldBasedCGUtil(new CAstRhinoTranslatorFactory());
   }
 
-  protected JSCallGraph runTest(String script, Object[][] assertions, BuilderType... builderTypes) throws IOException, WalaException, Error, CancelException {
+  protected JSCallGraph runTest(String script, Object[][] assertions, BuilderType... builderTypes) throws WalaException, Error, CancelException {
      return runTest(TestFieldBasedCG.class.getClassLoader().getResource(script), assertions, builderTypes);
    }
 
-  protected JSCallGraph runTest(URL url, Object[][] assertions, BuilderType... builderTypes) throws IOException, WalaException, Error, CancelException {
+  protected JSCallGraph runTest(URL url, Object[][] assertions, BuilderType... builderTypes) throws WalaException, Error, CancelException {
     JSCallGraph cg = null;
     for(BuilderType builderType : builderTypes) {
       ProgressMaster monitor = ProgressMaster.make(new NullProgressMonitor(), 45000, true);
@@ -48,8 +47,8 @@
         cg = util.buildCG(url, builderType, monitor, false, DefaultSourceExtractor.factory).fst;
         System.err.println(cg);
         verifyGraphAssertions(cg, assertions);
-      } catch(AssertionFailedError afe) {
-        throw new AssertionFailedError(builderType + ": " + afe.getMessage());
+      } catch(AssertionError afe) {
+        throw new AssertionError(builderType + ": " + afe.getMessage());
       } 
     }
     return cg;
@@ -58,21 +57,17 @@
   /**
    * for long-running tests that tend to time out on Travis
    */
-  protected JSCallGraph runTestExceptOnTravis(URL url, Object[][] assertions, BuilderType... builderTypes) throws IOException, WalaException, Error, CancelException {
-    if (System.getenv("TRAVIS") == null) {
-      return runTest(url, assertions, builderTypes);
-    } else {
-      return null;
-    }
+  protected void runTestExceptOnTravis(URL url, Object[][] assertions, BuilderType... builderTypes) throws WalaException, Error, CancelException {
+    assumeThat("not running on Travis CI", System.getenv("TRAVIS"), nullValue());
+    runTest(url, assertions, builderTypes);
   }
 
-  @SuppressWarnings("unused")
-  private void dumpCG(JSCallGraph cg) {
+  protected void dumpCG(JSCallGraph cg) {
   	CallGraph2JSON.IGNORE_HARNESS = false;
   	Map<String, Set<String>> edges = CallGraph2JSON.extractEdges(cg);
-  	for(String callsite : edges.keySet())
-  		for(String callee : edges.get(callsite))
-  			System.out.println(callsite + " -> " + callee);
+  	for(Map.Entry<String, Set<String>> entry : edges.entrySet())
+  		for(String callee : entry.getValue())
+  			System.out.println(entry.getKey() + " -> " + callee);
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/FieldBasedCGGamesTest.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/FieldBasedCGGamesTest.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/FieldBasedCGGamesTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/FieldBasedCGGamesTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.net.URL;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst.Error;
@@ -15,23 +14,19 @@
 
   @Test
   public void testBunnyHunt() throws IOException, WalaException, Error, CancelException {
-    runTestExceptOnTravis(new URL("http://www.themaninblue.com/experiment/BunnyHunt/"), new Object[][]{}, BuilderType.OPTIMISTIC_WORKLIST);
+    runTestExceptOnTravis(new URL("http://www.themaninblue.com/experiment/BunnyHunt/"), new Object[][]{}, BuilderType.OPTIMISTIC);
   }
-
-  @Test
-  public void testBomberman() throws IOException, WalaException, Error, CancelException {
-    runTestExceptOnTravis(new URL("http://www.e-forum.ro/bomberman/dynagame.html"), new Object[][]{}, BuilderType.OPTIMISTIC_WORKLIST);
-  }
-  
-  @Test
+    
+  // seems to break with http issues
+  //@Test
   public void testBeslimed() throws IOException, WalaException, Error, CancelException {
-    runTestExceptOnTravis(new URL("http://www.markus-inger.de/test/game.php"), new Object[][]{}, BuilderType.OPTIMISTIC_WORKLIST);
+    runTestExceptOnTravis(new URL("http://www.markus-inger.de/test/game.php"), new Object[][]{}, BuilderType.OPTIMISTIC);
   }
 
   // seems to break with http issues
   //@Test
   public void testDiggAttack() throws IOException, WalaException, Error, CancelException {
-    runTestExceptOnTravis(new URL("http://www.pixastic.com/labs/digg_attack/"), new Object[][]{}, BuilderType.OPTIMISTIC_WORKLIST);
+    runTestExceptOnTravis(new URL("http://www.pixastic.com/labs/digg_attack/"), new Object[][]{}, BuilderType.OPTIMISTIC);
   }
 
   @Test
@@ -41,18 +36,18 @@
  
   @Test
   public void testSolitaire() throws IOException, WalaException, Error, CancelException {
-    runTestExceptOnTravis(new URL("http://www.inmensia.com/files/solitaire1.0.html"), new Object[][]{}, BuilderType.OPTIMISTIC_WORKLIST);
+    runTestExceptOnTravis(new URL("http://www.inmensia.com/files/solitaire1.0.html"), new Object[][]{}, BuilderType.OPTIMISTIC);
   }
  
-  @Test(expected = CancelException.class)
+  @Test // (expected = CancelException.class)
   public void testWorldOfSolitaire() throws IOException, WalaException, Error, CancelException {
-    runTestExceptOnTravis(new URL("http://worldofsolitaire.com/"), new Object[][]{}, BuilderType.OPTIMISTIC_WORKLIST);
+    runTestExceptOnTravis(new URL("http://worldofsolitaire.com/"), new Object[][]{}, BuilderType.OPTIMISTIC);
     if (System.getenv("TRAVIS") != null) {
       // fake it
-      throw new CancelException(null);
+      // throw new CancelException(null);
     }
   }
-
+  
   @Test
   public void testMinesweeper() throws IOException, WalaException, Error, CancelException {
     runTestExceptOnTravis(new URL("http://www.inmensia.com/files/minesweeper1.0.html"), new Object[][]{}, BuilderType.OPTIMISTIC_WORKLIST);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/FieldBasedComparisonTest.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/FieldBasedComparisonTest.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/FieldBasedComparisonTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/FieldBasedComparisonTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,21 +1,17 @@
 package com.ibm.wala.cast.js.rhino.callgraph.fieldbased.test;
 
-import java.io.IOException;
-
-import junit.framework.AssertionFailedError;
-
 import org.junit.Test;
 
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst.Error;
 import com.ibm.wala.cast.js.html.JSSourceExtractor;
-import com.ibm.wala.cast.js.test.TestSimplePageCallGraphShape;
 import com.ibm.wala.cast.js.test.FieldBasedCGUtil.BuilderType;
+import com.ibm.wala.cast.js.test.TestSimplePageCallGraphShape;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.WalaException;
 
 public class FieldBasedComparisonTest extends AbstractFieldBasedTest {
 
-  private void test(String file, Object[][] assertions, BuilderType builderType) throws IOException, WalaException, Error, CancelException {
+  private void test(String file, Object[][] assertions, BuilderType builderType) throws WalaException, Error, CancelException {
     boolean save = JSSourceExtractor.USE_TEMP_NAME;
     try {
       JSSourceExtractor.USE_TEMP_NAME = false;
@@ -25,33 +21,33 @@
     }
   }
 
-  @Test(expected = AssertionFailedError.class)
-  public void testSkeletonPessimistic() throws IOException, WalaException, Error, CancelException {
+  @Test(expected = AssertionError.class)
+  public void testSkeletonPessimistic() throws WalaException, Error, CancelException {
     test("pages/skeleton.html", TestSimplePageCallGraphShape.assertionsForSkeleton, BuilderType.PESSIMISTIC);
   }
 
   @Test
-  public void testSkeletonOptimistic() throws IOException, WalaException, Error, CancelException {
+  public void testSkeletonOptimistic() throws WalaException, Error, CancelException {
     test("pages/skeleton.html", TestSimplePageCallGraphShape.assertionsForSkeleton, BuilderType.OPTIMISTIC);
   }
 
   @Test
-  public void testSkeletonWorklist() throws IOException, WalaException, Error, CancelException {
+  public void testSkeletonWorklist() throws WalaException, Error, CancelException {
     test("pages/skeleton.html", TestSimplePageCallGraphShape.assertionsForSkeleton, BuilderType.OPTIMISTIC_WORKLIST);
   }
 
-  @Test(expected = AssertionFailedError.class)
-  public void testSkeleton2Pessimistic() throws IOException, WalaException, Error, CancelException {
+  @Test(expected = AssertionError.class)
+  public void testSkeleton2Pessimistic() throws WalaException, Error, CancelException {
     test("pages/skeleton2.html", TestSimplePageCallGraphShape.assertionsForSkeleton2, BuilderType.PESSIMISTIC);
   }
 
   @Test
-  public void testSkeleton2Optimistic() throws IOException, WalaException, Error, CancelException {
+  public void testSkeleton2Optimistic() throws WalaException, Error, CancelException {
     test("pages/skeleton2.html", TestSimplePageCallGraphShape.assertionsForSkeleton2, BuilderType.OPTIMISTIC);
   }
 
   @Test
-  public void testSkeleton2Worklist() throws IOException, WalaException, Error, CancelException {
+  public void testSkeleton2Worklist() throws WalaException, Error, CancelException {
     test("pages/skeleton2.html", TestSimplePageCallGraphShape.assertionsForSkeleton2, BuilderType.OPTIMISTIC_WORKLIST);
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/TestFieldBasedCG.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/TestFieldBasedCG.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/TestFieldBasedCG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/callgraph/fieldbased/test/TestFieldBasedCG.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,8 +10,6 @@
  *****************************************************************************/
 package com.ibm.wala.cast.js.rhino.callgraph.fieldbased.test;
 
-import java.io.IOException;
-
 import org.junit.Test;
 
 import com.ibm.wala.cast.ir.translator.TranslatorToCAst.Error;
@@ -28,17 +26,17 @@
 	};
 	
 	@Test
-	public void testSimpleJSPessimistic() throws IOException, WalaException, Error, CancelException {
+	public void testSimpleJSPessimistic() throws WalaException, Error, CancelException {
 		runTest("tests/fieldbased/simple.js", assertionsForSimpleJS, BuilderType.PESSIMISTIC);
 	}
 
 	@Test
-	public void testSimpleJSOptimistic() throws IOException, WalaException, Error, CancelException {
+	public void testSimpleJSOptimistic() throws WalaException, Error, CancelException {
 	  runTest("tests/fieldbased/simple.js", assertionsForSimpleJS, BuilderType.OPTIMISTIC);
 	}
 	
 	@Test
-	public void testSimpleJSWorklist() throws IOException, WalaException, Error, CancelException {
+	public void testSimpleJSWorklist() throws WalaException, Error, CancelException {
 	  runTest("tests/fieldbased/simple.js", assertionsForSimpleJS, BuilderType.OPTIMISTIC_WORKLIST);
 	}
 
@@ -49,17 +47,17 @@
 	};
 	
 	@Test
-	public void testOneshotPessimistic() throws IOException, WalaException, Error, CancelException {
+	public void testOneshotPessimistic() throws WalaException, Error, CancelException {
 		runTest("tests/fieldbased/oneshot.js", assertionsForOneShot, BuilderType.PESSIMISTIC);
 	}
 	
   @Test
-  public void testOneshotOptimistic() throws IOException, WalaException, Error, CancelException {
+  public void testOneshotOptimistic() throws WalaException, Error, CancelException {
     runTest("tests/fieldbased/oneshot.js", assertionsForOneShot, BuilderType.OPTIMISTIC);
   }
 
   @Test
-  public void testOneshotWorklist() throws IOException, WalaException, Error, CancelException {
+  public void testOneshotWorklist() throws WalaException, Error, CancelException {
     runTest("tests/fieldbased/oneshot.js", assertionsForOneShot, BuilderType.OPTIMISTIC_WORKLIST);
   }
 
@@ -71,12 +69,12 @@
 	};
 	
 	@Test
-	public void testCallbacksOptimistic() throws IOException, WalaException, Error, CancelException {
+	public void testCallbacksOptimistic() throws WalaException, Error, CancelException {
 		runTest("tests/fieldbased/callbacks.js", assertionsForCallbacks, BuilderType.OPTIMISTIC_WORKLIST);
 	}
 	
   @Test
-  public void testCallbacksWorklist() throws IOException, WalaException, Error, CancelException {
+  public void testCallbacksWorklist() throws WalaException, Error, CancelException {
     runTest("tests/fieldbased/callbacks.js", assertionsForCallbacks, BuilderType.OPTIMISTIC_WORKLIST);
   }
 
@@ -85,17 +83,17 @@
 	};
 	
 	@Test
-	public void testLexicalPessimistic() throws IOException, WalaException, Error, CancelException {
+	public void testLexicalPessimistic() throws WalaException, Error, CancelException {
 		runTest("tests/fieldbased/lexical.js", assertionsForLexical, BuilderType.PESSIMISTIC);
 	}
 	
   @Test
-  public void testLexicalOptimistic() throws IOException, WalaException, Error, CancelException {
+  public void testLexicalOptimistic() throws WalaException, Error, CancelException {
     runTest("tests/fieldbased/lexical.js", assertionsForLexical, BuilderType.OPTIMISTIC);
   }
 
   @Test
-  public void testLexicalWorklist() throws IOException, WalaException, Error, CancelException {
+  public void testLexicalWorklist() throws WalaException, Error, CancelException {
     runTest("tests/fieldbased/lexical.js", assertionsForLexical, BuilderType.OPTIMISTIC_WORKLIST);
   }
 
@@ -107,12 +105,12 @@
 	};
 	
 	@Test
-	public void testReflectiveCallOptimistic() throws IOException, WalaException, Error, CancelException {
+	public void testReflectiveCallOptimistic() throws WalaException, Error, CancelException {
 		runTest("tests/fieldbased/reflective_calls.js", assertionsForReflectiveCall, BuilderType.OPTIMISTIC);
 	}
 	
   @Test
-  public void testReflectiveCallWorklist() throws IOException, WalaException, Error, CancelException {
+  public void testReflectiveCallWorklist() throws WalaException, Error, CancelException {
     runTest("tests/fieldbased/reflective_calls.js", assertionsForReflectiveCall, BuilderType.OPTIMISTIC_WORKLIST);
   }
 
@@ -122,12 +120,12 @@
 	};
 	
 	@Test
-	public void testNewOptimistic() throws IOException, WalaException, Error, CancelException {
+	public void testNewOptimistic() throws WalaException, Error, CancelException {
 	  runTest("tests/fieldbased/new.js", assertionsForNew, BuilderType.OPTIMISTIC);
 	}
   
   @Test
-  public void testNewWorklist() throws IOException, WalaException, Error, CancelException {
+  public void testNewWorklist() throws WalaException, Error, CancelException {
     runTest("tests/fieldbased/new.js", assertionsForNew, BuilderType.OPTIMISTIC_WORKLIST);
   }
 
@@ -137,17 +135,17 @@
   };
   
   @Test
-  public void testCallbacks2Optimistic() throws IOException, WalaException, Error, CancelException {
+  public void testCallbacks2Optimistic() throws WalaException, Error, CancelException {
     runTest("tests/fieldbased/callbacks2.js", assertionsForCallbacks2, BuilderType.OPTIMISTIC);
   }
 
   @Test
-  public void testCallbacks2Worklist() throws IOException, WalaException, Error, CancelException {
+  public void testCallbacks2Worklist() throws WalaException, Error, CancelException {
     runTest("tests/fieldbased/callbacks2.js", assertionsForCallbacks2, BuilderType.OPTIMISTIC_WORKLIST);
   }
 
   // @Test
-  public void testBug2979() throws IOException, WalaException, Error, CancelException {
+  public void testBug2979() throws WalaException, Error, CancelException {
     System.err.println(runTest("pages/2979.html", new Object[][]{}, BuilderType.PESSIMISTIC, BuilderType.OPTIMISTIC, BuilderType.OPTIMISTIC_WORKLIST));
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/HTMLCGBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,8 +16,9 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
+import java.util.function.Supplier;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.ibm.wala.cast.js.html.DefaultSourceExtractor;
 import com.ibm.wala.cast.js.html.JSSourceExtractor;
@@ -32,10 +33,8 @@
 import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
-import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.util.NullProgressMonitor;
 import com.ibm.wala.util.ProgressMaster;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.io.CommandLine;
 import com.ibm.wala.util.io.FileProvider;
 import com.ibm.wala.util.io.FileUtil;
@@ -76,12 +75,8 @@
 	 *          the HTML page to analyse, can either be a path to a local file or a URL
 	 * @param timeout
 	 *          analysis timeout in seconds, -1 means no timeout
-	 * @param fExtractor 
-	 * @throws IOException 
-	 * @throws ClassHierarchyException 
 	 */
-	public static CGBuilderResult buildHTMLCG(String src, int timeout, CGBuilderType builderType, Function<Void, JSSourceExtractor> fExtractor) 
-			throws ClassHierarchyException, IOException {
+	public static CGBuilderResult buildHTMLCG(String src, int timeout, CGBuilderType builderType, Supplier<JSSourceExtractor> fExtractor) {
 		CGBuilderResult res = new CGBuilderResult();
 		URL url = null;
 		try {
@@ -139,11 +134,8 @@
 	 * timeout argument is optional and defaults to {@link #DEFAULT_TIMEOUT}.
 	 * reachable argument is optional.  if provided, and some reachable function name contains function_name,
 	 * will print "REACHABLE"
-	 * @throws IOException 
-	 * @throws ClassHierarchyException 
-	 * 
 	 */
-	public static void main(String[] args) throws ClassHierarchyException, IOException {
+	public static void main(String[] args) throws IOException {
 		Properties parsedArgs = CommandLine.parse(args);
 		
 		String src = parsedArgs.getProperty("src");
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/PrintIRs.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/PrintIRs.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/PrintIRs.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/rhino/test/PrintIRs.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,6 +16,7 @@
 import java.net.URL;
 import java.util.Collections;
 import java.util.Set;
+import java.util.function.Predicate;
 
 import com.ibm.wala.cast.ipa.callgraph.CAstAnalysisScope;
 import com.ibm.wala.cast.ir.ssa.AstIRFactory;
@@ -28,21 +29,18 @@
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
 import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
 import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory;
-import com.ibm.wala.cast.js.util.Util;
 import com.ibm.wala.cast.loader.AstMethod;
 import com.ibm.wala.cast.types.AstMethodReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.SourceModule;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.IRFactory;
 import com.ibm.wala.ssa.SSAOptions;
-import com.ibm.wala.util.CancelException;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.Pair;
 
@@ -50,22 +48,13 @@
 
   /**
    * prints the IR of each function in the script
-   * 
-   * @throws IOException
-   * @throws ClassHierarchyException
    */
-  public static void printIRsForJS(String filename) throws IOException, ClassHierarchyException {
+  public static void printIRsForJS(String filename) throws ClassHierarchyException {
     // use Rhino to parse JavaScript
     JSCallGraphUtil.setTranslatorFactory(new CAstRhinoTranslatorFactory());
     // build a class hierarchy, for access to code info
     IClassHierarchy cha = JSCallGraphUtil.makeHierarchyForScripts(filename);
-    printIRsForCHA(cha, new Predicate<String>() {
-
-      @Override
-      public boolean test(String t) {
-        return t.startsWith("Lprologue.js");
-      }
-    });
+    printIRsForCHA(cha, t -> t.startsWith("Lprologue.js"));
   }
 
   protected static void printIRsForCHA(IClassHierarchy cha, Predicate<String> exclude) {
@@ -90,7 +79,7 @@
   }
 
   private static void printIRsForHTML(String filename) throws IllegalArgumentException, MalformedURLException, IOException,
-      CancelException, WalaException, Error {
+      WalaException, Error {
     // use Rhino to parse JavaScript
     JSCallGraphUtil.setTranslatorFactory(new CAstRhinoTranslatorFactory());
     // add model for DOM APIs
@@ -100,27 +89,12 @@
     SourceModule[] scripts = p.fst.toArray(new SourceModule[] {});
     JavaScriptLoaderFactory loaders = new WebPageLoaderFactory(JSCallGraphUtil.getTranslatorFactory());
     CAstAnalysisScope scope = new CAstAnalysisScope(scripts, loaders, Collections.singleton(JavaScriptLoader.JS));
-    IClassHierarchy cha = ClassHierarchy.make(scope, loaders, JavaScriptLoader.JS);
-    Util.checkForFrontEndErrors(cha);
-    printIRsForCHA(cha, new Predicate<String>() {
-
-      @Override
-      public boolean test(String t) {
-        return t.startsWith("Lprologue.js") || t.startsWith("Lpreamble.js");
-      }
-    });
+    IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, JavaScriptLoader.JS);
+    com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha);
+    printIRsForCHA(cha, t -> t.startsWith("Lprologue.js") || t.startsWith("Lpreamble.js"));
   }
 
-  /**
-   * 
-   * @param args
-   * @throws IOException
-   * @throws WalaException
-   * @throws CancelException
-   * @throws IllegalArgumentException
-   * @throws Error
-   */
-  public static void main(String[] args) throws IOException, IllegalArgumentException, CancelException, WalaException, Error {
+  public static void main(String[] args) throws IOException, IllegalArgumentException, WalaException, Error {
     String filename = args[0];
     if (filename.endsWith(".js")) {
       printIRsForJS(filename);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestCPA.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestCPA.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestCPA.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestCPA.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.cast.js.test;
+
+import java.io.IOException;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.ibm.wala.cast.ipa.callgraph.CAstCallGraphUtil;
+import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder;
+import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
+import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.propagation.CPAContextSelector;
+import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.WalaException;
+
+public class TestCPA {
+
+  @Before
+  public void setUp() {
+    com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil.setTranslatorFactory(new CAstRhinoTranslatorFactory());
+  }
+
+  @SuppressWarnings("static-access")
+  @Test public void testCPA() throws IOException, IllegalArgumentException, CancelException, WalaException {
+    JSCFABuilder builder = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "cpa.js");
+    builder.setContextSelector(new CPAContextSelector(builder.getContextSelector()));
+    CallGraph CG = builder.makeCallGraph(builder.getOptions());
+    JSCallGraphUtil.AVOID_DUMP = false;
+    CAstCallGraphUtil.dumpCG(builder.getCFAContextInterpreter(), builder.getPointerAnalysis(), CG);
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestRhinoSourceMap.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestRhinoSourceMap.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestRhinoSourceMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestRhinoSourceMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,8 +18,7 @@
 import java.io.IOException;
 import java.util.Map;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -32,7 +31,6 @@
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.HashMapFactory;
 
 public class TestRhinoSourceMap {
@@ -150,11 +148,11 @@
 	  };
 	  
 	  @Test
-	  public void testJquerySpecTestSourceMappings() throws IllegalArgumentException, IOException, CancelException, ClassHierarchyException {
+	  public void testJquerySpecTestSourceMappings() throws IllegalArgumentException, IOException, ClassHierarchyException {
 		  checkFunctionBodies("jquery_spec_test.js", jquery_spec_testSource);
 	  }
 
-	  private void checkFunctionBodies(String fileName, String[][] assertions) throws IOException, ClassHierarchyException {
+	  private static void checkFunctionBodies(String fileName, String[][] assertions) throws IOException, ClassHierarchyException {
 		  Map<String, String> sources = HashMapFactory.make();
 		  for(String[] assertion : assertions) {
 			  sources.put(assertion[0], assertion[1]);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShapeRhino.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShapeRhino.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShapeRhino.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShapeRhino.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,9 +17,6 @@
 
 import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder;
 import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory;
-import com.ibm.wala.cast.js.util.Util;
-import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
-import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.WalaException;
@@ -40,7 +37,7 @@
   public void test214631() throws IOException, IllegalArgumentException, CancelException, WalaException {
     JSCFABuilder b = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "214631.js");
     b.makeCallGraph(b.getOptions());
-    PointerAnalysis<InstanceKey> PA = b.getPointerAnalysis();
+    b.getPointerAnalysis();
     // just make sure this does not crash
   }
 
@@ -84,7 +81,7 @@
   public void testParseError() throws IllegalArgumentException, IOException, CancelException, WalaException {
     PropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "portal-example-simple.html");
     B.makeCallGraph(B.getOptions());
-    Util.checkForFrontEndErrors(B.getClassHierarchy());
+    com.ibm.wala.cast.util.Util.checkForFrontEndErrors(B.getClassHierarchy());
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhino.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhino.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhino.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhino.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *****************************************************************************/
 package com.ibm.wala.cast.js.test;
 
-import java.io.IOException;
 import java.net.URL;
 
 import org.junit.Before;
@@ -18,12 +17,10 @@
 
 import com.ibm.wala.cast.js.html.DefaultSourceExtractor;
 import com.ibm.wala.cast.js.html.IHtmlParser;
-import com.ibm.wala.cast.js.html.IHtmlParserFactory;
 import com.ibm.wala.cast.js.html.JSSourceExtractor;
 import com.ibm.wala.cast.js.html.WebUtil;
 import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder;
 import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory;
-import com.ibm.wala.cast.js.util.Util;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.WalaException;
@@ -35,18 +32,18 @@
 		new Object[] { "page3.html", new String[] { "page3.html/__WINDOW_MAIN__" } }
 	};
 
-	@Test public void testPage3() throws IOException, IllegalArgumentException, CancelException, WalaException {
+	@Test public void testPage3() throws IllegalArgumentException, CancelException, WalaException {
 		URL url = getClass().getClassLoader().getResource("pages/page3.html");
 		CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url, DefaultSourceExtractor.factory);
 		verifyGraphAssertions(CG, assertionsForPage3);
 	}
 
 	@Test(expected = WalaException.class)
-	public void testJSParseError() throws IOException, IllegalArgumentException, CancelException, WalaException {
+	public void testJSParseError() throws IllegalArgumentException, CancelException, WalaException {
 		URL url = getClass().getClassLoader().getResource("pages/garbage2.html");
 		JSCFABuilder B = JSCallGraphBuilderUtil.makeHTMLCGBuilder(url, DefaultSourceExtractor.factory);
 		B.makeCallGraph(B.getOptions());
-	    Util.checkForFrontEndErrors(B.getClassHierarchy());
+	    com.ibm.wala.cast.util.Util.checkForFrontEndErrors(B.getClassHierarchy());
 	}
 
 	public static void main(String[] args) {
@@ -60,12 +57,7 @@
     @Before
 	  public void setUp() {
 		    com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil.setTranslatorFactory(new CAstRhinoTranslatorFactory());
-			WebUtil.setFactory(new IHtmlParserFactory() {
-				@Override
-        public IHtmlParser getParser() {
-					return TestSimplePageCallGraphShapeRhino.this.getParser();
-				}
-			});
+			WebUtil.setFactory(TestSimplePageCallGraphShapeRhino.this::getParser);
 		    JSSourceExtractor.USE_TEMP_NAME = false;
 //		    JSSourceExtractor.DELETE_UPON_EXIT = false;    			
 	  }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhinoJericho.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhinoJericho.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhinoJericho.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShapeRhinoJericho.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.cast.js.test;
 
-import java.io.IOException;
 import java.net.URL;
 
 import org.junit.Test;
@@ -19,7 +18,6 @@
 import com.ibm.wala.cast.js.html.IHtmlParser;
 import com.ibm.wala.cast.js.html.jericho.JerichoHtmlParser;
 import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder;
-import com.ibm.wala.cast.js.util.Util;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.WalaException;
@@ -27,17 +25,17 @@
 
 public class TestSimplePageCallGraphShapeRhinoJericho extends TestSimplePageCallGraphShapeRhino {
 
-	@Test public void testCrawl() throws IOException, IllegalArgumentException, CancelException, WalaException {
+	@Test public void testCrawl() throws IllegalArgumentException, CancelException, WalaException {
 		URL url = getClass().getClassLoader().getResource("pages/crawl.html");
 		CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url, DefaultSourceExtractor.factory);
 		verifyGraphAssertions(CG, null);
 	}
 
-	@Test public void testParseError() throws IOException, IllegalArgumentException, CancelException, WalaException {
+	@Test public void testParseError() throws IllegalArgumentException, CancelException, WalaException {
 		URL url = getClass().getClassLoader().getResource("pages/garbage.html");
 		JSCFABuilder B = JSCallGraphBuilderUtil.makeHTMLCGBuilder(url, DefaultSourceExtractor.factory);
 		B.makeCallGraph(B.getOptions());
-	    Util.checkForFrontEndErrors(B.getClassHierarchy());
+	    com.ibm.wala.cast.util.Util.checkForFrontEndErrors(B.getClassHierarchy());
 	}
 
 	public static void main(String[] args) {
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/vis/JsViewerDriver.java wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/vis/JsViewerDriver.java
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/vis/JsViewerDriver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/vis/JsViewerDriver.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,6 +25,7 @@
 import com.ibm.wala.cast.js.html.WebUtil;
 import com.ibm.wala.cast.js.html.jericho.JerichoHtmlParser;
 import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder;
+import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
 import com.ibm.wala.cast.js.test.JSCallGraphBuilderUtil;
 import com.ibm.wala.cast.js.translator.CAstRhinoTranslatorFactory;
@@ -49,7 +50,7 @@
 		URL url = new URL(args[0]); 
 		
 		// computing CG + PA
-		JSCallGraphBuilderUtil.setTranslatorFactory(new CAstRhinoTranslatorFactory());
+		JSCallGraphUtil.setTranslatorFactory(new CAstRhinoTranslatorFactory());
 		JavaScriptLoader.addBootstrapFile(WebUtil.preamble);
 
 		SourceModule[] sources = getSources(domless, url);
@@ -60,7 +61,8 @@
 		CallGraph cg = builder.makeCallGraph(builder.getOptions());
 		PointerAnalysis<InstanceKey> pa = builder.getPointerAnalysis();
 
-		new JsViewer(cg, pa);
+		@SuppressWarnings("unused")
+		JsViewer jsViewer = new JsViewer(cg, pa);
 	}
 
 	private static SourceModule[] getSources(boolean domless, URL url)
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/launchers/com.ibm.wala.cast.js.rhino.test-JUnit.launch wala-1.5.1/com.ibm.wala.cast.js.rhino.test/launchers/com.ibm.wala.cast.js.rhino.test-JUnit.launch
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/launchers/com.ibm.wala.cast.js.rhino.test-JUnit.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/launchers/com.ibm.wala.cast.js.rhino.test-JUnit.launch	2019-01-29 17:08:39.000000000 +0000
@@ -22,6 +22,7 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;com.ibm.wala.cast.js.rhino.test&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.cast.js.test.data/examples-src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/launchers/JsViewerDriver.launch wala-1.5.1/com.ibm.wala.cast.js.rhino.test/launchers/JsViewerDriver.launch
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/launchers/JsViewerDriver.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/launchers/JsViewerDriver.launch	2019-01-29 17:08:39.000000000 +0000
@@ -1,13 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/vis/JsViewerDriver.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.js.vis.JsViewerDriver"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="file:${workspace_loc}/com.ibm.wala.cast.js.test/examples-src/pages/page1.html"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.cast.js.rhino.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx800M"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/com.ibm.wala.cast.js.rhino.test/harness-src/com/ibm/wala/cast/js/vis/JsViewerDriver.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.js.vis.JsViewerDriver"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="&quot;file:${resource_loc:/com.ibm.wala.cast.js.test/examples-src/pages/page1.html}&quot;"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.cast.js.rhino.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx800M"/>
+</launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/launchers/TestForInLoopHackRhino.launch wala-1.5.1/com.ibm.wala.cast.js.rhino.test/launchers/TestForInLoopHackRhino.launch
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/launchers/TestForInLoopHackRhino.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/launchers/TestForInLoopHackRhino.launch	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.js.test.TestForInLoopHackRhino"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.cast.js.rhino.test"/>
 </launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/launchers/TestMozillaBugPagesRhino.launch wala-1.5.1/com.ibm.wala.cast.js.rhino.test/launchers/TestMozillaBugPagesRhino.launch
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/launchers/TestMozillaBugPagesRhino.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/launchers/TestMozillaBugPagesRhino.launch	2019-01-29 17:08:39.000000000 +0000
@@ -15,6 +15,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.js.test.TestMozillaBugPagesRhino"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.cast.js.rhino.test"/>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Test Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js.rhino.test
-Bundle-Version: 1.3.9
-Bundle-Vendor: IBM
+Bundle-Version: 1.5.1
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.cast.js.rhino;bundle-version="1.0.0",
  com.ibm.wala.cast.js;bundle-version="1.0.0",
  com.ibm.wala.cast;bundle-version="1.0.0",
@@ -14,8 +14,10 @@
  com.ibm.wala.cast.js.test.data;bundle-version="1.3.4",
  com.ibm.wala.shrike;bundle-version="1.3.4",
  org.junit;bundle-version="4.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Export-Package: com.ibm.wala.cast.js.rhino.callgraph.fieldbased.test,
+Export-Package: com.ibm.wala.cast.js.examples.hybrid,
+ com.ibm.wala.cast.js.rhino.callgraph.fieldbased.test,
  com.ibm.wala.cast.js.rhino.test,
- com.ibm.wala.cast.js.test
+ com.ibm.wala.cast.js.test,
+ com.ibm.wala.cast.js.vis
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast.js.rhino.test/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.js.rhino.test
+Bundle-Vendor = IBM
+Bundle-Name = Test Plug-in
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/pom.xml wala-1.5.1/com.ibm.wala.cast.js.rhino.test/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
   <artifactId>com.ibm.wala.cast.js.rhino.test</artifactId>
   <packaging>eclipse-plugin</packaging>
@@ -22,6 +22,8 @@
               <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
               <argLine>-Xmx800M -ea</argLine>
               <redirectTestOutputToFile>true</redirectTestOutputToFile>
+	      <forkCount>2</forkCount>
+	      <reuseForks>false</reuseForks>
               <additionalClasspathElements>
                 <additionalClasspathElement>${basedir}/../com.ibm.wala.cast.js.test.data/examples-src</additionalClasspathElement>
               </additionalClasspathElements>
@@ -38,7 +40,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
   </dependencies> 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/.project wala-1.5.1/com.ibm.wala.cast.js.rhino.test/.project
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.cast.js.rhino.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,78 +1,126 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=error
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=0
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.rhino.test/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude08113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T02111contentType133org.eclipse.jdt.junit.JUnitResultF04file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/build.gradle wala-1.5.1/com.ibm.wala.cast.js.test/build.gradle
--- wala-1.3.9/com.ibm.wala.cast.js.test/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,35 @@
+plugins {
+	id 'com.github.hauner.jarTest'
+}
+
+sourceSets.test.java.srcDirs = ['harness-src']
+
+publishing.publications {
+	mavenJava(MavenPublication) {
+		artifact jarTest
+	}
+}
+
+dependencies {
+	testCompile(
+		'junit:junit:4.12',
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.cast.js'),
+		project(':com.ibm.wala.cast.js.rhino'),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.shrike'),
+		project(':com.ibm.wala.util'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.cast.test'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
+		)
+}
+
+processTestResources {
+	def data = project(':com.ibm.wala.cast.js.test.data')
+	dependsOn data.processTestResources
+	from data.sourceSets.test.resources
+}
+
+test {
+	maxHeapSize = '800M'
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/build.properties wala-1.5.1/com.ibm.wala.cast.js.test/build.properties
--- wala-1.3.9/com.ibm.wala.cast.js.test/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,7 @@
 source.. =  harness-src
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/.classpath wala-1.5.1/com.ibm.wala.cast.js.test/.classpath
--- wala-1.3.9/com.ibm.wala.cast.js.test/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="harness-src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/.cvsignore wala-1.5.1/com.ibm.wala.cast.js.test/.cvsignore
--- wala-1.3.9/com.ibm.wala.cast.js.test/.cvsignore	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/.cvsignore	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bin
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/CAstDumper.java wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/CAstDumper.java
--- wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/CAstDumper.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/CAstDumper.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -70,11 +69,11 @@
 	private void dump(CAstEntity entity, int indent, StringBuilder buf) {
 		Collection<CAstEntity> scopedEntities = Collections.emptySet();
 		if(entity.getKind() == CAstEntity.SCRIPT_ENTITY) {
-			buf.append(indent(indent) + entity.getName() + ":\n");
+			buf.append(indent(indent)).append(entity.getName()).append(":\n");
 			scopedEntities = dumpScopedEntities(entity, indent+2, buf);
 			dump(entity.getAST(), indent, buf, entity.getControlFlow());
 		} else if(entity.getKind() == CAstEntity.FUNCTION_ENTITY) {
-			buf.append(indent(indent) + "function " + entity.getName() + "(");
+			buf.append(indent(indent)).append("function ").append(entity.getName()).append('(');
 			for(int i=0;i<entity.getArgumentCount();++i) {
 				if(i>0)
 					buf.append(", ");
@@ -83,7 +82,7 @@
 			buf.append(") {\n");
 			scopedEntities = dumpScopedEntities(entity, indent+2, buf);
 			dump(entity.getAST(), indent+2, buf, entity.getControlFlow());
-			buf.append(indent(indent) + "}\n\n");
+			buf.append(indent(indent)).append("}\n\n");
 		} else {
 			throw new Error("Unknown entity kind " + entity.getKind());
 		}
@@ -92,30 +91,25 @@
 	}
 	
 	private Collection<CAstEntity> dumpScopedEntities(CAstEntity entity, int indent, StringBuilder buf) {
-		ArrayList<CAstEntity> scopedEntities = new ArrayList<CAstEntity>();
+		ArrayList<CAstEntity> scopedEntities = new ArrayList<>();
 		Map<CAstEntity, CAstNode> m = HashMapFactory.make();
 		for(Entry<CAstNode, Collection<CAstEntity>> e : entity.getAllScopedEntities().entrySet())
 			for(CAstEntity scopedEntity : e.getValue()) {
 				scopedEntities.add(scopedEntity);
 				m.put(scopedEntity, e.getKey());
 			}
-		Collections.sort(scopedEntities, new Comparator<CAstEntity>() {
-			@Override
-      public int compare(CAstEntity o1, CAstEntity o2) {
-				return o1.getName().compareTo(o2.getName());
-			}
-		});
+		Collections.sort(scopedEntities, (o1, o2) -> o1.getName().compareTo(o2.getName()));
 		
-		buf.append(indent(indent) + "> ");
+		buf.append(indent(indent)).append("> ");
 		boolean first = true;
 		for(CAstEntity scopedEntity : scopedEntities) {
 			if(first)
 				first = false;
 			else
 				buf.append(", ");
-			buf.append(scopedEntity.getName() + "@" + labeller.addNode(m.get(scopedEntity)));
+			buf.append(scopedEntity.getName()).append('@').append(labeller.addNode(m.get(scopedEntity)));
 		}
-		buf.append("\n");
+		buf.append('\n');
 		return scopedEntities;
 	}
 	
@@ -151,14 +145,14 @@
 		    if(!isTrivial(node.getChild(i)))
 		      dump(node.getChild(i), indent, buf, cfg);
 		} else {
-			buf.append(indent(indent) + labeller.addNode(node) + ": ");
+			buf.append(indent(indent)).append(labeller.addNode(node)).append(": ");
 			if(node.getKind() == CAstNode.CONSTANT) {
 				if(node.getValue() == null)
 					buf.append("null");
 				else if(node.getValue() instanceof Integer)
-					buf.append(node.getValue()+"");
+					buf.append(String.valueOf(node.getValue()));
 				else
-					buf.append("\"" + node.getValue() + "\"");
+					buf.append("\"").append(node.getValue()).append("\"");
 			} else if(node.getKind() == CAstNode.OPERATOR) {
 				buf.append(node.getValue().toString());
 			} else {
@@ -176,14 +170,14 @@
 						buf.append(", ");
 					}
 					if(label instanceof CAstNode)
-						buf.append("CAstNode@" + labeller.addNode((CAstNode)label) + ": ");
+						buf.append("CAstNode@").append(labeller.addNode((CAstNode) label)).append(": ");
 					else
-						buf.append(label + ": ");
+						buf.append(label).append(": ");
 					buf.append(labeller.addNode(target));
 				}
-				buf.append("]");
+				buf.append(']');
 			}
-			buf.append("\n");
+			buf.append('\n');
 			for(int i=0;i<node.getChildCount();++i) {
 				CAstNode child = node.getChild(i);
 				// omit empty statements in a block
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/FieldBasedCGUtil.java wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/FieldBasedCGUtil.java
--- wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/FieldBasedCGUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/FieldBasedCGUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,6 +15,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Supplier;
 
 import com.ibm.wala.cast.ipa.callgraph.CAstAnalysisScope;
 import com.ibm.wala.cast.ir.ssa.AstIRFactory;
@@ -25,25 +26,26 @@
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.ObjectVertex;
 import com.ibm.wala.cast.js.html.JSSourceExtractor;
 import com.ibm.wala.cast.js.html.WebPageLoaderFactory;
+import com.ibm.wala.cast.js.ipa.callgraph.JSAnalysisOptions;
 import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraph;
 import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
 import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
 import com.ibm.wala.cast.js.translator.JavaScriptTranslatorFactory;
-import com.ibm.wala.cast.js.util.Util;
+import com.ibm.wala.classLoader.Module;
 import com.ibm.wala.classLoader.SourceModule;
 import com.ibm.wala.classLoader.SourceURLModule;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
 import com.ibm.wala.util.NullProgressMonitor;
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.functions.Function;
 
 /**
  * Utility class for building call graphs.
@@ -52,7 +54,34 @@
  *
  */
 public class FieldBasedCGUtil {
-	public static enum BuilderType { PESSIMISTIC, OPTIMISTIC, OPTIMISTIC_WORKLIST };
+	public static enum BuilderType {
+	  PESSIMISTIC {
+	    @Override
+      protected FieldBasedCallGraphBuilder fieldBasedCallGraphBuilderFactory(IClassHierarchy cha,
+          final JSAnalysisOptions makeOptions, IAnalysisCacheView cache, boolean supportFullPointerAnalysis) {
+	      return new PessimisticCallGraphBuilder(cha, makeOptions, cache, supportFullPointerAnalysis);
+	    }
+	  },
+
+	  OPTIMISTIC {
+      @Override
+      protected FieldBasedCallGraphBuilder fieldBasedCallGraphBuilderFactory(IClassHierarchy cha,
+          JSAnalysisOptions makeOptions, IAnalysisCacheView cache, boolean supportFullPointerAnalysis) {
+        return new OptimisticCallgraphBuilder(cha, makeOptions, cache, supportFullPointerAnalysis);
+      }
+    },
+
+	  OPTIMISTIC_WORKLIST {
+      @Override
+      protected FieldBasedCallGraphBuilder fieldBasedCallGraphBuilderFactory(IClassHierarchy cha,
+          JSAnalysisOptions makeOptions, IAnalysisCacheView cache, boolean supportFullPointerAnalysis) {
+        return new WorklistBasedOptimisticCallgraphBuilder(cha, makeOptions, cache, supportFullPointerAnalysis);
+      }
+    };
+
+    protected abstract FieldBasedCallGraphBuilder fieldBasedCallGraphBuilderFactory(IClassHierarchy cha,
+        JSAnalysisOptions makeOptions, IAnalysisCacheView cache, boolean supportFullPointerAnalysis);
+	}
 
 	private final JavaScriptTranslatorFactory translatorFactory;
 
@@ -60,11 +89,11 @@
 		this.translatorFactory = translatorFactory;
 	}
 
-  public Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> buildCG(URL url, BuilderType builderType, boolean supportFullPointerAnalysis, Function<Void, JSSourceExtractor> fExtractor) throws IOException, WalaException, CancelException  {
+  public Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> buildCG(URL url, BuilderType builderType, boolean supportFullPointerAnalysis, Supplier<JSSourceExtractor> fExtractor) throws WalaException, CancelException  {
     return buildCG(url, builderType, new NullProgressMonitor(), supportFullPointerAnalysis, fExtractor);
   }
 
-  public Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> buildCG(URL url, BuilderType builderType, IProgressMonitor monitor, boolean supportFullPointerAnalysis, Function<Void, JSSourceExtractor> fExtractor) throws IOException, WalaException, CancelException  {
+  public Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> buildCG(URL url, BuilderType builderType, IProgressMonitor monitor, boolean supportFullPointerAnalysis, Supplier<JSSourceExtractor> fExtractor) throws WalaException, CancelException  {
     if (url.getFile().endsWith(".js")) {
       return buildScriptCG(url, builderType, monitor, supportFullPointerAnalysis);
     } else {
@@ -72,47 +101,35 @@
     }
   }
   
-	public Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> buildScriptCG(URL url, BuilderType builderType, IProgressMonitor monitor, boolean supportFullPointerAnalysis) throws IOException, WalaException, CancelException  {
+	public Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> buildScriptCG(URL url, BuilderType builderType, IProgressMonitor monitor, boolean supportFullPointerAnalysis) throws WalaException, CancelException  {
     JavaScriptLoaderFactory loaders = new JavaScriptLoaderFactory(translatorFactory);
-    SourceModule[] scripts = new SourceModule[]{
+    Module[] scripts = new Module[]{
         new SourceURLModule(url),
-        JSCallGraphBuilderUtil.getPrologueFile("prologue.js")
+        JSCallGraphUtil.getPrologueFile("prologue.js")
     };
     return buildCG(loaders, scripts, builderType, monitor, supportFullPointerAnalysis);
 	}
 
 	 public Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> buildTestCG(String dir, String name, BuilderType builderType, IProgressMonitor monitor, boolean supportFullPointerAnalysis) throws IOException, WalaException, CancelException  {
 	    JavaScriptLoaderFactory loaders = new JavaScriptLoaderFactory(translatorFactory);
-	    SourceModule[] scripts = JSCallGraphBuilderUtil.makeSourceModules(dir, name);
+	    Module[] scripts = JSCallGraphBuilderUtil.makeSourceModules(dir, name);
 	    return buildCG(loaders, scripts, builderType, monitor, supportFullPointerAnalysis);
 	  }
 
-	public Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> buildPageCG(URL url, BuilderType builderType, IProgressMonitor monitor, boolean supportFullPointerAnalysis, Function<Void, JSSourceExtractor> fExtractor) throws IOException, WalaException, CancelException  {
+	public Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> buildPageCG(URL url, BuilderType builderType, IProgressMonitor monitor, boolean supportFullPointerAnalysis, Supplier<JSSourceExtractor> fExtractor) throws WalaException, CancelException  {
 	  JavaScriptLoaderFactory loaders = new WebPageLoaderFactory(translatorFactory);
 	  SourceModule[] scripts = JSCallGraphBuilderUtil.makeHtmlScope(url, loaders, fExtractor);
 	  return buildCG(loaders, scripts, builderType, monitor, supportFullPointerAnalysis);
 	}
 
-	public Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> buildCG(JavaScriptLoaderFactory loaders, SourceModule[] scripts, BuilderType builderType, IProgressMonitor monitor, boolean supportFullPointerAnalysis) throws IOException, WalaException, CancelException  {
+	public Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> buildCG(JavaScriptLoaderFactory loaders, Module[] scripts, BuilderType builderType, IProgressMonitor monitor, boolean supportFullPointerAnalysis) throws WalaException, CancelException  {
 		CAstAnalysisScope scope = new CAstAnalysisScope(scripts, loaders, Collections.singleton(JavaScriptLoader.JS));
-		IClassHierarchy cha = ClassHierarchy.make(scope, loaders, JavaScriptLoader.JS);
-		Util.checkForFrontEndErrors(cha);
+		IClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, JavaScriptLoader.JS);
+		com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha);
 		Iterable<Entrypoint> roots = JSCallGraphUtil.makeScriptRoots(cha);
-		FieldBasedCallGraphBuilder builder = null;
-		
-		AnalysisCache cache = new AnalysisCache(AstIRFactory.makeDefaultFactory());
-		switch(builderType) {
-		case PESSIMISTIC:
-			builder = new PessimisticCallGraphBuilder(cha, JSCallGraphUtil.makeOptions(scope, cha, roots), cache, supportFullPointerAnalysis);
-			break;
-		case OPTIMISTIC:
-			builder = new OptimisticCallgraphBuilder(cha, JSCallGraphUtil.makeOptions(scope, cha, roots), cache, supportFullPointerAnalysis);
-			break;
-		case OPTIMISTIC_WORKLIST:
-		  builder = new WorklistBasedOptimisticCallgraphBuilder(cha, JSCallGraphUtil.makeOptions(scope, cha, roots), cache, supportFullPointerAnalysis);
-		  break;
-		}
-		
+		IAnalysisCacheView cache = new AnalysisCacheImpl(AstIRFactory.makeDefaultFactory());
+		final FieldBasedCallGraphBuilder builder = builderType.fieldBasedCallGraphBuilderFactory(cha,
+        JSCallGraphUtil.makeOptions(scope, cha, roots), cache, supportFullPointerAnalysis);
 		return builder.buildCallGraph(roots, monitor);
 	}
 
@@ -125,8 +142,9 @@
 	@SuppressWarnings("unused")
   private static void compareCGs(Map<String, Set<String>> cg1, Map<String, Set<String>> cg2) {
 	  boolean diff = false;
-	  for(String key : cg1.keySet()) {
-	    Set<String> targets1 = cg1.get(key), targets2 = cg2.get(key);
+	  for(Map.Entry<String, Set<String>> entry : cg1.entrySet()) {
+	    final String key = entry.getKey();
+	    Set<String> targets1 = entry.getValue(), targets2 = cg2.get(key);
 	    if(targets2 == null) {
 	      diff = true;
 	      System.err.println("CG2 doesn't have call site" + key);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java
--- wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/JSCallGraphBuilderUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,6 +16,7 @@
 import java.net.JarURLConnection;
 import java.net.URL;
 import java.util.Set;
+import java.util.function.Supplier;
 
 import org.junit.Assert;
 
@@ -33,17 +34,18 @@
 import com.ibm.wala.cast.js.ipa.callgraph.correlations.extraction.CorrelatedPairExtractorFactory;
 import com.ibm.wala.cast.js.loader.JavaScriptLoader;
 import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
-import com.ibm.wala.cast.js.test.JSCallGraphBuilderUtil.CGBuilderType;
 import com.ibm.wala.cast.loader.CAstAbstractLoader;
 import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
 import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.classLoader.Module;
 import com.ibm.wala.classLoader.SourceModule;
 import com.ibm.wala.classLoader.SourceURLModule;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
@@ -51,7 +53,6 @@
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.io.FileProvider;
 
 /**
@@ -94,7 +95,7 @@
    */
   public static JSCFABuilder makeScriptCGBuilder(String dir, String name, CGBuilderType builderType, ClassLoader loader) throws IOException, WalaException {
     URL script = getURLforFile(dir, name, loader);
-    CAstRewriterFactory preprocessor = builderType.extractCorrelatedPairs ? new CorrelatedPairExtractorFactory(translatorFactory, script) : null;
+    CAstRewriterFactory<?, ?> preprocessor = builderType.extractCorrelatedPairs ? new CorrelatedPairExtractorFactory(translatorFactory, script) : null;
     JavaScriptLoaderFactory loaders = JSCallGraphUtil.makeLoaders(preprocessor);
 
     AnalysisScope scope = makeScriptScope(dir, name, loaders, loader);
@@ -110,7 +111,6 @@
     } catch (FileNotFoundException e) {
       // I guess we need to do this on Windows sometimes?  --MS
       // if this fails, we won't catch the exception
-      f = provider.getFile(dir + "/" + name, JSCallGraphBuilderUtil.class.getClassLoader());
     }
     return f.toURI().toURL();
   }
@@ -123,13 +123,13 @@
     return makeScope(makeSourceModules(dir, name, JSCallGraphBuilderUtil.class.getClassLoader()), loaders, JavaScriptLoader.JS);    
   }
 
-  public static SourceModule[] makeSourceModules(String dir, String name) throws IOException {
+  public static Module[] makeSourceModules(String dir, String name) throws IOException {
     return makeSourceModules(dir, name, JSCallGraphBuilderUtil.class.getClassLoader());
   }
   
-  public static SourceModule[] makeSourceModules(String dir, String name, ClassLoader loader) throws IOException {
+  public static Module[] makeSourceModules(String dir, String name, ClassLoader loader) throws IOException {
     URL script = getURLforFile(dir, name, loader);
-    SourceModule[] modules = new SourceModule[] { 
+    Module[] modules = new Module[] { 
         (script.openConnection() instanceof JarURLConnection)? new SourceURLModule(script): makeSourceModule(script, dir, name), 
         getPrologueFile("prologue.js")
     };
@@ -160,22 +160,22 @@
     return CG;
   }
 
-  public static CallGraph makeScriptCG(SourceModule[] scripts, CGBuilderType builderType, IRFactory<IMethod> irFactory) throws IOException, IllegalArgumentException,
+  public static CallGraph makeScriptCG(SourceModule[] scripts, CGBuilderType builderType, IRFactory<IMethod> irFactory) throws IllegalArgumentException,
       CancelException, WalaException {
-    CAstRewriterFactory preprocessor = builderType.extractCorrelatedPairs ? new CorrelatedPairExtractorFactory(translatorFactory, scripts) : null;
+    CAstRewriterFactory<?, ?> preprocessor = builderType.extractCorrelatedPairs ? new CorrelatedPairExtractorFactory(translatorFactory, scripts) : null;
     PropagationCallGraphBuilder b = makeCGBuilder(makeLoaders(preprocessor), scripts, builderType, irFactory);
     CallGraph CG = b.makeCallGraph(b.getOptions());
     // dumpCG(b.getPointerAnalysis(), CG);
     return CG;
   }
 
-  public static JSCFABuilder makeHTMLCGBuilder(URL url, Function<Void, JSSourceExtractor> fExtractor) throws IOException, WalaException {
+  public static JSCFABuilder makeHTMLCGBuilder(URL url, Supplier<JSSourceExtractor> fExtractor) throws WalaException {
     return makeHTMLCGBuilder(url, CGBuilderType.ZERO_ONE_CFA, fExtractor);
   }
 
-  public static JSCFABuilder makeHTMLCGBuilder(URL url, CGBuilderType builderType, Function<Void, JSSourceExtractor> fExtractor) throws IOException, WalaException {
+  public static JSCFABuilder makeHTMLCGBuilder(URL url, CGBuilderType builderType, Supplier<JSSourceExtractor> fExtractor) throws WalaException {
     IRFactory<IMethod> irFactory = AstIRFactory.makeDefaultFactory();
-    CAstRewriterFactory preprocessor = builderType.extractCorrelatedPairs ? new CorrelatedPairExtractorFactory(translatorFactory, url) : null;
+    CAstRewriterFactory<?, ?> preprocessor = builderType.extractCorrelatedPairs ? new CorrelatedPairExtractorFactory(translatorFactory, url) : null;
     JavaScriptLoaderFactory loaders = new WebPageLoaderFactory(translatorFactory, preprocessor);
     SourceModule[] scriptsArray = makeHtmlScope(url, loaders, fExtractor);
     
@@ -186,8 +186,8 @@
     return builder;
   }
 
-  public static SourceModule[] makeHtmlScope(URL url, JavaScriptLoaderFactory loaders, Function<Void,JSSourceExtractor> fExtractor) {
-    Set<SourceModule> scripts = HashSetFactory.make();
+  public static SourceModule[] makeHtmlScope(URL url, JavaScriptLoaderFactory loaders, Supplier<JSSourceExtractor> fExtractor) {
+    Set<Module> scripts = HashSetFactory.make();
     
     JavaScriptLoader.addBootstrapFile(WebUtil.preamble);
     scripts.add(getPrologueFile("prologue.js"));
@@ -198,40 +198,40 @@
     } catch (Error e) {
       SourceModule dummy = new SourceURLModule(url);
       scripts.add(dummy);
-      ((CAstAbstractLoader)loaders.getTheLoader()).addMessage(dummy, e.warning);
+      ((CAstAbstractLoader)loaders.getTheLoader()).addMessages(dummy, e.warning);
     }
         
-    SourceModule[] scriptsArray = scripts.toArray(new SourceModule[ scripts.size() ]);
+    SourceModule[] scriptsArray = scripts.toArray(new SourceModule[0]);
     return scriptsArray;
   }
 
-  public static CallGraph makeHTMLCG(URL url, Function<Void, JSSourceExtractor> fExtractor) throws IOException, IllegalArgumentException, CancelException, WalaException {
-    PropagationCallGraphBuilder b = makeHTMLCGBuilder(url, fExtractor);
+  public static CallGraph makeHTMLCG(URL url, Supplier<JSSourceExtractor> fExtractor) throws IllegalArgumentException, CancelException, WalaException {
+    SSAPropagationCallGraphBuilder b = makeHTMLCGBuilder(url, fExtractor);
     CallGraph CG = b.makeCallGraph(b.getOptions());
-    dumpCG(b.getPointerAnalysis(), CG);
+    dumpCG(b.getCFAContextInterpreter(), b.getPointerAnalysis(), CG);
     return CG;
   }
 
-  public static CallGraph makeHTMLCG(URL url, CGBuilderType builderType, Function<Void, JSSourceExtractor> fExtractor) throws IOException, IllegalArgumentException,
+  public static CallGraph makeHTMLCG(URL url, CGBuilderType builderType, Supplier<JSSourceExtractor> fExtractor) throws IllegalArgumentException,
       CancelException, WalaException {
     PropagationCallGraphBuilder b = makeHTMLCGBuilder(url, builderType, fExtractor);
     CallGraph CG = b.makeCallGraph(b.getOptions());
     return CG;
   }
 
-  public static JSCFABuilder makeCGBuilder(JavaScriptLoaderFactory loaders, SourceModule[] scripts, CGBuilderType builderType, IRFactory<IMethod> irFactory) throws IOException, WalaException {
+  public static JSCFABuilder makeCGBuilder(JavaScriptLoaderFactory loaders, SourceModule[] scripts, CGBuilderType builderType, IRFactory<IMethod> irFactory) throws WalaException {
     AnalysisScope scope = makeScope(scripts, loaders, JavaScriptLoader.JS);
     return makeCG(loaders, scope, builderType, irFactory);
   }
 
-  protected static JSCFABuilder makeCG(JavaScriptLoaderFactory loaders, AnalysisScope scope, CGBuilderType builderType, IRFactory<IMethod> irFactory) throws IOException, WalaException {
+  protected static JSCFABuilder makeCG(JavaScriptLoaderFactory loaders, AnalysisScope scope, CGBuilderType builderType, IRFactory<IMethod> irFactory) throws WalaException {
     try {
       IClassHierarchy cha = makeHierarchy(scope, loaders);
-      com.ibm.wala.cast.js.util.Util.checkForFrontEndErrors(cha);
+      com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha);
       Iterable<Entrypoint> roots = makeScriptRoots(cha);
       JSAnalysisOptions options = makeOptions(scope, cha, roots);
       options.setHandleCallApply(builderType.handleCallApply());
-      AnalysisCache cache = makeCache(irFactory);
+      IAnalysisCacheView cache = makeCache(irFactory);
       JSCFABuilder builder = new JSZeroOrOneXCFABuilder(cha, options, cache, null, null, ZeroXInstanceKeys.ALLOCATIONS,
           builderType.useOneCFA());
       if(builderType.extractCorrelatedPairs())
@@ -244,15 +244,15 @@
     }
   }
 
-  public static CallGraph makeHTMLCG(URL url, CGBuilderType zeroOneCfaNoCallApply) throws IllegalArgumentException, IOException, CancelException, WalaException {
+  public static CallGraph makeHTMLCG(URL url, CGBuilderType zeroOneCfaNoCallApply) throws IllegalArgumentException, CancelException, WalaException {
     return makeHTMLCG(url, zeroOneCfaNoCallApply, DefaultSourceExtractor.factory);
   }
 
-  public static CallGraph makeHTMLCG(URL url) throws IllegalArgumentException, IOException, CancelException, WalaException {
+  public static CallGraph makeHTMLCG(URL url) throws IllegalArgumentException, CancelException, WalaException {
     return makeHTMLCG(url, DefaultSourceExtractor.factory);
   }
 
-  public static JSCFABuilder makeHTMLCGBuilder(URL url) throws IOException, WalaException {
+  public static JSCFABuilder makeHTMLCGBuilder(URL url) throws WalaException {
     return makeHTMLCGBuilder(url, DefaultSourceExtractor.factory);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestAjaxsltCallGraphShape.java wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestAjaxsltCallGraphShape.java
--- wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestAjaxsltCallGraphShape.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestAjaxsltCallGraphShape.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *****************************************************************************/
 package com.ibm.wala.cast.js.test;
 
-import java.io.IOException;
 import java.net.URL;
 
 import org.junit.Test;
@@ -30,7 +29,7 @@
 
   };
 
-  @Test public void testAjaxslt() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testAjaxslt() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("ajaxslt/test/xslt.html");
     // need to turn off call/apply handling for this to scale; alternatively use 1-CFA
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url, CGBuilderType.ZERO_ONE_CFA_NO_CALL_APPLY);
@@ -42,7 +41,7 @@
 
   };
 
-  @Test public void testAjaxpath() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testAjaxpath() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("ajaxslt/test/xpath.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);
     verifyGraphAssertions(CG, assertionsForAjaxpath);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestArgumentSensitivity.java wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestArgumentSensitivity.java
--- wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestArgumentSensitivity.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestArgumentSensitivity.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,10 +21,10 @@
 import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
 import com.ibm.wala.cast.js.ipa.callgraph.JSZeroOrOneXCFABuilder;
 import com.ibm.wala.cast.js.loader.JavaScriptLoaderFactory;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
@@ -34,23 +34,23 @@
 public abstract class TestArgumentSensitivity extends TestJSCallGraphShape {
 
   protected static final Object[][] assertionsForArgs = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/args.js" } },
+    new Object[] { ROOT, new String[] { "args.js" } },
     new Object[] {
-        "tests/args.js",
-        new String[] { "tests/args.js/a" } },
-    new Object[] { "tests/args.js/a", new String[] { "tests/args.js/x"} },
-    new Object[] { "tests/args.js/a", new String[] { "tests/args.js/y", "tests/args.js/z", "!tests/args.js/wrong" } } };
+        "args.js",
+        new String[] { "args.js/a" } },
+    new Object[] { "args.js/a", new String[] { "args.js/x"} },
+    new Object[] { "args.js/a", new String[] { "args.js/y", "args.js/z", "!args.js/wrong" } } };
 
   @Test public void testArgs() throws IOException, IllegalArgumentException, CancelException, ClassHierarchyException, WalaException {
     JavaScriptLoaderFactory loaders = JSCallGraphUtil.makeLoaders(null);
     AnalysisScope scope = JSCallGraphBuilderUtil.makeScriptScope("tests", "args.js", loaders);
 
     IClassHierarchy cha = JSCallGraphUtil.makeHierarchy(scope, loaders);
-    com.ibm.wala.cast.js.util.Util.checkForFrontEndErrors(cha);
+    com.ibm.wala.cast.util.Util.checkForFrontEndErrors(cha);
     Iterable<Entrypoint> roots = JSCallGraphUtil.makeScriptRoots(cha);
     JSAnalysisOptions options = JSCallGraphUtil.makeOptions(scope, cha, roots);
 
-    AnalysisCache cache = CAstCallGraphUtil.makeCache(new ArgumentSpecialization.ArgumentCountIRFactory(options.getSSAOptions()));
+    IAnalysisCacheView cache = CAstCallGraphUtil.makeCache(new ArgumentSpecialization.ArgumentCountIRFactory(options.getSSAOptions()));
 
     JSCFABuilder builder = new JSZeroOrOneXCFABuilder(cha, options, cache, null, null, ZeroXInstanceKeys.ALLOCATIONS, false);
     builder.setContextSelector(new ArgumentSpecialization.ArgumentCountContextSelector(builder.getContextSelector()));
@@ -58,7 +58,7 @@
     CallGraph CG = builder.makeCallGraph(options);
 
 //    CAstCallGraphUtil.AVOID_DUMP = false;
-    CAstCallGraphUtil.dumpCG(builder.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(builder.getCFAContextInterpreter(), builder.getPointerAnalysis(), CG);
     
     verifyGraphAssertions(CG, assertionsForArgs);
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestForInLoopHack.java wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestForInLoopHack.java
--- wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestForInLoopHack.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestForInLoopHack.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,28 +34,28 @@
     JSSourceExtractor.DELETE_UPON_EXIT = false;
   }
 
-  @Test public void testPage3WithoutHack() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testPage3WithoutHack() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/page3.html");
     JSCFABuilder builder = JSCallGraphBuilderUtil.makeHTMLCGBuilder(url);
     CallGraph CG = builder.makeCallGraph(builder.getOptions());
-    CAstCallGraphUtil.dumpCG(builder.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(builder.getCFAContextInterpreter(), builder.getPointerAnalysis(), CG);
   }
 
-  @Test public void testPage3WithHack() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testPage3WithHack() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/page3.html");
     JSCFABuilder builder = JSCallGraphBuilderUtil.makeHTMLCGBuilder(url);
     addHackedForInLoopSensitivity(builder);
     CallGraph CG = builder.makeCallGraph(builder.getOptions());
-    CAstCallGraphUtil.dumpCG(builder.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(builder.getCFAContextInterpreter(), builder.getPointerAnalysis(), CG);
   }
 
   @Ignore("This test now blows up due to proper handling of the || construct, used in extend().  Should handle this eventually.")
-  @Test public void testJQueryWithHack() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testJQueryWithHack() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/jquery_hacked.html");
     JSCFABuilder builder = JSCallGraphBuilderUtil.makeHTMLCGBuilder(url);
     addHackedForInLoopSensitivity(builder);
     CallGraph CG = builder.makeCallGraph(builder.getOptions());
-    CAstCallGraphUtil.dumpCG(builder.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(builder.getCFAContextInterpreter(), builder.getPointerAnalysis(), CG);
   }
 
   /*
@@ -70,88 +70,88 @@
   
   private static final Object[][] assertionsForBadForin = new Object[][] { 
     new Object[] { ROOT, 
-      new String[] { "tests/badforin.js" } },
-    new Object[] { "tests/badforin.js", 
-      new String[] { "tests/badforin.js/testForIn", "tests/badforin.js/_check_obj_foo", "tests/badforin.js/_check_obj_bar", "tests/badforin.js/_check_copy_foo", "tests/badforin.js/_check_copy_bar"} },
-    new Object[] { "tests/badforin.js/testForIn",
-      new String[] { "tests/badforin.js/testForIn1", "tests/badforin.js/testForIn2" } },
-    new Object[] { "tests/badforin.js/_check_obj_foo",
-      new String[] { "tests/badforin.js/testForIn1" } },
-    new Object[] { "tests/badforin.js/_check_copy_foo",
-      new String[] { "tests/badforin.js/testForIn1" } },
-    new Object[] { "tests/badforin.js/_check_obj_bar",
-      new String[] { "tests/badforin.js/testForIn2" } },
-    new Object[] { "tests/badforin.js/_check_copy_bar",
-      new String[] { "tests/badforin.js/testForIn2" } }
+      new String[] { "badforin.js" } },
+    new Object[] { "badforin.js", 
+      new String[] { "badforin.js/testForIn", "badforin.js/_check_obj_foo", "badforin.js/_check_obj_bar", "badforin.js/_check_copy_foo", "badforin.js/_check_copy_bar"} },
+    new Object[] { "badforin.js/testForIn",
+      new String[] { "badforin.js/testForIn1", "badforin.js/testForIn2" } },
+    new Object[] { "badforin.js/_check_obj_foo",
+      new String[] { "badforin.js/testForIn1" } },
+    new Object[] { "badforin.js/_check_copy_foo",
+      new String[] { "badforin.js/testForIn1" } },
+    new Object[] { "badforin.js/_check_obj_bar",
+      new String[] { "badforin.js/testForIn2" } },
+    new Object[] { "badforin.js/_check_copy_bar",
+      new String[] { "badforin.js/testForIn2" } }
   };
 
   @Test public void testBadForInWithoutHack() throws IOException, IllegalArgumentException, CancelException, WalaException {
     JSCFABuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "badforin.js");
     CallGraph CG = B.makeCallGraph(B.getOptions());
-    CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
     verifyGraphAssertions(CG, assertionsForBadForin);
   }
 
   private static final Object[][] assertionsForBadForinHackPrecision = new Object[][] { 
-    new Object[] { "tests/badforin.js/_check_obj_foo",
-      new String[] { "!tests/badforin.js/testForIn2" } },
-    new Object[] { "tests/badforin.js/_check_copy_foo",
-      new String[] { "!tests/badforin.js/testForIn2" } },
-    new Object[] { "tests/badforin.js/_check_obj_bar",
-      new String[] { "!tests/badforin.js/testForIn1" } },
-    new Object[] { "tests/badforin.js/_check_copy_bar",
-      new String[] { "!tests/badforin.js/testForIn1" } }
+    new Object[] { "badforin.js/_check_obj_foo",
+      new String[] { "!badforin.js/testForIn2" } },
+    new Object[] { "badforin.js/_check_copy_foo",
+      new String[] { "!badforin.js/testForIn2" } },
+    new Object[] { "badforin.js/_check_obj_bar",
+      new String[] { "!badforin.js/testForIn1" } },
+    new Object[] { "badforin.js/_check_copy_bar",
+      new String[] { "!badforin.js/testForIn1" } }
   };
 
   @Test public void testBadForInWithHack() throws IOException, IllegalArgumentException, CancelException, WalaException {
     JSCFABuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "badforin.js");
     addHackedForInLoopSensitivity(B);
     CallGraph CG = B.makeCallGraph(B.getOptions());
-    CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
     verifyGraphAssertions(CG, assertionsForBadForin);
     verifyGraphAssertions(CG, assertionsForBadForinHackPrecision);
   }
 
   private static final Object[][] assertionsForbadforin2 = new Object[][] { 
     new Object[] { ROOT, 
-      new String[] { "tests/badforin2.js" } },
-    new Object[] { "tests/badforin2.js", 
-      new String[] { "tests/badforin2.js/testForIn", "tests/badforin2.js/_check_obj_foo", "tests/badforin2.js/_check_obj_bar", "tests/badforin2.js/_check_copy_foo", "tests/badforin2.js/_check_copy_bar"} },
-    new Object[] { "tests/badforin2.js/testForIn",
-      new String[] { "tests/badforin2.js/testForIn1", "tests/badforin2.js/testForIn2" } },
-    new Object[] { "tests/badforin2.js/_check_obj_foo",
-      new String[] { "tests/badforin2.js/testForIn1" } },
-    new Object[] { "tests/badforin2.js/_check_copy_foo",
-      new String[] { "tests/badforin2.js/testForIn1" } },
-    new Object[] { "tests/badforin2.js/_check_obj_bar",
-      new String[] { "tests/badforin2.js/testForIn2" } },
-    new Object[] { "tests/badforin2.js/_check_copy_bar",
-      new String[] { "tests/badforin2.js/testForIn2" } }
+      new String[] { "badforin2.js" } },
+    new Object[] { "badforin2.js", 
+      new String[] { "badforin2.js/testForIn", "badforin2.js/_check_obj_foo", "badforin2.js/_check_obj_bar", "badforin2.js/_check_copy_foo", "badforin2.js/_check_copy_bar"} },
+    new Object[] { "badforin2.js/testForIn",
+      new String[] { "badforin2.js/testForIn1", "badforin2.js/testForIn2" } },
+    new Object[] { "badforin2.js/_check_obj_foo",
+      new String[] { "badforin2.js/testForIn1" } },
+    new Object[] { "badforin2.js/_check_copy_foo",
+      new String[] { "badforin2.js/testForIn1" } },
+    new Object[] { "badforin2.js/_check_obj_bar",
+      new String[] { "badforin2.js/testForIn2" } },
+    new Object[] { "badforin2.js/_check_copy_bar",
+      new String[] { "badforin2.js/testForIn2" } }
   };
 
   @Test public void testbadforin2WithoutHack() throws IOException, IllegalArgumentException, CancelException, WalaException {
     JSCFABuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "badforin2.js");
     CallGraph CG = B.makeCallGraph(B.getOptions());
-    CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
     verifyGraphAssertions(CG, assertionsForbadforin2);
   }
 
   private static final Object[][] assertionsForbadforin2HackPrecision = new Object[][] { 
-    new Object[] { "tests/badforin2.js/_check_obj_foo",
-      new String[] { "!tests/badforin2.js/testForIn2" } },
-    new Object[] { "tests/badforin2.js/_check_copy_foo",
-      new String[] { "!tests/badforin2.js/testForIn2" } },
-    new Object[] { "tests/badforin2.js/_check_obj_bar",
-      new String[] { "!tests/badforin2.js/testForIn1" } },
-    new Object[] { "tests/badforin2.js/_check_copy_bar",
-      new String[] { "!tests/badforin2.js/testForIn1" } }
+    new Object[] { "badforin2.js/_check_obj_foo",
+      new String[] { "!badforin2.js/testForIn2" } },
+    new Object[] { "badforin2.js/_check_copy_foo",
+      new String[] { "!badforin2.js/testForIn2" } },
+    new Object[] { "badforin2.js/_check_obj_bar",
+      new String[] { "!badforin2.js/testForIn1" } },
+    new Object[] { "badforin2.js/_check_copy_bar",
+      new String[] { "!badforin2.js/testForIn1" } }
   };
 
   @Test public void testbadforin2WithHack() throws IOException, IllegalArgumentException, CancelException, WalaException {
     JSCFABuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "badforin2.js");
     addHackedForInLoopSensitivity(B);
     CallGraph CG = B.makeCallGraph(B.getOptions());
-    CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
     verifyGraphAssertions(CG, assertionsForbadforin2);
     verifyGraphAssertions(CG, assertionsForbadforin2HackPrecision);
   }
@@ -160,7 +160,7 @@
     JSCFABuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "badforin3.js");
     addHackedForInLoopSensitivity(B);
     CallGraph CG = B.makeCallGraph(B.getOptions());
-    CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
   }
 
 
@@ -172,7 +172,7 @@
   }
   */
   
-  private void addHackedForInLoopSensitivity(JSCFABuilder builder) {
+  private static void addHackedForInLoopSensitivity(JSCFABuilder builder) {
     final ContextSelector orig = builder.getContextSelector();
     builder.setContextSelector(new PropertyNameContextSelector(builder.getAnalysisCache(), orig));
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestJavaScriptSlicer.java wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestJavaScriptSlicer.java
--- wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestJavaScriptSlicer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestJavaScriptSlicer.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,8 +12,6 @@
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Iterator;
-
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -23,6 +21,7 @@
 import com.ibm.wala.core.tests.slicer.SlicerTest;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.slicer.NormalStatement;
 import com.ibm.wala.ipa.slicer.SDG;
 import com.ibm.wala.ipa.slicer.Slicer;
@@ -32,7 +31,7 @@
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.intset.IntSetAction;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 public abstract class TestJavaScriptSlicer extends TestJSCallGraphShape {
 
@@ -74,10 +73,10 @@
   private Collection<Statement> slice(String file, DataDependenceOptions data, ControlDependenceOptions ctrl) throws IOException, WalaException, CancelException {
     JSCFABuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", file);
     CallGraph CG = B.makeCallGraph(B.getOptions());
+ 
+    SDG<InstanceKey> sdg = new SDG<>(CG, B.getPointerAnalysis(), new JavaScriptModRef<>(), data, ctrl);
 
     final Collection<Statement> ss = findTargetStatement(CG);
- 
-    SDG sdg = new SDG(CG, B.getPointerAnalysis(), new JavaScriptModRef(), data, ctrl);
     Collection<Statement> result = Slicer.computeBackwardSlice(sdg, ss);
     return result;
   }
@@ -85,15 +84,9 @@
   private Collection<Statement> findTargetStatement(CallGraph CG) {
     final Collection<Statement> ss = HashSetFactory.make();
     for(CGNode n : getNodes(CG, "suffix:_slice_target_fn")) {
-      for(Iterator<CGNode> callers = CG.getPredNodes(n); callers.hasNext(); ) {
-        final CGNode caller = callers.next();
-        for(Iterator<CallSiteReference> sites = CG.getPossibleSites(caller, n); sites.hasNext(); ) {
-          caller.getIR().getCallInstructionIndices(sites.next()).foreach(new IntSetAction() {
-            @Override
-            public void act(int x) {
-              ss.add(new NormalStatement(caller, x));
-            }
-          });
+      for(CGNode caller : Iterator2Iterable.make(CG.getPredNodes(n))) {
+        for(CallSiteReference site : Iterator2Iterable.make(CG.getPossibleSites(caller, n))) {
+          caller.getIR().getCallInstructionIndices(site).foreach(x -> ss.add(new NormalStatement(caller, x)));
         }
       }
     }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestJQueryExamples.java wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestJQueryExamples.java
--- wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestJQueryExamples.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestJQueryExamples.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.cast.js.test;
 
-import java.io.IOException;
 import java.net.URL;
 
 import org.junit.Before;
@@ -37,10 +36,10 @@
   }
 
   @Ignore("This tries to analyze unmodified jquery, which we can't do yet")
-  @Test public void testEx1() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testEx1() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/jquery/ex1.html");
     JSCFABuilder builder = JSCallGraphBuilderUtil.makeHTMLCGBuilder(url);
     CallGraph CG = builder.makeCallGraph(builder.getOptions());
-    CAstCallGraphUtil.dumpCG(builder.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(builder.getCFAContextInterpreter(), builder.getPointerAnalysis(), CG);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestLexicalModRef.java wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestLexicalModRef.java
--- wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestLexicalModRef.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestLexicalModRef.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,10 +34,11 @@
     LexicalModRef lexAccesses = LexicalModRef.make(CG, b.getPointerAnalysis());
     Map<CGNode, OrdinalSet<Pair<CGNode, String>>> readResult = lexAccesses.computeLexicalRef();
     Map<CGNode, OrdinalSet<Pair<CGNode, String>>> writeResult = lexAccesses.computeLexicalMod();
-    for (CGNode n : readResult.keySet()) {
+    for (Map.Entry<CGNode, OrdinalSet<Pair<CGNode, String>>> entry : readResult.entrySet()) {
+      final CGNode n = entry.getKey();
       if (n.toString().contains("Node: <Code body of function Ltests/simple-lexical.js/outer/inner>")) {
         // function "inner" reads exactly x and z 
-        OrdinalSet<Pair<CGNode, String>> readVars = readResult.get(n);
+        OrdinalSet<Pair<CGNode, String>> readVars = entry.getValue();
         Assert.assertEquals(2, readVars.size());
         Assert.assertEquals("[[Node: <Code body of function Ltests/simple-lexical.js/outer> Context: Everywhere,x], [Node: <Code body of function Ltests/simple-lexical.js/outer> Context: Everywhere,z]]", readVars.toString());
         // writes x and z as well
@@ -48,7 +49,7 @@
       }
       if (n.toString().contains("Node: <Code body of function Ltests/simple-lexical.js/outer/inner2>")) {
         // function "inner3" reads exactly innerName, inner3, and x and z via callees
-        OrdinalSet<Pair<CGNode, String>> readVars = readResult.get(n);
+        OrdinalSet<Pair<CGNode, String>> readVars = entry.getValue();
         Assert.assertEquals(4, readVars.size());
         for(Pair<CGNode, String> rv : readVars) {
           Assert.assertTrue(rv.toString(), 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestPointerAnalyses.java wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestPointerAnalyses.java
--- wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestPointerAnalyses.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestPointerAnalyses.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,13 +15,15 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Set;
-
+import java.util.function.Function;
+import java.util.function.Predicate;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.ibm.wala.analysis.pointers.HeapGraph;
 import com.ibm.wala.cast.ipa.callgraph.GlobalObjectKey;
 import com.ibm.wala.cast.ir.ssa.AstGlobalWrite;
+import com.ibm.wala.cast.ir.ssa.AstPropertyWrite;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.GlobalVertex;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.ObjectVertex;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.PrototypeFieldVertex;
@@ -53,19 +55,18 @@
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.NullProgressMonitor;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.MapIterator;
 import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.intset.OrdinalSet;
 import com.ibm.wala.util.strings.Atom;
 
 public abstract class TestPointerAnalyses {
 
-  private final class CheckPointers extends Predicate<Pair<Set<Pair<CGNode, NewSiteReference>>, Set<Pair<CGNode, NewSiteReference>>>> {
+  private final class CheckPointers implements Predicate<Pair<Set<Pair<CGNode, NewSiteReference>>, Set<Pair<CGNode, NewSiteReference>>>> {
     private Set<Pair<String,Integer>> map(Set<Pair<CGNode, NewSiteReference>> sites) {
       Set<Pair<String,Integer>> result = HashSetFactory.make();
       for(Pair<CGNode,NewSiteReference> s : sites) {
@@ -93,7 +94,7 @@
     JSCallGraphUtil.setTranslatorFactory(factory);
   }
 
-  private Pair<CGNode, NewSiteReference> map(CallGraph CG, Pair<CGNode, NewSiteReference> ptr) {
+  private static Pair<CGNode, NewSiteReference> map(CallGraph CG, Pair<CGNode, NewSiteReference> ptr) {
     CGNode n = ptr.fst;
     
     if (! (n.getMethod() instanceof JavaScriptConstructor)) {
@@ -116,7 +117,7 @@
     return Pair.make(caller, new NewSiteReference(site.getProgramCounter(), ptr.snd.getDeclaredType()));
   }
   
-  private Set<Pair<CGNode, NewSiteReference>> map(CallGraph CG, Set<Pair<CGNode, NewSiteReference>> ptrs) {
+  private static Set<Pair<CGNode, NewSiteReference>> map(CallGraph CG, Set<Pair<CGNode, NewSiteReference>> ptrs) {
     Set<Pair<CGNode, NewSiteReference>> result = HashSetFactory.make();
     for(Pair<CGNode, NewSiteReference> ptr : ptrs) {
       result.add(map(CG, ptr));
@@ -124,7 +125,7 @@
     return result;
   }
   
-  private Set<Pair<CGNode, NewSiteReference>> ptrs(Set<CGNode> functions, int local, CallGraph CG, PointerAnalysis<? extends InstanceKey> pa) {
+  private static Set<Pair<CGNode, NewSiteReference>> ptrs(Set<CGNode> functions, int local, CallGraph CG, PointerAnalysis<? extends InstanceKey> pa) {
     Set<Pair<CGNode, NewSiteReference>> result = HashSetFactory.make();
 
     for(CGNode n : functions) {
@@ -133,8 +134,8 @@
         OrdinalSet<? extends InstanceKey> pointers = pa.getPointsToSet(l);
         if (pointers != null) {
           for(InstanceKey k : pointers) {
-            for(Iterator<Pair<CGNode, NewSiteReference>> css = k.getCreationSites(CG); css.hasNext(); ) {
-              result.add(css.next());
+            for(Pair<CGNode, NewSiteReference> cs : Iterator2Iterable.make(k.getCreationSites(CG))) {
+              result.add(cs);
             }
           }
         }
@@ -144,7 +145,7 @@
     return result;
   }
   
-  private boolean isGlobal(Set<CGNode> functions, int local, PointerAnalysis<? extends InstanceKey> pa) {
+  private static boolean isGlobal(Set<CGNode> functions, int local, PointerAnalysis<? extends InstanceKey> pa) {
     for(CGNode n : functions) {
       PointerKey l = pa.getHeapModel().getPointerKeyForLocal(n, local);
       if (l != null) {
@@ -162,7 +163,7 @@
     return false;
   }
   
-  private void testPage(URL page, Predicate<MethodReference> filter, Predicate<Pair<Set<Pair<CGNode, NewSiteReference>>, Set<Pair<CGNode, NewSiteReference>>>> test) throws IOException, WalaException, CancelException {
+  private void testPage(URL page, Predicate<MethodReference> filter, Predicate<Pair<Set<Pair<CGNode, NewSiteReference>>, Set<Pair<CGNode, NewSiteReference>>>> test) throws WalaException, CancelException {
     boolean save = JSSourceExtractor.USE_TEMP_NAME;
     try {
       JSSourceExtractor.USE_TEMP_NAME = false;
@@ -251,18 +252,18 @@
       SymbolTable symtab = ir.getSymbolTable();
       for(SSAInstruction inst : ir.getInstructions()) {
         if (inst instanceof JavaScriptPropertyWrite) {
-          int property = ((JavaScriptPropertyWrite) inst).getMemberRef();
+          int property = ((AstPropertyWrite) inst).getMemberRef();
           if (symtab.isConstant(property)) {
             String p = JSCallGraphUtil.simulateToStringForPropertyNames(symtab.getConstantValue(property));
             
-            int obj = ((JavaScriptPropertyWrite) inst).getObjectRef();
+            int obj = ((AstPropertyWrite) inst).getObjectRef();
             PointerKey objKey = fbPA.getHeapModel().getPointerKeyForLocal(node, obj);
             OrdinalSet<ObjectVertex> objPtrs = fbPA.getPointsToSet(objKey);
             for(ObjectVertex o : objPtrs) {
               PointerKey propKey = fbPA.getHeapModel().getPointerKeyForInstanceField(o, new AstDynamicField(false, o.getConcreteType(), Atom.findOrCreateUnicodeAtom(p), JavaScriptTypes.Root));
               Assert.assertTrue("object " + o + " should have field " + propKey, hg.hasEdge(o, propKey));
 
-              int val = ((JavaScriptPropertyWrite) inst).getValue();
+              int val = ((AstPropertyWrite) inst).getValue();
               PointerKey valKey = fbPA.getHeapModel().getPointerKeyForLocal(node, val);
               OrdinalSet<ObjectVertex> valPtrs = fbPA.getPointsToSet(valKey);
               for(ObjectVertex v : valPtrs) {
@@ -303,8 +304,8 @@
           System.err.println("empty " + f + " for " + k + "(" + k.getConcreteType() + ")");          
         }
         if (dump) {
-          for(Iterator<Pair<CGNode, NewSiteReference>> css = k.getCreationSites(fbCG); css.hasNext(); ) {
-            System.err.println(css.next());
+          for(Pair<CGNode, NewSiteReference> cs : Iterator2Iterable.make(k.getCreationSites(fbCG))) {
+            System.err.println(cs);
           }
         }
       }
@@ -320,9 +321,9 @@
     PointerKey fbKey = fbPA.getHeapModel().getPointerKeyForLocal(node, vn);
     OrdinalSet<T> fbPointsTo = fbPA.getPointsToSet(fbKey);
     for(T o : fbPointsTo) {
-      for(Iterator<T> ps = proto.apply(o); ps.hasNext(); ) {
-        for(Iterator<Pair<CGNode, NewSiteReference>> css = ps.next().getCreationSites(CG); css.hasNext(); ) {
-          fbProtos.add(css.next());
+      for(T p : Iterator2Iterable.make(proto.apply(o))) {
+        for(Pair<CGNode, NewSiteReference> cs : Iterator2Iterable.make(p.getCreationSites(CG))) {
+          fbProtos.add(cs);
         }
       }
     }
@@ -334,23 +335,15 @@
       CallGraph CG,
       CGNode node, 
       int vn) {
-    return getPrototypeSites(fbPA, CG, new Function<ObjectVertex,Iterator<ObjectVertex>>() {
-      @Override
-      public Iterator<ObjectVertex> apply(ObjectVertex o) {
-        PrototypeFieldVertex proto = new PrototypeFieldVertex(PrototypeField.__proto__, o);
-        if (hg.containsNode(proto)) {
-        return 
-            new MapIterator<Object,ObjectVertex>(hg.getSuccNodes(proto),
-                new Function<Object,ObjectVertex>() {
-                  @Override
-                  public ObjectVertex apply(Object object) {
-                    return (ObjectVertex)object;
-                  } 
-            });
-        } else {
-          return EmptyIterator.instance();
-        }
-      } 
+    return getPrototypeSites(fbPA, CG, o -> {
+      PrototypeFieldVertex proto = new PrototypeFieldVertex(PrototypeField.__proto__, o);
+      if (hg.containsNode(proto)) {
+      return 
+          new MapIterator<>(hg.getSuccNodes(proto),
+              ObjectVertex.class::cast);
+      } else {
+        return EmptyIterator.instance();
+      }
     }, node, vn);
   }
 
@@ -358,32 +351,24 @@
       CallGraph CG, 
       CGNode node, 
       int vn) {
-    return getPrototypeSites(fbPA, CG, new Function<InstanceKey,Iterator<InstanceKey>>() {
-      @Override
-      public Iterator<InstanceKey> apply(InstanceKey o) {
-        return fbPA.getPointsToSet(new TransitivePrototypeKey(o)).iterator();
-      } 
-    }, node, vn);
+    return getPrototypeSites(fbPA, CG, o -> fbPA.getPointsToSet(new TransitivePrototypeKey(o)).iterator(), node, vn);
   }
 
-  private void testPageUserCodeEquivalent(URL page) throws IOException, WalaException, CancelException {
+  private void testPageUserCodeEquivalent(URL page) throws WalaException, CancelException {
     final String name = page.getFile().substring(page.getFile().lastIndexOf('/')+1, page.getFile().lastIndexOf('.'));
     testPage(page, nameFilter(name), new CheckPointers());
   }
 
   protected Predicate<MethodReference> nameFilter(final String name) {
-    return new Predicate<MethodReference>() {
-      @Override
-      public boolean test(MethodReference t) {
-        System.err.println(t + "  " + name);
-        return t.getSelector().equals(AstMethodReference.fnSelector) &&
-            t.getDeclaringClass().getName().toString().startsWith("L" + name);
-      }      
+    return t -> {
+      System.err.println(t + "  " + name);
+      return t.getSelector().equals(AstMethodReference.fnSelector) &&
+          t.getDeclaringClass().getName().toString().startsWith('L' + name);
     };
   }
   
   @Test
-  public void testWindowOnload() throws IOException, WalaException, CancelException {
+  public void testWindowOnload() throws WalaException, CancelException {
     testPageUserCodeEquivalent(getClass().getClassLoader().getResource("pages/windowonload.html"));
   }
 
@@ -396,4 +381,4 @@
   public void testInherit() throws IOException, WalaException, CancelException {
     testTestScript("tests", "inherit.js", nameFilter("tests/inherit.js"), new CheckPointers());
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestPrototypeCallGraphShape.java wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestPrototypeCallGraphShape.java
--- wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestPrototypeCallGraphShape.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestPrototypeCallGraphShape.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *****************************************************************************/
 package com.ibm.wala.cast.js.test;
 
-import java.io.IOException;
 import java.net.URL;
 
 import org.junit.Ignore;
@@ -32,7 +31,7 @@
 
   @Ignore("reminder that this no longer works with correlation tracking")
   @Test 
-  public void testPrototype() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  public void testPrototype() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/prototype.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);
     verifyGraphAssertions(CG, assertionsForPrototype);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShape.java wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShape.java
--- wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShape.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimpleCallGraphShape.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,6 @@
 
 import com.ibm.wala.cast.ipa.callgraph.CAstCallGraphUtil;
 import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder;
-import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
 import com.ibm.wala.cast.js.ipa.callgraph.PropertyNameContextSelector;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
@@ -39,11 +38,11 @@
   }
 
   protected static final Object[][] assertionsForArgs = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/args.js" } },
+    new Object[] { ROOT, new String[] { "args.js" } },
     new Object[] {
-        "tests/args.js",
-        new String[] { "tests/args.js/a" } },
-    new Object[] { "tests/args.js/a", new String[] { "tests/args.js/x", "tests/args.js/y" } } };
+        "args.js",
+        new String[] { "args.js/a" } },
+    new Object[] { "args.js/a", new String[] { "args.js/x", "args.js/y" } } };
 
 @Test public void testArgs() throws IOException, IllegalArgumentException, CancelException, WalaException {
   CallGraph CG = JSCallGraphBuilderUtil.makeScriptCG("tests", "args.js");
@@ -51,16 +50,16 @@
 }
 
   protected static final Object[][] assertionsForSimple = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/simple.js" } },
+      new Object[] { ROOT, new String[] { "simple.js" } },
       new Object[] {
-          "tests/simple.js",
-          new String[] { "tests/simple.js/bad", "tests/simple.js/silly", "tests/simple.js/fib", "tests/simple.js/stranger",
-              "tests/simple.js/trivial", "tests/simple.js/rubbish", "tests/simple.js/weirder" } },
-      new Object[] { "tests/simple.js/trivial", new String[] { "tests/simple.js/trivial/inc" } },
-      new Object[] { "tests/simple.js/rubbish",
-          new String[] { "tests/simple.js/weirder", "tests/simple.js/stranger", "tests/simple.js/rubbish" } },
-      new Object[] { "tests/simple.js/fib", new String[] { "tests/simple.js/fib" } },
-      new Object[] { "tests/simple.js/weirder", new String[] { "prologue.js/Math_abs" } } };
+          "simple.js",
+          new String[] { "simple.js/bad", "simple.js/silly", "simple.js/fib", "simple.js/stranger",
+              "simple.js/trivial", "simple.js/rubbish", "simple.js/weirder" } },
+      new Object[] { "simple.js/trivial", new String[] { "simple.js/trivial/inc" } },
+      new Object[] { "simple.js/rubbish",
+          new String[] { "simple.js/weirder", "simple.js/stranger", "simple.js/rubbish" } },
+      new Object[] { "simple.js/fib", new String[] { "simple.js/fib" } },
+      new Object[] { "simple.js/weirder", new String[] { "prologue.js/Math_abs" } } };
 
   @Test
   public void testSimple() throws IOException, IllegalArgumentException, CancelException, WalaException {
@@ -69,12 +68,12 @@
   }
 
   private static final Object[][] assertionsForObjects = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/objects.js" } },
-      new Object[] { "tests/objects.js",
-          new String[] { "tests/objects.js/objects_are_fun", "tests/objects.js/other", "tests/objects.js/something" } },
-      new Object[] { "tests/objects.js/other",
-          new String[] { "tests/objects.js/something", "tests/objects.js/objects_are_fun/nothing" } },
-      new Object[] { "tests/objects.js/objects_are_fun", new String[] { "tests/objects.js/other", "tests/objects.js/whatever" } } };
+      new Object[] { ROOT, new String[] { "objects.js" } },
+      new Object[] { "objects.js",
+          new String[] { "objects.js/objects_are_fun", "objects.js/other", "objects.js/something" } },
+      new Object[] { "objects.js/other",
+          new String[] { "objects.js/something", "objects.js/objects_are_fun/nothing" } },
+      new Object[] { "objects.js/objects_are_fun", new String[] { "objects.js/other", "objects.js/whatever" } } };
 
   @Test
   public void testObjects() throws IOException, IllegalArgumentException, CancelException, WalaException {
@@ -83,34 +82,34 @@
   }
 
   private static final Object[][] cfgAssertionsForInherit = new Object[][] {
-    new Object[]{"ctor:tests/inherit.js/objectMasquerading/Rectangle",
+    new Object[]{"ctor:inherit.js/objectMasquerading/Rectangle",
         new int[][]{{1,7},{2},{3,7},{4,7},{5,6},{7},{7}}
     },
-    new Object[]{"ctor:tests/inherit.js/sharedClassObject/Rectangle",
+    new Object[]{"ctor:inherit.js/sharedClassObject/Rectangle",
         new int[][]{{1,7},{2},{3,7},{4,7},{5,6},{7},{7}}
     }
   };
   
   private static final Object[][] assertionsForInherit = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/inherit.js" } },
+      new Object[] { ROOT, new String[] { "inherit.js" } },
       new Object[] {
-          "tests/inherit.js",
-          new String[] { "tests/inherit.js/objectMasquerading", "tests/inherit.js/objectMasquerading/Rectangle/area",
-              "tests/inherit.js/Polygon/shape", "tests/inherit.js/sharedClassObject",
-              "tests/inherit.js/sharedClassObject/Rectangle/area" } },
+          "inherit.js",
+          new String[] { "inherit.js/objectMasquerading", "inherit.js/objectMasquerading/Rectangle/area",
+              "inherit.js/Polygon/shape", "inherit.js/sharedClassObject",
+              "inherit.js/sharedClassObject/Rectangle/area" } },
       new Object[]{
-          "tests/inherit.js/objectMasquerading", 
-          new String[]{"ctor:tests/inherit.js/objectMasquerading/Rectangle"}}, 
+          "inherit.js/objectMasquerading", 
+          new String[]{"ctor:inherit.js/objectMasquerading/Rectangle"}}, 
       new Object[]{
-          "ctor:tests/inherit.js/objectMasquerading/Rectangle" ,
-          new String[]{"tests/inherit.js/objectMasquerading/Rectangle"}}, 
-      new Object[]{"tests/inherit.js/objectMasquerading/Rectangle",
-          new String[]{"tests/inherit.js/Polygon"}}, 
+          "ctor:inherit.js/objectMasquerading/Rectangle" ,
+          new String[]{"inherit.js/objectMasquerading/Rectangle"}}, 
+      new Object[]{"inherit.js/objectMasquerading/Rectangle",
+          new String[]{"inherit.js/Polygon"}}, 
       new Object[]{
-          "tests/inherit.js/sharedClassObject", 
-          new String[]{"ctor:tests/inherit.js/sharedClassObject/Rectangle"}},
-      new Object[]{"ctor:tests/inherit.js/sharedClassObject/Rectangle",
-          new String[]{"tests/inherit.js/sharedClassObject/Rectangle"}}
+          "inherit.js/sharedClassObject", 
+          new String[]{"ctor:inherit.js/sharedClassObject/Rectangle"}},
+      new Object[]{"ctor:inherit.js/sharedClassObject/Rectangle",
+          new String[]{"inherit.js/sharedClassObject/Rectangle"}}
   };
 
   @Test
@@ -121,8 +120,8 @@
   }
 
   private static final Object[][] assertionsForNewfn = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/newfn.js" } },
-      new Object[] { "tests/newfn.js",
+      new Object[] { ROOT, new String[] { "newfn.js" } },
+      new Object[] { "newfn.js",
           new String[] { "suffix:ctor$1/_fromctor", "suffix:ctor$2/_fromctor", "suffix:ctor$3/_fromctor" } } };
 
   @Test
@@ -132,11 +131,11 @@
   }
 
   private static final Object[][] assertionsForControlflow = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/control-flow.js" } },
+      new Object[] { ROOT, new String[] { "control-flow.js" } },
       new Object[] {
-          "tests/control-flow.js",
-          new String[] { "tests/control-flow.js/testSwitch", "tests/control-flow.js/testDoWhile",
-              "tests/control-flow.js/testWhile", "tests/control-flow.js/testFor", "tests/control-flow.js/testReturn" } } };
+          "control-flow.js",
+          new String[] { "control-flow.js/testSwitch", "control-flow.js/testDoWhile",
+              "control-flow.js/testWhile", "control-flow.js/testFor", "control-flow.js/testReturn" } } };
 
   @Test
   public void testControlflow() throws IOException, IllegalArgumentException, CancelException, WalaException {
@@ -145,12 +144,12 @@
   }
 
   private static final Object[][] assertionsForMoreControlflow = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/more-control-flow.js" } },
+      new Object[] { ROOT, new String[] { "more-control-flow.js" } },
       new Object[] {
-          "tests/more-control-flow.js",
-          new String[] { "tests/more-control-flow.js/testSwitch", "tests/more-control-flow.js/testIfConvertedSwitch",
-              "tests/more-control-flow.js/testDoWhile", "tests/more-control-flow.js/testWhile",
-              "tests/more-control-flow.js/testFor", "tests/more-control-flow.js/testReturn" } } };
+          "more-control-flow.js",
+          new String[] { "more-control-flow.js/testSwitch", "more-control-flow.js/testIfConvertedSwitch",
+              "more-control-flow.js/testDoWhile", "more-control-flow.js/testWhile",
+              "more-control-flow.js/testFor", "more-control-flow.js/testReturn" } } };
 
   @Test
   public void testMoreControlflow() throws IOException, IllegalArgumentException, CancelException, WalaException {
@@ -158,30 +157,30 @@
     verifyGraphAssertions(CG, assertionsForMoreControlflow);
   }
 
-  private static final Object[][] assertionsForForin = new Object[][] { new Object[] { ROOT, new String[] { "tests/forin.js" } },
-      new Object[] { "tests/forin.js", new String[] { "tests/forin.js/testForIn" } },
-      new Object[] { "tests/forin.js/testForIn", new String[] { "tests/forin.js/testForIn1", "tests/forin.js/testForIn2" } } };
+  private static final Object[][] assertionsForForin = new Object[][] { new Object[] { ROOT, new String[] { "forin.js" } },
+      new Object[] { "forin.js", new String[] { "forin.js/testForIn" } },
+      new Object[] { "forin.js/testForIn", new String[] { "forin.js/testForIn1", "forin.js/testForIn2" } } };
 
   @Test
   public void testForin() throws IOException, IllegalArgumentException, CancelException, WalaException {
     JSCFABuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "forin.js");
     CallGraph CG = B.makeCallGraph(B.getOptions());
 //    JSCallGraphUtil.AVOID_DUMP = false;
-    CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
     verifyGraphAssertions(CG, assertionsForForin);
   }
 
   private static final Object[][] assertionsForSimpleLexical = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/simple-lexical.js" } },
-      new Object[] { "tests/simple-lexical.js", new String[] { "tests/simple-lexical.js/outer" } },
+      new Object[] { ROOT, new String[] { "simple-lexical.js" } },
+      new Object[] { "simple-lexical.js", new String[] { "simple-lexical.js/outer" } },
       new Object[] {
-          "tests/simple-lexical.js/outer",
-          new String[] { "tests/simple-lexical.js/outer/indirect", "tests/simple-lexical.js/outer/inner",
-              "tests/simple-lexical.js/outer/inner2", "tests/simple-lexical.js/outer/inner3" } },
-      new Object[] { "tests/simple-lexical.js/outer/inner2",
-          new String[] { "tests/simple-lexical.js/outer/inner", "tests/simple-lexical.js/outer/inner3" } },
-      new Object[] { "tests/simple-lexical.js/outer/indirect",
-          new String[] { "tests/simple-lexical.js/outer/inner", "tests/simple-lexical.js/outer/inner3" } } };
+          "simple-lexical.js/outer",
+          new String[] { "simple-lexical.js/outer/indirect", "simple-lexical.js/outer/inner",
+              "simple-lexical.js/outer/inner2", "simple-lexical.js/outer/inner3" } },
+      new Object[] { "simple-lexical.js/outer/inner2",
+          new String[] { "simple-lexical.js/outer/inner", "simple-lexical.js/outer/inner3" } },
+      new Object[] { "simple-lexical.js/outer/indirect",
+          new String[] { "simple-lexical.js/outer/inner", "simple-lexical.js/outer/inner3" } } };
 
   @Test
   public void testSimpleLexical() throws IOException, IllegalArgumentException, CancelException, WalaException {
@@ -196,7 +195,7 @@
   }
   
   private static final Object[][] assertionsForLexicalMultiple = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/lexical_multiple_calls.js" } },
+    new Object[] { ROOT, new String[] { "lexical_multiple_calls.js" } },
     new Object[] { "suffix:lexical_multiple_calls.js", new String[] { "suffix:reachable1" } }, 
     new Object[] { "suffix:lexical_multiple_calls.js", new String[] { "suffix:reachable2" } }};
   
@@ -208,19 +207,19 @@
 
   
   private static final Object[][] assertionsForTry = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/try.js" } },
-      new Object[] { "tests/try.js",
-          new String[] { "tests/try.js/tryCatch", "tests/try.js/tryFinally", "tests/try.js/tryCatchFinally" } },
-      new Object[] { "tests/try.js/tryCatch",
-          new String[] { "tests/try.js/targetOne", "tests/try.js/targetTwo", "tests/try.js/two" } },
-      new Object[] { "tests/try.js/tryFinally",
-          new String[] { "tests/try.js/targetOne", "tests/try.js/targetTwo", "tests/try.js/two" } },
-      new Object[] { "tests/try.js/tryCatchFinally",
-          new String[] { "tests/try.js/targetOne", "tests/try.js/targetTwo", "tests/try.js/three", "tests/try.js/two" } },
-      new Object[] { "tests/try.js/tryCatchTwice",
-          new String[] { "tests/try.js/targetOne", "tests/try.js/targetTwo", "tests/try.js/three", "tests/try.js/two" } },
-      new Object[] { "tests/try.js/testRet",
-          new String[] { "tests/try.js/three", "tests/try.js/two" } }
+      new Object[] { ROOT, new String[] { "try.js" } },
+      new Object[] { "try.js",
+          new String[] { "try.js/tryCatch", "try.js/tryFinally", "try.js/tryCatchFinally" } },
+      new Object[] { "try.js/tryCatch",
+          new String[] { "try.js/targetOne", "try.js/targetTwo", "try.js/two" } },
+      new Object[] { "try.js/tryFinally",
+          new String[] { "try.js/targetOne", "try.js/targetTwo", "try.js/two" } },
+      new Object[] { "try.js/tryCatchFinally",
+          new String[] { "try.js/targetOne", "try.js/targetTwo", "try.js/three", "try.js/two" } },
+      new Object[] { "try.js/tryCatchTwice",
+          new String[] { "try.js/targetOne", "try.js/targetTwo", "try.js/three", "try.js/two" } },
+      new Object[] { "try.js/testRet",
+          new String[] { "try.js/three", "try.js/two" } }
   };
 
   @Test
@@ -237,8 +236,8 @@
   }
 
   private static final Object[][] assertionsForStringOp = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/string-op.js" } },
-      new Object[] { "tests/string-op.js", new String[] { "tests/string-op.js/getOp", "tests/string-op.js/plusNum" } } };
+      new Object[] { ROOT, new String[] { "string-op.js" } },
+      new Object[] { "string-op.js", new String[] { "string-op.js/getOp", "string-op.js/plusNum" } } };
 
   @Test
   public void testStringOp() throws IOException, IllegalArgumentException, CancelException, WalaException {
@@ -249,11 +248,11 @@
   }
 
   private static final Object[][] assertionsForUpward = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/upward.js" } },
+      new Object[] { ROOT, new String[] { "upward.js" } },
       new Object[] {
-          "tests/upward.js",
-          new String[] { "tests/upward.js/Obj/setit", "tests/upward.js/Obj/getit", "tests/upward.js/tester1",
-              "tests/upward.js/tester2" } } };
+          "upward.js",
+          new String[] { "upward.js/Obj/setit", "upward.js/Obj/getit", "upward.js/tester1",
+              "upward.js/tester2" } } };
 
   @Test
   public void testUpward() throws IOException, IllegalArgumentException, CancelException, WalaException {
@@ -262,21 +261,21 @@
   }
 
   private static final Object[][] assertionsForStringPrims = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/string-prims.js" } },
-      new Object[] { "tests/string-prims.js", new String[] { "prologue.js/String_prototype_split", "prologue.js/String_prototype_toUpperCase" } } };
+      new Object[] { ROOT, new String[] { "string-prims.js" } },
+      new Object[] { "string-prims.js", new String[] { "prologue.js/String_prototype_split", "prologue.js/String_prototype_toUpperCase" } } };
 
   @Test
   public void testStringPrims() throws IOException, IllegalArgumentException, CancelException, WalaException {
-    PropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "string-prims.js");
+    SSAPropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "string-prims.js");
     B.getOptions().setTraceStringConstants(true);
     CallGraph CG = B.makeCallGraph(B.getOptions());
 //    JSCallGraphUtil.AVOID_DUMP = false;
-    CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
     verifyGraphAssertions(CG, assertionsForStringPrims);
   }
 
-  private static final Object[][] assertionsForNested = new Object[][] { new Object[] { ROOT, new String[] { "tests/nested.js" } },
-      new Object[] { "tests/nested.js", new String[] { "tests/nested.js/f", "tests/nested.js/f/ff", "tests/nested.js/f/ff/fff" } } };
+  private static final Object[][] assertionsForNested = new Object[][] { new Object[] { ROOT, new String[] { "nested.js" } },
+      new Object[] { "nested.js", new String[] { "nested.js/f", "nested.js/f/ff", "nested.js/f/ff/fff" } } };
 
   @Test
   public void testNested() throws IOException, IllegalArgumentException, CancelException, WalaException {
@@ -286,7 +285,7 @@
   }
 
   private static final Object[][] assertionsForInstanceof = new Object[][] { new Object[] { ROOT,
-      new String[] { "tests/instanceof.js" } } };
+      new String[] { "instanceof.js" } } };
 
   @Test
   public void testInstanceof() throws IOException, IllegalArgumentException, CancelException, WalaException {
@@ -297,7 +296,7 @@
 
   /*
    * private static final Object[][] assertionsForWith = new Object[][] { new
-   * Object[] { ROOT, new String[] { "tests/with.js" } } };
+   * Object[] { ROOT, new String[] { "with.js" } } };
    * 
    * @Test public void testWith() throws IOException, IllegalArgumentException,
    * CancelException { PropagationCallGraphBuilder B =
@@ -325,8 +324,8 @@
   }
 
   private static final Object[][] assertionsForMultivar = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/multivar.js" } },
-      new Object[] { "tests/multivar.js", new String[] { "tests/multivar.js/a", "tests/multivar.js/bf", "tests/multivar.js/c" } } };
+      new Object[] { ROOT, new String[] { "multivar.js" } },
+      new Object[] { "multivar.js", new String[] { "multivar.js/a", "multivar.js/bf", "multivar.js/c" } } };
 
   @Test
   public void testMultivar() throws IOException, IllegalArgumentException, CancelException, WalaException {
@@ -335,7 +334,7 @@
   }
 
   private static final Object[][] assertionsForPrototypeContamination = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/prototype_contamination_bug.js" } },
+      new Object[] { ROOT, new String[] { "prototype_contamination_bug.js" } },
       new Object[] { "suffix:test1", new String[] { "suffix:foo_of_A" } },
       new Object[] { "suffix:test2", new String[] { "suffix:foo_of_B" } } };
 
@@ -370,14 +369,14 @@
         List<CGNode> succs = Iterator2Collection.toList(cg.getSuccNodes(n));
         Assert
             .assertEquals(
-                "[Node: <Code body of function Ltests/function_call.js/foo> Context: Everywhere, Node: <Code body of function Ltests/function_call.js/bar> Context: Everywhere]",
+                "[Node: <Code body of function Lfunction_call.js/foo> Context: Everywhere, Node: <Code body of function Lfunction_call.js/bar> Context: Everywhere]",
                 succs.toString());
       }
     }
   }
 
   private static final Object[][] assertionsForFunctionApply = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/function_apply.js" } },
+    new Object[] { ROOT, new String[] { "function_apply.js" } },
     new Object[] { "suffix:function_apply.js", new String[] { "suffix:theOne" } }, 
     new Object[] { "suffix:function_apply.js", new String[] { "suffix:theTwo" } } };
 
@@ -389,7 +388,7 @@
   }
 
   private static final Object[][] assertionsForFunctionApply2 = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/function_apply2.js" } },
+    new Object[] { ROOT, new String[] { "function_apply2.js" } },
     new Object[] { "suffix:function_apply2.js", new String[] { "suffix:theThree" } } }; 
 
   @Test
@@ -399,7 +398,7 @@
   }
 
   private static final Object[][] assertionsForFunctionApply3 = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/function_apply3.js" } },
+    new Object[] { ROOT, new String[] { "function_apply3.js" } },
     new Object[] { "suffix:apply", new String[] { "suffix:foo" } } }; 
 
   @Test
@@ -409,7 +408,7 @@
   }
 
   private static final Object[][] assertionsForWrap1 = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/wrap1.js" } },
+    new Object[] { ROOT, new String[] { "wrap1.js" } },
     new Object[] { "suffix:wrap1.js", new String[] { "suffix:i_am_reachable" } } };
 
   @Test
@@ -419,7 +418,7 @@
   }
 
   private static final Object[][] assertionsForWrap2 = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/wrap2.js" } },
+    new Object[] { ROOT, new String[] { "wrap2.js" } },
     new Object[] { "suffix:wrap2.js", new String[] { "suffix:i_am_reachable" } } };
 
   @Test
@@ -429,7 +428,7 @@
   }
 
   private static final Object[][] assertionsForWrap3 = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/wrap3.js" } },
+    new Object[] { ROOT, new String[] { "wrap3.js" } },
     new Object[] { "suffix:wrap3.js", new String[] { "suffix:i_am_reachable" } } };
 
   @Test
@@ -439,7 +438,7 @@
   }
 
   private static final Object[][] assertionsForComplexCall = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/complex_call.js" } },
+    new Object[] { ROOT, new String[] { "complex_call.js" } },
     new Object[] { "suffix:call.js", new String[] { "suffix:f3" } } };
 
   @Test
@@ -452,7 +451,7 @@
 
 
   private static final Object[][] assertionsForGlobalObj = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/global_object.js" } },
+    new Object[] { ROOT, new String[] { "global_object.js" } },
     new Object[] { "suffix:global_object.js", new String[] { "suffix:biz" } } };
 
   @Test
@@ -462,7 +461,7 @@
   }
   
   private static final Object[][] assertionsForGlobalObj2 = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/global_object2.js" } },
+    new Object[] { ROOT, new String[] { "global_object2.js" } },
     new Object[] { "suffix:global_object2.js", new String[] { "suffix:foo" } } };
 
   @Test
@@ -473,21 +472,21 @@
  
   
   private static final Object[][] assertionsForReturnThis = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/return_this.js" } },
+    new Object[] { ROOT, new String[] { "return_this.js" } },
     new Object[] { "suffix:return_this.js", new String[] { "suffix:foo" } }, 
     new Object[] { "suffix:return_this.js", new String[] { "suffix:bar" } } };
 
   @Test
   public void testReturnThis() throws IOException, IllegalArgumentException, CancelException, WalaException {
-    PropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "return_this.js");
+    SSAPropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "return_this.js");
     CallGraph CG = B.makeCallGraph(B.getOptions());
 //    JSCallGraphUtil.AVOID_DUMP = false;
-    CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
     verifyGraphAssertions(CG, assertionsForReturnThis);
   }
   
   private static final Object[][] assertionsForReturnThis2 = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/return_this2.js" } },
+    new Object[] { ROOT, new String[] { "return_this2.js" } },
     new Object[] { "suffix:return_this2.js", new String[] { "suffix:A" } }, 
     new Object[] { "suffix:return_this2.js", new String[] { "suffix:foo" } }, 
     new Object[] { "suffix:return_this2.js", new String[] { "suffix:test1" } }, 
@@ -505,7 +504,7 @@
   }
   
   private static final Object[][] assertionsForArguments = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/arguments.js" } },
+    new Object[] { ROOT, new String[] { "arguments.js" } },
     new Object[] { "suffix:arguments.js", new String[] { "suffix:f" } },
     new Object[] { "suffix:f", new String[] { "!suffix:g1", "!suffix:g2", "suffix:g3", } }
   };
@@ -517,7 +516,7 @@
   }
   
   private static final Object[][] assertionsForFunctionIsAFunction = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/Function_is_a_function.js" } },
+    new Object[] { ROOT, new String[] { "Function_is_a_function.js" } },
     new Object[] { "suffix:Function_is_a_function.js", new String[] { "suffix:Function_prototype_call" } } }; 
 
   @Test
@@ -527,7 +526,7 @@
   }
   
   private static final Object[][] assertionsForLexicalBroken = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/lexical_broken.js" } },
+    new Object[] { ROOT, new String[] { "lexical_broken.js" } },
     new Object[] { "suffix:lexical_broken.js", new String[] { "suffix:f" } },
     new Object[] { "suffix:f", new String[] { "suffix:g" } }
   };
@@ -544,7 +543,7 @@
   }
 
   private static final Object[][] assertionsForScopingOverwriteFunction = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/scoping_test.js" } },
+    new Object[] { ROOT, new String[] { "scoping_test.js" } },
     new Object[] { "suffix:scoping_test.js", new String[] { "suffix:i_am_reachable" } } 
   };
 
@@ -555,7 +554,7 @@
   }
   
   private static final Object[][] assertionsForNestedParamAssign = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/nested_assign_to_param.js" } },
+    new Object[] { ROOT, new String[] { "nested_assign_to_param.js" } },
     new Object[] { "suffix:nested_assign_to_param.js", new String[] { "suffix:i_am_reachable" } } 
   };
   
@@ -566,24 +565,24 @@
   }
 
   private static final Object[][] assertionsForDispatch = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/dispatch.js" } },
-    new Object[] { "tests/dispatch.js", new String[] { "tests/dispatch.js/left_outer", "tests/dispatch.js/right_outer" } },
-    new Object[] { "tests/dispatch.js/left_outer", new String[]{ "tests/dispatch.js/left_inner" } },
-    new Object[] { "tests/dispatch.js/right_outer", new String[]{ "tests/dispatch.js/right_inner" } }
+    new Object[] { ROOT, new String[] { "dispatch.js" } },
+    new Object[] { "dispatch.js", new String[] { "dispatch.js/left_outer", "dispatch.js/right_outer" } },
+    new Object[] { "dispatch.js/left_outer", new String[]{ "dispatch.js/left_inner" } },
+    new Object[] { "dispatch.js/right_outer", new String[]{ "dispatch.js/right_inner" } }
   };
 
   @Test
   public void testDispatch() throws IOException, IllegalArgumentException, CancelException, WalaException {
-    PropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "dispatch.js");
+    SSAPropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "dispatch.js");
     CallGraph CG = B.makeCallGraph(B.getOptions());
 //    JSCallGraphUtil.AVOID_DUMP = false;
-    CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
     verifyGraphAssertions(CG, assertionsForDispatch);
   }
 
   private static final Object[][] assertionsForDispatchSameTarget = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/dispatch_same_target.js" } },
-    new Object[] { "tests/dispatch_same_target.js/f3", new String[] { "tests/dispatch_same_target.js/f4" } } 
+    new Object[] { ROOT, new String[] { "dispatch_same_target.js" } },
+    new Object[] { "dispatch_same_target.js/f3", new String[] { "dispatch_same_target.js/f4" } } 
   };
 
 
@@ -598,8 +597,8 @@
   
   
   private static final Object[][] assertionsForForInPrototype = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/for_in_prototype.js" } },
-    new Object[] { "tests/for_in_prototype.js", new String[] { "suffix:A",
+    new Object[] { ROOT, new String[] { "for_in_prototype.js" } },
+    new Object[] { "for_in_prototype.js", new String[] { "suffix:A",
                                                                "suffix:reachable",
                                                                "suffix:also_reachable" } }
   };
@@ -611,8 +610,8 @@
   }
   
   private static final Object[][] assertionsForArrayIndexConv = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/array_index_conv.js" } },
-    new Object[] { "tests/array_index_conv.js", new String[] { "suffix:reachable1",
+    new Object[] { ROOT, new String[] { "array_index_conv.js" } },
+    new Object[] { "array_index_conv.js", new String[] { "suffix:reachable1",
                                                                "suffix:reachable2",
                                                                "suffix:reachable3",
                                                                "suffix:reachable4" } }
@@ -626,8 +625,8 @@
   }
 
   private static final Object[][] assertionsForArrayIndexConv2 = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/array_index_conv2.js" } },
-    new Object[] { "tests/array_index_conv2.js", new String[] { "suffix:invokeOnA" } },
+    new Object[] { ROOT, new String[] { "array_index_conv2.js" } },
+    new Object[] { "array_index_conv2.js", new String[] { "suffix:invokeOnA" } },
     new Object[] { "suffix:invokeOnA", new String[] { "suffix:reachable",
                                                       "suffix:also_reachable",
                                                       "suffix:reachable_too" } }
@@ -644,8 +643,8 @@
   }
 
   private static final Object[][] assertionsForDateProperty = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/date-property.js" } },
-    new Object[] { "tests/date-property.js", new String[] { "suffix:_fun" } }
+    new Object[] { ROOT, new String[] { "date-property.js" } },
+    new Object[] { "date-property.js", new String[] { "suffix:_fun" } }
   };
 
     @Test
@@ -657,8 +656,8 @@
     verifyGraphAssertions(CG, assertionsForDateProperty);
   }
     private static final Object[][] assertionsForDeadCode = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/dead.js" } },
-      new Object[] { "tests/dead.js", new String[] { "suffix:twoReturns" } }
+      new Object[] { ROOT, new String[] { "dead.js" } },
+      new Object[] { "dead.js", new String[] { "suffix:twoReturns" } }
     };
 
     @Test
@@ -671,10 +670,10 @@
     }
     
     private static final Object[][] assertionsForShadow = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/shadow_test.js" } },
-      new Object[] { "tests/shadow_test.js", new String[] { "tests/shadow_test.js/test" } },
-      new Object[] { "tests/shadow_test.js/test", new String[] { "tests/shadow_test.js/bad" } },
-      new Object[] { "tests/shadow_test.js/test", new String[] { "tests/shadow_test.js/global_bad" } }
+      new Object[] { ROOT, new String[] { "shadow_test.js" } },
+      new Object[] { "shadow_test.js", new String[] { "shadow_test.js/test" } },
+      new Object[] { "shadow_test.js/test", new String[] { "shadow_test.js/bad" } },
+      new Object[] { "shadow_test.js/test", new String[] { "shadow_test.js/global_bad" } }
     };
     
     @Test
@@ -685,8 +684,8 @@
     }
 
     private static final Object[][] assertionsForExtend = new Object[][] {
-      new Object[] { ROOT, new String[] { "tests/extend.js" } },
-      new Object[] { "tests/extend.js", new String[] { "suffix:bar", "!suffix:foo" } }
+      new Object[] { ROOT, new String[] { "extend.js" } },
+      new Object[] { "extend.js", new String[] { "suffix:bar", "!suffix:foo" } }
     };
     
     @Test
@@ -712,7 +711,7 @@
       CallGraph CG = B.makeCallGraph(B.getOptions());
       boolean save = CAstCallGraphUtil.AVOID_DUMP;
       //CAstCallGraphUtil.AVOID_DUMP = false;
-      CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+      CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
       CAstCallGraphUtil.AVOID_DUMP = save;
     }
 
@@ -725,56 +724,56 @@
       monitor.beginTask("build CG", 1);
       CallGraph CG = B.makeCallGraph(B.getOptions(), monitor);
       monitor.done();
-      CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+      CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
     }
 
   @Test
   public void testTutorialExample() throws IllegalArgumentException, IOException, CancelException, WalaException {
-    PropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "tutorial-example.js");
+    SSAPropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "tutorial-example.js");
     CallGraph CG = B.makeCallGraph(B.getOptions());
-    CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
     // verifyGraphAssertions(CG, assertionsForDateProperty);
   }
 
   private static final Object[][] assertionsForLoops = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/loops.js" } },
-    new Object[] { "tests/loops.js", new String[] { "tests/loops.js/three",  "tests/loops.js/four"} }
+    new Object[] { ROOT, new String[] { "loops.js" } },
+    new Object[] { "loops.js", new String[] { "loops.js/three",  "loops.js/four"} }
   };
 
   @Ignore("need to fix this.  bug from Sukyoung's group")
   @Test
   public void testLoops() throws IllegalArgumentException, IOException, CancelException, WalaException {
-    PropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "loops.js");
+    SSAPropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "loops.js");
     CallGraph CG = B.makeCallGraph(B.getOptions());
     boolean x = CAstCallGraphUtil.AVOID_DUMP;
     CAstCallGraphUtil.AVOID_DUMP = false;
-    CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
     CAstCallGraphUtil.AVOID_DUMP = x;
     verifyGraphAssertions(CG, assertionsForLoops);
   }
 
   private static final Object[][] assertionsForPrimitiveStrings = new Object[][] {
-    new Object[] { ROOT, new String[] { "tests/primitive_strings.js" } },
-    new Object[] { "tests/primitive_strings.js", new String[] { "tests/primitive_strings.js/f1", "tests/primitive_strings.js/f1"} },
-    new Object[] { "tests/primitive_strings.js/f2", new String[] { "prologue.js/String_prototype_concat" } },
-    new Object[] { "tests/primitive_strings.js/f1", new String[] { "prologue.js/String_prototype_concat" } },
+    new Object[] { ROOT, new String[] { "primitive_strings.js" } },
+    new Object[] { "primitive_strings.js", new String[] { "primitive_strings.js/f1", "primitive_strings.js/f1"} },
+    new Object[] { "primitive_strings.js/f2", new String[] { "prologue.js/String_prototype_concat" } },
+    new Object[] { "primitive_strings.js/f1", new String[] { "prologue.js/String_prototype_concat" } },
   };
 
   @Ignore("need to fix this.  bug from Sukyoung's group")
   @Test
   public void testPrimitiveStrings() throws IllegalArgumentException, IOException, CancelException, WalaException {
-    PropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "primitive_strings.js");
+    SSAPropagationCallGraphBuilder B = JSCallGraphBuilderUtil.makeScriptCGBuilder("tests", "primitive_strings.js");
     CallGraph CG = B.makeCallGraph(B.getOptions());
     boolean x = CAstCallGraphUtil.AVOID_DUMP;
     CAstCallGraphUtil.AVOID_DUMP = false;
-    CAstCallGraphUtil.dumpCG(B.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(B.getCFAContextInterpreter(), B.getPointerAnalysis(), CG);
     CAstCallGraphUtil.AVOID_DUMP = x;
     verifyGraphAssertions(CG, assertionsForPrimitiveStrings);
   }
 
   Object[][] renamingAssertions =  { 
-      { "tests/rename-example.js/f", new Name[]{ new Name(9, 7, "x"), new Name(9, 7, "y") } },
-      { "tests/rename-example.js/ff", new Name[]{ new Name(11, 10, "x"), new Name(11, 10, "y"), new Name(11, 10, "z") } }
+      { "rename-example.js/f", new Name[]{ new Name(9, 7, "x"), new Name(9, 7, "y") } },
+      { "rename-example.js/ff", new Name[]{ new Name(11, 10, "x"), new Name(11, 10, "y"), new Name(11, 10, "z") } }
   };
   
   @Test
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java
--- wala-1.3.9/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/harness-src/com/ibm/wala/cast/js/test/TestSimplePageCallGraphShape.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *****************************************************************************/
 package com.ibm.wala.cast.js.test;
 
-import java.io.IOException;
 import java.net.URL;
 
 import org.junit.Before;
@@ -18,8 +17,7 @@
 
 import com.ibm.wala.cast.ipa.callgraph.CAstCallGraphUtil;
 import com.ibm.wala.cast.js.html.IHtmlParser;
-import com.ibm.wala.cast.js.html.IHtmlParserFactory;
-import com.ibm.wala.cast.js.html.WebUtil;
+import com.ibm.wala.cast.js.html.JSSourceExtractor;
 import com.ibm.wala.cast.js.ipa.callgraph.JSCFABuilder;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.util.CancelException;
@@ -36,12 +34,7 @@
   @Override
   @Before
   public void setUp() {
-    WebUtil.setFactory(new IHtmlParserFactory() {
-      @Override
-      public IHtmlParser getParser() {
-        return getParser();
-      }
-    });
+    JSSourceExtractor.USE_TEMP_NAME = false;
   }
   
   private static final Object[][] assertionsForPage1 = new Object[][] {
@@ -56,7 +49,7 @@
     }
   };
 
-  @Test public void testPage1() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testPage1() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/page1.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);
     verifyGraphAssertions(CG, assertionsForPage1);
@@ -67,7 +60,7 @@
     new Object[] { "page2.html", new String[] { "page2.html/__WINDOW_MAIN__" } }
   };
   
-  @Test public void testPage2() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testPage2() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/page2.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);
     verifyGraphAssertions(CG, assertionsForPage2);
@@ -84,7 +77,7 @@
     }
   };
 
-  @Test public void testCrawlPage11() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testCrawlPage11() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/crawl/page11.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);
     verifyGraphAssertions(CG, assertionsForPage11);
@@ -101,7 +94,7 @@
     }
   };
   
-  @Test public void testCrawlPage11b() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testCrawlPage11b() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/crawl/page11b.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);
     verifyGraphAssertions(CG, assertionsForPage11b);
@@ -133,7 +126,7 @@
     },
   };
 
-  @Test public void testCrawlPage12() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testCrawlPage12() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/crawl/page12.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);
     verifyGraphAssertions(CG, assertionsForPage12);
@@ -166,7 +159,7 @@
     }
   };
 
-  @Test public void testCrawlPage13() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testCrawlPage13() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/crawl/page13.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);    
     verifyGraphAssertions(CG, assertionsForPage13);
@@ -184,7 +177,7 @@
     }
   };
 
-  @Test public void testCrawlPage15() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testCrawlPage15() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/crawl/page15.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);
     verifyGraphAssertions(CG, assertionsForPage15);
@@ -202,7 +195,7 @@
     }
   };
 
-  @Test public void testCrawlPage16() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testCrawlPage16() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/crawl/page16.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);
     verifyGraphAssertions(CG, assertionsForPage16);
@@ -225,7 +218,7 @@
     }
   };
     
-  @Test public void testCrawlPage17() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testCrawlPage17() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/crawl/page17.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);
     verifyGraphAssertions(CG, assertionsForPage17);
@@ -238,19 +231,19 @@
     new Object[] { "apollo-example.html/__WINDOW_MAIN__/signon", new String[] { "preamble.js/DOMWindow/window_open" } }
   };
   
-  @Test public void testApolloExample() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testApolloExample() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/apollo-example.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);
     verifyGraphAssertions(CG, assertionsForApolloExample);
   }
 
-  @Test public void testNojs() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testNojs() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/nojs.html");
     // all we need is for it to finish building CG successfully.
     JSCallGraphBuilderUtil.makeHTMLCG(url);
   }
 
-  @Test public void testPage4() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testPage4() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/page4.html");
     JSCallGraphBuilderUtil.makeHTMLCG(url);
   }
@@ -265,16 +258,16 @@
     new Object[]{ "suffix:forall_base", "pages/collection.js", 4, 4 }
   };
     
-  @Test public void testList() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testList() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/list.html");
     JSCFABuilder builder = JSCallGraphBuilderUtil.makeHTMLCGBuilder(url);
     CallGraph CG = builder.makeCallGraph(builder.getOptions());
 //    JSCallGraphBuilderUtil.AVOID_DUMP = false;
-    CAstCallGraphUtil.dumpCG(builder.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(builder.getCFAContextInterpreter(), builder.getPointerAnalysis(), CG);
     verifySourceAssertions(CG, sourceAssertionsForList);
   }
 
-  @Test public void testIframeTest2() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testIframeTest2() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/iframeTest2.html");
     JSCallGraphBuilderUtil.makeHTMLCG(url);
   }
@@ -288,11 +281,11 @@
 
   };
 
-  @Test public void testWindowx() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testWindowx() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/windowx.html");
     JSCFABuilder builder = JSCallGraphBuilderUtil.makeHTMLCGBuilder(url);
     CallGraph CG = builder.makeCallGraph(builder.getOptions());
-    CAstCallGraphUtil.dumpCG(builder.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(builder.getCFAContextInterpreter(), builder.getPointerAnalysis(), CG);
     verifyGraphAssertions(CG, assertionsForWindowx);
   }
 
@@ -302,11 +295,11 @@
     new Object[] { "windowonload.html/__WINDOW_MAIN__", new String[] { "windowonload.html/__WINDOW_MAIN__/onload_handler" } },
   };
 
-  @Test public void testWindowOnload() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testWindowOnload() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/windowonload.html");
     JSCFABuilder builder = JSCallGraphBuilderUtil.makeHTMLCGBuilder(url);
     CallGraph CG = builder.makeCallGraph(builder.getOptions());
-    CAstCallGraphUtil.dumpCG(builder.getPointerAnalysis(), CG);
+    CAstCallGraphUtil.dumpCG(builder.getCFAContextInterpreter(), builder.getPointerAnalysis(), CG);
     verifyGraphAssertions(CG, assertionsForWindowOnload);
   }
 
@@ -318,7 +311,7 @@
     new Object[] { "skeleton.html/__WINDOW_MAIN__/bad_guy", new String[] { "skeleton.html/__WINDOW_MAIN__/dollar" } },
   };
 
-  @Test public void testSkeleton() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testSkeleton() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/skeleton.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);
     verifyGraphAssertions(CG, assertionsForSkeleton);
@@ -334,7 +327,7 @@
     new Object[] { "skeleton2.html/__WINDOW_MAIN__/bad_guy", new String[] { "skeleton2.html/__WINDOW_MAIN__/dollar" } },
   };
 
-  @Test public void testSkeleton2() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testSkeleton2() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/skeleton2.html");
     CallGraph CG = JSCallGraphBuilderUtil.makeHTMLCG(url);
     System.err.println(CG);
@@ -342,7 +335,7 @@
   }
 
   /*
-  @Test public void testJQuery() throws IOException, IllegalArgumentException, CancelException, WalaException {
+  @Test public void testJQuery() throws IllegalArgumentException, CancelException, WalaException {
     URL url = getClass().getClassLoader().getResource("pages/jquery.html");
     CallGraph CG = Util.makeHTMLCG(url);
   }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/.launchConfigurations/com.ibm.wala.cast.js.test-JUnit.launch wala-1.5.1/com.ibm.wala.cast.js.test/.launchConfigurations/com.ibm.wala.cast.js.test-JUnit.launch
--- wala-1.3.9/com.ibm.wala.cast.js.test/.launchConfigurations/com.ibm.wala.cast.js.test-JUnit.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/.launchConfigurations/com.ibm.wala.cast.js.test-JUnit.launch	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.ibm.wala.cast.js.test"/>
@@ -16,6 +16,7 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;com.ibm.wala.cast.js.test&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.cast.js.test.data/examples-src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.cast.js.test"/>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WALA JavaScript Test Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.js.test
-Bundle-Version: 1.3.9
-Bundle-Vendor: IBM
+Bundle-Version: 1.5.1
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.cast.js,
  com.ibm.wala.cast,
  com.ibm.wala.core,
@@ -13,4 +13,4 @@
  com.ibm.wala.cast.js.test.data;bundle-version="1.3.4",
  org.junit;bundle-version="4.0.0"
 Export-Package: com.ibm.wala.cast.js.test
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast.js.test/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast.js.test/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.js.test
+Bundle-Vendor = IBM
+Bundle-Name = WALA JavaScript Test Plug-in
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/pom.xml wala-1.5.1/com.ibm.wala.cast.js.test/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.js.test/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
   <artifactId>com.ibm.wala.cast.js.test</artifactId>
   <packaging>eclipse-plugin</packaging>
@@ -38,7 +38,12 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
+    </dependency>
+    <dependency>
+      <groupId>net.htmlparser.jericho</groupId>
+      <artifactId>jericho-html</artifactId>
+      <version>3.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies> 
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/.project wala-1.5.1/com.ibm.wala.cast.js.test/.project
--- wala-1.3.9/com.ibm.wala.cast.js.test/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.cast.js.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/.settings/org.eclipse.core.resources.prefs wala-1.5.1/com.ibm.wala.cast.js.test/.settings/org.eclipse.core.resources.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.test/.settings/org.eclipse.core.resources.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/.settings/org.eclipse.core.resources.prefs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding//harness-src/com/ibm/wala/cast/js/test/TestCorrelatedPairExtraction.java=UTF-8
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.js.test/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.test/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,78 +1,125 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=error
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast.js.test/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.test/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.cast.js.test/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.test/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude08113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T02111contentType133org.eclipse.jdt.junit.JUnitResultF04file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/build.gradle wala-1.5.1/com.ibm.wala.cast.js.test.data/build.gradle
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,23 @@
+sourceSets.test.resources.srcDirs = ['examples-src']
+
+task downloadAjaxslt(type: VerifiedDownload) {
+	def version = '0.8.1'
+	def versionedArchive = "ajaxslt-${version}.tar.gz"
+	src "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ajaxslt/$versionedArchive"
+	dest "$temporaryDir/$versionedArchive"
+	checksum 'c995abe3310a401bb4db7f28a6409756'
+}
+
+task unpackAjaxslt(type: Sync, dependsOn: downloadAjaxslt) {
+	from(tarTree(downloadAjaxslt.dest)) {
+		eachFile {
+			def newSegments = relativePath.segments[1 .. -1] as String[]
+			relativePath new RelativePath(!directory, newSegments)
+		}
+	}
+	into 'examples-src/ajaxslt'
+}
+
+clean.dependsOn cleanUnpackAjaxslt
+
+processTestResources.dependsOn(unpackAjaxslt)
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/build.properties wala-1.5.1/com.ibm.wala.cast.js.test.data/build.properties
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1 +1,3 @@
-bin.includes = examples-src/
+bin.includes = examples-src/,\
+               META-INF/,\
+               OSGI-INF/
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/build.xml wala-1.5.1/com.ibm.wala.cast.js.test.data/build.xml
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/build.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project>
 <project name="com.ibm.wala.cast.js.test.data" default="getJars" basedir=".">
 
 	<property name="basews" value="${ws}"/>
@@ -12,8 +13,8 @@
 	<property name="javacVerbose" value="false"/>
 	<property name="logExtension" value=".log"/>
 	<property name="compilerArg" value=""/>
-	<property name="javacSource" value="1.5"/>
-	<property name="javacTarget" value="1.5"/>
+	<property name="javacSource" value="1.8"/>
+	<property name="javacTarget" value="1.8"/>
 	<!-- This property has been updated to correspond to the paths used by the latest Java update
 	on Mac OS X 10.6 (Java version 1.6.0_22).  If you are not using this version of Mac OS X or Java,
 	try changing the value of the property to "${java.home}/../../../Classes" -->
@@ -42,10 +43,10 @@
    <target name="fetchAjaxslt" depends="ajaxsltPresent" unless="ajaxslt.present">
      <delete dir="${temp.folder}"/>
      <mkdir dir="${temp.folder}"/>
-     <get src="http://ajaxslt.googlecode.com/files/ajaxslt-0-7.tar.gz" dest="${temp.folder}/ajaxslt-0-7.tar.gz" />
-     <untar src="${temp.folder}/ajaxslt-0-7.tar.gz" dest="${temp.folder}" compression="gzip" />
+     <get src="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ajaxslt/ajaxslt-0.8.1.tar.gz" dest="${temp.folder}/ajaxslt-0.8.1.tar.gz"/>
+     <untar src="${temp.folder}/ajaxslt-0.8.1.tar.gz" dest="${temp.folder}" compression="gzip" />
      <copy todir="${plugin.destination}/examples-src/ajaxslt">
-       <fileset dir="${temp.folder}/ajaxslt" />
+       <fileset dir="${temp.folder}/ajaxslt-0.8.1" />
      </copy>
      <delete dir="${temp.folder}"/>
    </target>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/examples-src/tests/cpa.js wala-1.5.1/com.ibm.wala.cast.js.test.data/examples-src/tests/cpa.js
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/examples-src/tests/cpa.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/examples-src/tests/cpa.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,22 @@
+function three(a, b, c) {
+	return a;
+}
+
+function two_a(a, b) {
+	return three(a, b, "string");
+}
+
+function two_b(a, b) {
+	return three(a, b, 17);
+}
+
+var x = "one";
+var y = "two";
+
+two_a(x, y);
+two_a(y, x);
+
+for(var i = 0; i < 2; i++) {
+	two_b(i==0?x:y, i==0?y:x);
+}
+
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/examples-src/tests/date-property.js wala-1.5.1/com.ibm.wala.cast.js.test.data/examples-src/tests/date-property.js
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/examples-src/tests/date-property.js	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/examples-src/tests/date-property.js	2019-01-29 17:08:39.000000000 +0000
@@ -1,13 +1,15 @@
-var t = "this is a long string";
+var t = new String("this is a long string");
 
 var bar = t.substring(0, 10);
 
 var d = new Date("October 13, 1975 11:13:00");
 
-var document = {  
-	fun: function _fun(x) {
-		return x;
-	}
-};
+var document = { };
 
-document[d](bar);
+document[d] = function _fun(x) {
+    return x;
+}
+
+var f = document[d]
+
+f(bar);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/examples-src/tests/demo2.js wala-1.5.1/com.ibm.wala.cast.js.test.data/examples-src/tests/demo2.js
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/examples-src/tests/demo2.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/examples-src/tests/demo2.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,14 @@
+var document = { URL: "whatever",
+  write: function Document_prototype_write(x) { } };
+var id = function _id(x) { return x; };
+function Id() { this.id = id; }
+function SubId() { }; SubId.prototype = new Id();
+
+if (Math.random.call(null) > 0) {
+    var id1 = new Id();
+    var text = id1.id.call(document, document.URL);
+} else {
+    var id2 = new SubId();
+    var text = id2.id("not a url");
+}
+document.write(text);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/examples-src/tests/demo.js wala-1.5.1/com.ibm.wala.cast.js.test.data/examples-src/tests/demo.js
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/examples-src/tests/demo.js	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/examples-src/tests/demo.js	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,14 @@
+function Document_prototype_write(x) {
+
+}
+
+function id(x) {
+    return x;
+}
+
+var document = { URL: "whatever" };
+var url = id(document.URL);
+Document_prototype_write(url);
+
+var notUrl = id("not a url");
+Document_prototype_write(notUrl);
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/examples-src/tests/function_apply.js wala-1.5.1/com.ibm.wala.cast.js.test.data/examples-src/tests/function_apply.js
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/examples-src/tests/function_apply.js	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/examples-src/tests/function_apply.js	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,3 @@
 var s = p.apply(null, [theTwo]);
 s();
 
-// test invoking with non-array argsList
-p.apply(null, o);
-
-
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/examples-src/tests/slice1.js wala-1.5.1/com.ibm.wala.cast.js.test.data/examples-src/tests/slice1.js
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/examples-src/tests/slice1.js	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/examples-src/tests/slice1.js	2019-01-29 17:08:39.000000000 +0000
@@ -9,7 +9,7 @@
 if (o !=  null) {
     o = (function _push_o(x) { return x>0? x: -1; })(o.f);
 
-    var p = { };
+    var p = { f: function yuck(a, b) { _slice_target_fn(a); _slice_target_fn(b); } };
 
-    _slice_target_fn(o);
+    p.f(o);
 }
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -3,9 +3,8 @@
 Eclipse-LazyStart: true
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.ibm.wala.cast.js.test.data;singleton:=true
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Bundle-Vendor: %providerName
-Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: examples-src/
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast.js.test.data/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+pluginName = WALA CAst Java ECJ frontend
+providerName = IBM
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/pom.xml wala-1.5.1/com.ibm.wala.cast.js.test.data/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
   <artifactId>com.ibm.wala.cast.js.test.data</artifactId>
   <packaging>eclipse-plugin</packaging>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/.project wala-1.5.1/com.ibm.wala.cast.js.test.data/.project
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.cast.js.test.data</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.jdt.core.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1 @@
+compilers.p.build.bin.includes=0
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.container wala-1.5.1/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.container
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.container	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.container	2019-01-29 17:08:39.000000000 +0000
@@ -1 +1 @@
-org.eclipse.wst.jsdt.launching.JRE_CONTAINER
\ No newline at end of file
+org.eclipse.wst.jsdt.launching.JRE_CONTAINER
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.name wala-1.5.1/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.name
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.name	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.jsdt.ui.superType.name	2019-01-29 17:08:39.000000000 +0000
@@ -1 +1 @@
-Global
\ No newline at end of file
+Global
diff -Nru wala-1.3.9/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.js.test.data/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201508251749
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude11804file131examples-src/pages/garbage.htmlT0304file132examples-src/pages/garbage2.htmlT0304file139target/site/dependency-convergence.htmlT0304file136examples-src/ajaxslt/test/xpath.htmlT0304file139examples-src/ajaxslt/xslt_unittest.htmlT0304file135examples-src/ajaxslt/test/xslt.htmlT0304file129examples-src/pages/page4.htmlT0304file128examples-src/pages/list.htmlT0304file129examples-src/pages/page1.htmlT0304file129examples-src/pages/page2.htmlT0304file133examples-src/pages/prototype.htmlT0304file133examples-src/pages/prototype.htmlT0304file132examples-src/pages/skeleton.htmlT0304file133examples-src/pages/skeleton2.htmlT0304file133examples-src/pages/skeleton3.htmlT0304file136examples-src/pages/windowonload.htmlT0304file131examples-src/pages/windowx.htmlT0304file145examples-src/tests/portal-example-simple.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude09113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT0304file128target/antrun/build-main.xmlT0304file167target/javadoc-bundle-options/javadoc-options-javadoc-resources.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/build.gradle wala-1.5.1/com.ibm.wala.cast.test/build.gradle
--- wala-1.3.9/com.ibm.wala.cast.test/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,135 @@
+plugins {
+	id 'com.github.hauner.jarTest'
+	id 'cpp'
+	id 'eclipse'
+	id 'edu.wpi.first.GradleJni' version '0.2.1'
+}
+
+eclipse.project.natures 'org.eclipse.pde.PluginNature'
+prepareIntelliJIDEA.dependsOn jarTest
+
+apply plugin: 'java'
+
+sourceSets.test.java.srcDirs = ['harness-src/java']
+
+publishing.publications {
+	mavenJava(MavenPublication) {
+		artifact jarTest
+	}
+}
+
+dependencies {
+	testCompile(
+		'junit:junit:4.12',
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.util'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
+		)
+}
+
+def currentJvm = org.gradle.internal.jvm.Jvm.current()
+
+def addCastRpath(currentJvm, targetPlatform, linker) {
+	switch (targetPlatform.operatingSystem.name) {
+		case 'linux':
+		case 'osx':
+			[
+				// TODO: compute path on following line from 'cast' library properties somehow
+				"${project(':com.ibm.wala.cast').buildDir}/libs/cast/shared",
+				// TODO: compute paths on following lines from 'jdk' library properties somehow
+				"${currentJvm.javaHome}/jre/lib/amd64/server",
+				"${currentJvm.javaHome}/jre/lib/server",
+			].each { linker.args "-Wl,-rpath,$it" }
+	}
+}
+
+model {
+	components {
+		xlator_test(JniNativeLibrarySpec) {
+			javaCompileTasks << compileTestJava
+
+			sources.cpp {
+				source {
+					srcDirs = ['harness-src/c']
+					include 'smoke.cpp'
+				}
+				['cast', 'jdk'].each {
+					lib project: ':com.ibm.wala.cast', library: it
+				}
+			}
+
+			binaries {
+				withType(StaticLibraryBinarySpec) {
+					buildable = false
+				}
+				withType(SharedLibraryBinarySpec) {
+					addCastRpath(currentJvm, targetPlatform, linker)
+				}
+			}
+		}
+
+		smoke_main(NativeExecutableSpec) {
+			sources.cpp {
+				source {
+					srcDirs = ['harness-src/c']
+					include 'smoke_main.cpp'
+				}
+				['cast', 'jdk'].each {
+					lib project: ':com.ibm.wala.cast', library: it
+				}
+			}
+
+			binaries.all {
+				addCastRpath(currentJvm, targetPlatform, linker)
+			}
+		}
+	}
+
+	tasks {
+		test {
+			def lib = linkXlator_testSharedLibrary
+			dependsOn lib
+			systemProperty 'java.library.path', lib.destinationDirectory.get().asFile
+		}
+
+		checkSmoke_main(Exec) {
+			// main executable to run for test
+			def executableBinary = $.binaries.smoke_mainExecutable
+			executable executableBinary.executableFile
+			dependsOn executableBinary
+			def pathElements = [$.binaries.test.getClassesDir()]
+
+			// implementations of native methods
+			def library = $.binaries.xlator_testSharedLibrary
+			dependsOn library
+			pathElements << library.sharedLibraryFile.parent
+
+			// "primordial.txt" resource loaded during test
+			def coreResources = project(':com.ibm.wala.core').processResources
+			dependsOn coreResources
+			pathElements << coreResources.destinationDir
+
+			// additional supporting Java class files
+			['cast', 'core', 'util'].each {
+				def compileJava = project(":com.ibm.wala.$it").compileJava
+				dependsOn compileJava
+				pathElements << compileJava.destinationDir
+			}
+
+			// all combined as a colon-delimited path list
+			args pathElements.join(':')
+
+			// log output to file, although we don't validate it
+			final def outFile = file("$temporaryDir/stdout-and-stderr.log")
+			outputs.file outFile
+			doFirst {
+				final def fileStream = new FileOutputStream(outFile)
+				standardOutput fileStream
+				errorOutput fileStream
+			}
+		}
+
+		check.dependsOn checkSmoke_main
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/build.properties wala-1.5.1/com.ibm.wala.cast.test/build.properties
--- wala-1.3.9/com.ibm.wala.cast.test/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,6 @@
-source.. =  harness-src
-output.. = bin/
+source.. =  harness-src/java
+output.. = bin/test
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/build.xml wala-1.5.1/com.ibm.wala.cast.test/build.xml
--- wala-1.3.9/com.ibm.wala.cast.test/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/build.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  =======================================================================
-    WALA CAst core tests build file
-  =======================================================================
--->
-<project name="com.ibm.wala.cast.test" default="jar" basedir=".">
-    <!-- Software version details -->
-    <property name="name" value="walacasttest" />
-    <property name="module_name" value="com.ibm.wala.cast.test" />
-    <property name="Name" value="WALA CAst core tests" />
-    <property name="version" value="1-alpha" />
-
-    <!-- Compilation switches -->
-    <property name="debug" value="true" />
-    <property name="deprecation" value="false" />
-    <property name="optimize" value="true" />
-    <property name="javacFailOnError" value="true" />
-    <property name="javacDebugInfo" value="on" />
-    <property name="javacVerbose" value="false" />
-
-
-    <!-- Set global properties for this build -->
-    <property name="src" value="harness-src" />
-    <property name="build" value="build" />
-    <property name="build.result" value="${basedir}" />
-    <property name="build.tests" value="${basedir}" />
-    <property name="build.javadocs" value="${build}/javadocs" />
-    <property name="publish.javadocs" value="javadocs/com.ibm.wala.cast.test" />
-    <property name="dist" value="dist" />
-    <property name="etc" value="etc" />
-    <property name="docs" value="docs" />
-    <property name="lib" value="lib" />
-    <property name="mainlib" value="../mainlib" />
-    <property name="sharedlib" value="../sharedlib" />
-
-    <property name="templates" value="../com.ibm.safe/templates"/>
-    <property name="specifications" value="../com.ibm.safe/specifications"/>
-
-    <property name="cvsroot" value="/gsa/watgsa/home/d/o/dolby/cvs/JTD"/>
-
-    <property name="excluded-tests-file" value="excluded-tests.txt" />
-
-    <import file="${sharedlib}/scripts/common-tests-targets.xml"/>        
-
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/.classpath wala-1.5.1/com.ibm.wala.cast.test/.classpath
--- wala-1.3.9/com.ibm.wala.cast.test/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="harness-src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/harness-src/c/Makefile wala-1.5.1/com.ibm.wala.cast.test/harness-src/c/Makefile
--- wala-1.3.9/com.ibm.wala.cast.test/harness-src/c/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/harness-src/c/Makefile	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,34 @@
+
+include Makefile.configuration
+
+include ../../../com.ibm.wala.cast/source/c/Makefile.configuration
+
+include ../../../com.ibm.wala.cast/source/c/Makefile.definitions
+
+TEST_JNI_BRIDGE_HEADER = $(C_GENERATED)com_ibm_wala_cast_test_TestNativeTranslator.h
+
+CAST_OBJS = $(wildcard $(C_GENERATED)/*.o)
+
+#
+# rules
+#
+
+default:	$(CAST_TEST_BIN)$(LIBPREFIX)xlator_test.$(DLLEXT)
+
+$(TEST_JNI_BRIDGE_HEADER):	$(CAST_TEST_BIN)com/ibm/wala/cast/test/TestNativeTranslator.class
+	$(JAVA_HOME)/bin/javah -classpath "$(CAST_TEST_BIN)$(JAVAH_CLASS_PATH)" -d "$(JAVAH_GENERATED)" com.ibm.wala.cast.test.TestNativeTranslator
+
+$(C_GENERATED)/smoke.o:	$(TEST_JNI_BRIDGE_HEADER) smoke.cpp
+	$(CC) $(ALL_FLAGS) -o $@ -c smoke.cpp
+
+$(C_GENERATED)/smoke_main.o:	$(TEST_JNI_BRIDGE_HEADER) smoke_main.cpp
+	$(CC) $(ALL_FLAGS) -o $@ -c smoke_main.cpp
+
+$(CAST_TEST_BIN)$(LIBPREFIX)xlator_test.$(DLLEXT):	$(C_GENERATED)/smoke.o
+	$(CC) $(CC_LDFLAGS) -Wl,-rpath -Wl,$(DOMO_AST_BIN) $(CAST_OBJS) -o $@
+
+main:	$(C_GENERATED)/smoke_main
+
+$(C_GENERATED)/smoke_main:	$(TEST_JNI_BRIDGE_HEADER) $(DOMO_AST_BIN)/$(LIBPREFIX)cast/launch.o $(C_GENERATED)/smoke_main.o
+	$(CC) $(ALL_FLAGS) $(DOMO_AST_BIN)/$(LIBPREFIX)cast/launch.o $(C_GENERATED)/smoke_main.o $(CC_LD_PATHS) -o $@ 
+
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/harness-src/c/Makefile.configuration wala-1.5.1/com.ibm.wala.cast.test/harness-src/c/Makefile.configuration
--- wala-1.3.9/com.ibm.wala.cast.test/harness-src/c/Makefile.configuration	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/harness-src/c/Makefile.configuration	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,7 @@
+# -*- makefile -*-
+
+SCRIPT_NAME := $(realpath $(lastword $(MAKEFILE_LIST)))
+C_DIR := $(dir $(SCRIPTINAME))
+CAST_TEST_DIR := $(realpath $(C_DIR)../..)/
+CAST_TEST_BIN := $(CAST_TEST_DIR)target/classes/
+
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/harness-src/c/smoke.cpp wala-1.5.1/com.ibm.wala.cast.test/harness-src/c/smoke.cpp
--- wala-1.3.9/com.ibm.wala.cast.test/harness-src/c/smoke.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/harness-src/c/smoke.cpp	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,20 @@
+#include "CAstWrapper.h"
+#include "com_ibm_wala_cast_test_TestNativeTranslator.h"
+
+JNIEXPORT jobject JNICALL Java_com_ibm_wala_cast_test_TestNativeTranslator_inventAst
+  (JNIEnv *java_env, jclass cls, jobject ast)
+{
+  TRY(exp, java_env)
+
+  CAstWrapper CAst(java_env, exp, ast);
+  THROW_ANY_EXCEPTION(exp);
+
+  return
+    CAst.makeNode(CAst.BINARY_EXPR,
+      CAst.OP_ADD,
+      CAst.makeConstant(1),
+      CAst.makeConstant(2));
+  
+  CATCH()
+  return NULL;
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/harness-src/c/smoke_main.cpp wala-1.5.1/com.ibm.wala.cast.test/harness-src/c/smoke_main.cpp
--- wala-1.3.9/com.ibm.wala.cast.test/harness-src/c/smoke_main.cpp	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/harness-src/c/smoke_main.cpp	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,72 @@
+#include "launch.h"
+#include <stdlib.h>
+#include <string.h>
+
+void die(JNIEnv *java_env) {
+  jclass Object =
+    java_env->FindClass("java/lang/Object");
+  
+  jclass NativeTranslatorTest =
+    java_env->FindClass("com/ibm/wala/cast/test/TestNativeTranslator");
+
+  jmethodID testInit =
+    java_env->GetMethodID(NativeTranslatorTest, "<init>", "()V");
+  
+  jmethodID toString =
+    java_env->GetMethodID(Object, "toString", "()Ljava/lang/String;");
+  
+  jthrowable real_ex = java_env->ExceptionOccurred();
+  
+  jstring msg = (jstring) java_env->CallObjectMethod(real_ex, toString);
+  
+  jboolean f = true;
+  const char *text = java_env->GetStringUTFChars(msg, &f);
+  
+  printf("exception: %s\n", text);
+  
+  java_env->ReleaseStringUTFChars(msg, text);
+  
+  exit(-1);
+}
+
+int main(int argc, char **argv) {
+  char *buf = (char *)malloc((strlen(argv[1]) + 100) * sizeof(char));
+  strcpy(buf, argv[1]);
+
+  printf("1: %s\n", buf);
+  
+  JNIEnv *java_env = launch_jvm(buf);
+  
+  printf("2: %s, %p\n", buf, java_env);
+  
+  jclass NativeTranslatorTest =
+    java_env->FindClass("com/ibm/wala/cast/test/TestNativeTranslator");
+  if (java_env->ExceptionCheck()) { die(java_env); }
+
+  printf("3: %s\n", buf);
+  
+  jmethodID testInit =
+    java_env->GetMethodID(NativeTranslatorTest, "<init>", "()V");
+  if (java_env->ExceptionCheck()) { die(java_env); }
+
+  printf("4: %s\n", buf);
+  
+  jobject test =
+    java_env->NewObject(NativeTranslatorTest, testInit);
+  if (java_env->ExceptionCheck()) { die(java_env); }
+
+  printf("5: %s\n", buf);
+  
+  jmethodID testAst =
+    java_env->GetMethodID(NativeTranslatorTest, "testNativeCAst", "()V");
+  if (java_env->ExceptionCheck()) { die(java_env); }
+  
+  printf("6: %s\n", buf);
+  
+  java_env->CallVoidMethod(test, testAst);
+  if (java_env->ExceptionCheck()) { die(java_env); }
+
+  printf("6: %s\n", buf);
+
+  exit(0);
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCallGraphShape.java wala-1.5.1/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCallGraphShape.java
--- wala-1.3.9/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCallGraphShape.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCallGraphShape.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,215 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-package com.ibm.wala.cast.test;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import junit.framework.Assert;
-
-import com.ibm.wala.cast.loader.AstMethod;
-import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
-import com.ibm.wala.classLoader.CallSiteReference;
-import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.CGNode;
-import com.ibm.wala.ipa.callgraph.CallGraph;
-import com.ibm.wala.ssa.IR;
-import com.ibm.wala.ssa.SSACFG;
-import com.ibm.wala.ssa.SSAInstruction;
-import com.ibm.wala.util.collections.NonNullSingletonIterator;
-
-public abstract class TestCallGraphShape extends WalaTestCase {
-
-  protected void verifyCFGAssertions(CallGraph CG, Object[][] assertionData) {
-    for(Object[] dat : assertionData) {
-      String function = (String) dat[0];
-      for(CGNode N : getNodes(CG, function)) {
-        int[][] edges = (int[][]) dat[1];
-        SSACFG cfg = N.getIR().getControlFlowGraph();
-        for (int i = 0; i < edges.length; i++) {
-          SSACFG.BasicBlock bb = cfg.getNode(i);
-          Assert.assertEquals("basic block " + i, edges[i].length, cfg.getSuccNodeCount(bb));
-          for (int j = 0; j < edges[i].length; j++) {
-            Assert.assertTrue(cfg.hasEdge(bb, cfg.getNode(edges[i][j])));
-          }
-        }
-      }
-    }
-  }
-  
-  protected void verifySourceAssertions(CallGraph CG, Object[][] assertionData) {
-    for(Object[] dat : assertionData) {
-      String function = (String) dat[0];
-      for(CGNode N : getNodes(CG, function)) {
-        if (N.getMethod() instanceof AstMethod) {
-          AstMethod M = (AstMethod) N.getMethod();
-          SSAInstruction[] insts = N.getIR().getInstructions();
-          insts: for(int i = 0; i < insts.length; i++) {
-            SSAInstruction inst = insts[i];
-            if (inst != null) {
-              Position pos = M.getSourcePosition(i);
-              if (pos != null) {
-                String fileName = pos.getURL().toString();
-                if (fileName.lastIndexOf('/') >= 0) {
-                  fileName = fileName.substring(fileName.lastIndexOf('/')+1);
-                }
-                for(int j = 0; j < assertionData.length; j++) {
-                  String file = (String) assertionData[j][1];
-                  if (file.indexOf('/') >= 0) {
-                    file = file.substring(file.lastIndexOf('/') + 1);
-                  }
-                  if (file.equalsIgnoreCase(fileName)) {
-                    if (pos.getFirstLine() >= (Integer) assertionData[j][2]
-                                           &&
-                        (pos.getLastLine() != -1? pos.getLastLine(): pos.getFirstLine()) <= (Integer) assertionData[j][3]) {
-                      System.err.println("found " + inst + " of " + M + " at expected position " + pos);
-                      continue insts;
-                    }
-                  }
-                }
-
-                Assert.assertTrue("unexpected location " + pos + " for " + inst + " of " + M + "\n" + N.getIR(), false);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  protected static class Name {
-    String name;
-
-    int instructionIndex;
-
-    int vn;
-
-    public Name(int vn, int instructionIndex, String name) {
-      this.vn = vn;
-      this.name = name;
-      this.instructionIndex = instructionIndex;
-    }
-  }
-
-  protected void verifyNameAssertions(CallGraph CG, Object[][] assertionData) {
-    for (int i = 0; i < assertionData.length; i++) {
-      Iterator NS = getNodes(CG, (String) assertionData[i][0]).iterator();
-      while (NS.hasNext()) {
-        CGNode N = (CGNode) NS.next();
-        IR ir = N.getIR();
-        Name[] names = (Name[]) assertionData[i][1];
-        for (int j = 0; j < names.length; j++) {
-
-          System.err.println("looking for " + names[j].name + ", " + names[j].vn + " in " + N);
-
-          String[] localNames = ir.getLocalNames(names[j].instructionIndex, names[j].vn);
-
-          boolean found = false;
-          for (int k = 0; k < localNames.length; k++) {
-            if (localNames[k].equals(names[j].name)) {
-              found = true;
-            }
-          }
-
-          Assert.assertTrue("no name " + names[j].name + " for " + N + "\n" + ir, found);
-        }
-      }
-    }
-  }
-
-  protected void verifyGraphAssertions(CallGraph CG, Object[][] assertionData) {
-    // System.err.println(CG);
-
-    if (assertionData == null) {
-      return;
-    }
-    
-    for (int i = 0; i < assertionData.length; i++) {
-
-      check_target: for (int j = 0; j < ((String[]) assertionData[i][1]).length; j++) {
-        Iterator srcs = (assertionData[i][0] instanceof String) ? getNodes(CG, (String) assertionData[i][0]).iterator()
-            : new NonNullSingletonIterator<CGNode>(CG.getFakeRootNode());
-
-        Assert.assertTrue("cannot find " + assertionData[i][0], srcs.hasNext());
-
-        boolean checkAbsence = false;
-        String targetName = ((String[]) assertionData[i][1])[j];
-        if (targetName.startsWith("!")) {
-          checkAbsence = true;
-          targetName = targetName.substring(1);
-        }
-
-        while (srcs.hasNext()) {
-          CGNode src = (CGNode) srcs.next();
-          for (Iterator sites = src.iterateCallSites(); sites.hasNext();) {
-            CallSiteReference sr = (CallSiteReference) sites.next();
-           
-            Iterator dsts = getNodes(CG, targetName).iterator();
-            if (! checkAbsence) {
-              Assert.assertTrue("cannot find " + targetName, dsts.hasNext());
-            }
-            
-            while (dsts.hasNext()) {
-              CGNode dst = (CGNode) dsts.next();
-              for (Iterator tos = CG.getPossibleTargets(src, sr).iterator(); tos.hasNext();) {
-                if (tos.next().equals(dst)) {
-                  if (checkAbsence) {
-                    System.err.println(("found unexpected " + src + " --> " + dst + " at " + sr));
-                    Assert.assertTrue("found edge " + assertionData[i][0] + " ---> " + targetName, false);
-                  } else {
-                    System.err.println(("found expected " + src + " --> " + dst + " at " + sr));
-                    continue check_target;
-                  }
-                }
-              }
-            }
-          }
-        }
-
-        System.err.println("cannot find edge " + assertionData[i][0] + " ---> " + targetName);
-        Assert.assertTrue("cannot find edge " + assertionData[i][0] + " ---> " + targetName, checkAbsence);
-      }
-    }
-  }
-
-
-  /**
-   * Verifies that none of the nodes that match the source description has an edge to any of the nodes that match the destination
-   * description. (Used for checking for false connections in the callgraph)
-   * 
-   * @param CG
-   * @param sourceDescription
-   * @param destDescription
-   */
-  protected void verifyNoEdges(CallGraph CG, String sourceDescription, String destDescription) {
-    Collection sources = getNodes(CG, sourceDescription);
-    Collection dests = getNodes(CG, destDescription);
-    for (Object source : sources) {
-      for (Object dest : dests) {
-        for (Iterator<CGNode> i = CG.getSuccNodes((CGNode) source); i.hasNext();) {
-          if (i.next().equals(dest)) {
-            Assert.fail("Found a link from " + source + " to " + dest);
-          }
-        }
-      }
-    }
-  }
-  
-  protected static final Object ROOT = new Object() {
-    @Override
-    public String toString() {
-      return "CallGraphRoot";
-    }
-  };
-
-  protected abstract Collection<CGNode> getNodes(CallGraph CG, String functionIdentifier);
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstPattern.java wala-1.5.1/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstPattern.java
--- wala-1.3.9/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstPattern.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstPattern.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,389 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-package com.ibm.wala.cast.test;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-import com.ibm.wala.cast.tree.CAstNode;
-import com.ibm.wala.cast.tree.impl.CAstImpl;
-import com.ibm.wala.cast.util.CAstPattern;
-import com.ibm.wala.cast.util.CAstPattern.Segments;
-import com.ibm.wala.cast.util.CAstPrinter;
-import com.ibm.wala.core.tests.util.WalaTestCase;
-
-public class TestCAstPattern extends WalaTestCase {
-
-  private static final int NAME_ASSERTION_SINGLE = 501;
-
-  private static final int NAME_ASSERTION_MULTI = 502;
-
-  private static class TestingCAstImpl extends CAstImpl {
-    private final Map testNameMap = new HashMap();
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public CAstNode makeNode(int kind, CAstNode children[]) {
-      if (kind == NAME_ASSERTION_SINGLE || kind == NAME_ASSERTION_MULTI) {
-        assert children.length == 2;
-        assert children[0].getValue() instanceof String;
-        @SuppressWarnings("unused")
-        CAstNode result = children[1];
-        if (kind == NAME_ASSERTION_SINGLE) {
-          testNameMap.put(children[0].getValue(), children[1]);
-        } else {
-          if (!testNameMap.containsKey(children[0].getValue())) {
-            testNameMap.put(children[0].getValue(), new ArrayList());
-          }
-
-          ((List) testNameMap.get(children[0].getValue())).add(children[1]);
-        }
-        return children[1];
-      } else {
-        return super.makeNode(kind, children);
-      }
-    }
-
-  }
-
-  private void test(CAstPattern p, CAstNode n, Map names) {
-    System.err.println(("testing pattern " + p));
-    System.err.println(("testing with input " + CAstPrinter.print(n)));
-
-    if (names == null) {
-      Assert.assertFalse(p.match(n, null));
-    } else {
-      Segments s = CAstPattern.match(p, n);
-      Assert.assertTrue(s != null);
-      for (Iterator ns = names.keySet().iterator(); ns.hasNext();) {
-        String nm = (String) ns.next();
-        Object o = names.get(nm);
-        if (o instanceof CAstNode) {
-          System.err.println(("found " + CAstPrinter.print(s.getSingle(nm)) + " for " + nm));
-          Assert.assertTrue("for name " + nm + ": expected " + names.get(nm) + " but got " + s.getSingle(nm), names.get(nm).equals(
-              s.getSingle(nm)));
-        } else {
-          for (Iterator cs = s.getMultiple(nm).iterator(); cs.hasNext();) {
-            System.err.println(("found " + CAstPrinter.print((CAstNode) cs.next()) + " for " + nm));
-          }
-          Assert.assertTrue("for name " + nm + ": expected " + names.get(nm) + " but got " + s.getMultiple(nm), names.get(nm)
-              .equals(s.getMultiple(nm)));
-        }
-      }
-    }
-  }
-
-  private final CAstPattern simpleNamePattern = CAstPattern.parse("<top>BINARY_EXPR(\"+\",<left>\"prefix\",\"suffix\")");
-
-  private final CAstNode simpleNameAst;
-
-  private final Map simpleNameMap;
-
-  {
-    TestingCAstImpl Ast = new TestingCAstImpl();
-
-    simpleNameAst = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
-        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("left"), Ast.makeConstant("prefix")), Ast
-        .makeConstant("suffix")));
-
-    simpleNameMap = Ast.testNameMap;
-  }
-
-  @Test public void testSimpleName() {
-    test(simpleNamePattern, simpleNameAst, simpleNameMap);
-  }
-
-  private final CAstPattern simpleStarNamePattern = CAstPattern.parse("<top>BINARY_EXPR(\"+\",*,<right>\"suffix\")");
-
-  private final CAstNode simpleStarNameAst;
-
-  private final Map simpleStarNameMap;
-
-  {
-    TestingCAstImpl Ast = new TestingCAstImpl();
-
-    simpleStarNameAst = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
-        .makeConstant("+"), Ast.makeConstant("prefix"), Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("right"), Ast
-        .makeConstant("suffix"))));
-
-    simpleStarNameMap = Ast.testNameMap;
-  }
-
-  @Test public void testSimpleStarName() {
-    test(simpleStarNamePattern, simpleStarNameAst, simpleStarNameMap);
-  }
-
-  private final CAstPattern simpleRepeatedPattern = CAstPattern.parse("<top>BINARY_EXPR(\"+\",<children>@(VAR(*))@)");
-
-  private final CAstNode simpleRepeatedAstOne;
-
-  private final Map simpleRepeatedMapOne;
-
-  {
-    TestingCAstImpl Ast = new TestingCAstImpl();
-
-    simpleRepeatedAstOne = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
-        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
-        .makeConstant("suffix")))));
-
-    simpleRepeatedMapOne = Ast.testNameMap;
-  }
-
-  @Test public void testSimpleRepeatedOne() {
-    test(simpleRepeatedPattern, simpleRepeatedAstOne, simpleRepeatedMapOne);
-  }
-
-  private final CAstNode simpleRepeatedAstTwo;
-
-  private final Map simpleRepeatedMapTwo;
-
-  {
-    TestingCAstImpl Ast = new TestingCAstImpl();
-
-    simpleRepeatedAstTwo = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
-        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
-        .makeConstant("prefix"))), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
-        .makeConstant("suffix")))));
-
-    simpleRepeatedMapTwo = Ast.testNameMap;
-  }
-
-  @Test public void testSimpleRepeatedTwo() {
-    test(simpleRepeatedPattern, simpleRepeatedAstTwo, simpleRepeatedMapTwo);
-  }
-
-  private final CAstNode simpleRepeatedAstThree;
-
-  private final Map simpleRepeatedMapThree;
-
-  {
-    TestingCAstImpl Ast = new TestingCAstImpl();
-
-    simpleRepeatedAstThree = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
-        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
-        .makeConstant("prefix"))), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
-        .makeConstant("middle"))), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
-        .makeConstant("suffix")))));
-
-    simpleRepeatedMapThree = Ast.testNameMap;
-  }
-
-  @Test public void testSimpleRepeatedThree() {
-    test(simpleRepeatedPattern, simpleRepeatedAstThree, simpleRepeatedMapThree);
-  }
-
-  private final CAstPattern simpleDoubleStarPattern = CAstPattern.parse("<top>BINARY_EXPR(\"+\",<children>**)");
-
-  private final CAstNode simpleDoubleStarAst;
-
-  private final Map simpleDoubleStarMap;
-
-  {
-    TestingCAstImpl Ast = new TestingCAstImpl();
-
-    simpleDoubleStarAst = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
-        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
-        .makeConstant("prefix"))), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
-        .makeConstant("suffix")))));
-
-    simpleDoubleStarMap = Ast.testNameMap;
-  }
-
-  @Test public void testSimpleDoubleStar() {
-    test(simpleDoubleStarPattern, simpleDoubleStarAst, simpleDoubleStarMap);
-  }
-
-  private final CAstPattern simpleAlternativePattern = CAstPattern
-      .parse("<top>BINARY_EXPR(\"+\",<firstchild>|(VAR(\"suffix\")||VAR(\"prefix\"))|,*)");
-
-  private final CAstNode simpleAlternativeAst;
-
-  private final Map simpleAlternativeMap;
-
-  {
-    TestingCAstImpl Ast = new TestingCAstImpl();
-
-    simpleAlternativeAst = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
-        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("firstchild"), Ast.makeNode(CAstNode.VAR, Ast
-        .makeConstant("prefix"))), Ast.makeNode(CAstNode.VAR, Ast.makeConstant("suffix"))));
-
-    simpleAlternativeMap = Ast.testNameMap;
-  }
-
-  @Test public void testSimpleAlternative() {
-    test(simpleAlternativePattern, simpleAlternativeAst, simpleAlternativeMap);
-  }
-
-  private final CAstPattern simpleOptionalPattern = CAstPattern
-      .parse("<top>BINARY_EXPR(\"+\",?(VAR(\"prefix\"))?,<child>VAR(\"suffix\"))");
-
-  private final CAstNode simpleOptionalAstWith;
-
-  private final Map simpleOptionalMapWith;
-
-  {
-    TestingCAstImpl Ast = new TestingCAstImpl();
-
-    simpleOptionalAstWith = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
-        .makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeConstant("prefix")), Ast.makeNode(NAME_ASSERTION_SINGLE, Ast
-        .makeConstant("child"), Ast.makeNode(CAstNode.VAR, Ast.makeConstant("suffix")))));
-
-    simpleOptionalMapWith = Ast.testNameMap;
-  }
-
-  @Test public void testSimpleOptionalWith() {
-    test(simpleOptionalPattern, simpleOptionalAstWith, simpleOptionalMapWith);
-  }
-
-  private final CAstNode simpleOptionalAstNot;
-
-  private final Map simpleOptionalMapNot;
-
-  {
-    TestingCAstImpl Ast = new TestingCAstImpl();
-
-    simpleOptionalAstNot = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
-        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("child"), Ast.makeNode(CAstNode.VAR, Ast
-        .makeConstant("suffix")))));
-
-    simpleOptionalMapNot = Ast.testNameMap;
-  }
-
-  @Test public void testSimpleOptionalNot() {
-    test(simpleOptionalPattern, simpleOptionalAstNot, simpleOptionalMapNot);
-  }
-
-  private final String recursiveTreeStr = "|({leaf}|(<const>CONSTANT()||VAR(<vars>*))|||{node}BINARY_EXPR(\"+\",`leaf`,|(`leaf`||`node`)|))|";
-
-  private final CAstPattern recursiveTreePattern = CAstPattern.parse(recursiveTreeStr);
-
-  private final CAstNode recursiveTreeOneAst;
-
-  private final Map recursiveTreeOneMap;
-
-  {
-    TestingCAstImpl Ast = new TestingCAstImpl();
-
-    recursiveTreeOneAst = Ast.makeNode(CAstNode.BINARY_EXPR, Ast.makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
-        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("x"))), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
-        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("y"))));
-
-    recursiveTreeOneMap = Ast.testNameMap;
-  }
-
-  @Test public void testRecursiveTreeOne() {
-    test(recursiveTreePattern, recursiveTreeOneAst, recursiveTreeOneMap);
-  }
-
-  private final CAstNode recursiveTreeTwoAst;
-
-  private final Map recursiveTreeTwoMap;
-
-  {
-    TestingCAstImpl Ast = new TestingCAstImpl();
-
-    recursiveTreeTwoAst = Ast.makeNode(CAstNode.BINARY_EXPR, Ast.makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
-        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("x"))), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
-        .makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast
-        .makeConstant("y"))), Ast.makeNode(CAstNode.VAR, Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast
-        .makeConstant("z")))));
-
-    recursiveTreeTwoMap = Ast.testNameMap;
-  }
-
-  @Test public void testRecursiveTreeTwo() {
-    test(recursiveTreePattern, recursiveTreeTwoAst, recursiveTreeTwoMap);
-  }
-
-  private final CAstNode recursiveTreeFiveAst;
-
-  private final Map recursiveTreeFiveMap;
-
-  {
-    TestingCAstImpl Ast = new TestingCAstImpl();
-
-    recursiveTreeFiveAst = Ast.makeNode(CAstNode.BINARY_EXPR, Ast.makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
-        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("u"))), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
-        .makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast
-        .makeConstant("v"))), Ast.makeNode(CAstNode.BINARY_EXPR, Ast.makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
-        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("w"))), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
-        .makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast
-        .makeConstant("x"))), Ast.makeNode(CAstNode.BINARY_EXPR, Ast.makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
-        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("y"))), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
-        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("z"))))))));
-
-    recursiveTreeFiveMap = Ast.testNameMap;
-  }
-
-  @Test public void testRecursiveTreeFive() {
-    test(recursiveTreePattern, recursiveTreeFiveAst, recursiveTreeFiveMap);
-  }
-
-  private final CAstPattern buggyRecursiveTreePattern = CAstPattern
-      .parse("|({leaf}|(<const>CONSTANT()||VAR(<vars>*))|||{node}BINARY_EXPR(\"+\",`leaf`,`node`))|");
-
-  @Test public void testBuggyRecursiveTreeOne() {
-    test(buggyRecursiveTreePattern, recursiveTreeOneAst, null);
-  }
-
-  @Test public void testBuggyRecursiveTreeTwo() {
-    test(buggyRecursiveTreePattern, recursiveTreeTwoAst, null);
-  }
-
-  @Test public void testBuggyRecursiveTreeFive() {
-    test(buggyRecursiveTreePattern, recursiveTreeFiveAst, null);
-  }
-
-  private static final String extraTestsStr = "BINARY_EXPR(|(\"==\"||\"\\==\")|,|(CONSTANT()||VAR(CONSTANT()))|,|(CONSTANT()||VAR(CONSTANT()))|)";
-
-  private final CAstPattern testedTreePattern = CAstPattern.parse("{top}|(" + recursiveTreeStr + "||BINARY_EXPR(\",\","
-      + extraTestsStr + ",`top`))|");
-
-  @Test public void testTestedTreeOne() {
-    test(testedTreePattern, recursiveTreeOneAst, recursiveTreeOneMap);
-  }
-
-  @Test public void testTestedTreeTwo() {
-    test(testedTreePattern, recursiveTreeTwoAst, recursiveTreeTwoMap);
-  }
-
-  @Test public void testTestedTreeFive() {
-    test(testedTreePattern, recursiveTreeFiveAst, recursiveTreeFiveMap);
-  }
-
-  private final CAstNode testedTreeOneAst;
-
-  private final Map testedTreeOneMap;
-
-  {
-    TestingCAstImpl Ast = new TestingCAstImpl();
-
-    testedTreeOneAst = Ast.makeNode(CAstNode.BINARY_EXPR, Ast.makeConstant(","), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
-        .makeConstant("=="), Ast.makeNode(CAstNode.VAR, Ast.makeConstant("x")), Ast.makeConstant(7)), Ast.makeNode(
-        CAstNode.BINARY_EXPR, Ast.makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(NAME_ASSERTION_MULTI, Ast
-            .makeConstant("vars"), Ast.makeConstant("x"))), Ast.makeNode(CAstNode.VAR, Ast.makeNode(NAME_ASSERTION_MULTI, Ast
-            .makeConstant("vars"), Ast.makeConstant("y")))));
-
-    testedTreeOneMap = Ast.testNameMap;
-  }
-
-  @Test public void testTestedTreeOneWithTest() {
-    test(testedTreePattern, testedTreeOneAst, testedTreeOneMap);
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstTranslator.java wala-1.5.1/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstTranslator.java
--- wala-1.3.9/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstTranslator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstTranslator.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package com.ibm.wala.cast.test;
-
-import java.io.File;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import junit.framework.Assert;
-
-import com.ibm.wala.cast.ipa.callgraph.CAstCallGraphUtil;
-import com.ibm.wala.cast.ir.ssa.AstIRFactory;
-import com.ibm.wala.cast.loader.SingleClassLoaderFactory;
-import com.ibm.wala.classLoader.IClass;
-import com.ibm.wala.classLoader.IField;
-import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.classLoader.Language;
-import com.ibm.wala.classLoader.SourceFileModule;
-import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.ipa.callgraph.impl.Everywhere;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
-import com.ibm.wala.ssa.IRFactory;
-import com.ibm.wala.ssa.SSAOptions;
-import com.ibm.wala.util.collections.HashMapFactory;
-import com.ibm.wala.util.collections.Pair;
-
-public abstract class TestCAstTranslator extends WalaTestCase {
-
-  protected static class TranslatorAssertions {
-    private final Set<String> classes = new HashSet<String>();
-
-    private final Map<String, String> supers = new HashMap<String, String>();
-
-    private final Set<Pair<String, String>> instanceFields = new HashSet<Pair<String, String>>();
-
-    private final Set<Pair<String, String>> staticFields = new HashSet<Pair<String, String>>();
-
-    private final Map<Pair<String, Object>, Object> instanceMethods = HashMapFactory.make();
-
-    private final Map<Pair<String, Object>, Object> staticMethods = HashMapFactory.make();
-
-    private Set<String> getClasses() {
-      return classes;
-    }
-
-    private Map<String, String> getSuperClasses() {
-      return supers;
-    }
-
-    private Set<Pair<String, String>> getInstanceFields() {
-      return instanceFields;
-    }
-
-    private Set<Pair<String, String>> getStaticFields() {
-      return staticFields;
-    }
-
-    private Map<Pair<String, Object>, Object> getInstanceMethods() {
-      return instanceMethods;
-    }
-
-    private Map<Pair<String, Object>, Object> getStaticMethods() {
-      return staticMethods;
-    }
-
-    public TranslatorAssertions(Object[][] data) {
-      for (int dataIndex = 0; dataIndex < data.length; dataIndex++) {
-        Object[] entry = data[dataIndex];
-        String clsName = (String) entry[0];
-        this.classes.add(clsName);
-
-        String superName = (String) entry[1];
-        this.supers.put(clsName, superName);
-
-        String[] instanceFields = (String[]) entry[2];
-        if (instanceFields != null) {
-          for (int i = 0; i < instanceFields.length; i++) {
-            this.instanceFields.add(Pair.make(clsName, instanceFields[i]));
-          }
-        }
-
-        String[] staticFields = (String[]) entry[3];
-        if (staticFields != null) {
-          for (int i = 0; i < staticFields.length; i++) {
-            this.staticFields.add(Pair.make(clsName, staticFields[i]));
-          }
-        }
-
-        Pair[] instanceMethods = (Pair[]) entry[4];
-        if (instanceMethods != null) {
-          for (int i = 0; i < instanceMethods.length; i++) {
-            this.instanceMethods.put(Pair.make(clsName, instanceMethods[i].fst), instanceMethods[i].snd);
-          }
-        }
-
-        Pair[] staticMethods = (Pair[]) entry[5];
-        if (staticMethods != null) {
-          for (int i = 0; i < staticMethods.length; i++) {
-            this.staticMethods.put(Pair.make(clsName, staticMethods[i].fst), staticMethods[i].snd);
-          }
-        }
-      }
-    }
-  }
-
-  protected abstract Language getLanguage();
-
-  protected abstract String getTestPath();
-
-  protected abstract SingleClassLoaderFactory getClassLoaderFactory();
-
-  protected final IRFactory<IMethod> factory = AstIRFactory.makeDefaultFactory();
-
-  protected final SSAOptions options = new SSAOptions();
-
-  public ClassHierarchy runTranslator(SourceFileModule[] fileNames) throws Exception {
-    SingleClassLoaderFactory loaders = getClassLoaderFactory();
-
-    AnalysisScope scope = CAstCallGraphUtil.makeScope(fileNames, loaders, getLanguage());
-
-    ClassHierarchy cha = ClassHierarchy.make(scope, loaders, getLanguage());
-
-    return cha;
-  }
-
-  protected void dump(ClassHierarchy cha) {
-    for (Iterator<?> clss = cha.iterator(); clss.hasNext();) {
-      IClass cls = (IClass) clss.next();
-      System.err.println(("class " + cls));
-      for (Iterator<?> flds = cls.getDeclaredInstanceFields().iterator(); flds.hasNext();) {
-        IField fld = (IField) flds.next();
-        System.err.println(("instance field " + fld));
-      }
-      for (Iterator<?> flds = cls.getDeclaredStaticFields().iterator(); flds.hasNext();) {
-        IField fld = (IField) flds.next();
-        System.err.println(("static field " + fld));
-      }
-      for (Iterator<?> mths = cls.getDeclaredMethods().iterator(); mths.hasNext();) {
-        IMethod mth = (IMethod) mths.next();
-        if (mth.isStatic())
-          System.err.print("static ");
-        System.err.println(("method " + mth + " with " + mth.getNumberOfParameters() + " parameters"));
-        for (int i = 0; i < mth.getNumberOfParameters(); i++) {
-          System.err.println(("param " + i + ": " + mth.getParameterType(i)));
-        }
-        System.err.println(factory.makeIR(mth, Everywhere.EVERYWHERE, options));
-      }
-    }
-  }
-
-  public void checkAssertions(ClassHierarchy cha, TranslatorAssertions assertions) {
-    Set<String> classes = assertions.getClasses();
-    Map<String, String> supers = assertions.getSuperClasses();
-    Set<Pair<String, String>> instanceFields = assertions.getInstanceFields();
-    Set<Pair<String, String>> staticFields = assertions.getStaticFields();
-    Map<Pair<String, Object>, Object> instanceMethods = assertions.getInstanceMethods();
-    Map<Pair<String, Object>, Object> staticMethods = assertions.getStaticMethods();
-
-    int clsCount = 0;
-    for (Iterator<?> clss = cha.iterator(); clss.hasNext();) {
-      IClass cls = (IClass) clss.next();
-      clsCount++;
-      Assert.assertTrue("found class " + cls.getName().toString(), classes.contains(cls.getName().toString()));
-
-      if (cls.getSuperclass() == null) {
-        Assert.assertTrue(cls.getName() + " has no superclass", supers.get(cls.getName()) == null);
-      } else {
-        Assert.assertTrue("super of " + cls.getName() + " is " + cls.getSuperclass().getName(), supers
-            .get(cls.getName().toString()).equals(cls.getSuperclass().getName().toString()));
-      }
-
-      for (Iterator<?> flds = cls.getDeclaredInstanceFields().iterator(); flds.hasNext();) {
-        IField fld = (IField) flds.next();
-        Assert.assertTrue(cls.getName() + " has field " + fld.getName(), instanceFields.contains(Pair.make(
-            cls.getName().toString(), fld.getName().toString())));
-      }
-
-      for (Iterator<?> flds = cls.getDeclaredStaticFields().iterator(); flds.hasNext();) {
-        IField fld = (IField) flds.next();
-        Assert.assertTrue(cls.getName() + " has static field " + fld.getName(), staticFields.contains(Pair.make(cls.getName()
-            .toString(), fld.getName().toString())));
-      }
-
-      for (Iterator<?> mths = cls.getDeclaredMethods().iterator(); mths.hasNext();) {
-        IMethod mth = (IMethod) mths.next();
-        Integer np = new Integer(mth.getNumberOfParameters());
-        Pair<String, String> key = Pair.make(cls.getName().toString(), mth.getName().toString());
-
-        if (mth.isStatic()) {
-          Assert.assertTrue(cls.getName() + " has static method " + mth.getName(), staticMethods.containsKey(key));
-          Assert.assertTrue(cls.getName() + "::" + mth.getName() + " has " + np + " parameters", staticMethods.get(key).equals(np));
-        } else {
-          Assert.assertTrue(cls.getName() + " has method " + mth.getName(), instanceMethods.containsKey(key));
-          Assert.assertTrue(cls.getName() + "::" + mth.getName() + " has " + np + " parameters", instanceMethods.get(key)
-              .equals(np));
-        }
-      }
-    }
-
-    Assert.assertTrue("want " + classes.size() + " classes", clsCount == classes.size());
-  }
-
-  protected void testInternal(String[] args, TranslatorAssertions assertions) throws Exception {
-    String testPath = getTestPath();
-    SourceFileModule[] fileNames = new SourceFileModule[args.length];
-    for (int i = 0; i < args.length; i++) {
-      if (new File(args[i]).exists()) {
-        fileNames[i] = CAstCallGraphUtil.makeSourceModule(new File(args[i]).toURI().toURL(), args[i]);
-      } else if (new File(testPath + args[i]).exists()) {
-        fileNames[i] = CAstCallGraphUtil.makeSourceModule(new File(testPath + args[i]).toURI().toURL(), args[i]);
-      } else {
-        URL url = getClass().getClassLoader().getResource(args[i]);
-        fileNames[i] = CAstCallGraphUtil.makeSourceModule(url, args[i]);
-      }
-      Assert.assertTrue(args[i], fileNames[i] != null);
-    }
-
-    ClassHierarchy cha = runTranslator(fileNames);
-    dump(cha);
-    if (assertions != null) {
-      checkAssertions(cha, assertions);
-    } else {
-      System.err.println(("WARNING: no assertions for " + getClass()));
-    }
-  }
-
-  protected void testInternal(String arg, TranslatorAssertions assertions) {
-    try {
-      testInternal(new String[] { arg }, assertions);
-    } catch (Exception e) {
-      e.printStackTrace();
-      Assert.assertTrue(e.toString(), false);
-    }
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestCallGraphShape.java wala-1.5.1/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestCallGraphShape.java
--- wala-1.3.9/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestCallGraphShape.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestCallGraphShape.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,211 @@
+/******************************************************************************
+ * Copyright (c) 2002 - 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *****************************************************************************/
+package com.ibm.wala.cast.test;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.junit.Assert;
+
+import com.ibm.wala.cast.loader.AstMethod;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
+import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.core.tests.util.WalaTestCase;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.SSACFG;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.util.collections.Iterator2Iterable;
+import com.ibm.wala.util.collections.NonNullSingletonIterator;
+
+public abstract class TestCallGraphShape extends WalaTestCase {
+
+  protected void verifyCFGAssertions(CallGraph CG, Object[][] assertionData) {
+    for(Object[] dat : assertionData) {
+      String function = (String) dat[0];
+      for(CGNode N : getNodes(CG, function)) {
+        int[][] edges = (int[][]) dat[1];
+        SSACFG cfg = N.getIR().getControlFlowGraph();
+        for (int i = 0; i < edges.length; i++) {
+          SSACFG.BasicBlock bb = cfg.getNode(i);
+          Assert.assertEquals("basic block " + i, edges[i].length, cfg.getSuccNodeCount(bb));
+          for (int j = 0; j < edges[i].length; j++) {
+            Assert.assertTrue(cfg.hasEdge(bb, cfg.getNode(edges[i][j])));
+          }
+        }
+      }
+    }
+  }
+  
+  protected void verifySourceAssertions(CallGraph CG, Object[][] assertionData) {
+    for(Object[] dat : assertionData) {
+      String function = (String) dat[0];
+      for(CGNode N : getNodes(CG, function)) {
+        if (N.getMethod() instanceof AstMethod) {
+          AstMethod M = (AstMethod) N.getMethod();
+          SSAInstruction[] insts = N.getIR().getInstructions();
+          insts: for(int i = 0; i < insts.length; i++) {
+            SSAInstruction inst = insts[i];
+            if (inst != null) {
+              Position pos = M.getSourcePosition(i);
+              if (pos != null) {
+                String fileName = pos.getURL().toString();
+                if (fileName.lastIndexOf('/') >= 0) {
+                  fileName = fileName.substring(fileName.lastIndexOf('/')+1);
+                }
+                for(int j = 0; j < assertionData.length; j++) {
+                  String file = (String) assertionData[j][1];
+                  if (file.indexOf('/') >= 0) {
+                    file = file.substring(file.lastIndexOf('/') + 1);
+                  }
+                  if (file.equalsIgnoreCase(fileName)) {
+                    if (pos.getFirstLine() >= (Integer) assertionData[j][2]
+                                           &&
+                        (pos.getLastLine() != -1? pos.getLastLine(): pos.getFirstLine()) <= (Integer) assertionData[j][3]) {
+                      System.err.println("found " + inst + " of " + M + " at expected position " + pos);
+                      continue insts;
+                    }
+                  }
+                }
+
+                Assert.assertTrue("unexpected location " + pos + " for " + inst + " of " + M + "\n" + N.getIR(), false);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  protected static class Name {
+    String name;
+
+    int instructionIndex;
+
+    int vn;
+
+    public Name(int vn, int instructionIndex, String name) {
+      this.vn = vn;
+      this.name = name;
+      this.instructionIndex = instructionIndex;
+    }
+  }
+
+  protected void verifyNameAssertions(CallGraph CG, Object[][] assertionData) {
+    for (Object[] element : assertionData) {
+      Iterator<CGNode> NS = getNodes(CG, (String) element[0]).iterator();
+      while (NS.hasNext()) {
+        CGNode N = NS.next();
+        IR ir = N.getIR();
+        Name[] names = (Name[]) element[1];
+        for (Name name : names) {
+
+          System.err.println("looking for " + name.name + ", " + name.vn + " in " + N);
+
+          String[] localNames = ir.getLocalNames(name.instructionIndex, name.vn);
+
+          boolean found = false;
+          for (String localName : localNames) {
+            if (localName.equals(name.name)) {
+              found = true;
+            }
+          }
+
+          Assert.assertTrue("no name " + name.name + " for " + N + "\n" + ir, found);
+        }
+      }
+    }
+  }
+
+  protected void verifyGraphAssertions(CallGraph CG, Object[][] assertionData) {
+    // System.err.println(CG);
+
+    if (assertionData == null) {
+      return;
+    }
+    
+    for (int i = 0; i < assertionData.length; i++) {
+
+      check_target: for (int j = 0; j < ((String[]) assertionData[i][1]).length; j++) {
+        Iterator<CGNode> srcs = (assertionData[i][0] instanceof String) ? getNodes(CG, (String) assertionData[i][0]).iterator()
+            : new NonNullSingletonIterator<>(CG.getFakeRootNode());
+
+        Assert.assertTrue("cannot find " + assertionData[i][0], srcs.hasNext());
+
+        boolean checkAbsence = false;
+        String targetName = ((String[]) assertionData[i][1])[j];
+        if (targetName.startsWith("!")) {
+          checkAbsence = true;
+          targetName = targetName.substring(1);
+        }
+
+        while (srcs.hasNext()) {
+          CGNode src = srcs.next();
+          for (CallSiteReference sr : Iterator2Iterable.make(src.iterateCallSites())) {
+           
+            Iterator<CGNode> dsts = getNodes(CG, targetName).iterator();
+            if (! checkAbsence) {
+              Assert.assertTrue("cannot find " + targetName, dsts.hasNext());
+            }
+            
+            while (dsts.hasNext()) {
+              CGNode dst = dsts.next();
+              for (CGNode cgNode : CG.getPossibleTargets(src, sr)) {
+                if (cgNode.equals(dst)) {
+                  if (checkAbsence) {
+                    System.err.println(("found unexpected " + src + " --> " + dst + " at " + sr));
+                    Assert.assertTrue("found edge " + assertionData[i][0] + " ---> " + targetName, false);
+                  } else {
+                    System.err.println(("found expected " + src + " --> " + dst + " at " + sr));
+                    continue check_target;
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        System.err.println("cannot find edge " + assertionData[i][0] + " ---> " + targetName);
+        Assert.assertTrue("cannot find edge " + assertionData[i][0] + " ---> " + targetName, checkAbsence);
+      }
+    }
+  }
+
+
+  /**
+   * Verifies that none of the nodes that match the source description has an edge to any of the nodes that match the destination
+   * description. (Used for checking for false connections in the callgraph)
+   */
+  protected void verifyNoEdges(CallGraph CG, String sourceDescription, String destDescription) {
+    Collection<CGNode> sources = getNodes(CG, sourceDescription);
+    Collection<CGNode> dests = getNodes(CG, destDescription);
+    for (Object source : sources) {
+      for (Object dest : dests) {
+        for (CGNode n : Iterator2Iterable.make(CG.getSuccNodes((CGNode) source))) {
+          if (n.equals(dest)) {
+            Assert.fail("Found a link from " + source + " to " + dest);
+          }
+        }
+      }
+    }
+  }
+  
+  protected static final Object ROOT = new Object() {
+    @Override
+    public String toString() {
+      return "CallGraphRoot";
+    }
+  };
+
+  protected abstract Collection<CGNode> getNodes(CallGraph CG, String functionIdentifier);
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestCAstPattern.java wala-1.5.1/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestCAstPattern.java
--- wala-1.3.9/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestCAstPattern.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestCAstPattern.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,389 @@
+/******************************************************************************
+ * Copyright (c) 2002 - 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *****************************************************************************/
+package com.ibm.wala.cast.test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.ibm.wala.cast.tree.CAstNode;
+import com.ibm.wala.cast.tree.impl.CAstImpl;
+import com.ibm.wala.cast.util.CAstPattern;
+import com.ibm.wala.cast.util.CAstPattern.Segments;
+import com.ibm.wala.cast.util.CAstPrinter;
+import com.ibm.wala.core.tests.util.WalaTestCase;
+
+public class TestCAstPattern extends WalaTestCase {
+
+  private static final int NAME_ASSERTION_SINGLE = 501;
+
+  private static final int NAME_ASSERTION_MULTI = 502;
+
+  private static class TestingCAstImpl extends CAstImpl {
+    private final Map<String, Object> testNameMap = new HashMap<>();
+
+    @Override
+    public CAstNode makeNode(int kind, CAstNode children[]) {
+      if (kind == NAME_ASSERTION_SINGLE || kind == NAME_ASSERTION_MULTI) {
+        assert children.length == 2;
+        final Object child0Value = children[0].getValue();
+        assert child0Value instanceof String;
+        final String name = (String) child0Value;
+        @SuppressWarnings("unused")
+        CAstNode result = children[1];
+        if (kind == NAME_ASSERTION_SINGLE) {
+          testNameMap.put(name, children[1]);
+        } else {
+          @SuppressWarnings("unchecked")
+          ArrayList<CAstNode> nodeList = (ArrayList<CAstNode>) testNameMap.get(name);
+          if (nodeList == null) {
+            nodeList = new ArrayList<>();
+            testNameMap.put(name, nodeList);
+          }
+          nodeList.add(children[1]);
+        }
+        return children[1];
+      } else {
+        return super.makeNode(kind, children);
+      }
+    }
+
+  }
+
+  private static void test(CAstPattern p, CAstNode n, Map<String, Object> names) {
+    System.err.println(("testing pattern " + p));
+    System.err.println(("testing with input " + CAstPrinter.print(n)));
+
+    if (names == null) {
+      Assert.assertFalse(p.match(n, null));
+    } else {
+      Segments s = CAstPattern.match(p, n);
+      Assert.assertTrue(s != null);
+      for (Map.Entry<String, Object> entry : names.entrySet()) {
+        Object o = entry.getValue();
+        final String nm = entry.getKey();
+        if (o instanceof CAstNode) {
+          System.err.println(("found " + CAstPrinter.print(s.getSingle(nm)) + " for " + nm));
+          Assert.assertTrue("for name " + nm + ": expected " + entry.getValue() + " but got " + s.getSingle(nm), entry.getValue().equals(
+              s.getSingle(nm)));
+        } else {
+          for (CAstNode node : s.getMultiple(nm)) {
+            System.err.println(("found " + CAstPrinter.print(node) + " for " + nm));
+          }
+          Assert.assertTrue("for name " + nm + ": expected " + entry.getValue() + " but got " + s.getMultiple(nm), entry.getValue()
+              .equals(s.getMultiple(nm)));
+        }
+      }
+    }
+  }
+
+  private final CAstPattern simpleNamePattern = CAstPattern.parse("<top>BINARY_EXPR(\"+\",<left>\"prefix\",\"suffix\")");
+
+  private final CAstNode simpleNameAst;
+
+  private final Map<String, Object> simpleNameMap;
+
+  {
+    TestingCAstImpl Ast = new TestingCAstImpl();
+
+    simpleNameAst = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
+        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("left"), Ast.makeConstant("prefix")), Ast
+        .makeConstant("suffix")));
+
+    simpleNameMap = Ast.testNameMap;
+  }
+
+  @Test public void testSimpleName() {
+    test(simpleNamePattern, simpleNameAst, simpleNameMap);
+  }
+
+  private final CAstPattern simpleStarNamePattern = CAstPattern.parse("<top>BINARY_EXPR(\"+\",*,<right>\"suffix\")");
+
+  private final CAstNode simpleStarNameAst;
+
+  private final Map<String, Object> simpleStarNameMap;
+
+  {
+    TestingCAstImpl Ast = new TestingCAstImpl();
+
+    simpleStarNameAst = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
+        .makeConstant("+"), Ast.makeConstant("prefix"), Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("right"), Ast
+        .makeConstant("suffix"))));
+
+    simpleStarNameMap = Ast.testNameMap;
+  }
+
+  @Test public void testSimpleStarName() {
+    test(simpleStarNamePattern, simpleStarNameAst, simpleStarNameMap);
+  }
+
+  private final CAstPattern simpleRepeatedPattern = CAstPattern.parse("<top>BINARY_EXPR(\"+\",<children>@(VAR(*))@)");
+
+  private final CAstNode simpleRepeatedAstOne;
+
+  private final Map<String, Object> simpleRepeatedMapOne;
+
+  {
+    TestingCAstImpl Ast = new TestingCAstImpl();
+
+    simpleRepeatedAstOne = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
+        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
+        .makeConstant("suffix")))));
+
+    simpleRepeatedMapOne = Ast.testNameMap;
+  }
+
+  @Test public void testSimpleRepeatedOne() {
+    test(simpleRepeatedPattern, simpleRepeatedAstOne, simpleRepeatedMapOne);
+  }
+
+  private final CAstNode simpleRepeatedAstTwo;
+
+  private final Map<String, Object> simpleRepeatedMapTwo;
+
+  {
+    TestingCAstImpl Ast = new TestingCAstImpl();
+
+    simpleRepeatedAstTwo = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
+        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
+        .makeConstant("prefix"))), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
+        .makeConstant("suffix")))));
+
+    simpleRepeatedMapTwo = Ast.testNameMap;
+  }
+
+  @Test public void testSimpleRepeatedTwo() {
+    test(simpleRepeatedPattern, simpleRepeatedAstTwo, simpleRepeatedMapTwo);
+  }
+
+  private final CAstNode simpleRepeatedAstThree;
+
+  private final Map<String, Object> simpleRepeatedMapThree;
+
+  {
+    TestingCAstImpl Ast = new TestingCAstImpl();
+
+    simpleRepeatedAstThree = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
+        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
+        .makeConstant("prefix"))), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
+        .makeConstant("middle"))), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
+        .makeConstant("suffix")))));
+
+    simpleRepeatedMapThree = Ast.testNameMap;
+  }
+
+  @Test public void testSimpleRepeatedThree() {
+    test(simpleRepeatedPattern, simpleRepeatedAstThree, simpleRepeatedMapThree);
+  }
+
+  private final CAstPattern simpleDoubleStarPattern = CAstPattern.parse("<top>BINARY_EXPR(\"+\",<children>**)");
+
+  private final CAstNode simpleDoubleStarAst;
+
+  private final Map<String, Object> simpleDoubleStarMap;
+
+  {
+    TestingCAstImpl Ast = new TestingCAstImpl();
+
+    simpleDoubleStarAst = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
+        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
+        .makeConstant("prefix"))), Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("children"), Ast.makeNode(CAstNode.VAR, Ast
+        .makeConstant("suffix")))));
+
+    simpleDoubleStarMap = Ast.testNameMap;
+  }
+
+  @Test public void testSimpleDoubleStar() {
+    test(simpleDoubleStarPattern, simpleDoubleStarAst, simpleDoubleStarMap);
+  }
+
+  private final CAstPattern simpleAlternativePattern = CAstPattern
+      .parse("<top>BINARY_EXPR(\"+\",<firstchild>|(VAR(\"suffix\")||VAR(\"prefix\"))|,*)");
+
+  private final CAstNode simpleAlternativeAst;
+
+  private final Map<String, Object> simpleAlternativeMap;
+
+  {
+    TestingCAstImpl Ast = new TestingCAstImpl();
+
+    simpleAlternativeAst = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
+        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("firstchild"), Ast.makeNode(CAstNode.VAR, Ast
+        .makeConstant("prefix"))), Ast.makeNode(CAstNode.VAR, Ast.makeConstant("suffix"))));
+
+    simpleAlternativeMap = Ast.testNameMap;
+  }
+
+  @Test public void testSimpleAlternative() {
+    test(simpleAlternativePattern, simpleAlternativeAst, simpleAlternativeMap);
+  }
+
+  private final CAstPattern simpleOptionalPattern = CAstPattern
+      .parse("<top>BINARY_EXPR(\"+\",?(VAR(\"prefix\"))?,<child>VAR(\"suffix\"))");
+
+  private final CAstNode simpleOptionalAstWith;
+
+  private final Map<String, Object> simpleOptionalMapWith;
+
+  {
+    TestingCAstImpl Ast = new TestingCAstImpl();
+
+    simpleOptionalAstWith = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
+        .makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeConstant("prefix")), Ast.makeNode(NAME_ASSERTION_SINGLE, Ast
+        .makeConstant("child"), Ast.makeNode(CAstNode.VAR, Ast.makeConstant("suffix")))));
+
+    simpleOptionalMapWith = Ast.testNameMap;
+  }
+
+  @Test public void testSimpleOptionalWith() {
+    test(simpleOptionalPattern, simpleOptionalAstWith, simpleOptionalMapWith);
+  }
+
+  private final CAstNode simpleOptionalAstNot;
+
+  private final Map<String, Object> simpleOptionalMapNot;
+
+  {
+    TestingCAstImpl Ast = new TestingCAstImpl();
+
+    simpleOptionalAstNot = Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("top"), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
+        .makeConstant("+"), Ast.makeNode(NAME_ASSERTION_SINGLE, Ast.makeConstant("child"), Ast.makeNode(CAstNode.VAR, Ast
+        .makeConstant("suffix")))));
+
+    simpleOptionalMapNot = Ast.testNameMap;
+  }
+
+  @Test public void testSimpleOptionalNot() {
+    test(simpleOptionalPattern, simpleOptionalAstNot, simpleOptionalMapNot);
+  }
+
+  private final String recursiveTreeStr = "|({leaf}|(<const>CONSTANT()||VAR(<vars>*))|||{node}BINARY_EXPR(\"+\",`leaf`,|(`leaf`||`node`)|))|";
+
+  private final CAstPattern recursiveTreePattern = CAstPattern.parse(recursiveTreeStr);
+
+  private final CAstNode recursiveTreeOneAst;
+
+  private final Map<String, Object> recursiveTreeOneMap;
+
+  {
+    TestingCAstImpl Ast = new TestingCAstImpl();
+
+    recursiveTreeOneAst = Ast.makeNode(CAstNode.BINARY_EXPR, Ast.makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
+        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("x"))), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
+        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("y"))));
+
+    recursiveTreeOneMap = Ast.testNameMap;
+  }
+
+  @Test public void testRecursiveTreeOne() {
+    test(recursiveTreePattern, recursiveTreeOneAst, recursiveTreeOneMap);
+  }
+
+  private final CAstNode recursiveTreeTwoAst;
+
+  private final Map<String, Object> recursiveTreeTwoMap;
+
+  {
+    TestingCAstImpl Ast = new TestingCAstImpl();
+
+    recursiveTreeTwoAst = Ast.makeNode(CAstNode.BINARY_EXPR, Ast.makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
+        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("x"))), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
+        .makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast
+        .makeConstant("y"))), Ast.makeNode(CAstNode.VAR, Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast
+        .makeConstant("z")))));
+
+    recursiveTreeTwoMap = Ast.testNameMap;
+  }
+
+  @Test public void testRecursiveTreeTwo() {
+    test(recursiveTreePattern, recursiveTreeTwoAst, recursiveTreeTwoMap);
+  }
+
+  private final CAstNode recursiveTreeFiveAst;
+
+  private final Map<String, Object> recursiveTreeFiveMap;
+
+  {
+    TestingCAstImpl Ast = new TestingCAstImpl();
+
+    recursiveTreeFiveAst = Ast.makeNode(CAstNode.BINARY_EXPR, Ast.makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
+        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("u"))), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
+        .makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast
+        .makeConstant("v"))), Ast.makeNode(CAstNode.BINARY_EXPR, Ast.makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
+        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("w"))), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
+        .makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast
+        .makeConstant("x"))), Ast.makeNode(CAstNode.BINARY_EXPR, Ast.makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
+        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("y"))), Ast.makeNode(CAstNode.VAR, Ast.makeNode(
+        NAME_ASSERTION_MULTI, Ast.makeConstant("vars"), Ast.makeConstant("z"))))))));
+
+    recursiveTreeFiveMap = Ast.testNameMap;
+  }
+
+  @Test public void testRecursiveTreeFive() {
+    test(recursiveTreePattern, recursiveTreeFiveAst, recursiveTreeFiveMap);
+  }
+
+  private final CAstPattern buggyRecursiveTreePattern = CAstPattern
+      .parse("|({leaf}|(<const>CONSTANT()||VAR(<vars>*))|||{node}BINARY_EXPR(\"+\",`leaf`,`node`))|");
+
+  @Test public void testBuggyRecursiveTreeOne() {
+    test(buggyRecursiveTreePattern, recursiveTreeOneAst, null);
+  }
+
+  @Test public void testBuggyRecursiveTreeTwo() {
+    test(buggyRecursiveTreePattern, recursiveTreeTwoAst, null);
+  }
+
+  @Test public void testBuggyRecursiveTreeFive() {
+    test(buggyRecursiveTreePattern, recursiveTreeFiveAst, null);
+  }
+
+  private static final String extraTestsStr = "BINARY_EXPR(|(\"==\"||\"\\==\")|,|(CONSTANT()||VAR(CONSTANT()))|,|(CONSTANT()||VAR(CONSTANT()))|)";
+
+  private final CAstPattern testedTreePattern = CAstPattern.parse("{top}|(" + recursiveTreeStr + "||BINARY_EXPR(\",\","
+      + extraTestsStr + ",`top`))|");
+
+  @Test public void testTestedTreeOne() {
+    test(testedTreePattern, recursiveTreeOneAst, recursiveTreeOneMap);
+  }
+
+  @Test public void testTestedTreeTwo() {
+    test(testedTreePattern, recursiveTreeTwoAst, recursiveTreeTwoMap);
+  }
+
+  @Test public void testTestedTreeFive() {
+    test(testedTreePattern, recursiveTreeFiveAst, recursiveTreeFiveMap);
+  }
+
+  private final CAstNode testedTreeOneAst;
+
+  private final Map<String, Object> testedTreeOneMap;
+
+  {
+    TestingCAstImpl Ast = new TestingCAstImpl();
+
+    testedTreeOneAst = Ast.makeNode(CAstNode.BINARY_EXPR, Ast.makeConstant(","), Ast.makeNode(CAstNode.BINARY_EXPR, Ast
+        .makeConstant("=="), Ast.makeNode(CAstNode.VAR, Ast.makeConstant("x")), Ast.makeConstant(7)), Ast.makeNode(
+        CAstNode.BINARY_EXPR, Ast.makeConstant("+"), Ast.makeNode(CAstNode.VAR, Ast.makeNode(NAME_ASSERTION_MULTI, Ast
+            .makeConstant("vars"), Ast.makeConstant("x"))), Ast.makeNode(CAstNode.VAR, Ast.makeNode(NAME_ASSERTION_MULTI, Ast
+            .makeConstant("vars"), Ast.makeConstant("y")))));
+
+    testedTreeOneMap = Ast.testNameMap;
+  }
+
+  @Test public void testTestedTreeOneWithTest() {
+    test(testedTreePattern, testedTreeOneAst, testedTreeOneMap);
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestCAstTranslator.java wala-1.5.1/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestCAstTranslator.java
--- wala-1.3.9/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestCAstTranslator.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestCAstTranslator.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,247 @@
+/*******************************************************************************
+ * Copyright (c) 2013 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.cast.test;
+
+import java.io.File;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Assert;
+
+import com.ibm.wala.cast.ipa.callgraph.CAstCallGraphUtil;
+import com.ibm.wala.cast.ir.ssa.AstIRFactory;
+import com.ibm.wala.cast.loader.SingleClassLoaderFactory;
+import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.IField;
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.classLoader.Language;
+import com.ibm.wala.classLoader.SourceFileModule;
+import com.ibm.wala.core.tests.util.WalaTestCase;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.impl.Everywhere;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.ssa.IRFactory;
+import com.ibm.wala.ssa.SSAOptions;
+import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.Pair;
+
+public abstract class TestCAstTranslator extends WalaTestCase {
+
+  protected static class TranslatorAssertions {
+    private final Set<String> classes = new HashSet<>();
+
+    private final Map<String, String> supers = new HashMap<>();
+
+    private final Set<Pair<String, String>> instanceFields = new HashSet<>();
+
+    private final Set<Pair<String, String>> staticFields = new HashSet<>();
+
+    private final Map<Pair<String, Object>, Object> instanceMethods = HashMapFactory.make();
+
+    private final Map<Pair<String, Object>, Object> staticMethods = HashMapFactory.make();
+
+    private Set<String> getClasses() {
+      return classes;
+    }
+
+    private Map<String, String> getSuperClasses() {
+      return supers;
+    }
+
+    private Set<Pair<String, String>> getInstanceFields() {
+      return instanceFields;
+    }
+
+    private Set<Pair<String, String>> getStaticFields() {
+      return staticFields;
+    }
+
+    private Map<Pair<String, Object>, Object> getInstanceMethods() {
+      return instanceMethods;
+    }
+
+    private Map<Pair<String, Object>, Object> getStaticMethods() {
+      return staticMethods;
+    }
+
+    public TranslatorAssertions(Object[][] data) {
+      for (Object[] entry : data) {
+        String clsName = (String) entry[0];
+        this.classes.add(clsName);
+
+        String superName = (String) entry[1];
+        this.supers.put(clsName, superName);
+
+        String[] instanceFields = (String[]) entry[2];
+        if (instanceFields != null) {
+          for (String instanceField : instanceFields) {
+            this.instanceFields.add(Pair.make(clsName, instanceField));
+          }
+        }
+
+        String[] staticFields = (String[]) entry[3];
+        if (staticFields != null) {
+          for (String staticField : staticFields) {
+            this.staticFields.add(Pair.make(clsName, staticField));
+          }
+        }
+
+        Pair<?, ?>[] instanceMethods = (Pair[]) entry[4];
+        if (instanceMethods != null) {
+          for (Pair<?, ?> instanceMethod : instanceMethods) {
+            this.instanceMethods.put(Pair.make(clsName, (Object) instanceMethod.fst), instanceMethod.snd);
+          }
+        }
+
+        Pair<?, ?>[] staticMethods = (Pair[]) entry[5];
+        if (staticMethods != null) {
+          for (Pair<?, ?> staticMethod : staticMethods) {
+            this.staticMethods.put(Pair.make(clsName, (Object) staticMethod.fst), staticMethod.snd);
+          }
+        }
+      }
+    }
+  }
+
+  protected abstract Language getLanguage();
+
+  protected abstract String getTestPath();
+
+  protected abstract SingleClassLoaderFactory getClassLoaderFactory();
+
+  protected final IRFactory<IMethod> factory = AstIRFactory.makeDefaultFactory();
+
+  protected final SSAOptions options = new SSAOptions();
+
+  public ClassHierarchy runTranslator(SourceFileModule[] fileNames) throws Exception {
+    SingleClassLoaderFactory loaders = getClassLoaderFactory();
+
+    AnalysisScope scope = CAstCallGraphUtil.makeScope(fileNames, loaders, getLanguage());
+
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope, loaders, getLanguage());
+
+    return cha;
+  }
+
+  protected void dump(ClassHierarchy cha) {
+    for (Object name : cha) {
+      IClass cls = (IClass) name;
+      System.err.println(("class " + cls));
+      for (Object name2 : cls.getDeclaredInstanceFields()) {
+        IField fld = (IField) name2;
+        System.err.println(("instance field " + fld));
+      }
+      for (Object name2 : cls.getDeclaredStaticFields()) {
+        IField fld = (IField) name2;
+        System.err.println(("static field " + fld));
+      }
+      for (Object name2 : cls.getDeclaredMethods()) {
+        IMethod mth = (IMethod) name2;
+        if (mth.isStatic())
+          System.err.print("static ");
+        System.err.println(("method " + mth + " with " + mth.getNumberOfParameters() + " parameters"));
+        for (int i = 0; i < mth.getNumberOfParameters(); i++) {
+          System.err.println(("param " + i + ": " + mth.getParameterType(i)));
+        }
+        System.err.println(factory.makeIR(mth, Everywhere.EVERYWHERE, options));
+      }
+    }
+  }
+
+  public void checkAssertions(ClassHierarchy cha, TranslatorAssertions assertions) {
+    Set<String> classes = assertions.getClasses();
+    Map<String, String> supers = assertions.getSuperClasses();
+    Set<Pair<String, String>> instanceFields = assertions.getInstanceFields();
+    Set<Pair<String, String>> staticFields = assertions.getStaticFields();
+    Map<Pair<String, Object>, Object> instanceMethods = assertions.getInstanceMethods();
+    Map<Pair<String, Object>, Object> staticMethods = assertions.getStaticMethods();
+
+    int clsCount = 0;
+    for (Object name : cha) {
+      IClass cls = (IClass) name;
+      clsCount++;
+      Assert.assertTrue("found class " + cls.getName().toString(), classes.contains(cls.getName().toString()));
+
+      if (cls.getSuperclass() == null) {
+        Assert.assertTrue(cls.getName() + " has no superclass", supers.get(cls.getName().toString()) == null);
+      } else {
+        Assert.assertTrue("super of " + cls.getName() + " is " + cls.getSuperclass().getName(), supers
+            .get(cls.getName().toString()).equals(cls.getSuperclass().getName().toString()));
+      }
+
+      for (Object name2 : cls.getDeclaredInstanceFields()) {
+        IField fld = (IField) name2;
+        Assert.assertTrue(cls.getName() + " has field " + fld.getName(), instanceFields.contains(Pair.make(
+            cls.getName().toString(), fld.getName().toString())));
+      }
+
+      for (Object name2 : cls.getDeclaredStaticFields()) {
+        IField fld = (IField) name2;
+        Assert.assertTrue(cls.getName() + " has static field " + fld.getName(), staticFields.contains(Pair.make(cls.getName()
+            .toString(), fld.getName().toString())));
+      }
+
+      for (Object name2 : cls.getDeclaredMethods()) {
+        IMethod mth = (IMethod) name2;
+        Integer np = Integer.valueOf(mth.getNumberOfParameters());
+        Pair<String, String> key = Pair.make(cls.getName().toString(), mth.getName().toString());
+
+        if (mth.isStatic()) {
+          Assert.assertTrue(cls.getName() + " has static method " + mth.getName(), staticMethods.containsKey(key));
+          Assert.assertTrue(cls.getName() + "::" + mth.getName() + " has " + np + " parameters", staticMethods.get(key).equals(np));
+        } else {
+          Assert.assertTrue(cls.getName() + " has method " + mth.getName(), instanceMethods.containsKey(key));
+          Assert.assertTrue(cls.getName() + "::" + mth.getName() + " has " + np + " parameters", instanceMethods.get(key)
+              .equals(np));
+        }
+      }
+    }
+
+    Assert.assertTrue("want " + classes.size() + " classes", clsCount == classes.size());
+  }
+
+  protected void testInternal(String[] args, TranslatorAssertions assertions) throws Exception {
+    String testPath = getTestPath();
+    SourceFileModule[] fileNames = new SourceFileModule[args.length];
+    for (int i = 0; i < args.length; i++) {
+      if (new File(args[i]).exists()) {
+        fileNames[i] = CAstCallGraphUtil.makeSourceModule(new File(args[i]).toURI().toURL(), args[i]);
+      } else if (new File(testPath + args[i]).exists()) {
+        fileNames[i] = CAstCallGraphUtil.makeSourceModule(new File(testPath + args[i]).toURI().toURL(), args[i]);
+      } else {
+        URL url = getClass().getClassLoader().getResource(args[i]);
+        fileNames[i] = CAstCallGraphUtil.makeSourceModule(url, args[i]);
+      }
+      Assert.assertTrue(args[i], fileNames[i] != null);
+    }
+
+    ClassHierarchy cha = runTranslator(fileNames);
+    dump(cha);
+    if (assertions != null) {
+      checkAssertions(cha, assertions);
+    } else {
+      System.err.println(("WARNING: no assertions for " + getClass()));
+    }
+  }
+
+  protected void testInternal(String arg, TranslatorAssertions assertions) {
+    try {
+      testInternal(new String[] { arg }, assertions);
+    } catch (Exception e) {
+      e.printStackTrace();
+      Assert.assertTrue(e.toString(), false);
+    }
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestConstantCollector.java wala-1.5.1/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestConstantCollector.java
--- wala-1.3.9/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestConstantCollector.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestConstantCollector.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,204 @@
+package com.ibm.wala.cast.test;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.ibm.wala.cast.tree.CAst;
+import com.ibm.wala.cast.tree.CAstAnnotation;
+import com.ibm.wala.cast.tree.CAstControlFlowMap;
+import com.ibm.wala.cast.tree.CAstEntity;
+import com.ibm.wala.cast.tree.CAstNode;
+import com.ibm.wala.cast.tree.CAstNodeTypeMap;
+import com.ibm.wala.cast.tree.CAstQualifier;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
+import com.ibm.wala.cast.tree.CAstType;
+import com.ibm.wala.cast.tree.impl.CAstImpl;
+import com.ibm.wala.cast.tree.impl.CAstOperator;
+import com.ibm.wala.cast.tree.rewrite.AstConstantFolder;
+import com.ibm.wala.cast.util.AstConstantCollector;
+import com.ibm.wala.cast.util.CAstPattern;
+import com.ibm.wala.cast.util.CAstPattern.Segments;
+import com.ibm.wala.util.collections.EmptyIterator;
+
+public class TestConstantCollector {
+
+  private CAst ast = new CAstImpl();
+    
+  private static CAstEntity fakeEntity(CAstNode root) {
+    return new CAstEntity() {
+
+      @Override
+      public int getKind() {
+        // TODO Auto-generated method stub
+        return 0;
+      }
+
+      @Override
+      public String getName() {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public String getSignature() {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public String[] getArgumentNames() {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public CAstNode[] getArgumentDefaults() {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public int getArgumentCount() {
+        // TODO Auto-generated method stub
+        return 0;
+      }
+
+      @Override
+      public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
+        return Collections.emptyMap();
+      }
+
+      @Override
+      public Iterator<CAstEntity> getScopedEntities(CAstNode construct) {
+        return EmptyIterator.instance();
+      }
+
+      @Override
+      public CAstNode getAST() {
+        return root;
+      }
+
+      @Override
+      public CAstControlFlowMap getControlFlow() {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public CAstSourcePositionMap getSourceMap() {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public Position getPosition() {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public CAstNodeTypeMap getNodeTypeMap() {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public Collection<CAstQualifier> getQualifiers() {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public CAstType getType() {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public Collection<CAstAnnotation> getAnnotations() {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public Position getPosition(int arg) {
+        // TODO Auto-generated method stub
+        return null;
+      }
+
+      @Override
+      public Position getNamePosition() {
+        // TODO Auto-generated method stub
+        return null;
+      }
+    };
+  }
+  
+  private CAstNode root1 =
+      ast.makeNode(CAstNode.BLOCK_STMT,
+          ast.makeNode(CAstNode.ASSIGN,
+              ast.makeNode(CAstNode.VAR,
+                  ast.makeConstant("var1")),
+              ast.makeConstant(15)));
+
+  @Test
+  public void testSegmentsRoot1() {
+    Collection<Segments> x = CAstPattern.findAll(AstConstantCollector.simpleValuePattern, fakeEntity(root1));
+    assert x.size() == 1;
+  }
+
+  @Test
+  public void testRoot1() {
+    Map<String,Object> x = AstConstantCollector.collectConstants(fakeEntity(root1));
+    assert x.size() == 1;
+  }
+
+  private CAstNode root2 =
+      ast.makeNode(CAstNode.BLOCK_STMT,
+          ast.makeNode(CAstNode.ASSIGN,
+              ast.makeNode(CAstNode.VAR,
+                  ast.makeConstant("var1")),
+              ast.makeConstant(15)),
+          ast.makeNode(CAstNode.ASSIGN,
+              ast.makeNode(CAstNode.VAR,
+                  ast.makeConstant("var1")),
+              ast.makeConstant(14)));
+
+  @Test
+  public void testSegmentsRoot2() {
+    Collection<Segments> x = CAstPattern.findAll(AstConstantCollector.simpleValuePattern, fakeEntity(root2));
+    assert x.size() == 2;
+  }
+
+  @Test
+  public void testRoot2() {
+    Map<String,Object> x = AstConstantCollector.collectConstants(fakeEntity(root2));
+    assert x.size() == 0;
+  }
+
+  private CAstNode root3 =
+      ast.makeNode(CAstNode.BLOCK_EXPR,
+          ast.makeNode(CAstNode.ASSIGN,
+              ast.makeNode(CAstNode.VAR,
+                  ast.makeConstant("var1")),
+              ast.makeConstant(15)),
+          ast.makeNode(CAstNode.BINARY_EXPR,
+              CAstOperator.OP_ADD,
+              ast.makeConstant(10),
+              ast.makeNode(CAstNode.VAR, ast.makeConstant("var1"))));
+
+  public static final CAstPattern toCodePattern3 = CAstPattern.parse("BINARY_EXPR(*,\"10\",\"15\")");
+
+  @Test
+  public void testRoot3() {
+    CAstEntity ce = fakeEntity(root3);
+    CAstEntity nce = AstConstantFolder.fold(ce);
+    Collection<Segments> matches = CAstPattern.findAll(toCodePattern3, nce);
+    assert matches.size() == 1;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestNativeTranslator.java wala-1.5.1/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestNativeTranslator.java
--- wala-1.3.9/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestNativeTranslator.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/harness-src/java/com/ibm/wala/cast/test/TestNativeTranslator.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,175 @@
+package com.ibm.wala.cast.test;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.ibm.wala.cast.ir.translator.NativeTranslatorToCAst;
+import com.ibm.wala.cast.tree.CAst;
+import com.ibm.wala.cast.tree.CAstAnnotation;
+import com.ibm.wala.cast.tree.CAstControlFlowMap;
+import com.ibm.wala.cast.tree.CAstEntity;
+import com.ibm.wala.cast.tree.CAstNode;
+import com.ibm.wala.cast.tree.CAstNodeTypeMap;
+import com.ibm.wala.cast.tree.CAstQualifier;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
+import com.ibm.wala.cast.tree.CAstType;
+import com.ibm.wala.cast.tree.impl.CAstImpl;
+import com.ibm.wala.cast.tree.rewrite.CAstRewriter.CopyKey;
+import com.ibm.wala.cast.tree.rewrite.CAstRewriter.RewriteContext;
+import com.ibm.wala.cast.tree.rewrite.CAstRewriterFactory;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.util.io.TemporaryFile;
+
+public class TestNativeTranslator {
+  
+  static {
+    System.loadLibrary("xlator_test");
+  }
+
+  private static native CAstNode inventAst(SmokeXlator ast);
+
+  private static class SmokeXlator extends NativeTranslatorToCAst {
+
+    private SmokeXlator(CAst Ast, URL sourceURL) throws IOException {
+      super(Ast, sourceURL, TemporaryFile.urlToFile("temp", sourceURL).getAbsolutePath());
+    }
+
+    @Override
+    public <C extends RewriteContext<K>, K extends CopyKey<K>> void addRewriter(CAstRewriterFactory<C, K> factory,
+        boolean prepend) {
+      assert false;
+    }
+
+    @Override
+    public CAstEntity translateToCAst() {
+      return new CAstEntity() {
+
+        @Override
+        public int getKind() {
+          return CAstEntity.FUNCTION_ENTITY;
+        }
+
+        @Override
+        public String getName() {
+          return sourceURL.getFile();
+        }
+
+        @Override
+        public String getSignature() {
+          return "()";
+        }
+
+        @Override
+        public String[] getArgumentNames() {
+           return new String[0];
+        }
+
+        @Override
+        public CAstNode[] getArgumentDefaults() {
+          return new CAstNode[0];
+        }
+
+        @Override
+        public int getArgumentCount() {
+          return 0;
+        }
+
+        @Override
+        public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
+          return Collections.emptyMap();
+        }
+
+        @Override
+        public Iterator<CAstEntity> getScopedEntities(CAstNode construct) {
+          return Collections.emptyIterator();
+        }
+
+        private CAstNode ast;
+        
+        @Override
+        public CAstNode getAST() {
+          if (ast == null) {
+            ast = inventAst(SmokeXlator.this);
+          }
+          return ast;
+        }
+
+        @Override
+        public CAstControlFlowMap getControlFlow() {
+          // TODO Auto-generated method stub
+          return null;
+        }
+
+        @Override
+        public CAstSourcePositionMap getSourceMap() {
+          // TODO Auto-generated method stub
+          return null;
+        }
+
+        @Override
+        public Position getPosition() {
+          // TODO Auto-generated method stub
+          return null;
+        }
+
+        @Override
+        public CAstNodeTypeMap getNodeTypeMap() {
+          // TODO Auto-generated method stub
+          return null;
+        }
+
+        @Override
+        public Collection<CAstQualifier> getQualifiers() {
+          // TODO Auto-generated method stub
+          return null;
+        }
+
+        @Override
+        public CAstType getType() {
+          // TODO Auto-generated method stub
+          return null;
+        }
+
+        @Override
+        public Collection<CAstAnnotation> getAnnotations() {
+          // TODO Auto-generated method stub
+          return null;
+        }
+
+        @Override
+        public Position getPosition(int arg) {
+          // TODO Auto-generated method stub
+          return null;
+        }
+
+        @Override
+        public Position getNamePosition() {
+          // TODO Auto-generated method stub
+          return null;
+        }
+      };
+    }
+  }
+    
+  @Test
+  public void testNativeCAst() throws IOException {
+    CAst Ast = new CAstImpl();
+    
+    URL junk = IR.class.getClassLoader().getResource("primordial.txt");
+     
+    SmokeXlator xlator = new SmokeXlator(Ast, junk);
+    
+    CAstNode ast = xlator.translateToCAst().getAST();    
+  
+    System.err.println(ast);
+    
+    assert ast.getChildCount() == 3;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/.launchConfigurations/com.ibm.wala.cast.test-JUnit.launch wala-1.5.1/com.ibm.wala.cast.test/.launchConfigurations/com.ibm.wala.cast.test-JUnit.launch
--- wala-1.3.9/com.ibm.wala.cast.test/.launchConfigurations/com.ibm.wala.cast.test-JUnit.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/.launchConfigurations/com.ibm.wala.cast.test-JUnit.launch	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,9 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/1.7.0 25/"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.cast.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Djava.library.path=${project_loc:/com.ibm.wala.cast.test}/bin"/>
 </launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.cast.test/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.cast.test/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: CAst Test Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.cast.test
-Bundle-Version: 1.3.9
-Bundle-Vendor: IBM
+Bundle-Version: 1.5.1
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: 
  org.junit;bundle-version="4.0.0",
  com.ibm.wala.core.tests,
@@ -12,5 +12,6 @@
  com.ibm.wala.shrike,
  org.eclipse.core.runtime
 Export-Package: com.ibm.wala.cast.test
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: com.ibm.wala.cast.test
 
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.cast.test/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.cast.test/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.cast.test
+Bundle-Vendor = IBM
+Bundle-Name = CAst Test Plug-in
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/pom.xml wala-1.5.1/com.ibm.wala.cast.test/pom.xml
--- wala-1.3.9/com.ibm.wala.cast.test/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,13 +5,48 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
   <artifactId>com.ibm.wala.cast.test</artifactId>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
       <plugin>
+	<groupId>org.codehaus.mojo</groupId>
+	<artifactId>exec-maven-plugin</artifactId>
+	<version>1.6.0</version>
+	<executions>
+	  <execution>
+	    <phase>compile</phase>
+	    <configuration>
+	      <executable>make</executable>
+	      <arguments>
+		<argument>--quiet</argument>
+		<argument>default</argument>
+		<argument>main</argument>
+	      </arguments>
+	      <workingDirectory>${basedir}/harness-src/c</workingDirectory>
+	    </configuration>
+	    <goals>
+	      <goal>exec</goal>
+	    </goals>
+	  </execution>
+	  <execution>
+	    <id>test-native</id>
+	    <phase>test</phase>
+	    <configuration>
+	      <executable>${basedir}/../com.ibm.wala.cast/target/classes/libcast/smoke_main</executable>
+	      <arguments>
+		<argument>${project.build.outputDirectory}:${basedir}/../com.ibm.wala.cast/target/classes:${basedir}/../com.ibm.wala.core/target/classes:${basedir}/../com.ibm.wala.util/target/classes</argument>
+	      </arguments>
+	    </configuration>
+	    <goals>
+	      <goal>exec</goal>
+	    </goals>
+	  </execution>
+	</executions>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <executions>
@@ -20,7 +55,7 @@
             <phase>test</phase>
             <configuration>
               <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
-              <argLine>-Xmx800M -ea</argLine>
+              <argLine>-Djava.library.path=${project.build.outputDirectory} -ea</argLine>
               <redirectTestOutputToFile>true</redirectTestOutputToFile>
             </configuration>
             <goals>
@@ -35,8 +70,13 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.mojo</groupId>
+      <artifactId>exec-maven-plugin</artifactId>
+      <version>1.6.0</version>
+    </dependency>
   </dependencies> 
 </project>
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/.project wala-1.5.1/com.ibm.wala.cast.test/.project
--- wala-1.3.9/com.ibm.wala.cast.test/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.cast.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.cast.test/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.cast.test/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,78 +1,125 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.cast.test/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.cast.test/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.cast.test/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.cast.test/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.cast.test/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.cast.test/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude08113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T02111contentType133org.eclipse.jdt.junit.JUnitResultF04file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.core/build.gradle wala-1.5.1/com.ibm.wala.core/build.gradle
--- wala-1.3.9/com.ibm.wala.core/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,29 @@
+plugins {
+	id 'eclipse'
+}
+
+eclipse.project.natures 'org.eclipse.pde.PluginNature'
+
+sourceSets.main {
+	java.srcDirs = ['src']
+	resources.srcDirs = [
+		'dat',
+		'lib',
+	]
+}
+
+dependencies {
+	compile(
+		project(':com.ibm.wala.shrike'),
+		project(':com.ibm.wala.util'),
+		)
+}
+
+javadoc {
+	def dalvik = ':com.ibm.wala.dalvik'
+	dependsOn "$dalvik:compileJava"
+
+	doFirst {
+		classpath += files project(dalvik).compileJava
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/build.properties wala-1.5.1/com.ibm.wala.core/build.properties
--- wala-1.3.9/com.ibm.wala.core/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -4,7 +4,8 @@
                .,\
                lib/
 jars.compile.order = .
-output.. = bin/
 source.. = dat/,\
            src/,\
            lib/
+output.. = bin/main
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.core/build.xml wala-1.5.1/com.ibm.wala.core/build.xml
--- wala-1.3.9/com.ibm.wala.core/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/build.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.ibm.wala.core" default="build.jars" basedir=".">
-
-        <property file="antbuild.properties"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="com.ibm.wala.core"/>
-	<property name="bundleVersion" value="1.1.3.200805291128"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="true"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="javacSource" value="1.5"/>
-	<property name="javacTarget" value="1.5"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/com.ibm.wala.core_1.1.3.200805291128">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="clean" description="Build the plug-in: com.ibm.wala.core for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/com.ibm.wala.core_1.1.3.200805291128.jar" basedir="${temp.folder}/com.ibm.wala.core_1.1.3.200805291128" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot" depends="init" unless="@dot" description="Create jar: com.ibm.wala.core @dot.">
-		<delete dir="${temp.folder}/@dot.bin"/>
-		<mkdir dir="${temp.folder}/@dot.bin"/>
-		<path id="@dot.classpath">
-			<pathelement path="${shrike.root}/bin/"/>
-			<pathelement path="${shrike.root}/@dot"/>
-			<pathelement path="${eclipse35.root}/plugins/org.eclipse.core.runtime_3.5.0.v20090525.jar"/>
-                        <pathelement path="${eclipse35.root}/plugins/org.eclipse.equinox.common_3.5.1.R35x_v20090807-1100.jar"/>
-                        <pathelement path="${eclipse35.root}/plugins/org.eclipse.core.resources_3.5.2.R35x_v20091203-1235.jar"/>
-                        <pathelement path="${eclipse35.root}/plugins/org.eclipse.osgi_3.5.2.R35x_v20100126.jar"/>
-                        <pathelement path="${eclipse35.root}/plugins/org.eclipse.core.jobs_3.4.100.v20090429-1800.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="dat/"			/>
-			<src path="src/"			/>
-			<src path="lib/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-			<compilerarg line="-log '${temp.folder}/@dot.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-		</javac>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/@dot.bin" failonerror="true" overwrite="false">
-			<fileset dir="dat/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="lib/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${build.result.folder}"/>
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="${temp.folder}/@dot.bin">
-			</fileset>
-		</copy>
-		<delete dir="${temp.folder}/@dot.bin"/>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="dat/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="lib/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: com.ibm.wala.core.">
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/com.ibm.wala.core_1.1.3.200805291128"/>
-		<copy todir="${destination.temp.folder}/com.ibm.wala.core_1.1.3.200805291128" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/com.ibm.wala.core_1.1.3.200805291128" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="lib/primordial.jar.model"/>
-				<include name="plugin.properties"/>
-				<include name="dat/natives.xml"/>
-				<include name="META-INF/"/>
-			</fileset>
-		</copy>
-		<!-- eclipse.versionReplacer path="${destination.temp.folder}/com.ibm.wala.core_1.1.3.200805291128" version="1.1.3.200805291128" -->
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/com.ibm.wala.core_1.1.3.200805291128"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/com.ibm.wala.core_1.1.3.200805291128" failonerror="false" overwrite="false"/>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/com.ibm.wala.core_1.1.3.200805291128"/>
-		<copy todir="${destination.temp.folder}/com.ibm.wala.core_1.1.3.200805291128" failonerror="false" overwrite="false">
-			<fileset dir="${temp.folder}">
-				<include name="@dot.bin${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: com.ibm.wala.core of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/com.ibm.wala.core_1.1.3.200805291128.jar"/>
-		<delete file="${plugin.destination}/com.ibm.wala.core_1.1.3.200805291128.zip"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/snugglebug/sjf/workspace/com.ibm.wala.core" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: com.ibm.wala.core.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/com.ibm.wala.core_1.1.3.200805291128.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.core/.classpath wala-1.5.1/com.ibm.wala.core/.classpath
--- wala-1.3.9/com.ibm.wala.core/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="dat"/>
-	<classpathentry kind="src" path="lib"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.core/dat/codetemplates.xml wala-1.5.1/com.ibm.wala.core/dat/codetemplates.xml
--- wala-1.3.9/com.ibm.wala.core/dat/codetemplates.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/dat/codetemplates.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><templates><template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE templates>
+<templates><template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
  * @return the ${bare_field_name}
  */</template><template autoinsert="true" context="settercomment_context" deleted="false" description="Comment for setter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment">/**
  * @param ${param} the ${bare_field_name} to set
diff -Nru wala-1.3.9/com.ibm.wala.core/dat/.cvsignore wala-1.5.1/com.ibm.wala.core/dat/.cvsignore
--- wala-1.3.9/com.ibm.wala.core/dat/.cvsignore	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/dat/.cvsignore	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-wala.properties
diff -Nru wala-1.3.9/com.ibm.wala.core/dat/formatter.xml wala-1.5.1/com.ibm.wala.core/dat/formatter.xml
--- wala-1.3.9/com.ibm.wala.core/dat/formatter.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/dat/formatter.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE profiles>
 <profiles version="10">
 <profile name="WALA" version="10">
 <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
diff -Nru wala-1.3.9/com.ibm.wala.core/dat/natives_no_model.xml wala-1.5.1/com.ibm.wala.core/dat/natives_no_model.xml
--- wala-1.3.9/com.ibm.wala.core/dat/natives_no_model.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/dat/natives_no_model.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!DOCTYPE summary-spec>
 <!-- native methods in the IBM Windows DK 1.3.1 -->
 <summary-spec>
 	<classloader name="Primordial">
diff -Nru wala-1.3.9/com.ibm.wala.core/dat/natives.xml wala-1.5.1/com.ibm.wala.core/dat/natives.xml
--- wala-1.3.9/com.ibm.wala.core/dat/natives.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/dat/natives.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!DOCTYPE summary-spec>
 <!-- native methods in the IBM Windows DK 1.3.1 -->
 <summary-spec>
 	<classloader name="Primordial">
@@ -356,6 +357,17 @@
 						value="secure" />
 					<call type="static" name="initializeSystemClass"
 						class="Ljava/lang/System" descriptor="()V" />
+                    <!-- a hack to model running of shutdown hooks (actually runs at
+                         JVM shutdown) -->
+                    <call type="static" name="runHooks"
+                          class="Ljava/lang/Shutdown" descriptor="()V" />
+                    <!-- Model propagation of an uncaught exception on a thread.  Imprecise
+                         as a subsequent analysis may be able to prove this is impossible -->
+                    <new def="tg" class="Ljava/lang/ThreadGroup" />
+                    <call type="virtual" name="uncaughtException"
+                          class="Ljava/lang/ThreadGroup"
+                          descriptor="(Ljava/lang/Thread;Ljava/lang/Throwable;)V"
+                          arg0="tg" arg1="null" arg2="null" />
 				</method>
 
 				<method name="initializeSystemClass" descriptor="()V"
diff -Nru wala-1.3.9/com.ibm.wala.core/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.core/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.core/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -3,13 +3,20 @@
 Eclipse-LazyStart: true
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.ibm.wala.core
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: com.ibm.wala.shrike,
  com.ibm.wala.util;bundle-version="1.0.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Export-Package: .,
+ com.ibm.wala.analysis.arraybounds,
+ com.ibm.wala.analysis.arraybounds.hypergraph,
+ com.ibm.wala.analysis.arraybounds.hypergraph.algorithms,
+ com.ibm.wala.analysis.arraybounds.hypergraph.weight,
+ com.ibm.wala.analysis.arraybounds.hypergraph.weight.edgeweights,
+ com.ibm.wala.analysis.exceptionanalysis,
+ com.ibm.wala.analysis.nullpointer,
  com.ibm.wala.analysis.pointers,
  com.ibm.wala.analysis.reflection,
  com.ibm.wala.analysis.reflection.java7,
@@ -39,6 +46,9 @@
  com.ibm.wala.ipa.callgraph.propagation.rta,
  com.ibm.wala.ipa.callgraph.pruned,
  com.ibm.wala.ipa.cfg,
+ com.ibm.wala.ipa.cfg.exceptionpruning,
+ com.ibm.wala.ipa.cfg.exceptionpruning.filter,
+ com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural,
  com.ibm.wala.ipa.cha,
  com.ibm.wala.ipa.modref,
  com.ibm.wala.ipa.slicer,
@@ -64,7 +74,9 @@
  com.ibm.wala.util.strings,
  com.ibm.wala.util.warnings,
  com.ibm.wala.viz,
- com.ibm.wala.viz.viewer
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ com.ibm.wala.viz.viewer,
+ com.ibm.wala.viz.viewer.images
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-BuddyPolicy: registered
 Bundle-ClassPath: .
+Automatic-Module-Name: com.ibm.wala.core
diff -Nru wala-1.3.9/com.ibm.wala.core/mvncentral.xml wala-1.5.1/com.ibm.wala.core/mvncentral.xml
--- wala-1.3.9/com.ibm.wala.core/mvncentral.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/mvncentral.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.wala</groupId>
   <artifactId>com.ibm.wala.core</artifactId>
-  <version>1.3.9</version>  
+  <version>1.5.1</version>
   <packaging>jar</packaging>
   <name>WALA Core</name>
   <description>Core WALA analysis libraries</description>
@@ -45,12 +45,12 @@
     <dependency>
       <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.util</artifactId>
-      <version>1.3.9</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.shrike</artifactId>
-      <version>1.3.9</version>
+      <version>1.5.1</version>
     </dependency>
   </dependencies>
 
@@ -60,17 +60,37 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </repository>
   </repositories>  
+
+  <profiles>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
   
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
+    <resources>
+      <resource>
+        <directory>dat</directory>
+      </resource>
+      <resource>
+        <directory>lib</directory>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.2</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
 
@@ -102,6 +122,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <additionalparam>${javadoc.options}</additionalparam>
+        </configuration>        
         <version>2.9.1</version>
         <executions>
           <execution>
diff -Nru wala-1.3.9/com.ibm.wala.core/plugin.properties wala-1.5.1/com.ibm.wala.core/plugin.properties
--- wala-1.3.9/com.ibm.wala.core/plugin.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/plugin.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,5 @@
-PLUGINNAME=core WALA analysis engine
-VENDORNAME=IBM
+pluginName=core WALA analysis engine
+vendorName=IBM
 providerName =IBM
 
 # ====================================================================
diff -Nru wala-1.3.9/com.ibm.wala.core/pom.xml wala-1.5.1/com.ibm.wala.core/pom.xml
--- wala-1.3.9/com.ibm.wala.core/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
   <artifactId>com.ibm.wala.core</artifactId>
   <packaging>eclipse-plugin</packaging>
diff -Nru wala-1.3.9/com.ibm.wala.core/.project wala-1.5.1/com.ibm.wala.core/.project
--- wala-1.3.9/com.ibm.wala.core/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.core/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.core/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.core/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -12,114 +12,128 @@
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
 org.eclipse.jdt.core.compiler.problem.deadCode=warning
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
 org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
 org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
 org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.core/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.core/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.core/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.core/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.core/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.core/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraphBuilder.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraphBuilder.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,390 @@
+package com.ibm.wala.analysis.arraybounds;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.Stack;
+
+import com.ibm.wala.analysis.arraybounds.hypergraph.DirectedHyperEdge;
+import com.ibm.wala.analysis.arraybounds.hypergraph.HyperNode;
+import com.ibm.wala.shrikeBT.IBinaryOpInstruction;
+import com.ibm.wala.shrikeBT.IConditionalBranchInstruction.Operator;
+import com.ibm.wala.ssa.DefUse;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.SSAArrayLengthInstruction;
+import com.ibm.wala.ssa.SSAArrayLoadInstruction;
+import com.ibm.wala.ssa.SSAArrayReferenceInstruction;
+import com.ibm.wala.ssa.SSAArrayStoreInstruction;
+import com.ibm.wala.ssa.SSABinaryOpInstruction;
+import com.ibm.wala.ssa.SSACFG.BasicBlock;
+import com.ibm.wala.ssa.SSAConditionalBranchInstruction;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.SSAInstruction.Visitor;
+import com.ibm.wala.ssa.SSANewInstruction;
+import com.ibm.wala.ssa.SSAPhiInstruction;
+import com.ibm.wala.ssa.SSAPiInstruction;
+
+/**
+ * @see ArrayBoundsGraph
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ */
+public class ArrayBoundsGraphBuilder {
+	private final IR ir;
+	/** Variables, which were already explored. */
+	private final HashSet<Integer> foundVariables;
+	private final DefUse defUse;
+
+	private final ArrayBoundsGraph lowerBoundGraph;
+
+	private final ArrayBoundsGraph upperBoundGraph;
+	private final Set<SSAArrayReferenceInstruction> arrayReferenceInstructions;
+	private final IBinaryOpInstruction.Operator SUB = IBinaryOpInstruction.Operator.SUB;
+
+	private final IBinaryOpInstruction.Operator ADD = IBinaryOpInstruction.Operator.ADD;
+
+	public ArrayBoundsGraphBuilder(IR ir) {
+		this.ir = ir;
+
+		this.foundVariables = new HashSet<>();
+		this.defUse = new DefUse(ir);
+
+		this.arrayReferenceInstructions = new HashSet<>();
+		this.lowerBoundGraph = new ArrayBoundsGraph();
+		this.upperBoundGraph = new ArrayBoundsGraph();
+
+		this.findArrayAccess();
+		this.exploreIr();
+		this.addConstructionLength();
+
+    this.lowerBoundGraph.updateNodeEdges();
+    this.upperBoundGraph.updateNodeEdges();   
+		
+		this.lowerBoundGraph.postProcessConstants();
+		this.upperBoundGraph.postProcessConstants();
+		
+    this.lowerBoundGraph.updateNodeEdges();
+    this.upperBoundGraph.updateNodeEdges();   		
+		
+		bundleDeadEnds(this.lowerBoundGraph);
+		bundleDeadEnds(this.upperBoundGraph);
+
+		collapseNonPhiEdges(this.lowerBoundGraph);
+		collapseNonPhiEdges(this.upperBoundGraph);
+
+		this.lowerBoundGraph.updateNodeEdges();
+		this.upperBoundGraph.updateNodeEdges();
+	}
+
+	private void addConstructionLength() {
+
+		for (final Integer array : this.lowerBoundGraph.getArrayLength()
+				.keySet()) {
+			final Integer tmp = array;
+
+			final SSAInstruction instruction = this.defUse.getDef(array);
+			if (instruction != null) {
+				instruction.visit(new Visitor() {
+					@Override
+					public void visitNew(SSANewInstruction instruction) {
+					  //We only support arrays with dimension 1
+						if (instruction.getNumberOfUses() == 1) {
+  						final int constructionLength = instruction.getUse(0);
+  						Integer arraysNode = ArrayBoundsGraphBuilder.this.lowerBoundGraph
+  								.getArrayLength().get(tmp);
+  						ArrayBoundsGraphBuilder.this.lowerBoundGraph.addEdge(
+  								arraysNode, constructionLength);
+  						arraysNode = ArrayBoundsGraphBuilder.this.upperBoundGraph
+  								.getArrayLength().get(tmp);
+  						ArrayBoundsGraphBuilder.this.upperBoundGraph.addEdge(
+  								arraysNode, constructionLength);
+  
+  						ArrayBoundsGraphBuilder.this
+  						.addPossibleConstant(constructionLength);
+						}
+					}
+				});
+			}
+		}
+
+	}
+
+	/**
+	 * Case 1: piRestrictor restricts the pi variable for upper/ lower bounds graph
+	 * Given this code below, we want to create a hyper edge
+	 * {piParent, piRestrictor} --&gt; {piVar}.
+	 *
+	 * If is op in {&lt;, &gt;} we now, that the distance from piRestrictor to piVar
+	 * is +-1 as ( a &lt; b ) &lt;==&gt; ( a &lt;= b - 1), same with "&lt;".
+	 * To be more precise we introduce a helper node and add
+	 * {piRestrictor} -- (-)1 --&gt; {helper}
+	 * {piParent, helper} --&gt; {piVar}
+	 *
+	 * Case 2: no restriction is given by the branch (i.e. the operator is not equal)
+	 * {piParent} --&gt; {piVar}
+	 *
+	 * <pre>if (piParent op piRestrictor) {piVar = piParent}</pre>
+	 */
+	private void addPiStructure(Integer piVar, Integer piParent,
+			Integer piRestrictor, Operator op) {
+
+		Integer helper;
+		switch (op) {
+		case EQ:
+			this.upperBoundGraph.addPi(piVar, piParent, piRestrictor);
+			this.lowerBoundGraph.addPi(piVar, piParent, piRestrictor);
+			break;
+		case NE:
+			this.upperBoundGraph.addEdge(piParent, piVar);
+			this.lowerBoundGraph.addEdge(piParent, piVar);
+			break;
+		case LE: // piVar <= piRestrictor
+			this.upperBoundGraph.addPi(piVar, piParent, piRestrictor);
+
+			this.lowerBoundGraph.addEdge(piParent, piVar);
+			break;
+		case GE: // piVar >= piRestrictor
+			this.lowerBoundGraph.addPi(piVar, piParent, piRestrictor);
+
+			this.upperBoundGraph.addEdge(piParent, piVar);
+			break;
+		case LT: // piVar < piRestrictor
+			helper = this.upperBoundGraph.generateNewVar();
+			this.upperBoundGraph.addAdditionEdge(piRestrictor, helper, -1);
+			this.upperBoundGraph.addPi(piVar, piParent, helper);
+
+			this.lowerBoundGraph.addEdge(piParent, piVar);
+			break;
+		case GT: // piVar > piRestrictor
+			helper = this.lowerBoundGraph.generateNewVar();
+			this.lowerBoundGraph.addAdditionEdge(piRestrictor, helper, 1);
+			this.lowerBoundGraph.addPi(piVar, piParent, helper);
+
+			this.upperBoundGraph.addEdge(piParent, piVar);
+			break;
+    default:
+      throw new UnsupportedOperationException(String.format("unexpected operator %s", op));
+		}
+
+	}
+
+	private void addPossibleConstant(int handle) {
+		if (this.ir.getSymbolTable().isIntegerConstant(handle)) {
+			final int value = this.ir.getSymbolTable().getIntValue(handle);
+			this.lowerBoundGraph.addConstant(handle, value);
+			this.upperBoundGraph.addConstant(handle, value);
+		}
+	}
+
+	/**
+	 * Connect all lose ends to the infinity node. See the description of
+	 * {@link ArrayBoundsGraph} for why this is necessary.
+	 */
+	private static void bundleDeadEnds(ArrayBoundsGraph graph) {
+		final Set<HyperNode<Integer>> nodes = new HashSet<>(graph.getNodes().values());
+
+		for (final DirectedHyperEdge<Integer> edge : graph.getEdges()) {
+			for (final HyperNode<Integer> node : edge.getDestination()) {
+				nodes.remove(node);
+			}
+		}
+
+		for (final HyperNode<Integer> node : nodes) {
+			graph.markAsDeadEnd(node.getValue());
+		}
+	}
+
+	/**
+	 * To make construction of the hyper-graph more easy, we always add single
+	 * edges and fuse them into one hyper-edge. Where necessary (Everywhere but
+	 * incoming edges of phi nodes.)
+	 */
+	private static void collapseNonPhiEdges(ArrayBoundsGraph graph) {
+		final Map<HyperNode<Integer>, DirectedHyperEdge<Integer>> inEdges = new HashMap<>();
+		final Set<DirectedHyperEdge<Integer>> edges = new HashSet<>(graph.getEdges());
+		for (final DirectedHyperEdge<Integer> edge : edges) {
+			assert edge.getDestination().size() == 1;
+
+			final HyperNode<Integer> node = edge.getDestination().iterator()
+					.next();
+			if (!graph.getPhis().contains(node.getValue())) {
+				if (inEdges.containsKey(node)) {
+					final DirectedHyperEdge<Integer> inEdge = inEdges.get(node);
+					assert inEdge.getWeight().equals(edge.getWeight());
+					for (final HyperNode<Integer> src : edge.getSource()) {
+						inEdge.getSource().add(src);
+					}
+					graph.getEdges().remove(edge);
+				} else {
+					inEdges.put(node, edge);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Discovers predecessors and adds them to the graph.
+	 */
+	private void discoverPredecessors(final Stack<Integer> todo, int handle) {
+		final SSAInstruction def = this.defUse.getDef(handle);
+		if (def == null) {
+			this.addPossibleConstant(handle);
+		} else {
+			def.visit(new Visitor() {
+				@Override
+				public void visitArrayLength(
+						SSAArrayLengthInstruction instruction) {
+					ArrayBoundsGraphBuilder.this.lowerBoundGraph
+					.markAsArrayLength(instruction.getArrayRef(),
+							instruction.getDef());
+					ArrayBoundsGraphBuilder.this.upperBoundGraph
+					.markAsArrayLength(instruction.getArrayRef(),
+							instruction.getDef());
+				}
+
+				@Override
+				public void visitBinaryOp(SSABinaryOpInstruction instruction) {
+					if (instruction.getOperator() == ArrayBoundsGraphBuilder.this.SUB
+							|| instruction.getOperator() == ArrayBoundsGraphBuilder.this.ADD) {
+						final BinaryOpWithConstant op = BinaryOpWithConstant
+								.create(instruction,
+										ArrayBoundsGraphBuilder.this.ir);
+
+						if (op != null) {
+							todo.push(op.getOtherVar());
+							int value = op.getConstantValue();
+							if (instruction.getOperator() == ArrayBoundsGraphBuilder.this.SUB) {
+								value = -value;
+							}
+							ArrayBoundsGraphBuilder.this.lowerBoundGraph
+							.addAdditionEdge(op.getOtherVar(),
+									instruction.getDef(), value);
+							ArrayBoundsGraphBuilder.this.upperBoundGraph
+							.addAdditionEdge(op.getOtherVar(),
+									instruction.getDef(), value);
+
+						}
+					}
+				}
+
+				@Override
+				public void visitPhi(SSAPhiInstruction instruction) {				  
+				  int phi = instruction.getDef();
+          ArrayBoundsGraphBuilder.this.lowerBoundGraph.addPhi(phi);
+          ArrayBoundsGraphBuilder.this.upperBoundGraph.addPhi(phi);
+
+          for (int i = 0; i < instruction.getNumberOfUses(); i++) {            
+            int use = instruction.getUse(i);          
+            todo.push(use);
+
+            ArrayBoundsGraphBuilder.this.lowerBoundGraph.addEdge(use, phi);
+            ArrayBoundsGraphBuilder.this.upperBoundGraph.addEdge(use, phi);
+          }
+
+				}
+
+				@Override
+				public void visitPi(SSAPiInstruction instruction) {
+					final SSAConditionalBranchInstruction branch = (SSAConditionalBranchInstruction) instruction
+							.getCause();
+					assert branch.getNumberOfUses() == 2;
+
+					final Integer piVar = instruction.getDef();
+					final Integer piParent = instruction.getUse(0);
+
+					final ConditionNormalizer cnd = new ConditionNormalizer(
+							branch, piParent, ArrayBoundsGraphBuilder.this
+							.isBranchTaken(instruction, branch));
+
+					final Integer piRestrictor = cnd.getRhs();
+
+					todo.push(piParent);
+					todo.push(piRestrictor);
+
+					ArrayBoundsGraphBuilder.this.addPiStructure(piVar,
+							piParent, piRestrictor, cnd.getOp());
+				}
+			});
+		}
+	}
+
+	private void exploreIr() {
+		final Set<Integer> variablesUsedAsIndex = new HashSet<>();
+		for (final Set<Integer> variables : this.lowerBoundGraph
+				.getArrayAccess().values()) {
+			variablesUsedAsIndex.addAll(variables);
+		}
+
+		for (final Integer variable : variablesUsedAsIndex) {
+			this.startDFS(variable);
+		}
+	}
+
+	private void findArrayAccess() {
+		this.ir.visitNormalInstructions(new Visitor() {
+			@Override
+			public void visitArrayLoad(SSAArrayLoadInstruction instruction) {
+				ArrayBoundsGraphBuilder.this.lowerBoundGraph.markAsArrayAccess(
+						instruction.getArrayRef(), instruction.getIndex());
+				ArrayBoundsGraphBuilder.this.upperBoundGraph.markAsArrayAccess(
+						instruction.getArrayRef(), instruction.getIndex());
+
+				ArrayBoundsGraphBuilder.this.arrayReferenceInstructions
+				.add(instruction);
+			}
+
+			@Override
+			public void visitArrayStore(SSAArrayStoreInstruction instruction) {
+				ArrayBoundsGraphBuilder.this.lowerBoundGraph.markAsArrayAccess(
+						instruction.getArrayRef(), instruction.getIndex());
+				ArrayBoundsGraphBuilder.this.upperBoundGraph.markAsArrayAccess(
+						instruction.getArrayRef(), instruction.getIndex());
+
+				ArrayBoundsGraphBuilder.this.arrayReferenceInstructions
+				.add(instruction);
+			}
+		});
+
+	}
+
+	public Set<SSAArrayReferenceInstruction> getArrayReferenceInstructions() {
+		return this.arrayReferenceInstructions;
+	}
+
+	public ArrayBoundsGraph getLowerBoundGraph() {
+		return this.lowerBoundGraph;
+	}
+
+	public ArrayBoundsGraph getUpperBoundGraph() {
+		return this.upperBoundGraph;
+	}
+
+	private boolean isBranchTaken(SSAPiInstruction pi,
+			SSAConditionalBranchInstruction cnd) {
+		final BasicBlock branchTargetBlock = this.ir.getControlFlowGraph()
+				.getBlockForInstruction(cnd.getTarget());
+
+		return branchTargetBlock.getNumber() == pi.getSuccessor();
+	}
+
+	/**
+	 * Explore the DefUse-Chain with depth-first-search to add constraints to
+	 * the given variable.
+	 */
+	private void startDFS(int index) {
+		final Stack<Integer> todo = new Stack<>();
+		todo.push(index);
+
+		while (!todo.isEmpty()) {
+			final int next = todo.pop();
+			if (this.foundVariables.add(next)) {
+				this.lowerBoundGraph.addNode(next);
+				this.upperBoundGraph.addNode(next);
+
+				this.discoverPredecessors(todo, next);
+			}
+		}
+
+	}
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraph.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,311 @@
+package com.ibm.wala.analysis.arraybounds;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.ibm.wala.analysis.arraybounds.hypergraph.DirectedHyperEdge;
+import com.ibm.wala.analysis.arraybounds.hypergraph.DirectedHyperGraph;
+import com.ibm.wala.analysis.arraybounds.hypergraph.HyperNode;
+import com.ibm.wala.analysis.arraybounds.hypergraph.SoftFinalHyperNode;
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight;
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight.Type;
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.edgeweights.AdditiveEdgeWeight;
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.edgeweights.EdgeWeight;
+import com.ibm.wala.util.collections.Pair;
+
+/**
+ * Some thoughts about implementation details, not mentioned in [1]:
+ *
+ * As it is written The paper describes, that the distance is equal to the
+ * shortest hyper path. But what if we don't know anything about a variable
+ * (i.e. it is returned by a method)? There will be no path at all, the distance
+ * should be unlimited.
+ *
+ * Initializing all nodes with -infinity instead of infinity, seems to work at
+ * first glance, as we also have hyper edges with more than one source, which
+ * cause the maximum to be propagated instead of minimum. However, this will not
+ * work, as loops will not get updated properly.
+ *
+ * We need to make sure, that only nodes, which are not connected to the source
+ * of shortest path computation are set to infinity. To do so, it is enough to
+ * set nodes, which don't have a predecessor to infinity. (Nodes in cycles will
+ * always have an ancestor, which is not part of the cycle. So all nodes are
+ * either connected to the source, or a node with no predecessor.)
+ *
+ * In this implementation this is done, by adding an infinity node and connect
+ * all lose ends to it (see
+ * {@link ArrayBoundsGraphBuilder#bundleDeadEnds(ArrayBoundsGraph)}). Note, that
+ * array length and the zero node are dead ends, if they are not the source of a
+ * shortest path computation. To prevent changing the inequality graph,
+ * depending on which source is used, a kind of trap door construct is used (See
+ * {@link ArrayBoundsGraph#createSourceVar(Integer)}).
+ *
+ * There are some variations, but these are minor changes to improve results:
+ * <ul>
+ * <li>handling of constants (see
+ * {@link ArrayBoundsGraph#addConstant(Integer, Integer)})
+ * <li>pi nodes (see {@link ArrayBoundsGraph#addPhi(Integer)})
+ * <li>array length nodes (see {@link ArrayBoundsGraph#arrayLength})
+ * </ul>
+ *
+ * [1] Bodík, Rastislav, Rajiv Gupta, and Vivek Sarkar.
+ * "ABCD: eliminating array bounds checks on demand." ACM SIGPLAN Notices. Vol.
+ * 35. No. 5. ACM, 2000.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ */
+@SuppressWarnings({ "JavadocReference", "javadoc" })
+public class ArrayBoundsGraph extends DirectedHyperGraph<Integer> {
+	/**
+	 * We need a ssa variable representing zero. So we just use an integer,
+	 * which is never produced by ssa generation
+	 */
+	public final static Integer ZERO = -1;
+	
+	public final static Integer ZERO_HELPER = -3;
+	
+	/**
+	 * We need a ssa variable representing unlimited (values we don't know
+	 * anything about). So we just use an integer, which is never produced by
+	 * ssa generation
+	 */
+	public final static Integer UNLIMITED = -2;
+
+	/**
+	 * Maps each array variable to a set of variables, which are used as Index
+	 * for accessing that array
+	 */
+	private final HashMap<Integer, Set<Integer>> arrayAccess;
+
+	/**
+	 * Maps each array variable to a node which is parent to all variables, that
+	 * contain the array length
+	 */
+	private final HashMap<Integer, Integer> arrayLength;
+
+	private final HashSet<Integer> phis;
+	
+	private final HashMap<Integer, Pair<Integer,Integer>> constants;
+
+	/**
+	 * For simplicity we introduce extra variables, for arrayLength, to have a
+	 * unique node representing the array length, even if the length is accessed
+	 * more than once in the code.
+	 *
+	 * Start with -3 so it is unequal to other constants
+	 */
+	private Integer arrayCounter = -4;
+
+	public ArrayBoundsGraph() {
+		this.arrayAccess = new HashMap<>();
+		this.arrayLength = new HashMap<>();
+		this.constants = new HashMap<>();
+		this.phis = new HashSet<>();
+		this.addNode(UNLIMITED);
+		this.phis.add(UNLIMITED);
+		this.createSourceVar(ZERO);
+		
+		this.addNode(ZERO_HELPER);
+		this.addEdge(ZERO, ZERO_HELPER);
+		//this.phis.add(ZERO_HELPER);
+	}
+
+  public void postProcessConstants() {
+    for (Map.Entry<Integer, Pair<Integer, Integer>> entry : constants.entrySet()) {
+		  HyperNode<Integer> constantNode = this.getNodes().get(entry.getKey());
+		  final Pair<Integer, Integer> value = entry.getValue();
+		  HyperNode<Integer> helper1 = this.getNodes().get(value.fst);
+		  HyperNode<Integer> helper2 = this.getNodes().get(value.snd);
+		  
+		  for (DirectedHyperEdge<Integer> edge:constantNode.getOutEdges()) {
+		    if (!edge.getDestination().contains(helper2)) {
+		      edge.getSource().remove(constantNode);
+		      edge.getSource().add(helper1);
+		    }
+		  }
+		}
+  }
+
+	public void addAdditionEdge(Integer src, Integer dst, Integer value) {
+		this.addNode(src);
+		final HyperNode<Integer> srcNode = this.getNodes().get(src);
+
+		this.addNode(dst);
+		final HyperNode<Integer> dstNode = this.getNodes().get(dst);
+
+		Weight weight;
+		if (value == 0) {
+			weight = Weight.ZERO;
+		} else {
+			weight = new Weight(Type.NUMBER, value);
+		}
+
+		final EdgeWeight edgeWeight = new AdditiveEdgeWeight(weight);
+
+		final DirectedHyperEdge<Integer> edge = new DirectedHyperEdge<>();
+		edge.getDestination().add(dstNode);
+		edge.getSource().add(srcNode);
+		edge.setWeight(edgeWeight);
+
+		this.getEdges().add(edge);
+	}
+
+	public void addArray(Integer array) {
+		this.getArrayNode(array);
+	}
+
+	/**
+	 * Add variable as constant with value value.
+	 *
+	 * This will create the following construct: [zero] -(value)-&gt; [h1] -0- &gt;
+	 * [variable] -(-value)-&gt; [h2] -0-&gt; [zero].
+	 *
+	 * The bidirectional linking, allows things like
+	 *
+	 * <pre>
+	 * int[] a = new int[2]();
+	 * a[0] = 1;
+	 * </pre>
+	 *
+	 * to work properly. h1, h2 are helper nodes: [zero] and [variable] may have
+	 * other predecessors, this will cause their in edges to be merged to a
+	 * single hyper edge with weight zero. The helper nodes are inserted to keep
+	 * the proper distance from [zero].
+	 */
+	public void addConstant(Integer variable, Integer value) {
+		final Integer helper1 = this.generateNewVar();
+		final Integer helper2 = this.generateNewVar();
+
+		this.addAdditionEdge(ZERO_HELPER, helper1, value);
+		// this.addEdge(helper1, variable);
+		this.addAdditionEdge(variable, helper2, -value);
+		this.addEdge(helper2, ZERO_HELPER);
+		
+		this.constants.put(variable, Pair.make(helper1, helper2));
+	}
+
+	public void addEdge(Integer src, Integer dst) {
+		this.addAdditionEdge(src, dst, 0);
+	}
+
+	public HyperNode<Integer> addNode(Integer value) {
+		HyperNode<Integer> result;
+		if (!this.getNodes().keySet().contains(value)) {
+			result = new HyperNode<>(value);
+			this.getNodes().put(value, result);
+		} else {
+			result = this.getNodes().get(value);
+		}
+		return result;
+	}
+
+	public void addPhi(Integer dst) {
+		this.phis.add(dst);
+	}
+
+	public void addPi(Integer dst, Integer src1, Integer src2) {
+		this.addEdge(src1, dst);
+		this.addEdge(src2, dst);
+	}
+
+	/**
+	 * Adds var as source var. A source var is a variable, which can be used as
+	 * source for shortest path computation.
+	 *
+	 * This will create the following construct: [unlimited] -&gt; [var] -&gt; [var]
+	 * -(unlimited)-&gt; [unlimited]
+	 *
+	 * This is a trap door construct: if [var] is not set to 0 it will get the
+	 * value unlimited, if [var] is set to 0 it will stay 0.
+	 */
+	public void createSourceVar(Integer var) {
+	  if (this.getNodes().keySet().contains(var)){
+	    throw new AssertionError("Source variables should only be created once.");
+	  }
+	  
+	  SoftFinalHyperNode<Integer> node = new SoftFinalHyperNode<>(var);
+	  this.getNodes().put(var, node);		
+
+//		final HyperNode<Integer> varNode = this.getNodes().get(var);
+//		final HyperNode<Integer> unlimitedNode = this.getNodes().get(UNLIMITED);
+
+//		final DirectedHyperEdge<Integer> edge = new DirectedHyperEdge<>();
+//		edge.setWeight(new AdditiveEdgeWeight(Weight.UNLIMITED));
+//		edge.getSource().add(varNode);
+//		edge.getDestination().add(unlimitedNode);
+//		this.getEdges().add(edge);
+
+		this.addEdge(UNLIMITED, var);
+		//this.addEdge(var, var);
+	}
+
+	public Integer generateNewVar() {
+		final int result = this.arrayCounter;
+		this.arrayCounter += -1;
+		return result;
+	}
+
+	public HashMap<Integer, Set<Integer>> getArrayAccess() {
+		return this.arrayAccess;
+	}
+
+	public HashMap<Integer, Integer> getArrayLength() {
+		return this.arrayLength;
+	}
+
+	public Integer getArrayNode(Integer array) {
+		Integer arrayVar;
+		if (!this.arrayLength.containsKey(array)) {
+			arrayVar = this.generateNewVar();
+			this.arrayLength.put(array, arrayVar);
+			this.createSourceVar(arrayVar);
+		} else {
+			arrayVar = this.arrayLength.get(array);
+		}
+		return arrayVar;
+	}
+
+	public HashSet<Integer> getPhis() {
+		return this.phis;
+	}
+
+	public void markAsArrayAccess(Integer array, Integer index) {
+		Set<Integer> indices;
+		if (!this.arrayAccess.containsKey(array)) {
+			indices = new HashSet<>();
+			this.arrayAccess.put(array, indices);
+		} else {
+			indices = this.arrayAccess.get(array);
+		}
+		indices.add(index);
+		this.addArray(array);
+	}
+
+	/**
+	 * Mark variable as length for array.
+	 */
+	public void markAsArrayLength(Integer array, Integer variable) {
+		this.addEdge(this.getArrayNode(array), variable);
+	}
+
+	public void markAsDeadEnd(Integer variable) {
+		this.addEdge(UNLIMITED, variable);
+	}
+	
+	public Weight getVariableWeight(Integer variable){
+	  if (constants.containsKey(variable)) {
+	    variable = constants.get(variable).fst;
+	  }
+	  
+	  return this.getNodes().get(variable).getWeight();
+	}
+	
+	@Override
+	public void reset() {
+	  super.reset();
+	  this.getNodes().get(UNLIMITED).setWeight(Weight.UNLIMITED);
+	  this.getNodes().get(UNLIMITED).setNewWeight(Weight.UNLIMITED);
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayOutOfBoundsAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayOutOfBoundsAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayOutOfBoundsAnalysis.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayOutOfBoundsAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,138 @@
+package com.ibm.wala.analysis.arraybounds;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.ibm.wala.analysis.arraybounds.hypergraph.HyperNode;
+import com.ibm.wala.analysis.arraybounds.hypergraph.algorithms.ShortestPath;
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.NormalOrder;
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.ReverseOrder;
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.SSAArrayReferenceInstruction;
+import com.ibm.wala.util.ssa.InstructionByIIndexMap;
+
+/**
+ * The array out of bounds analysis uses the inequality graph as described in
+ * [1]. And a shortest path computation as suggested ibid. as possible solver
+ * for the inequality graph.
+ *
+ * [1] Bodík, Rastislav, Rajiv Gupta, and Vivek Sarkar.
+ * "ABCD: eliminating array bounds checks on demand." ACM SIGPLAN Notices. Vol.
+ * 35. No. 5. ACM, 2000.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class ArrayOutOfBoundsAnalysis {
+  public enum UnnecessaryCheck {
+    NONE, UPPER, LOWER, BOTH;
+
+    public UnnecessaryCheck union(UnnecessaryCheck other) {
+      final Set<UnnecessaryCheck> set = new HashSet<>();
+      set.add(this);
+      set.add(other);
+      set.remove(NONE);
+      if (set.contains(BOTH) || (set.contains(UPPER) && set.contains(LOWER))) {
+        return BOTH;
+      } else if (set.size() == 0) {
+        return NONE;
+      } else if (set.size() == 1) {
+        return set.iterator().next();
+      } else {
+        throw new RuntimeException("Case that should not happen, this method is implemented wrong.");
+      }
+    }
+  }
+
+  private ArrayBoundsGraph lowerBoundGraph;
+  private ArrayBoundsGraph upperBoundGraph;
+
+  /**
+   * List of variables, that are used for array access and if they are
+   * neccessary
+   */
+  private final Map<SSAArrayReferenceInstruction, UnnecessaryCheck> boundsCheckUnnecessary;
+
+  /**
+   * Create and perform the array out of bounds analysis.
+   * 
+   * Make sure, the given IR was created with pi nodes for each variable, that
+   * is part of a branch instruction! Otherwise the results will be poor.
+   */
+  public ArrayOutOfBoundsAnalysis(IR ir) {
+    this.boundsCheckUnnecessary = new InstructionByIIndexMap<>();
+    this.buildInequalityGraphs(ir);
+
+    this.computeLowerBound();
+    this.computeUpperBounds();
+
+    this.lowerBoundGraph = null;
+    this.upperBoundGraph = null;
+  }
+
+  private void addUnnecessaryCheck(SSAArrayReferenceInstruction instruction, UnnecessaryCheck checkToAdd) {
+    final UnnecessaryCheck oldCheck = this.boundsCheckUnnecessary.get(instruction);
+    final UnnecessaryCheck newCheck = oldCheck.union(checkToAdd);
+    this.boundsCheckUnnecessary.put(instruction, newCheck);
+  }
+
+  private void buildInequalityGraphs(IR ir) {
+    ArrayBoundsGraphBuilder builder = new ArrayBoundsGraphBuilder(ir);
+    this.lowerBoundGraph = builder.getLowerBoundGraph();
+    this.upperBoundGraph = builder.getUpperBoundGraph();
+
+    for (final SSAArrayReferenceInstruction instruction : builder.getArrayReferenceInstructions()) {
+      this.boundsCheckUnnecessary.put(instruction, UnnecessaryCheck.NONE);
+    }
+    builder = null;
+  }
+
+  /**
+   * compute lower bound
+   */
+  private void computeLowerBound() {
+    final HyperNode<Integer> zero = this.lowerBoundGraph.getNodes().get(ArrayBoundsGraph.ZERO);
+    ShortestPath.compute(this.lowerBoundGraph, zero, new NormalOrder());
+
+    for (final SSAArrayReferenceInstruction instruction : this.boundsCheckUnnecessary.keySet()) {
+      
+      Weight weight = this.lowerBoundGraph.getVariableWeight(instruction.getIndex());
+      
+      if (weight.getType() == Weight.Type.NUMBER && weight.getNumber() >= 0) {
+        this.addUnnecessaryCheck(instruction, UnnecessaryCheck.LOWER);
+      }
+    }
+  }
+
+  /**
+   * compute upper bound for each array
+   */
+  private void computeUpperBounds() {
+    final Map<Integer, Integer> arrayLengths = this.upperBoundGraph.getArrayLength();
+    for (final Map.Entry<Integer, Integer> entry : arrayLengths.entrySet()) {
+      final HyperNode<Integer> arrayNode = this.upperBoundGraph.getNodes().get(entry.getValue());
+
+      ShortestPath.compute(this.upperBoundGraph, arrayNode, new ReverseOrder());
+
+      for (final SSAArrayReferenceInstruction instruction : this.boundsCheckUnnecessary.keySet()) {
+        if (instruction.getArrayRef() == entry.getKey()) {
+          Weight weight = this.upperBoundGraph.getVariableWeight(instruction.getIndex());
+
+          if (weight.getType() == Weight.Type.NUMBER && weight.getNumber() <= -1) {
+            this.addUnnecessaryCheck(instruction, UnnecessaryCheck.UPPER);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * @return for each array reference instruction (load or store), if both,
+   *         lower bound, upper bound or no check is unnecessary.
+   */
+  public Map<SSAArrayReferenceInstruction, UnnecessaryCheck> getBoundsCheckNecessary() {
+    return this.boundsCheckUnnecessary;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/BinaryOpWithConstant.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/BinaryOpWithConstant.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/BinaryOpWithConstant.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/BinaryOpWithConstant.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,84 @@
+package com.ibm.wala.analysis.arraybounds;
+
+import com.ibm.wala.shrikeBT.IBinaryOpInstruction.IOperator;
+import com.ibm.wala.shrikeBT.IBinaryOpInstruction.Operator;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.SSABinaryOpInstruction;
+
+/**
+ * Normalizes a binary operation with a constant by providing direct access to
+ * assigned = other op constant.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class BinaryOpWithConstant {
+	/**
+	 * @return normalized BinaryOpWithConstant or null, if normalization was not
+	 *         successful.
+	 */
+	public static BinaryOpWithConstant create(
+			SSABinaryOpInstruction instruction, IR ir) {
+		BinaryOpWithConstant result = null;
+
+		if (instruction.mayBeIntegerOp()) {
+			assert instruction.getNumberOfUses() == 2;
+			Integer other = null;
+			Integer value = null;
+
+			int constantPos = -1;
+			for (int i = 0; i < instruction.getNumberOfUses(); i++) {
+				final int constant = instruction.getUse(i);
+				if (ir.getSymbolTable().isIntegerConstant(constant)) {
+					other = instruction.getUse((i + 1) % 2);
+					value = ir.getSymbolTable().getIntValue(constant);
+					constantPos = i;
+				}
+			}
+
+			final IOperator op = instruction.getOperator();
+
+			if (constantPos != -1) {
+				if (op == Operator.ADD || op == Operator.SUB
+						&& constantPos == 1) {
+					result = new BinaryOpWithConstant(op, other, value,
+							instruction.getDef());
+				}
+			}
+		}
+
+		return result;
+	}
+
+	private final IOperator op;
+	private final Integer other;
+
+	private final Integer value;
+
+	private final Integer assigned;
+
+	private BinaryOpWithConstant(IOperator op, Integer other, Integer value,
+			Integer assigned) {
+		super();
+		this.op = op;
+		this.other = other;
+		this.value = value;
+		this.assigned = assigned;
+	}
+
+	public Integer getAssignedVar() {
+		return this.assigned;
+	}
+
+	public Integer getConstantValue() {
+		return this.value;
+	}
+
+	public IOperator getOp() {
+		return this.op;
+	}
+
+	public Integer getOtherVar() {
+		return this.other;
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ConditionNormalizer.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ConditionNormalizer.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ConditionNormalizer.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ConditionNormalizer.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,115 @@
+package com.ibm.wala.analysis.arraybounds;
+
+import com.ibm.wala.shrikeBT.IConditionalBranchInstruction.Operator;
+import com.ibm.wala.ssa.SSAConditionalBranchInstruction;
+
+/**
+ * ConditionNormalizer normalizes a branch condition. See Constructor for more
+ * information.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class ConditionNormalizer {
+	private final int lhs;
+	private int rhs;
+	private Operator op;
+
+	/**
+	 * Creates a normalization of cnd such that lhs op rhs is true.
+	 *
+	 * Normalization means, that the given variable lhs, will be on the left
+	 * hand side of the comparison, also if the branch is not taken, the
+	 * operation needs to be negated.
+	 *
+	 * p.a. the condition is !(rhs &gt;= lhs), it will be normalized to lhs &gt; rhs
+	 *
+	 * @param cnd
+	 *            condition to normalize
+	 * @param lhs
+	 *            variable, that should be on the left hand side
+	 * @param branchIsTaken
+	 *            if the condition is for the branching case or not
+	 */
+	public ConditionNormalizer(SSAConditionalBranchInstruction cnd, int lhs,
+			boolean branchIsTaken) {
+		this.lhs = lhs;
+
+		if (cnd.getNumberOfUses() != 2) {
+			throw new IllegalArgumentException(
+					"Condition uses not exactly two variables.");
+		}
+
+		this.op = (Operator) cnd.getOperator();
+		for (int i = 0; i < cnd.getNumberOfUses(); i++) {
+			final int var = cnd.getUse(i);
+			if ((var != lhs)) {
+				if (cnd.getUse((i + 1) % 2) != lhs) {
+					throw new IllegalArgumentException(
+							"Lhs not contained in condition.");
+				}
+
+				if (i == 0) {
+					// make sure the other is lhs
+					this.op = swapOperator(this.op);
+				}
+				if (!branchIsTaken) {
+					this.op = negateOperator(this.op);
+				}
+				this.rhs = var;
+			}
+		}
+	}
+
+	public int getLhs() {
+		return this.lhs;
+	}
+
+	public Operator getOp() {
+		return this.op;
+	}
+
+	public int getRhs() {
+		return this.rhs;
+	}
+
+	private static Operator negateOperator(Operator op) {
+		switch (op) {
+		case EQ:
+			return Operator.NE;
+		case NE:
+			return Operator.EQ;
+		case LT:
+			return Operator.GE;
+		case GE:
+			return Operator.LT;
+		case GT:
+			return Operator.LE;
+		case LE:
+			return Operator.GT;
+		default:
+			throw new RuntimeException(
+					"Programming Error: Got unknown operator.");
+		}
+	}
+
+	private static Operator swapOperator(Operator op) {
+		switch (op) {
+		case EQ:
+			return op;
+		case NE:
+			return op;
+		case LT:
+			return Operator.GT;
+		case GE:
+			return Operator.LE;
+		case GT:
+			return Operator.LT;
+		case LE:
+			return Operator.GE;
+		default:
+			throw new RuntimeException(
+					"Programming Error: Got unknown operator.");
+		}
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/algorithms/ShortestPath.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/algorithms/ShortestPath.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/algorithms/ShortestPath.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/algorithms/ShortestPath.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,217 @@
+package com.ibm.wala.analysis.arraybounds.hypergraph.algorithms;
+
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.ibm.wala.analysis.arraybounds.hypergraph.DirectedHyperEdge;
+import com.ibm.wala.analysis.arraybounds.hypergraph.DirectedHyperGraph;
+import com.ibm.wala.analysis.arraybounds.hypergraph.HyperNode;
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight;
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight.Type;
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.edgeweights.EdgeWeight;
+
+/**
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ * @param <T>
+ *          NodeValueType
+ * @see ShortestPath#compute(DirectedHyperGraph, HyperNode, Comparator)
+ */
+public class ShortestPath<T> {
+  /**
+   * Computes all shortest paths from source. The result is stored in
+   * {@link HyperNode#getWeight()}.
+   *
+   * This is using a variation of Bellman-Ford for hyper graphs.
+   *
+   * @param comparator
+   *          defines order on weights.
+   */
+  public static <NodeValueType> void compute(DirectedHyperGraph<NodeValueType> graph, HyperNode<NodeValueType> source,
+      Comparator<Weight> comparator) {
+    graph.reset();
+    source.setWeight(Weight.ZERO);
+    new ShortestPath<>(graph, comparator);
+  }
+
+  private Set<DirectedHyperEdge<T>> updatedEdges;
+  private final Comparator<Weight> comparator;
+  private final DirectedHyperGraph<T> graph;
+  private boolean setUnlimitedOnChange = false;
+
+  private boolean hasNegativeCycle = false;
+
+  /**
+   * @param graph
+   *          Source nodes for shortest path computation should be set to 0,
+   *          other nodes should be set to {@link Weight#NOT_SET}.
+   * @param comparator
+   *          defines order on weights.
+   */
+  private ShortestPath(DirectedHyperGraph<T> graph, Comparator<Weight> comparator) {
+    this.comparator = comparator;
+    this.graph = graph;
+
+    this.computeShortestPaths();
+    this.hasNegativeCycle = (this.updatedEdges.size() > 0);
+    if (this.hasNegativeCycle) {
+      // trigger, that changing values are set to infty in writeChanges:
+      this.setUnlimitedOnChange = true;
+
+      // we need to propagate negative cycle to all connected nodes
+      this.computeShortestPaths();
+    }
+  }
+
+  private void computeShortestPaths() {
+    this.updatedEdges = this.graph.getEdges();
+    final int nodeCount = this.graph.getNodes().size();
+    for (int i = 0; i < nodeCount - 1; i++) {
+      this.updateAllEdges();
+      if (this.updatedEdges.size() == 0) {
+        break;
+      }
+    }
+  }
+
+  /**
+   * @return weight &gt; otherWeight
+   */
+  private boolean greaterThen(Weight weight, Weight otherWeight) {
+    return otherWeight.getType() == Type.NOT_SET || this.comparator.compare(weight, otherWeight) > 0;
+  }
+
+  /**
+   * @return weight &lt; otherWeight
+   */
+  private boolean lessThen(Weight weight, Weight otherWeight) {
+    return otherWeight.getType() == Type.NOT_SET || this.comparator.compare(weight, otherWeight) < 0;
+  }
+
+  /**
+   * Maximum of source weights, modified by the value of the edge. Note that
+   * every weight is larger than {@link Weight#NOT_SET} for max computation.
+   * This allows distances to propagate, even if not all nodes are connected to
+   * the source of the shortest path computation. Otherwise (source,
+   * other)->(sink) would not have a path from source to sink.
+   *
+   * @return max{edgeValue.newValue(sourceWeight) | sourceWeight \in
+   *         edge.getSources()}
+   */
+  private Weight maxOfSources(final DirectedHyperEdge<T> edge) {
+    final EdgeWeight edgeValue = edge.getWeight();
+    Weight newWeight = Weight.NOT_SET;
+    for (final HyperNode<T> node : edge.getSource()) {
+
+      final Weight nodeWeight = node.getWeight();
+      if (nodeWeight.getType() != Type.NOT_SET) {
+
+        final Weight temp = edgeValue.newValue(nodeWeight);
+        if (this.greaterThen(temp, newWeight)) {
+          newWeight = temp;
+        }
+      } else {
+        newWeight = Weight.NOT_SET;
+        break;
+      }
+    }
+    return newWeight;
+  }
+
+  /**
+   * We do not need to iterate all edges, but edges of which the source weight
+   * was changed, other edges will not lead to a change of the destination
+   * weight. For correct updating of the destination weight, we need to consider
+   * all incoming edges. (The minimum of in edges is computed per round, not
+   * global - see
+   * {@link ShortestPath#updateDestinationsWithMin(DirectedHyperEdge, Weight)}
+   * )
+   *
+   * @return A set of edges, that may lead to changes of weights.
+   */
+  private HashSet<DirectedHyperEdge<T>> selectEdgesToIterate() {
+    final HashSet<DirectedHyperEdge<T>> edgesToIterate = new HashSet<>();
+    for (final DirectedHyperEdge<T> edge : this.updatedEdges) {
+      for (final HyperNode<T> node : edge.getDestination()) {
+        edgesToIterate.addAll(node.getInEdges());
+      }
+    }
+    return edgesToIterate;
+  }
+
+  private void updateAllEdges() {
+
+    for (final DirectedHyperEdge<T> edge : this.selectEdgesToIterate()) {
+      final Weight maxOfSources = this.maxOfSources(edge);
+
+      if (maxOfSources.getType() != Type.NOT_SET) {
+        this.updateDestinationsWithMin(edge, maxOfSources);
+      }
+    }
+
+    this.writeChanges();
+  }
+
+  /**
+   * Updates Nodes with the minimum of all incoming edges. The minimum is
+   * computed over the minimum of all edges that were processed in this round (
+   * {@link ShortestPath#selectEdgesToIterate()}).
+   *
+   * This is necessary for the feature described in
+   * {@link ShortestPath#maxOfSources(DirectedHyperEdge)} to work properly: The
+   * result of different rounds is not always monotonous, p.a.:
+   *
+   * <pre>
+   * (n1, n2)->(n3)
+   * Round 1: n1 = unset, n2 = -3 -&gt; n3 = max(unset,-3) = -3
+   * Round 2: n1 = 1, n2 = -3 -&gt; n3 = max(1,-3) = 1
+   * </pre>
+   *
+   * Would we compute the minimum of n3 over all rounds, it would be -3, but 1
+   * is correct.
+   *
+   * Note: that every weight is smaller than {@link Weight#NOT_SET} for min
+   * computation. This allows distances to propagate, even if not all nodes are
+   * connected to the source of the shortest path computation. Otherwise
+   * (source)->(sink), (other)->(sink), would not have a path from source to
+   * sink.
+   */
+  private void updateDestinationsWithMin(final DirectedHyperEdge<T> edge, Weight newWeight) {
+    if (!newWeight.equals(Weight.NOT_SET)) {
+      for (final HyperNode<T> node : edge.getDestination()) {
+        if (this.lessThen(newWeight, node.getNewWeight())) {
+          node.setNewWeight(newWeight);
+        }
+      }
+    }
+  }
+
+  /**
+   * This method is necessary, as the min is updated per round. (See
+   * {@link ShortestPath#updateDestinationsWithMin(DirectedHyperEdge, Weight)} )
+   */
+  private void writeChanges() {
+    final HashSet<DirectedHyperEdge<T>> newUpdatedEdges = new HashSet<>();
+
+    for (final HyperNode<T> node : this.graph.getNodes().values()) {
+      final Weight oldWeight = node.getWeight();
+      final Weight newWeight = node.getNewWeight();
+      if (!newWeight.equals(Weight.NOT_SET) && !oldWeight.equals(newWeight)) {
+        // node weight has changed, so out edges have to be updated next
+        // round:
+        newUpdatedEdges.addAll(node.getOutEdges());
+
+        if (this.setUnlimitedOnChange) {
+          node.setWeight(Weight.UNLIMITED);
+        } else {
+          node.setWeight(node.getNewWeight());
+        }
+      }
+      node.setNewWeight(Weight.NOT_SET);
+    }
+
+    this.updatedEdges = newUpdatedEdges;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/DirectedHyperEdge.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/DirectedHyperEdge.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/DirectedHyperEdge.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/DirectedHyperEdge.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,44 @@
+package com.ibm.wala.analysis.arraybounds.hypergraph;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.edgeweights.EdgeWeight;
+
+/**
+ * A DirectedHyperEdge is an edge of a {@link DirectedHyperGraph}.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ * @param <T>
+ *            Type used in HyperNodes (HyperNode&lt;T&gt;)
+ */
+public class DirectedHyperEdge<T> {
+	/** Contains all destinations of this HyperEdge */
+	private final Set<HyperNode<T>> tail;
+	/** Contains multiple sources of this HyperEdge */
+	private final Set<HyperNode<T>> head;
+	private EdgeWeight weight;
+
+	public DirectedHyperEdge() {
+		this.tail = new HashSet<>();
+		this.head = new HashSet<>();
+	}
+
+	public Set<HyperNode<T>> getDestination() {
+		return this.head;
+	}
+
+	public Set<HyperNode<T>> getSource() {
+		return this.tail;
+	}
+
+	public EdgeWeight getWeight() {
+		return this.weight;
+	}
+
+	public void setWeight(EdgeWeight weight) {
+		this.weight = weight;
+	}
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/DirectedHyperGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/DirectedHyperGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/DirectedHyperGraph.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/DirectedHyperGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,76 @@
+package com.ibm.wala.analysis.arraybounds.hypergraph;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight;
+
+/**
+ * Implementation of a directed hyper graph. In a hyper graph an edge can have
+ * more than one head and more than one tail.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ */
+public class DirectedHyperGraph<T> {
+	private final Map<T, HyperNode<T>> nodes;
+	private final Set<DirectedHyperEdge<T>> edges;
+
+	public DirectedHyperGraph() {
+		this.nodes = new HashMap<>();
+		this.edges = new HashSet<>();
+	}
+
+	public Set<DirectedHyperEdge<T>> getEdges() {
+		return this.edges;
+	}
+
+	public Map<T, HyperNode<T>> getNodes() {
+		return this.nodes;
+	}
+
+	/**
+	 * Resets the weight of all nodes.
+	 */
+	public void reset() {
+		for (final HyperNode<T> node : this.getNodes().values()) {
+			node.setWeight(Weight.NOT_SET);
+			node.setNewWeight(Weight.NOT_SET);
+		}
+	}
+
+	@Override
+	public String toString() {
+		final StringBuilder buffer = new StringBuilder();
+		for (final DirectedHyperEdge<T> edge : this.getEdges()) {
+			buffer.append(edge.getSource());
+			buffer.append(" -- ");
+			buffer.append(edge.getWeight());
+			buffer.append(" --> ");
+			buffer.append(edge.getDestination());
+			buffer.append('\n');
+		}
+		return buffer.toString();
+	}
+
+	/**
+	 * The outdEdges of a node may not have been set on construction. Use this
+	 * method to set them based on the edges of this HyperGraph.
+	 */
+	public void updateNodeEdges() {
+		for (final HyperNode<T> node : this.getNodes().values()) {
+			node.setOutEdges(new HashSet<DirectedHyperEdge<T>>());
+			node.setInEdges(new HashSet<DirectedHyperEdge<T>>());
+		}
+
+		for (final DirectedHyperEdge<T> edge : this.edges) {
+			for (final HyperNode<T> node : edge.getSource()) {
+				node.getOutEdges().add(edge);
+			}
+			for (final HyperNode<T> node : edge.getDestination()) {
+				node.getInEdges().add(edge);
+			}
+		}
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/HyperNode.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/HyperNode.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/HyperNode.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/HyperNode.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,85 @@
+package com.ibm.wala.analysis.arraybounds.hypergraph;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight;
+
+/**
+ * A HyperNode is a node of a {@link DirectedHyperGraph}.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ */
+public class HyperNode<T> {
+	private Weight weight;
+	private Weight newWeight;
+
+	/**
+	 * Set of edges, which have this node as source, can be set automatically
+	 * with {@link DirectedHyperGraph#updateNodeEdges()}
+	 */
+	private Set<DirectedHyperEdge<T>> outEdges;
+	/**
+	 * Set of edges, which have this node as source, can be set automatically
+	 * with {@link DirectedHyperGraph#updateNodeEdges()}
+	 */
+	private Set<DirectedHyperEdge<T>> inEdges;
+
+	private T value;
+
+	public HyperNode(T value) {
+		this.value = value;
+		this.outEdges = new HashSet<>();
+		this.weight = Weight.NOT_SET;
+		this.newWeight = Weight.NOT_SET;
+	}
+
+	public Set<DirectedHyperEdge<T>> getInEdges() {
+		return this.inEdges;
+	}
+
+	public Weight getNewWeight() {
+		return this.newWeight;
+	}
+
+	public Set<DirectedHyperEdge<T>> getOutEdges() {
+		return this.outEdges;
+	}
+
+	public T getValue() {
+		return this.value;
+	}
+
+	public Weight getWeight() {
+		return this.weight;
+	}
+
+	public void setInEdges(Set<DirectedHyperEdge<T>> inEdges) {
+		this.inEdges = inEdges;
+	}
+
+	public void setNewWeight(Weight newWeight) {
+		this.newWeight = newWeight;
+	}
+
+	public void setOutEdges(Set<DirectedHyperEdge<T>> outEdges) {
+		this.outEdges = outEdges;
+	}
+
+	public void setValue(T value) {
+		this.value = value;
+	}
+
+	public void setWeight(Weight weight) {
+		this.weight = weight;
+	}
+
+	@Override
+	public String toString() {
+		if (this.weight == Weight.NOT_SET) {
+			return this.value.toString();
+		} else {
+			return this.value.toString() + ": " + this.weight;
+		}
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/package-info.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/package-info.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/package-info.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,8 @@
+package com.ibm.wala.analysis.arraybounds.hypergraph;
+
+/**
+ * This package contains a generic implementation of directed hypergraphs.
+ * The implementation is optimized for shortest path search, with
+ * {@link com.ibm.wala.analysis.arraybounds.hypergraph.algorithms.ShortestPath#compute(com.ibm.wala.analysis.arraybounds.hypergraph.DirectedHyperGraph,
+ * com.ibm.wala.analysis.arraybounds.hypergraph.HyperNode, java.util.Comparator) ShortestPath}
+ */
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/SoftFinalHyperNode.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/SoftFinalHyperNode.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/SoftFinalHyperNode.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/SoftFinalHyperNode.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.analysis.arraybounds.hypergraph;
+
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight;
+
+public class SoftFinalHyperNode<T> extends HyperNode<T> {
+
+  public SoftFinalHyperNode(T value) {
+    super(value);
+  }
+
+  @Override
+  public void setWeight(Weight weight) {
+    if (weight.equals(Weight.NOT_SET) || this.getWeight().equals(Weight.NOT_SET)) {
+      super.setWeight(weight);
+    }
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/edgeweights/AdditiveEdgeWeight.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/edgeweights/AdditiveEdgeWeight.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/edgeweights/AdditiveEdgeWeight.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/edgeweights/AdditiveEdgeWeight.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,58 @@
+package com.ibm.wala.analysis.arraybounds.hypergraph.weight.edgeweights;
+
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight;
+
+/**
+ * EdgeWeight that adds a specific value.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class AdditiveEdgeWeight implements EdgeWeight {
+	private final Weight value;
+
+	public AdditiveEdgeWeight(Weight value) {
+		this.value = value;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (this.getClass() != obj.getClass()) {
+			return false;
+		}
+		final AdditiveEdgeWeight other = (AdditiveEdgeWeight) obj;
+		if (this.value == null) {
+			if (other.value != null) {
+				return false;
+			}
+		} else if (!this.value.equals(other.value)) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result
+				+ ((this.value == null) ? 0 : this.value.hashCode());
+		return result;
+	}
+
+	@Override
+	public Weight newValue(Weight weight) {
+		return weight.add(this.value);
+	}
+
+	@Override
+	public String toString() {
+		return this.value.toString();
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/edgeweights/EdgeWeight.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/edgeweights/EdgeWeight.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/edgeweights/EdgeWeight.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/edgeweights/EdgeWeight.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,13 @@
+package com.ibm.wala.analysis.arraybounds.hypergraph.weight.edgeweights;
+
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight;
+
+/**
+ * The weight of an edge can produce a new value for the tail nodes given the
+ * head nodes.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ */
+public interface EdgeWeight {
+	public Weight newValue(Weight weight);
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/NormalOrder.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/NormalOrder.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/NormalOrder.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/NormalOrder.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,45 @@
+package com.ibm.wala.analysis.arraybounds.hypergraph.weight;
+
+import java.util.Comparator;
+
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight.Type;
+
+/**
+ * Defines a normal Order on Weight: unlimited &lt; ... &lt; -1 &lt; 0 &lt; 1 &lt; ... not_set
+ * is not comparable
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class NormalOrder implements Comparator<Weight> {
+
+	@Override
+	public int compare(Weight o1, Weight o2) {
+		int result = 0;
+
+		if (o1.getType() == Type.NOT_SET || o2.getType() == Type.NOT_SET) {
+			throw new IllegalArgumentException(
+					"Tried to compare weights, which are not set yet.");
+		}
+
+		if (o1.getType() == o2.getType()) {
+			if (o1.getType() == Type.NUMBER) {
+				result = o1.getNumber() - o2.getNumber();
+			} else {
+				result = 0;
+			}
+		} else {
+			if (o1.getType() == Type.UNLIMITED) {
+				result = -1;
+			} else if (o2.getType() == Type.UNLIMITED) {
+				result = 1;
+			} else {
+				throw new IllegalArgumentException(
+						"Programming error, expected no cases to be left.");
+			}
+		}
+
+		return result;
+	}
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/ReverseOrder.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/ReverseOrder.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/ReverseOrder.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/ReverseOrder.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,36 @@
+package com.ibm.wala.analysis.arraybounds.hypergraph.weight;
+
+import java.util.Comparator;
+
+import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight.Type;
+
+/**
+ * Defines a reverse Order on Weight: ... &gt; 1 &gt; 0 &gt; -1 &gt; ... &gt; unlimited not_set
+ * is not comparable
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class ReverseOrder implements Comparator<Weight> {
+
+	private final NormalOrder normalOrder;
+
+	public ReverseOrder() {
+		this.normalOrder = new NormalOrder();
+	}
+
+	@Override
+	public int compare(Weight o1, Weight o2) {
+		int result;
+		if (o1.getType() == Type.UNLIMITED) {
+			result = -1;
+		} else if (o2.getType() == Type.UNLIMITED) {
+			result = 1;
+		} else {
+			result = -this.normalOrder.compare(o1, o2);
+		}
+
+		return result;
+	}
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/Weight.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/Weight.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/Weight.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/Weight.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,109 @@
+package com.ibm.wala.analysis.arraybounds.hypergraph.weight;
+
+/**
+ * A weight may be not set, a number or unlimited, note that the meaning of
+ * unlimited is given by the chosen order (see {@link NormalOrder} and
+ * {@link ReverseOrder}).
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ */
+public class Weight {
+	public enum Type {
+		NUMBER, NOT_SET, UNLIMITED
+	}
+
+	public static final Weight UNLIMITED = new Weight(Type.UNLIMITED, 0);
+	public static final Weight NOT_SET = new Weight(Type.NOT_SET, 0);
+
+	public static final Weight ZERO = new Weight(Type.NUMBER, 0);
+
+	private final Type type;
+	private final int number;
+
+	public Weight(int number) {
+		this.type = Type.NUMBER;
+		this.number = number;
+	}
+
+	public Weight(Type type, int number) {
+		super();
+		this.type = type;
+		this.number = number;
+	}
+
+	/**
+	 * Returns this + other. If this is not Number this will be returned, if
+	 * other is not number other will be returned
+	 *
+	 * @return this + other
+	 */
+	public Weight add(Weight other) {
+		Weight result = null;
+		if (this.getType() == Type.NUMBER) {
+			if (other.getType() == Type.NUMBER) {
+				result = new Weight(Type.NUMBER, this.getNumber()
+						+ other.getNumber());
+			} else {
+				result = other;
+			}
+		} else {
+			result = this;
+		}
+
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (this.getClass() != obj.getClass()) {
+			return false;
+		}
+		final Weight other = (Weight) obj;
+		if (this.number != other.number) {
+			return false;
+		}
+		if (this.type != other.type) {
+			return false;
+		}
+		return true;
+	}
+
+	public int getNumber() {
+		return this.number;
+	}
+
+	public Type getType() {
+		return this.type;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + this.number;
+		result = prime * result
+				+ ((this.type == null) ? 0 : this.type.hashCode());
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		if (this.type == Type.NUMBER) {
+			return Integer.toString(this.number);
+		} else {
+			if (this.type == Type.NOT_SET) {
+				return "NOT_SET";
+			} else if (this.type == Type.UNLIMITED) {
+				return "UNLIMITED";
+			} else {
+				return "Type: " + this.type;
+			}
+		}
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/CGIntraproceduralExceptionAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/CGIntraproceduralExceptionAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/CGIntraproceduralExceptionAnalysis.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/CGIntraproceduralExceptionAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.analysis.exceptionanalysis;
+
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural.InterproceduralExceptionFilter;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.types.TypeReference;
+
+/**
+ * Wrapper to store multiple intraprocedural analysis for a call graph.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class CGIntraproceduralExceptionAnalysis {
+  private Map<CGNode, IntraproceduralExceptionAnalysis> analysis;
+  private Set<TypeReference> exceptions;
+  private CallGraph callGraph;
+
+  public CGIntraproceduralExceptionAnalysis(CallGraph cg, PointerAnalysis<InstanceKey> pointerAnalysis, ClassHierarchy cha,
+      InterproceduralExceptionFilter<SSAInstruction> filter) {
+    this.callGraph = cg;
+    this.exceptions = new LinkedHashSet<>();
+    this.analysis = new LinkedHashMap<>();
+    for (CGNode node : cg) {
+      if (node.getIR() == null || node.getIR().isEmptyIR()) {
+        analysis.put(node, IntraproceduralExceptionAnalysis.newDummy());
+      } else {
+        IntraproceduralExceptionAnalysis intraEA;
+        intraEA = new IntraproceduralExceptionAnalysis(node, filter.getFilter(node), cha, pointerAnalysis);
+        analysis.put(node, intraEA);
+        exceptions.addAll(intraEA.getExceptions());
+        exceptions.addAll(intraEA.getPossiblyCaughtExceptions());
+      }
+    }
+  }
+
+  /**
+   * @return IntraproceduralExceptionAnalysis for given node.
+   */
+  public IntraproceduralExceptionAnalysis getAnalysis(CGNode node) {
+    if (!callGraph.containsNode(node)) {
+      throw new IllegalArgumentException("The given CG node has to be part " + "of the call graph given during construction.");
+    }
+
+    IntraproceduralExceptionAnalysis result = analysis.get(node);
+    if (result == null) {
+      throw new RuntimeException("Internal Error: No result for the given node.");
+    }
+    return result;
+  }
+
+  /**
+   * Return a set of all Exceptions, which might occur within the given call
+   * graph.
+   * 
+   * @return all exceptions, which might occur.
+   */
+  public Set<TypeReference> getExceptions() {
+    return exceptions;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/Exception2BitvectorTransformer.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/Exception2BitvectorTransformer.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/Exception2BitvectorTransformer.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/Exception2BitvectorTransformer.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.analysis.exceptionanalysis;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import com.ibm.wala.fixpoint.BitVectorVariable;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.collections.ObjectArrayMapping;
+import com.ibm.wala.util.intset.BitVector;
+import com.ibm.wala.util.intset.OrdinalSetMapping;
+
+public class Exception2BitvectorTransformer {
+  private OrdinalSetMapping<TypeReference> values;
+
+  public OrdinalSetMapping<TypeReference> getValues() {
+    return values;
+  }
+
+  public Exception2BitvectorTransformer(Set<TypeReference> exceptions) {
+    createValues(exceptions);
+    for (TypeReference exception : exceptions) {
+      BitVector bv = new BitVector(values.getSize());
+      bv.set(values.getMappedIndex(exception));
+    }
+  }
+
+  private void createValues(Set<TypeReference> exceptions) {
+    TypeReference[] exceptionsArray = new TypeReference[exceptions.size()];
+    exceptions.toArray(exceptionsArray);
+    values = new ObjectArrayMapping<>(exceptionsArray);
+  }
+
+  public BitVector computeBitVector(Set<TypeReference> exceptions) {
+    BitVector result = new BitVector(values.getSize());
+    for (TypeReference exception : exceptions) {
+      int pos = values.getMappedIndex(exception);
+      if (pos != -1) {
+        result.set(pos);
+      } else {
+        throw new IllegalArgumentException("Got exception I don't know about,"
+            + "make sure only to use exceptions given to the constructor ");
+      }
+    }
+    return result;
+  }
+
+  public Set<TypeReference> computeExceptions(BitVector bitVector) {
+    assert bitVector.length() == values.getSize();
+    Set<TypeReference> result = new HashSet<>();
+    for (int i = 0; i < bitVector.length(); i++) {
+      if (bitVector.get(i)) {
+        result.add(values.getMappedObject(i));
+      }
+    }
+    return result;
+  }
+
+  public Set<TypeReference> computeExceptions(BitVectorVariable bitVector) {
+    Set<TypeReference> result = new HashSet<>();
+    for (int i = 0; i < values.getSize(); i++) {
+      if (bitVector.get(i)) {
+        result.add(values.getMappedObject(i));
+      }
+    }
+    return result;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/ExceptionAnalysis2EdgeFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/ExceptionAnalysis2EdgeFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/ExceptionAnalysis2EdgeFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/ExceptionAnalysis2EdgeFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.analysis.exceptionanalysis;
+
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.cfg.EdgeFilter;
+import com.ibm.wala.ssa.ISSABasicBlock;
+import com.ibm.wala.ssa.SSAInstruction;
+
+/**
+ * Converter to use the results of the exception analysis with an edge filter.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class ExceptionAnalysis2EdgeFilter implements EdgeFilter<ISSABasicBlock> {
+  private ExceptionAnalysis analysis;
+  private CGNode node;
+
+  public ExceptionAnalysis2EdgeFilter(ExceptionAnalysis analysis, CGNode node) {
+    this.analysis = analysis;
+    this.node = node;
+  }
+
+  @Override
+  public boolean hasNormalEdge(ISSABasicBlock src, ISSABasicBlock dst) {
+    boolean originalEdge = node.getIR().getControlFlowGraph().getNormalSuccessors(src).contains(dst);
+    boolean result = originalEdge;
+    SSAInstruction instruction = IntraproceduralExceptionAnalysis.getThrowingInstruction(src);
+    if (instruction != null) {
+      if (analysis.getFilter().getFilter(node).alwaysThrowsException(instruction)) {
+        result = false;
+      }
+    }
+    return result;
+  }
+
+  @Override
+  public boolean hasExceptionalEdge(ISSABasicBlock src, ISSABasicBlock dst) {
+    boolean originalEdge = node.getIR().getControlFlowGraph().getExceptionalSuccessors(src).contains(dst);
+    boolean result = originalEdge;
+
+    if (dst.isCatchBlock()) {
+      if (!analysis.catchesException(node, src, dst)) {
+        result = false;
+      }
+    } else {
+      assert dst.isExitBlock();
+      result = analysis.hasUncaughtExceptions(node, src);
+    }
+    return result;
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/ExceptionAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/ExceptionAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/ExceptionAnalysis.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/ExceptionAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,236 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.analysis.exceptionanalysis;
+
+import java.util.Iterator;
+import java.util.Set;
+
+import com.ibm.wala.analysis.arraybounds.ArrayOutOfBoundsAnalysis;
+import com.ibm.wala.analysis.nullpointer.IntraproceduralNullPointerAnalysis;
+import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.dataflow.graph.BitVectorFramework;
+import com.ibm.wala.dataflow.graph.BitVectorSolver;
+import com.ibm.wala.fixpoint.BitVectorVariable;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionMatcher;
+import com.ibm.wala.ipa.cfg.exceptionpruning.filter.DummyFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural.IgnoreExceptionsInterFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural.InterproceduralExceptionFilter;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ssa.ISSABasicBlock;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.SSAInstruction.Visitor;
+import com.ibm.wala.ssa.SSAInvokeInstruction;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
+import com.ibm.wala.util.graph.Graph;
+import com.ibm.wala.util.graph.impl.InvertedGraph;
+
+/**
+ * 
+ * This class analyzes the exceptional control flow. Use
+ * {@link ExceptionAnalysis2EdgeFilter} to remove infeasible edges.
+ * 
+ * In a first step an intraprocedural analysis is performed, to collect the
+ * thrown exceptions and collect the exceptions caught, per invoke instruction.
+ * The results of the intraprocedural analysis are used for a GenKill data flow
+ * analysis on the call graph. (Each node generates intraprocedural thrown
+ * exceptions and along invoke edges, caught exceptions are removed.)
+ * 
+ * Notice: Only exceptions, which are part of the analysis scope are considered.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class ExceptionAnalysis {
+  private BitVectorSolver<CGNode> solver;
+  private Exception2BitvectorTransformer transformer;
+  private InterproceduralExceptionFilter<SSAInstruction> filter;
+  private ClassHierarchy cha;
+  private CGIntraproceduralExceptionAnalysis intraResult;
+  private CallGraph cg;
+  private boolean isSolved = false;
+
+  public ExceptionAnalysis(CallGraph callgraph, PointerAnalysis<InstanceKey> pointerAnalysis, ClassHierarchy cha) {
+    this(callgraph, pointerAnalysis, cha, null);
+  }
+
+  /**
+   * @param filter
+   *          a filter to include results of other analysis (like
+   *          {@link ArrayOutOfBoundsAnalysis} or
+   *          {@link IntraproceduralNullPointerAnalysis}) or to ignore
+   *          exceptions completely.
+   */
+  public ExceptionAnalysis(CallGraph callgraph, PointerAnalysis<InstanceKey> pointerAnalysis, ClassHierarchy cha,
+      InterproceduralExceptionFilter<SSAInstruction> filter) {
+    this.cha = cha;
+    this.cg = callgraph;
+    if (filter == null) {
+      this.filter = new IgnoreExceptionsInterFilter<>(new DummyFilter<SSAInstruction>());
+    } else {
+      this.filter = filter;
+    }
+
+    intraResult = new CGIntraproceduralExceptionAnalysis(callgraph, pointerAnalysis, cha, this.filter);
+    transformer = new Exception2BitvectorTransformer(intraResult.getExceptions());
+    ExceptionTransferFunctionProvider transferFunctionProvider = new ExceptionTransferFunctionProvider(intraResult, callgraph,
+        transformer);
+
+    Graph<CGNode> graph = new InvertedGraph<>(callgraph);
+    BitVectorFramework<CGNode, TypeReference> problem = new BitVectorFramework<>(graph, transferFunctionProvider,
+        transformer.getValues());
+
+    solver = new InitializedBitVectorSolver(problem);
+    solver.initForFirstSolve();
+  }
+
+  public void solve() {
+    try {
+      solver.solve(null);
+    } catch (CancelException e) {
+      throw new RuntimeException("Internal Error: Got Cancel Exception, " + "but didn't use Progressmonitor!", e);
+    }
+    this.isSolved = true;
+  }
+
+  public void solve(IProgressMonitor monitor) throws CancelException {
+    solver.solve(monitor);
+    this.isSolved = true;
+  }
+
+  public boolean catchesException(CGNode node, ISSABasicBlock throwBlock, ISSABasicBlock catchBlock) {
+    if (!isSolved) {
+      throw new IllegalStateException("You need to use .solve() first!");
+    }
+
+    if (node.getIR().getControlFlowGraph().getExceptionalSuccessors(throwBlock).contains(catchBlock) && catchBlock.isCatchBlock()) {
+      SSAInstruction instruction = IntraproceduralExceptionAnalysis.getThrowingInstruction(throwBlock);
+      assert instruction != null;
+      Iterator<TypeReference> caughtExceptions = catchBlock.getCaughtExceptionTypes();
+      Set<TypeReference> thrownExceptions = this.getExceptions(node, instruction);
+      boolean isCaught = false;
+      while (caughtExceptions.hasNext() && !isCaught) {
+        TypeReference caughtException = caughtExceptions.next();
+        for (TypeReference thrownException : thrownExceptions) {
+          isCaught |= cha.isAssignableFrom(cha.lookupClass(caughtException), cha.lookupClass(thrownException));
+          if (isCaught)
+            break;
+        }
+      }
+      return isCaught;
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * @return if the block has uncaught exceptions
+   */
+  public boolean hasUncaughtExceptions(CGNode node, ISSABasicBlock block) {
+    if (!isSolved) {
+      throw new IllegalStateException("You need to use .solve() first!");
+    }
+
+    SSAInstruction instruction = IntraproceduralExceptionAnalysis.getThrowingInstruction(block);
+    if (instruction != null) {
+      Set<TypeReference> exceptions = this.getExceptions(node, instruction);
+
+      boolean allCaught = true;
+      for (TypeReference thrownException : exceptions) {
+        boolean isCaught = false;
+        for (ISSABasicBlock catchBlock : node.getIR().getControlFlowGraph().getExceptionalSuccessors(block)) {
+          Iterator<TypeReference> caughtExceptions = catchBlock.getCaughtExceptionTypes();
+          while (caughtExceptions.hasNext() && !isCaught) {
+            TypeReference caughtException = caughtExceptions.next();
+            isCaught |= cha.isAssignableFrom(cha.lookupClass(caughtException), cha.lookupClass(thrownException));
+            if (isCaught)
+              break;
+          }
+          if (isCaught)
+            break;
+        }
+        allCaught &= isCaught;
+        if (!allCaught)
+          break;
+      }
+
+      return !allCaught;
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Returns all exceptions, which may be raised by this instruction. This
+   * includes exceptions from throw and invoke statements.
+   * 
+   * @return all exceptions, which may be raised by this instruction
+   */
+  public Set<TypeReference> getExceptions(final CGNode node, SSAInstruction instruction) {
+    if (!isSolved) {
+      throw new IllegalStateException("You need to use .solve() first!");
+    }
+
+    final Set<TypeReference> thrown = intraResult.getAnalysis(node).collectThrownExceptions(instruction);
+
+    instruction.visit(new Visitor() {
+      @Override
+      public void visitInvoke(SSAInvokeInstruction instruction) {
+        CallSiteReference site = instruction.getCallSite();
+        Set<CGNode> targets = cg.getPossibleTargets(node, site);
+        for (CGNode target : targets) {
+          thrown.addAll(getCGNodeExceptions(target));
+        }
+      }
+    });
+
+    Set<TypeReference> result = thrown;
+    if (filter != null) {
+      ExceptionFilter<SSAInstruction> nodeFilter = filter.getFilter(node);
+      result = ExceptionMatcher.retainedExceptions(thrown, nodeFilter.filteredExceptions(instruction), cha);
+    }
+    return result;
+  }
+
+  /**
+   * @return all exceptions, which might be thrown by the method represented
+   *         through the call graph node.
+   */
+  public Set<TypeReference> getCGNodeExceptions(CGNode node) {
+    if (!isSolved) {
+      throw new IllegalStateException("You need to use .solve() first!");
+    }
+
+    BitVectorVariable nodeResult = solver.getOut(node);
+    if (nodeResult != null) {
+      return transformer.computeExceptions(nodeResult);
+    } else {
+      return null;
+    }
+  }
+
+  /**
+   * @return the used filter
+   */
+  public InterproceduralExceptionFilter<SSAInstruction> getFilter() {
+    if (!isSolved) {
+      throw new IllegalStateException("You need to use .solve() first!");
+    }
+
+    return filter;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/ExceptionTransferFunctionProvider.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/ExceptionTransferFunctionProvider.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/ExceptionTransferFunctionProvider.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/ExceptionTransferFunctionProvider.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.analysis.exceptionanalysis;
+
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.dataflow.graph.AbstractMeetOperator;
+import com.ibm.wala.dataflow.graph.BitVectorMinusVector;
+import com.ibm.wala.dataflow.graph.BitVectorUnion;
+import com.ibm.wala.dataflow.graph.BitVectorUnionVector;
+import com.ibm.wala.dataflow.graph.ITransferFunctionProvider;
+import com.ibm.wala.fixpoint.BitVectorVariable;
+import com.ibm.wala.fixpoint.UnaryOperator;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.intset.BitVector;
+
+public class ExceptionTransferFunctionProvider implements ITransferFunctionProvider<CGNode, BitVectorVariable> {
+  private Exception2BitvectorTransformer transformer;
+  private CallGraph cg;
+  private CGIntraproceduralExceptionAnalysis intraResult;
+
+  public ExceptionTransferFunctionProvider(CGIntraproceduralExceptionAnalysis intraResult, CallGraph cg,
+      Exception2BitvectorTransformer transformer) {
+    this.cg = cg;
+    this.transformer = transformer;
+    this.intraResult = intraResult;
+  }
+
+  @Override
+  public boolean hasNodeTransferFunctions() {
+    return true;
+  }
+
+  @Override
+  public boolean hasEdgeTransferFunctions() {
+    return true;
+  }
+
+  @Override
+  public AbstractMeetOperator<BitVectorVariable> getMeetOperator() {
+    return BitVectorUnion.instance();
+  }
+
+  @Override
+  public UnaryOperator<BitVectorVariable> getNodeTransferFunction(CGNode node) {
+    Set<TypeReference> exceptions = intraResult.getAnalysis(node).getExceptions();
+    BitVector bitVector = transformer.computeBitVector(exceptions);
+    return new BitVectorUnionVector(bitVector);
+  }
+
+  @Override
+  public UnaryOperator<BitVectorVariable> getEdgeTransferFunction(CGNode dst, CGNode src) {
+    /*
+     * Note, that dst and src are swapped. For the data-flow-analysis we use
+     * called -> caller, but for the call graph we need caller -> called.
+     */
+
+    Iterator<CallSiteReference> callsites = cg.getPossibleSites(src, dst);
+    BitVector filtered = new BitVector(transformer.getValues().getSize());
+
+    if (callsites.hasNext()) {
+
+      CallSiteReference callsite = callsites.next();
+
+      Set<TypeReference> caught = new LinkedHashSet<>(intraResult.getAnalysis(src).getCaughtExceptions(callsite));
+      while (callsites.hasNext()) {
+        callsite = callsites.next();
+        caught.retainAll(intraResult.getAnalysis(src).getCaughtExceptions(callsite));
+      }
+
+      filtered = transformer.computeBitVector(caught);
+      return new BitVectorMinusVector(filtered);
+    } else {
+      // This case should not happen, as we should only get src, dst pairs,
+      // which represent an edge in the call graph. For each edge in the call
+      // graph should be at least one call site.
+      throw new RuntimeException("Internal Error: Got call graph edge without call site.");
+    }
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/InitializedBitVectorSolver.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/InitializedBitVectorSolver.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/InitializedBitVectorSolver.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/InitializedBitVectorSolver.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.analysis.exceptionanalysis;
+
+import com.ibm.wala.dataflow.graph.BitVectorSolver;
+import com.ibm.wala.dataflow.graph.IKilldallFramework;
+import com.ibm.wala.fixpoint.BitVectorVariable;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.util.intset.BitVector;
+
+public class InitializedBitVectorSolver extends BitVectorSolver<CGNode> {
+  public InitializedBitVectorSolver(IKilldallFramework<CGNode, BitVectorVariable> problem) {
+    super(problem);
+  }
+
+  @Override
+  protected BitVectorVariable makeNodeVariable(CGNode n, boolean IN) {
+    return newBV();
+  }
+
+  @Override
+  protected BitVectorVariable makeEdgeVariable(CGNode src, CGNode dst) {
+    return newBV();
+  }
+
+  private static BitVectorVariable newBV() {
+    /*
+     * If we do not initialize BitVectorVariable, with a BitVector, it contains
+     * null, which may crash in combination with {@link BitVectorMinusVector}
+     * used in {@link ExceptionTransferFunction}
+     */
+    BitVectorVariable result = new BitVectorVariable();
+    result.addAll(new BitVector());
+    return result;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/IntraproceduralExceptionAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/IntraproceduralExceptionAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/IntraproceduralExceptionAnalysis.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/IntraproceduralExceptionAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,315 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.analysis.exceptionanalysis;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.FilteredException;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.ISSABasicBlock;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.SSAInstruction.Visitor;
+import com.ibm.wala.ssa.SSAInvokeInstruction;
+import com.ibm.wala.ssa.SSAThrowInstruction;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.intset.IntIterator;
+import com.ibm.wala.util.intset.IntSet;
+import com.ibm.wala.util.ssa.InstructionByIIndexMap;
+
+public class IntraproceduralExceptionAnalysis {
+  private Set<TypeReference> exceptions;
+  private Set<TypeReference> possiblyCaughtExceptions;
+  private PointerAnalysis<InstanceKey> pointerAnalysis;
+  private CGNode node;
+  private ClassHierarchy classHierachy;
+  private ExceptionFilter<SSAInstruction> filter;
+  private IR ir;
+  private boolean dummy = false;
+  private Map<SSAInstruction, Boolean> allExceptionsCaught;
+
+  public static IntraproceduralExceptionAnalysis newDummy() {
+    return new IntraproceduralExceptionAnalysis();
+  }
+
+  /**
+   * Create a dummy analysis.
+   */
+  private IntraproceduralExceptionAnalysis() {
+    this.dummy = true;
+    this.exceptions = Collections.emptySet();
+  }
+
+  /**
+   * You can use this method, if you don't have a call graph, but want some
+   * exception analysis. But as no pointer analysis is given, we can not
+   * consider throw instructions.
+   */
+  @Deprecated
+  public IntraproceduralExceptionAnalysis(IR ir, ExceptionFilter<SSAInstruction> filter, ClassHierarchy cha) {
+    this(ir, filter, cha, null, null);
+  }
+
+  /**
+   * Create and compute intraprocedural exception analysis. (IR from
+   * node.getIR() will be used.)
+   */
+  public IntraproceduralExceptionAnalysis(CGNode node, ExceptionFilter<SSAInstruction> filter, ClassHierarchy cha,
+      PointerAnalysis<InstanceKey> pointerAnalysis) {
+    this(node.getIR(), filter, cha, pointerAnalysis, node);
+  }
+
+  /**
+   * Create and compute intraprocedural exception analysis.
+   */
+  public IntraproceduralExceptionAnalysis(IR ir, ExceptionFilter<SSAInstruction> filter, ClassHierarchy cha,
+      PointerAnalysis<InstanceKey> pointerAnalysis, CGNode node) {
+    this.pointerAnalysis = pointerAnalysis;
+    this.classHierachy = cha;
+    this.filter = filter;
+    this.ir = ir;
+    this.node = node;
+    this.exceptions = new LinkedHashSet<>();
+    this.possiblyCaughtExceptions = new LinkedHashSet<>();
+    this.allExceptionsCaught = new InstructionByIIndexMap<>();
+    compute();
+  }
+
+  /**
+   * Computes thrown exceptions for each basic block of all call graph nodes.
+   * Everything, but invoke instructions, will be considered. This includes
+   * filtered and caught exceptions.
+   */
+  private void compute() {
+    if (ir != null) {
+      for (ISSABasicBlock block : ir.getControlFlowGraph()) {
+        SSAInstruction throwingInstruction = getThrowingInstruction(block);
+        if (throwingInstruction != null && throwingInstruction.isPEI()) {
+          Set<TypeReference> thrownExceptions = collectThrownExceptions(throwingInstruction);
+          Set<TypeReference> caughtExceptions = collectCaughtExceptions(block);
+          Set<TypeReference> filteredExceptions = collectFilteredExceptions(throwingInstruction);
+
+          thrownExceptions.removeAll(filteredExceptions);
+          thrownExceptions.removeAll(caughtExceptions);
+          this.allExceptionsCaught.put(throwingInstruction, thrownExceptions.isEmpty());
+          exceptions.addAll(thrownExceptions);
+        }
+
+        if (block.isCatchBlock()) {
+          Iterator<TypeReference> it = block.getCaughtExceptionTypes();
+          while (it.hasNext()) {
+            possiblyCaughtExceptions.add(it.next());
+          }
+        }
+      }
+    }
+
+    Set<TypeReference> subClasses = new LinkedHashSet<>();
+    for (TypeReference caught : possiblyCaughtExceptions) {
+      for (IClass iclass : this.classHierachy.computeSubClasses(caught)) {
+        subClasses.add(iclass.getReference());
+      }
+    }
+
+    possiblyCaughtExceptions.addAll(subClasses);
+  }
+
+  /**
+   * Return all exceptions that could be returned from getCaughtExceptions
+   * 
+   * @return all exceptions that could be returned from getCaughtExceptions
+   */
+  public Set<TypeReference> getPossiblyCaughtExceptions() {
+    return possiblyCaughtExceptions;
+  }
+
+  /**
+   * Returns the set of exceptions, which are to be filtered for
+   * throwingInstruction.
+   * 
+   * @return exceptions, which are to be filtered
+   */
+  private Set<TypeReference> collectFilteredExceptions(SSAInstruction throwingInstruction) {
+    if (filter != null) {
+      Set<TypeReference> filtered = new LinkedHashSet<>();
+      Collection<FilteredException> filters = filter.filteredExceptions(throwingInstruction);
+      for (FilteredException filter : filters) {
+        if (filter.isSubclassFiltered()) {
+          for (IClass iclass : this.classHierachy.computeSubClasses(filter.getException())) {
+            filtered.add(iclass.getReference());
+          }
+        } else {
+          filtered.add(filter.getException());
+        }
+      }
+      return filtered;
+    } else {
+      return Collections.emptySet();
+    }
+  }
+
+  /**
+   * Returns a set of exceptions, which might be thrown from this instruction
+   * within this method.
+   * 
+   * This does include exceptions dispatched by throw instructions, but not
+   * exceptions from method calls.
+   * 
+   * @return a set of exceptions, which might be thrown from this instruction
+   *         within this method
+   */
+  public Set<TypeReference> collectThrownExceptions(SSAInstruction throwingInstruction) {
+    final LinkedHashSet<TypeReference> result = new LinkedHashSet<>(throwingInstruction.getExceptionTypes());
+
+    throwingInstruction.visit(new Visitor() {
+      @Override
+      public void visitThrow(SSAThrowInstruction instruction) {
+        addThrown(result, instruction);
+      }
+    });
+
+    return result;
+  }
+
+  /**
+   * Collects all exceptions, which could be dispatched by the throw
+   * instruction, using the pointer analysis. Adds the collected exceptions to
+   * addTo.
+   * 
+   * @param addTo
+   *          set to add the result
+   * @param instruction
+   *          the throw instruction
+   */
+  private void addThrown(LinkedHashSet<TypeReference> addTo, SSAThrowInstruction instruction) {
+    int exceptionVariable = instruction.getException();
+
+    if (pointerAnalysis != null) {
+      PointerKey pointerKey = pointerAnalysis.getHeapModel().getPointerKeyForLocal(node, exceptionVariable);
+      Iterator<Object> it = pointerAnalysis.getHeapGraph().getSuccNodes(pointerKey);
+      while (it.hasNext()) {
+        Object next = it.next();
+        if (next instanceof InstanceKey) {
+          InstanceKey instanceKey = (InstanceKey) next;
+          IClass iclass = instanceKey.getConcreteType();
+          addTo.add(iclass.getReference());
+        } else {
+          throw new IllegalStateException("Internal error: Expected InstanceKey, got " + next.getClass().getName());
+        }
+      }
+    }
+  }
+
+  /**
+   * @return an instruction which may throw exceptions, or null if this block
+   *         can't throw exceptions
+   */
+  public static SSAInstruction getThrowingInstruction(ISSABasicBlock block) {
+    SSAInstruction result = null;
+    if (block.getLastInstructionIndex() >= 0) {
+      SSAInstruction lastInstruction = block.getLastInstruction();
+      if (lastInstruction != null && lastInstruction.isPEI()) {
+        result = lastInstruction;
+      }
+    }
+    return result;
+  }
+
+  /**
+   * @return a set of all exceptions which will be caught, if thrown by the
+   *         given block.
+   */
+  private Set<TypeReference> collectCaughtExceptions(ISSABasicBlock block) {
+    LinkedHashSet<TypeReference> result = new LinkedHashSet<>();
+    List<ISSABasicBlock> exceptionalSuccessors = ir.getControlFlowGraph().getExceptionalSuccessors(block);
+    for (ISSABasicBlock succ : exceptionalSuccessors) {
+      if (succ.isCatchBlock()) {
+        Iterator<TypeReference> it = succ.getCaughtExceptionTypes();
+        while (it.hasNext()) {
+          result.add(it.next());
+        }
+      }
+    }
+
+    Set<TypeReference> subClasses = new LinkedHashSet<>();
+    for (TypeReference caught : result) {
+      for (IClass iclass : this.classHierachy.computeSubClasses(caught)) {
+        subClasses.add(iclass.getReference());
+      }
+    }
+
+    result.addAll(subClasses);
+    return result;
+  }
+
+  /**
+   * Returns all exceptions for the given call site in the given call graph
+   * node, which will be caught.
+   * 
+   * @return caught exceptions
+   */
+  public Set<TypeReference> getCaughtExceptions(CallSiteReference callsite) {
+    Set<TypeReference> result = null;
+    if (dummy) {
+      result = Collections.emptySet();
+    } else {
+      IntSet iindices = ir.getCallInstructionIndices(callsite);
+      IntIterator it = iindices.intIterator();
+      while (it.hasNext()) {
+        int iindex = it.next();
+
+        SSAInstruction instruction = ir.getInstructions()[iindex];
+        if (!((instruction instanceof SSAInvokeInstruction))) {
+          throw new IllegalArgumentException("The given callsite dose not correspond to an invoke instruction." + instruction);
+        }
+
+        ISSABasicBlock block = ir.getBasicBlockForInstruction(instruction);
+        if (result == null) {
+          result = new LinkedHashSet<>(collectCaughtExceptions(block));
+        } else {
+          result.retainAll(collectCaughtExceptions(block));
+        }
+      }
+    }
+    return result;
+  }
+
+  public boolean hasUncaughtExceptions(SSAInstruction instruction) {
+    Boolean allCaught = this.allExceptionsCaught.get(instruction);
+    return (allCaught == null ? true : !allCaught.booleanValue());
+  }
+
+  /**
+   * Returns all exceptions which might be created and thrown but not caught or
+   * filtered. (So this does not contain exceptions from invoked methods.)
+   * 
+   * If constructed without points-to-analysis, it does not contain exceptions
+   * thrown by throw statements.
+   * 
+   * @return all exceptions created and thrown intraprocedural
+   */
+  public Set<TypeReference> getExceptions() {
+    return exceptions;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/package-info.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/package-info.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/exceptionanalysis/package-info.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,8 @@
+/**
+ * This package contains an exception analysis. For an interprocedural
+ * exception analysis use {@link com.ibm.wala.analysis.exceptionanalysis.ExceptionAnalysis}. 
+ * If you need a CFG without unnecessary exception edges use {@link com.ibm.wala.ipa.cfg.PrunedCFG}
+ * in combination with {@link com.ibm.wala.analysis.exceptionanalysis.ExceptionAnalysis2EdgeFilter} 
+
+ */
+package com.ibm.wala.analysis.exceptionanalysis;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/IntraproceduralNullPointerAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/IntraproceduralNullPointerAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/IntraproceduralNullPointerAnalysis.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/IntraproceduralNullPointerAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,64 @@
+package com.ibm.wala.analysis.nullpointer;
+
+import com.ibm.wala.cfg.exc.intra.IntraprocNullPointerAnalysis;
+import com.ibm.wala.cfg.exc.intra.NullPointerFrameWork;
+import com.ibm.wala.cfg.exc.intra.NullPointerSolver;
+import com.ibm.wala.cfg.exc.intra.NullPointerState;
+import com.ibm.wala.cfg.exc.intra.NullPointerState.State;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.ISSABasicBlock;
+import com.ibm.wala.ssa.SSACFG;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
+
+/**
+ * Intraprocedural dataflow analysis to detect impossible NullPointerExceptions.
+ *
+ * This class is basically a copy of {@link IntraprocNullPointerAnalysis}, but
+ * does only provide the result of the analysis instead of a pruned CFG.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class IntraproceduralNullPointerAnalysis {
+	static private final IProgressMonitor NO_PROGRESS_MONITOR = null;
+	private final NullPointerSolver<ISSABasicBlock> solver;
+	private final IR ir;
+
+	public IntraproceduralNullPointerAnalysis(IR ir) {
+		if (ir == null || ir.isEmptyIR()) {
+			throw new IllegalArgumentException("IR may not be null or empty.");
+		}
+
+		this.ir = ir;
+
+		final int maxVarNum = ir.getSymbolTable().getMaxValueNumber();
+		SSACFG cfg = ir.getControlFlowGraph();
+		final NullPointerFrameWork<ISSABasicBlock> problem = new NullPointerFrameWork<>(
+				cfg, ir);
+		this.solver = new NullPointerSolver<>(problem, maxVarNum,
+				ir, cfg.entry());
+		try {
+			this.solver.solve(NO_PROGRESS_MONITOR);
+		} catch (final CancelException e) {
+			// can't happen as we have no monitor
+		}
+	}
+
+	public State nullPointerExceptionThrowState(SSAInstruction instruction) {
+		assert instruction != null;
+		if (instruction.isPEI()
+				&& instruction.getExceptionTypes().contains(
+						TypeReference.JavaLangNullPointerException)) {
+			final NullPointerState blockState = this.solver.getIn(this.ir
+					.getBasicBlockForInstruction(instruction));
+			final RelevantVariableFinder finder = new RelevantVariableFinder(
+					instruction);
+			assert finder.getVarNum() >= 0;
+			return blockState.getState(finder.getVarNum());
+		}
+		return State.NOT_NULL;
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/RelevantVariableFinder.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/RelevantVariableFinder.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/RelevantVariableFinder.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/nullpointer/RelevantVariableFinder.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,312 @@
+package com.ibm.wala.analysis.nullpointer;
+
+import com.ibm.wala.ssa.SSAArrayLengthInstruction;
+import com.ibm.wala.ssa.SSAArrayLoadInstruction;
+import com.ibm.wala.ssa.SSAArrayStoreInstruction;
+import com.ibm.wala.ssa.SSABinaryOpInstruction;
+import com.ibm.wala.ssa.SSACheckCastInstruction;
+import com.ibm.wala.ssa.SSAComparisonInstruction;
+import com.ibm.wala.ssa.SSAConditionalBranchInstruction;
+import com.ibm.wala.ssa.SSAConversionInstruction;
+import com.ibm.wala.ssa.SSAGetCaughtExceptionInstruction;
+import com.ibm.wala.ssa.SSAGetInstruction;
+import com.ibm.wala.ssa.SSAGotoInstruction;
+import com.ibm.wala.ssa.SSAInstanceofInstruction;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.SSAInstruction.IVisitor;
+import com.ibm.wala.ssa.SSAInvokeInstruction;
+import com.ibm.wala.ssa.SSALoadMetadataInstruction;
+import com.ibm.wala.ssa.SSAMonitorInstruction;
+import com.ibm.wala.ssa.SSANewInstruction;
+import com.ibm.wala.ssa.SSAPhiInstruction;
+import com.ibm.wala.ssa.SSAPiInstruction;
+import com.ibm.wala.ssa.SSAPutInstruction;
+import com.ibm.wala.ssa.SSAReturnInstruction;
+import com.ibm.wala.ssa.SSASwitchInstruction;
+import com.ibm.wala.ssa.SSAThrowInstruction;
+import com.ibm.wala.ssa.SSAUnaryOpInstruction;
+
+/**
+ * Helper class to find the variable that may be null.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class RelevantVariableFinder implements IVisitor {
+	private int varNumNew;
+	private final int varNum;
+
+	public RelevantVariableFinder(SSAInstruction instrcution) {
+		this.varNumNew = -1;
+		instrcution.visit(this);
+		this.varNum = this.varNumNew;
+	}
+
+	public int getVarNum() {
+		return this.varNum;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitArrayLength(com.ibm.wala
+	 * .ssa.SSAArrayLengthInstruction)
+	 */
+	@Override
+	public void visitArrayLength(SSAArrayLengthInstruction instruction) {
+		this.varNumNew = instruction.getArrayRef();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitArrayLoad(com.ibm.wala.
+	 * ssa.SSAArrayLoadInstruction)
+	 */
+	@Override
+	public void visitArrayLoad(SSAArrayLoadInstruction instruction) {
+		this.varNumNew = instruction.getArrayRef();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitArrayStore(com.ibm.wala
+	 * .ssa.SSAArrayStoreInstruction)
+	 */
+	@Override
+	public void visitArrayStore(SSAArrayStoreInstruction instruction) {
+		this.varNumNew = instruction.getArrayRef();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitBinaryOp(com.ibm.wala.ssa
+	 * .SSABinaryOpInstruction)
+	 */
+	@Override
+	public void visitBinaryOp(SSABinaryOpInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitCheckCast(com.ibm.wala.
+	 * ssa.SSACheckCastInstruction)
+	 */
+	@Override
+	public void visitCheckCast(SSACheckCastInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitComparison(com.ibm.wala
+	 * .ssa.SSAComparisonInstruction)
+	 */
+	@Override
+	public void visitComparison(SSAComparisonInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitConditionalBranch(com.ibm
+	 * .wala.ssa.SSAConditionalBranchInstruction)
+	 */
+	@Override
+	public void visitConditionalBranch(
+			SSAConditionalBranchInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitConversion(com.ibm.wala
+	 * .ssa.SSAConversionInstruction)
+	 */
+	@Override
+	public void visitConversion(SSAConversionInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see com.ibm.wala.ssa.SSAInstruction.IVisitor#visitGet(com.ibm.wala.ssa.
+	 * SSAGetInstruction)
+	 */
+	@Override
+	public void visitGet(SSAGetInstruction instruction) {
+		if (!instruction.isStatic()) {
+			this.varNumNew = instruction.getRef();
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitGetCaughtException(com.
+	 * ibm.wala.ssa.SSAGetCaughtExceptionInstruction)
+	 */
+	@Override
+	public void visitGetCaughtException(
+			SSAGetCaughtExceptionInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see com.ibm.wala.ssa.SSAInstruction.IVisitor#visitGoto(com.ibm.wala.ssa.
+	 * SSAGotoInstruction)
+	 */
+	@Override
+	public void visitGoto(SSAGotoInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitInstanceof(com.ibm.wala
+	 * .ssa.SSAInstanceofInstruction)
+	 */
+	@Override
+	public void visitInstanceof(SSAInstanceofInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitInvoke(com.ibm.wala.ssa
+	 * .SSAInvokeInstruction)
+	 */
+	@Override
+	public void visitInvoke(SSAInvokeInstruction instruction) {
+		if (!instruction.isStatic()) {
+			this.varNumNew = instruction.getReceiver();
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitLoadMetadata(com.ibm.wala
+	 * .ssa.SSALoadMetadataInstruction)
+	 */
+	@Override
+	public void visitLoadMetadata(SSALoadMetadataInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitMonitor(com.ibm.wala.ssa
+	 * .SSAMonitorInstruction)
+	 */
+	@Override
+	public void visitMonitor(SSAMonitorInstruction instruction) {
+		this.varNumNew = instruction.getRef();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see com.ibm.wala.ssa.SSAInstruction.IVisitor#visitNew(com.ibm.wala.ssa.
+	 * SSANewInstruction)
+	 */
+	@Override
+	public void visitNew(SSANewInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see com.ibm.wala.ssa.SSAInstruction.IVisitor#visitPhi(com.ibm.wala.ssa.
+	 * SSAPhiInstruction)
+	 */
+	@Override
+	public void visitPhi(SSAPhiInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see com.ibm.wala.ssa.SSAInstruction.IVisitor#visitPi(com.ibm.wala.ssa.
+	 * SSAPiInstruction)
+	 */
+	@Override
+	public void visitPi(SSAPiInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see com.ibm.wala.ssa.SSAInstruction.IVisitor#visitPut(com.ibm.wala.ssa.
+	 * SSAPutInstruction)
+	 */
+	@Override
+	public void visitPut(SSAPutInstruction instruction) {
+		if (!instruction.isStatic()) {
+			this.varNumNew = instruction.getRef();
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitReturn(com.ibm.wala.ssa
+	 * .SSAReturnInstruction)
+	 */
+	@Override
+	public void visitReturn(SSAReturnInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitSwitch(com.ibm.wala.ssa
+	 * .SSASwitchInstruction)
+	 */
+	@Override
+	public void visitSwitch(SSASwitchInstruction instruction) {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitThrow(com.ibm.wala.ssa.
+	 * SSAThrowInstruction)
+	 */
+	@Override
+	public void visitThrow(SSAThrowInstruction instruction) {
+		this.varNumNew = instruction.getException();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see
+	 * com.ibm.wala.ssa.SSAInstruction.IVisitor#visitUnaryOp(com.ibm.wala.ssa
+	 * .SSAUnaryOpInstruction)
+	 */
+	@Override
+	public void visitUnaryOp(SSAUnaryOpInstruction instruction) {
+	}
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/pointers/BasicHeapGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/pointers/BasicHeapGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/pointers/BasicHeapGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/pointers/BasicHeapGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,6 +14,7 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Iterator;
+import java.util.function.IntFunction;
 
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IField;
@@ -26,9 +27,9 @@
 import com.ibm.wala.util.collections.CompoundIterator;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.IntMapIterator;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
-import com.ibm.wala.util.functions.IntFunction;
 import com.ibm.wala.util.graph.AbstractNumberedGraph;
 import com.ibm.wala.util.graph.NumberedEdgeManager;
 import com.ibm.wala.util.graph.NumberedGraph;
@@ -48,7 +49,7 @@
 /**
  * Basic implementation of {@link HeapGraph}
  */
-public class BasicHeapGraph extends HeapGraphImpl {
+public class BasicHeapGraph<T extends InstanceKey> extends HeapGraphImpl<T> {
 
   private final static boolean VERBOSE = false;
 
@@ -70,7 +71,7 @@
    * @param P governing pointer analysis
    * @throws NullPointerException if P is null
    */
-  public BasicHeapGraph(final PointerAnalysis<InstanceKey> P, final CallGraph callGraph) throws NullPointerException {
+  public BasicHeapGraph(final PointerAnalysis<T> P, final CallGraph callGraph) throws NullPointerException {
     super(P);
     this.callGraph = callGraph;
 
@@ -78,7 +79,7 @@
     final NumberedNodeManager<Object> nodeMgr = new NumberedNodeManager<Object>() {
       @Override
       public Iterator<Object> iterator() {
-        return new CompoundIterator<Object>(pointerKeys.iterator(), P.getInstanceKeyMapping().iterator());
+        return new CompoundIterator<>(pointerKeys.iterator(), P.getInstanceKeyMapping().iterator());
       }
 
       @Override
@@ -99,12 +100,12 @@
       @Override
       public int getNumber(Object N) {
         if (N instanceof PointerKey) {
-          return pointerKeys.getMappedIndex((PointerKey) N);
+          return pointerKeys.getMappedIndex(N);
         } else {
           if (!(N instanceof InstanceKey)) {
             Assertions.UNREACHABLE(N.getClass().toString());
           }
-          int inumber = P.getInstanceKeyMapping().getMappedIndex((InstanceKey) N);
+          int inumber = P.getInstanceKeyMapping().getMappedIndex(N);
           return (inumber == -1) ? -1 : inumber + pointerKeys.getMaximumIndex() + 1;
         }
       }
@@ -130,17 +131,12 @@
 
       @Override
       public Iterator<Object> iterateNodes(IntSet s) {
-        return new NumberedNodeIterator<Object>(s, this);
+        return new NumberedNodeIterator<>(s, this);
       }
     };
 
     final IBinaryNaturalRelation pred = computePredecessors(nodeMgr);
-    final IntFunction<Object> toNode = new IntFunction<Object>() {
-      @Override
-      public Object apply(int i) {
-        return nodeMgr.getNode(i);
-      }
-    };
+    final IntFunction<Object> toNode = nodeMgr::getNode;
 
     this.G = new AbstractNumberedGraph<Object>() {
       private final NumberedEdgeManager<Object> edgeMgr = new NumberedEdgeManager<Object>() {
@@ -151,7 +147,7 @@
           if (p == null) {
             return EmptyIterator.instance();
           } else {
-            return new IntMapIterator<Object>(p.intIterator(), toNode);
+            return new IntMapIterator<>(p.intIterator(), toNode);
           }
         }
 
@@ -179,7 +175,7 @@
             return EmptyIterator.instance();
           }
           SparseIntSet s = factory.make(succ);
-          return new IntMapIterator<Object>(s.intIterator(), toNode);
+          return new IntMapIterator<>(s.intIterator(), toNode);
         }
 
         @Override
@@ -245,8 +241,7 @@
   private OrdinalSetMapping<PointerKey> getPointerKeys() {
     MutableMapping<PointerKey> result = MutableMapping.make();
 
-    for (Iterator<PointerKey> it = getPointerAnalysis().getPointerKeys().iterator(); it.hasNext();) {
-      PointerKey p = it.next();
+    for (PointerKey p : getPointerAnalysis().getPointerKeys()) {
       result.add(p);
     }
     return result;
@@ -256,11 +251,11 @@
   private int[] computeSuccNodeNumbers(Object N, NumberedNodeManager<Object> nodeManager) {
     if (N instanceof PointerKey) {
       PointerKey P = (PointerKey) N;
-      OrdinalSet<InstanceKey> S = getPointerAnalysis().getPointsToSet(P);
+      OrdinalSet<T> S = getPointerAnalysis().getPointsToSet(P);
       int[] result = new int[S.size()];
       int i = 0;
-      for (Iterator<InstanceKey> it = S.iterator(); it.hasNext();) {
-        result[i] = nodeManager.getNumber(it.next());
+      for (T t : S) {
+        result[i] = nodeManager.getNumber(t);
         i++;
       }
       return result;
@@ -268,9 +263,7 @@
       InstanceKey I = (InstanceKey) N;
       TypeReference T = I.getConcreteType().getReference();
 
-      if (T == null) {
-        assert T != null : "null concrete type from " + I.getClass();
-      }
+      assert T != null : "null concrete type from " + I.getClass();
       if (T.isArrayType()) {
         PointerKey p = getHeapModel().getPointerKeyForArrayContents(I);
         if (p == null || !nodeManager.containsNode(p)) {
@@ -280,12 +273,9 @@
         }
       } else {
         IClass klass = getHeapModel().getClassHierarchy().lookupClass(T);
-        if (klass == null) {
-          assert klass != null : "null klass for type " + T;
-        }
+        assert klass != null : "null klass for type " + T;
         MutableSparseIntSet result = MutableSparseIntSet.makeEmpty();
-        for (Iterator<IField> it = klass.getAllInstanceFields().iterator(); it.hasNext();) {
-          IField f = it.next();
+        for (IField f : klass.getAllInstanceFields()) {
           if (!f.getReference().getFieldType().isPrimitiveType()) {
             PointerKey p = getHeapModel().getPointerKeyForInstanceField(I, f);
             if (p != null && nodeManager.containsNode(p)) {
@@ -330,8 +320,7 @@
       if (!(n instanceof LocalPointerKey)) {
         int[] succ = computeSuccNodeNumbers(n, nodeManager);
         if (succ != null) {
-          for (int z = 0; z < succ.length; z++) {
-            int j = succ[z];
+          for (int j : succ) {
             R.add(j, i);
           }
         }
@@ -344,9 +333,8 @@
    */
   private void computePredecessorsForLocals(NumberedNodeManager<Object> nodeManager, BasicNaturalRelation R) {
 
-    ArrayList<LocalPointerKey> list = new ArrayList<LocalPointerKey>();
-    for (Iterator<Object> it = nodeManager.iterator(); it.hasNext();) {
-      Object n = it.next();
+    ArrayList<LocalPointerKey> list = new ArrayList<>();
+    for (Object n : nodeManager) {
       if (n instanceof LocalPointerKey) {
         list.add((LocalPointerKey) n);
       }
@@ -364,8 +352,7 @@
       int num = nodeManager.getNumber(n);
       int[] succ = computeSuccNodeNumbers(n, nodeManager);
       if (succ != null) {
-        for (int z = 0; z < succ.length; z++) {
-          int j = succ[z];
+        for (int j : succ) {
           R.add(j, num);
         }
       }
@@ -507,12 +494,12 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     result.append("Nodes:\n");
     for (int i = 0; i <= getMaxNumber(); i++) {
       Object node = getNode(i);
       if (node != null) {
-        result.append(i).append("  ").append(node).append("\n");
+        result.append(i).append("  ").append(node).append('\n');
       }
     }
     result.append("Edges:\n");
@@ -520,11 +507,10 @@
       Object node = getNode(i);
       if (node != null) {
         result.append(i).append(" -> ");
-        for (Iterator it = getSuccNodes(node); it.hasNext();) {
-          Object s = it.next();
-          result.append(getNumber(s)).append(" ");
+        for (Object s : Iterator2Iterable.make(getSuccNodes(node))) {
+          result.append(getNumber(s)).append(' ');
         }
-        result.append("\n");
+        result.append('\n');
       }
     }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/pointers/HeapGraphImpl.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/pointers/HeapGraphImpl.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/pointers/HeapGraphImpl.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/pointers/HeapGraphImpl.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,9 +18,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.graph.Graph;
-import com.ibm.wala.util.graph.NumberedGraph;
 import com.ibm.wala.util.graph.impl.NumberedNodeIterator;
 import com.ibm.wala.util.graph.traverse.DFS;
 import com.ibm.wala.util.intset.IntSet;
@@ -48,16 +46,12 @@
 
   @Override
   public Iterator<Object> iterateNodes(IntSet s) {
-    return new NumberedNodeIterator<Object>(s, this);
+    return new NumberedNodeIterator<>(s, this);
   }
 
+  @Override
   public Collection<Object> getReachableInstances(Set<Object> roots) {
-    Predicate f = new Predicate() {
-      @Override public boolean test(Object o) {
-        return (o instanceof InstanceKey);
-      }
-    };
-    return DFS.getReachableNodes(this, roots, f);
+    return DFS.getReachableNodes(this, roots, InstanceKey.class::isInstance);
   }
 
   @Override
@@ -68,10 +62,12 @@
   /**
    * @return the heap model used in this pointer analysis.
    */
+  @Override
   public HeapModel getHeapModel() {
     return pa.getHeapModel();
   }
 
+  @Override
   public PointerAnalysis<T> getPointerAnalysis() {
     return pa;
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/AbstractReflectionInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/AbstractReflectionInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/AbstractReflectionInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/AbstractReflectionInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,8 +27,8 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.classLoader.SyntheticMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
@@ -65,13 +65,13 @@
   /**
    * cache of analysis information
    */
-  protected AnalysisCache cache;
+  protected IAnalysisCacheView cache;
 
 
   protected int getLocalForType(TypeReference T) {
     Integer I = typeIndexMap.get(T);
     if (I == null) {
-      typeIndexMap.put(T, I = new Integer(indexLocal += 2));
+      typeIndexMap.put(T, I = Integer.valueOf(indexLocal += 2));
     }
     return I.intValue();
   }
@@ -89,7 +89,6 @@
   }
 
   /**
-   * @param type
    * @return a TypeAbstraction object representing this type. We just use ConeTypes by default, since we don't propagate
    *         information allowing us to distinguish between points and cones yet.
    */
@@ -119,7 +118,7 @@
 
     @Override
     public String getMsg() {
-      return getClass().toString() + " : " + T + " " + nImplementors;
+      return getClass().toString() + " : " + T + ' ' + nImplementors;
     }
 
     public static ManySubtypesWarning create(TypeAbstraction T, int n) {
@@ -176,17 +175,17 @@
     /**
      * List of synthetic allocation statements we model for this specialized instance
      */
-    final protected ArrayList<SSAInstruction> allocations = new ArrayList<SSAInstruction>();
+    final protected ArrayList<SSAInstruction> allocations = new ArrayList<>();
 
     /**
      * List of synthetic invoke instructions we model for this specialized instance.
      */
-    final protected ArrayList<SSAInstruction> calls = new ArrayList<SSAInstruction>();
+    final protected ArrayList<SSAInstruction> calls = new ArrayList<>();
 
     /**
      * List of all instructions
      */
-    protected final ArrayList<SSAInstruction> allInstructions = new ArrayList<SSAInstruction>();
+    protected final ArrayList<SSAInstruction> allInstructions = new ArrayList<>();
 
     private final SSAInstructionFactory insts = declaringClass.getClassLoader().getInstructionFactory();
     
@@ -270,4 +269,4 @@
       allInstructions.add(s);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassFactoryContextInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassFactoryContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassFactoryContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassFactoryContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,6 +14,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import com.ibm.wala.analysis.typeInference.TypeAbstraction;
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.cfg.InducedCFG;
 import com.ibm.wala.classLoader.CallSiteReference;
@@ -21,10 +22,13 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.ContextKey;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.summaries.SyntheticIR;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAInstructionFactory;
@@ -61,9 +65,10 @@
     }
 /** BEGIN Custom change: caching */
     
-    final JavaTypeContext context = (JavaTypeContext) node.getContext();
+    
+    final Context context = node.getContext();
     final IMethod method = node.getMethod();
-    final String hashKey = method.toString() + "@" + context.toString();
+    final String hashKey = method.toString() + '@' + context.toString();
     
     IR result = cache.get(hashKey);
     
@@ -77,6 +82,11 @@
   }
 
   @Override
+  public IRView getIRView(CGNode node) {
+    return getIR(node);
+  }
+
+  @Override
   public int getNumberOfStatements(CGNode node) {
     assert understands(node);
     return getIR(node).getInstructions().length;
@@ -90,7 +100,7 @@
     if (node == null) {
       throw new IllegalArgumentException("node is null");
     }
-    if (!(node.getContext() instanceof JavaTypeContext)) {
+    if (!(node.getContext().isA(JavaTypeContext.class))) {
       return false;
     }
     return ClassFactoryContextSelector.isClassFactory(node.getMethod().getReference());
@@ -105,10 +115,9 @@
       throw new IllegalArgumentException("node is null");
     }
     assert understands(node);
-    JavaTypeContext context = (JavaTypeContext) node.getContext();
-    TypeReference tr = context.getType().getTypeReference();
+    TypeReference tr = ((TypeAbstraction)node.getContext().get(ContextKey.RECEIVER)).getTypeReference();
     if (tr != null) {
-      return new NonNullSingletonIterator<NewSiteReference>(NewSiteReference.make(0, tr));
+      return new NonNullSingletonIterator<>(NewSiteReference.make(0, tr));
     }
     return EmptyIterator.instance();
   }
@@ -122,12 +131,12 @@
     return EmptyIterator.instance();
   }
 
-  private SSAInstruction[] makeStatements(JavaTypeContext context) {
-    SSAInstructionFactory insts = context.getType().getType().getClassLoader().getInstructionFactory();
-    ArrayList<SSAInstruction> statements = new ArrayList<SSAInstruction>();
+  private static SSAInstruction[] makeStatements(Context context) {
+    SSAInstructionFactory insts = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType().getClassLoader().getInstructionFactory();
+    ArrayList<SSAInstruction> statements = new ArrayList<>();
     // vn1 is the string parameter
     int retValue = 2;
-    TypeReference tr = context.getType().getTypeReference();
+    TypeReference tr = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getTypeReference();
     if (tr != null) {
       SSALoadMetadataInstruction l = insts.LoadMetadataInstruction(statements.size(), retValue, TypeReference.JavaLangClass, tr);
       statements.add(l);
@@ -142,7 +151,7 @@
     return result;
   }
 
-  private IR makeIR(IMethod method, JavaTypeContext context) {
+  private static IR makeIR(IMethod method, Context context) {
     SSAInstruction instrs[] = makeStatements(context);
     return new SyntheticIR(method, context, new InducedCFG(instrs, method, context), instrs, SSAOptions.defaultOptions(), null);
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassFactoryContextSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassFactoryContextSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassFactoryContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassFactoryContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,10 +13,12 @@
 import com.ibm.wala.analysis.typeInference.PointType;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.IClassLoader;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.propagation.ConstantKey;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.IR;
@@ -79,10 +81,6 @@
   /**
    * If the {@link CallSiteReference} invokes Class.forName(s) and s is a string constant, return a {@link JavaTypeContext}
    * representing the type named by s, if we can resolve it in the {@link IClassHierarchy}.
-   * 
-   * @see com.ibm.wala.ipa.callgraph.ContextSelector#getCalleeTarget(com.ibm.wala.ipa.callgraph.CGNode,
-   *      com.ibm.wala.classLoader.CallSiteReference, com.ibm.wala.classLoader.IMethod,
-   *      InstanceKey[])
    */
   @Override
   public Context getCalleeTarget(CGNode caller, CallSiteReference site, IMethod callee, InstanceKey[] receiver) {
@@ -103,19 +101,36 @@
           return new JavaTypeContext(new PointType(klass));
         }
       }
+      int nameVn = callee.isStatic()? 0: 1;
+      if (receiver != null && receiver.length > nameVn) {
+        if (receiver[nameVn] instanceof ConstantKey) {
+          ConstantKey ik = (ConstantKey) receiver[nameVn];
+          if (ik.getConcreteType().getReference().equals(TypeReference.JavaLangString)) {
+            String className = StringStuff.deployment2CanonicalTypeString(ik.getValue().toString());
+            for(IClassLoader cl : caller.getClassHierarchy().getLoaders()) {
+              TypeReference t = TypeReference.findOrCreate(cl.getReference(), className);
+              IClass klass = caller.getClassHierarchy().lookupClass(t);
+              if (klass != null) {
+                return new JavaTypeContext(new PointType(klass));
+              }
+            }
+          }
+        }
+      }
     }
     return null;
   }
 
   private static final IntSet thisParameter = IntSetUtil.make(new int[]{0});
 
-  private static final IntSet firstParameter = IntSetUtil.make(new int[]{1});
+  private static final IntSet firstParameter = IntSetUtil.make(new int[]{0, 1});
 
   @Override
   public IntSet getRelevantParameters(CGNode caller, CallSiteReference site) {
-    if (isClassFactory(site.getDeclaredTarget())) {
+    IMethod resolved = caller.getMethod().getClassHierarchy().resolveMethod(site.getDeclaredTarget());
+    if (isClassFactory(resolved != null? resolved.getReference(): site.getDeclaredTarget())) {
       SSAAbstractInvokeInstruction[] invokeInstructions = caller.getIR().getCalls(site);
-      if (invokeInstructions.length != 1) {
+      if (invokeInstructions.length >= 1) {
         if (invokeInstructions[0].isStatic()) {
           return thisParameter;
         } else {
@@ -128,4 +143,4 @@
       return EmptyIntSet.instance;      
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassNewInstanceContextInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassNewInstanceContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassNewInstanceContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassNewInstanceContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,6 +13,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import com.ibm.wala.analysis.typeInference.TypeAbstraction;
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.cfg.InducedCFG;
 import com.ibm.wala.classLoader.CallSiteReference;
@@ -20,11 +21,14 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.ContextKey;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.SyntheticIR;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAInstructionFactory;
@@ -80,9 +84,9 @@
     }
 /** BEGIN Custom change: caching */
     
-    final JavaTypeContext context = (JavaTypeContext) node.getContext();
+    final Context context = node.getContext();
     final IMethod method = node.getMethod();
-    final String hashKey = method.toString() + "@" + context.toString();
+    final String hashKey = method.toString() + '@' + context.toString();
     
     IR result = cache.get(hashKey);
     
@@ -96,6 +100,11 @@
   }
 
   @Override
+  public IRView getIRView(CGNode node) {
+    return getIR(node);
+  }
+
+  @Override
   public int getNumberOfStatements(CGNode node) {
     assert understands(node);
     return getIR(node).getInstructions().length;
@@ -106,7 +115,7 @@
     if (node == null) {
       throw new IllegalArgumentException("node is null");
     }
-    if (!(node.getContext() instanceof JavaTypeContext)) {
+    if (!(node.getContext().isA(JavaTypeContext.class))) {
       return false;
     }
     return node.getMethod().getReference().equals(CLASS_NEW_INSTANCE_REF);
@@ -118,10 +127,10 @@
       throw new IllegalArgumentException("node is null");
     }
     assert understands(node);
-    JavaTypeContext context = (JavaTypeContext) node.getContext();
-    TypeReference tr = context.getType().getTypeReference();
+    Context context = node.getContext();
+    TypeReference tr = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getTypeReference();
     if (tr != null) {
-      return new NonNullSingletonIterator<NewSiteReference>(NewSiteReference.make(0, tr));
+      return new NonNullSingletonIterator<>(NewSiteReference.make(0, tr));
     }
     return EmptyIterator.instance();
   }
@@ -132,9 +141,9 @@
     return EmptyIterator.instance();
   }
 
-  private IR makeIR(IMethod method, JavaTypeContext context) {
-    SSAInstructionFactory insts = context.getType().getType().getClassLoader().getInstructionFactory();
-    TypeReference tr = context.getType().getTypeReference();
+  private IR makeIR(IMethod method, Context context) {
+    SSAInstructionFactory insts = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType().getClassLoader().getInstructionFactory();
+    TypeReference tr = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getTypeReference();
     if (tr != null) {
       SpecializedMethod m = new SpecializedMethod(method, method.getDeclaringClass(), method.isStatic(), false);
       IClass klass = cha.lookupClass(tr);
@@ -167,7 +176,7 @@
     return null;
   }
 
-  private IMethod getPublicDefaultCtor(IClass klass) {
+  private static IMethod getPublicDefaultCtor(IClass klass) {
     IMethod ctorMethod = klass.getMethod(defCtorSelector);
     if (ctorMethod != null && ctorMethod.isPublic() && ctorMethod.getDeclaringClass() == klass) {
       return ctorMethod;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassNewInstanceContextSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassNewInstanceContextSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassNewInstanceContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ClassNewInstanceContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,7 +34,7 @@
   /**
    * If receiver is a {@link ConstantKey} whose value is an {@link IClass}, return a {@link JavaTypeContext}
    * representing the type of the IClass. (This corresponds to the case where we know the exact type that will be
-   * allocated by the <code>Class.newInstance()</code> call.)  Otherwise, return <code>null</code>.    
+   * allocated by the {@code Class.newInstance()} call.)  Otherwise, return {@code null}.
    */
   @Override
   public Context getCalleeTarget(CGNode caller, CallSiteReference site, IMethod callee, InstanceKey[] receiver) {
@@ -47,7 +47,7 @@
     return null;
   }
 
-  private boolean isTypeConstant(InstanceKey instance) {
+  private static boolean isTypeConstant(InstanceKey instance) {
     if (instance instanceof ConstantKey) {
       ConstantKey c = (ConstantKey) instance;
       if (c.getValue() instanceof IClass) {
@@ -61,10 +61,10 @@
 
   @Override
   public IntSet getRelevantParameters(CGNode caller, CallSiteReference site) {
-    if (site.isDispatch() || site.getDeclaredTarget().getNumberOfParameters() > 0) {
+    if (ClassNewInstanceContextInterpreter.CLASS_NEW_INSTANCE_REF.equals(site.getDeclaredTarget())) {
       return thisParameter;
     } else {
       return EmptyIntSet.instance;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/CloneInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/CloneInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/CloneInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/CloneInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,6 +34,7 @@
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAGetInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
@@ -61,14 +62,14 @@
 public class CloneInterpreter implements SSAContextInterpreter {
 
   /**
-   * Comment for <code>cloneAtom</code>
+   * Comment for {@code cloneAtom}
    */
   public final static Atom cloneAtom = Atom.findOrCreateUnicodeAtom("clone");
 
   private final static Descriptor cloneDesc = Descriptor.findOrCreateUTF8("()Ljava/lang/Object;");
 
   /**
-   * Comment for <code>CLONE</code>
+   * Comment for {@code CLONE}
    */
   public final static MethodReference CLONE = MethodReference.findOrCreate(TypeReference.JavaLangObject, cloneAtom, cloneDesc);
 
@@ -93,7 +94,7 @@
   private final static int NEW_PC = 0;
 
   /**
-   * Mapping from TypeReference -> IR TODO: Soft references?
+   * Mapping from TypeReference -&gt; IR TODO: Soft references?
    */
   final private Map<TypeReference, IR> IRCache = HashMapFactory.make();
 
@@ -115,6 +116,11 @@
   }
 
   @Override
+  public IRView getIRView(CGNode node) {
+    return getIR(node);
+  }
+
+  @Override
   public int getNumberOfStatements(CGNode node) {
     assert understands(node);
     return getIR(node).getInstructions().length;
@@ -135,13 +141,13 @@
     }
     assert understands(node);
     IClass cls = ContextUtil.getConcreteClassFromContext(node.getContext());
-    return new NonNullSingletonIterator<NewSiteReference>(NewSiteReference.make(NEW_PC, cls.getReference()));
+    return new NonNullSingletonIterator<>(NewSiteReference.make(NEW_PC, cls.getReference()));
   }
 
   @Override
   public Iterator<CallSiteReference> iterateCallSites(CGNode node) {
     assert understands(node);
-    return new NonNullSingletonIterator<CallSiteReference>(ARRAYCOPY_SITE);
+    return new NonNullSingletonIterator<>(ARRAYCOPY_SITE);
   }
 
   /**
@@ -150,7 +156,7 @@
   private SSAInstruction[] makeStatements(IClass klass) {
     assert klass != null;
 
-    ArrayList<SSAInstruction> statements = new ArrayList<SSAInstruction>();
+    ArrayList<SSAInstruction> statements = new ArrayList<>();
     // value number 1 is "this".
     int nextLocal = 2;
 
@@ -183,8 +189,7 @@
       // TODO:
       IClass k = klass;
       while (k != null) {
-        for (Iterator<IField> it = klass.getDeclaredInstanceFields().iterator(); it.hasNext();) {
-          IField f = it.next();
+        for (IField f : klass.getDeclaredInstanceFields()) {
           int tempValue = nextLocal++;
           SSAGetInstruction G = insts.GetInstruction(statements.size(), tempValue, 1, f.getReference());
           statements.add(G);
@@ -239,7 +244,7 @@
 
   public Set getCaughtExceptions(CGNode node) {
     SSAInstruction[] statements = getIR(node).getInstructions();
-    return CodeScanner.getCaughtExceptions(node.getMethod().getDeclaringClass().getClassLoader().getLanguage(), statements);
+    return CodeScanner.getCaughtExceptions(statements);
   }
 
   public boolean hasObjectArrayLoad(CGNode node) {
@@ -252,7 +257,7 @@
     return CodeScanner.hasObjectArrayStore(statements);
   }
 
-  public Iterator iterateCastTypes(CGNode node) {
+  public Iterator<TypeReference> iterateCastTypes(CGNode node) {
     SSAInstruction[] statements = getIR(node).getInstructions();
     return CodeScanner.iterateCastTypes(statements);
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryBypassInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryBypassInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryBypassInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryBypassInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -32,10 +32,10 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.classLoader.SyntheticMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.SummarizedMethod;
 import com.ibm.wala.ipa.summaries.SyntheticIR;
@@ -44,6 +44,7 @@
 import com.ibm.wala.ssa.ConstantValue;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAInstructionFactory;
@@ -56,6 +57,7 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.warnings.Warnings;
 
@@ -65,7 +67,7 @@
 public class FactoryBypassInterpreter extends AbstractReflectionInterpreter {
 
   /**
-   * A Map from CallerSiteContext -> Set <TypeReference>represents the types a factory method might create in a particular context
+   * A Map from CallerSiteContext -&gt; Set &lt;TypeReference&gt;represents the types a factory method might create in a particular context
    */
   private final Map<Context, Set<TypeReference>> map = HashMapFactory.make();
 
@@ -77,9 +79,9 @@
   /**
    * @param options governing analysis options
    */
-  public FactoryBypassInterpreter(AnalysisOptions options, AnalysisCache cache) {
+  public FactoryBypassInterpreter(AnalysisOptions options, IAnalysisCacheView iAnalysisCacheView) {
     this.options = options;
-    this.cache = cache;
+    this.cache = iAnalysisCacheView;
   }
 
   @Override
@@ -91,7 +93,12 @@
       System.err.println("generating IR for " + node);
     }
     SpecializedFactoryMethod m = findOrCreateSpecializedFactoryMethod(node);
-    return cache.getSSACache().findOrCreateIR(m, node.getContext(), options.getSSAOptions());
+    return cache.getIR(m, node.getContext());
+  }
+
+  @Override
+  public IRView getIRView(CGNode node) {
+    return getIR(node);
   }
 
   private Set<TypeReference> getTypesForContext(Context context) {
@@ -134,7 +141,7 @@
     if (node == null) {
       throw new IllegalArgumentException("node is null");
     }
-    if (node.getMethod().isSynthetic()) {
+    if (node.getMethod().isWalaSynthetic()) {
       SyntheticMethod s = (SyntheticMethod) node.getMethod();
       if (s.isFactoryMethod()) {
         return getTypesForContext(node.getContext()) != null;
@@ -151,8 +158,8 @@
     }
     SpecializedFactoryMethod m = findOrCreateSpecializedFactoryMethod(node);
     HashSet<NewSiteReference> result = HashSetFactory.make(5);
-    for (Iterator<SSAInstruction> it = m.getAllocationStatements().iterator(); it.hasNext();) {
-      SSANewInstruction s = (SSANewInstruction) it.next();
+    for (SSAInstruction ssaInstruction : m.getAllocationStatements()) {
+      SSANewInstruction s = (SSANewInstruction) ssaInstruction;
       result.add(s.getNewSite());
     }
     return result.iterator();
@@ -194,16 +201,15 @@
       types = HashSetFactory.make(2);
       map.put(context, types);
     }
-    if (types.contains(type)) {
+    if (!types.add(type)) {
       return false;
     } else {
-      types.add(type);
       // update any extant synthetic method
       SpecializedFactoryMethod m = syntheticMethodCache.get(context);
       if (m != null) {
         TypeAbstraction T = typeRef2TypeAbstraction(cha, type);
         m.addStatementsForTypeAbstraction(T);
-        cache.getSSACache().invalidate(m, context);
+        cache.invalidate(m, context);
       }
       return true;
     }
@@ -257,7 +263,7 @@
   private SpecializedFactoryMethod findOrCreateSpecializedFactoryMethod(CGNode node) {
     SpecializedFactoryMethod m = syntheticMethodCache.get(node.getContext());
     if (m == null) {
-      Set types = getTypesForContext(node.getContext());
+      Set<TypeReference> types = getTypesForContext(node.getContext());
       m = new SpecializedFactoryMethod((SummarizedMethod) node.getMethod(), node.getContext(), types);
       syntheticMethodCache.put(node.getContext(), m);
     }
@@ -306,7 +312,7 @@
     }
   }
 
-  public Iterator iterateCastTypes(CGNode node) {
+  public Iterator<TypeReference> iterateCastTypes(CGNode node) {
     if (node == null) {
       throw new IllegalArgumentException("node is null");
     }
@@ -333,8 +339,8 @@
     if (node == null) {
       throw new IllegalArgumentException("node is null");
     }
-    SpecializedFactoryMethod m = findOrCreateSpecializedFactoryMethod(node);
-    return cache.getSSACache().findOrCreateDU(m, node.getContext(), options.getSSAOptions());
+    // SpecializedFactoryMethod m = findOrCreateSpecializedFactoryMethod(node);
+    return cache.getDefUse(getIR(node));
   }
 
   protected class SpecializedFactoryMethod extends SpecializedMethod {
@@ -342,7 +348,7 @@
     /**
      * List of synthetic invoke instructions we model for this specialized instance.
      */
-    final private ArrayList<SSAInstruction> calls = new ArrayList<SSAInstruction>();
+    final private ArrayList<SSAInstruction> calls = new ArrayList<>();
 
     /**
      * The method being modelled
@@ -372,7 +378,7 @@
       }
     }
 
-    protected SpecializedFactoryMethod(final SummarizedMethod m, Context context, final Set S) {
+    protected SpecializedFactoryMethod(final SummarizedMethod m, Context context, final Set<TypeReference> S) {
       super(m, m.getDeclaringClass(), m.isStatic(), true);
 
       this.context = context;
@@ -387,8 +393,7 @@
       // add original statements from the method summary
       nextLocal = addOriginalStatements(m);
 
-      for (Iterator it = S.iterator(); it.hasNext();) {
-        TypeReference type = (TypeReference) it.next();
+      for (TypeReference type : S) {
         TypeAbstraction T = typeRef2TypeAbstraction(m.getClassHierarchy(), type);
         addStatementsForTypeAbstraction(T);
       }
@@ -422,7 +427,7 @@
           if (((ConeType) T).isInterface()) {
             Set<IClass> implementors = T.getType().getClassHierarchy().getImplementors(ref);
             if (DEBUG) {
-              System.err.println(("Implementors for " + T + " " + implementors));
+              System.err.println(("Implementors for " + T + ' ' + implementors));
             }
             if (implementors.isEmpty()) {
               if (DEBUG) {
@@ -438,7 +443,7 @@
           } else {
             Collection<IClass> subclasses = T.getType().getClassHierarchy().computeSubClasses(ref);
             if (DEBUG) {
-              System.err.println(("Subclasses for " + T + " " + subclasses));
+              System.err.println(("Subclasses for " + T + ' ' + subclasses));
             }
             if (subclasses.isEmpty()) {
               if (DEBUG) {
@@ -476,8 +481,6 @@
 
     /**
      * Set up a method summary which allocates and returns an instance of concrete type T.
-     * 
-     * @param T
      */
     private void addStatementsForConcreteType(final TypeReference T) {
       int alloc = addStatementsForConcreteSimpleType(T);
@@ -500,8 +503,7 @@
       SSAInstruction[] original = m.getStatements(options.getSSAOptions());
       // local value number 1 is "this", so the next free value number is 2
       int nextLocal = 2;
-      for (int i = 0; i < original.length; i++) {
-        SSAInstruction s = original[i];
+      for (SSAInstruction s : original) {
         allInstructions.add(s);
         if (s instanceof SSAInvokeInstruction) {
           calls.add(s);
@@ -531,8 +533,7 @@
         allInstructions.add(r);
       }
 
-      for (; it.hasNext();) {
-        IClass klass = it.next();
+      for (IClass klass : Iterator2Iterable.make(it)) {
         TypeReference T = klass.getReference();
         if (klass.isAbstract() || klass.isInterface() || typesAllocated.contains(T)) {
           continue;
@@ -597,8 +598,8 @@
     public SSAInstruction[] getStatements() {
       SSAInstruction[] result = new SSAInstruction[allInstructions.size()];
       int i = 0;
-      for (Iterator<SSAInstruction> it = allInstructions.iterator(); it.hasNext();) {
-        result[i++] = it.next();
+      for (SSAInstruction ssaInstruction : allInstructions) {
+        result[i++] = ssaInstruction;
       }
       return result;
     }
@@ -628,7 +629,7 @@
       Map<Integer, ConstantValue> constants = null;
       if (valueNumberForConstantOne > -1) {
         constants = HashMapFactory.make(1);
-        constants.put(new Integer(valueNumberForConstantOne), new ConstantValue(new Integer(1)));
+        constants.put(Integer.valueOf(valueNumberForConstantOne), new ConstantValue(Integer.valueOf(1)));
       }
 
       return new SyntheticIR(this, context, new InducedCFG(instrs, this, context), instrs, options, constants);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryContextSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryContextSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -38,7 +38,7 @@
     if (callee == null) {
       throw new IllegalArgumentException("callee is null");
     }
-    if (callee.isSynthetic()) {
+    if (callee.isWalaSynthetic()) {
       SyntheticMethod s = (SyntheticMethod) callee;
       if (s.isFactoryMethod()) {
         return new CallStringContext(new CallString(site, caller.getMethod()));
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetClassContextInterpeter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetClassContextInterpeter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetClassContextInterpeter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetClassContextInterpeter.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,6 +14,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import com.ibm.wala.analysis.typeInference.TypeAbstraction;
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.cfg.InducedCFG;
 import com.ibm.wala.classLoader.CallSiteReference;
@@ -21,10 +22,13 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.ContextKey;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.summaries.SyntheticIR;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAInstructionFactory;
@@ -58,9 +62,9 @@
     }
 /** BEGIN Custom change: caching */
     
-    final JavaTypeContext context = (JavaTypeContext) node.getContext();
+    final Context context = node.getContext();
     final IMethod method = node.getMethod();
-    final String hashKey = method.toString() + "@" + context.toString();
+    final String hashKey = method.toString() + '@' + context.toString();
     
     IR result = cache.get(hashKey);
     
@@ -74,6 +78,11 @@
   }
 
   @Override
+  public IRView getIRView(CGNode node) {
+    return getIR(node);
+  }
+
+  @Override
   public int getNumberOfStatements(CGNode node) {
     assert understands(node);
     return getIR(node).getInstructions().length;
@@ -84,7 +93,7 @@
     if (node == null) {
       throw new IllegalArgumentException("node is null");
     }
-    if (!(node.getContext() instanceof JavaTypeContext)) {
+    if (!(node.getContext().isA(JavaTypeContext.class))) {
       return false;
     }
     return node.getMethod().getReference().equals(GetClassContextSelector.GET_CLASS);
@@ -100,12 +109,12 @@
     return EmptyIterator.instance();
   }
 
-  private SSAInstruction[] makeStatements(JavaTypeContext context) {
-    ArrayList<SSAInstruction> statements = new ArrayList<SSAInstruction>();
+  private static SSAInstruction[] makeStatements(Context context) {
+    ArrayList<SSAInstruction> statements = new ArrayList<>();
     int nextLocal = 2;
     int retValue = nextLocal++;
-    TypeReference tr = context.getType().getTypeReference();
-    SSAInstructionFactory insts = context.getType().getType().getClassLoader().getInstructionFactory();
+    TypeReference tr = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getTypeReference();
+    SSAInstructionFactory insts = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType().getClassLoader().getInstructionFactory();
     if (tr != null) {
       SSALoadMetadataInstruction l = insts.LoadMetadataInstruction(statements.size(), retValue, TypeReference.JavaLangClass, tr);
       statements.add(l);
@@ -120,7 +129,7 @@
     return result;
   }
 
-  private IR makeIR(IMethod method, JavaTypeContext context) {
+  private static IR makeIR(IMethod method, Context context) {
     SSAInstruction instrs[] = makeStatements(context);
     return new SyntheticIR(method, context, new InducedCFG(instrs, method, context), instrs, SSAOptions.defaultOptions(), null);
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetClassContextSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetClassContextSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetClassContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetClassContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,11 +51,11 @@
 
   @Override
   public IntSet getRelevantParameters(CGNode caller, CallSiteReference site) {
-    if (site.isDispatch() || site.getDeclaredTarget().getNumberOfParameters() > 0) {
+    if (site.getDeclaredTarget().equals(GET_CLASS)) {
       return thisParameter;
     } else {
       return EmptyIntSet.instance;
     }
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetMethodContextInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetMethodContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetMethodContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetMethodContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,6 +15,8 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import com.ibm.wala.analysis.reflection.GetMethodContext.NameItem;
+import com.ibm.wala.analysis.typeInference.TypeAbstraction;
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.cfg.InducedCFG;
 import com.ibm.wala.classLoader.CallSiteReference;
@@ -22,11 +24,14 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.ContextKey;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.summaries.SyntheticIR;
 import com.ibm.wala.ssa.ConstantValue;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAInstructionFactory;
@@ -65,9 +70,6 @@
 
   private static final boolean DEBUG = false;
 
-  /**
-   * @see com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter#getIR(com.ibm.wala.ipa.callgraph.CGNode)
-   */
   @Override
   public IR getIR(CGNode node) {
     if (node == null) {
@@ -78,15 +80,15 @@
       System.err.println("generating IR for " + node);
     }
     IMethod method = node.getMethod();
-    GetMethodContext context = (GetMethodContext) node.getContext();
+    Context context = node.getContext();
     Map<Integer,ConstantValue> constants = HashMapFactory.make();
     if (method.getReference().equals(GET_METHOD)) {
-      Atom name = Atom.findOrCreateAsciiAtom(context.getName());
+      Atom name = Atom.findOrCreateAsciiAtom(((NameItem)(context.get(ContextKey.NAME))).name());
       SSAInstruction instrs[] = makeGetMethodStatements(context,constants,name);
       return new SyntheticIR(method, context, new InducedCFG(instrs, method, context), instrs, SSAOptions.defaultOptions(), constants);
     }
     if (method.getReference().equals(GET_DECLARED_METHOD)) {
-      Atom name = Atom.findOrCreateAsciiAtom(context.getName());
+      Atom name = Atom.findOrCreateAsciiAtom(((NameItem)(context.get(ContextKey.NAME))).name());
       SSAInstruction instrs[] = makeGetDeclaredMethodStatements(context,constants,name);
       return new SyntheticIR(method, context, new InducedCFG(instrs, method, context), instrs, SSAOptions.defaultOptions(), constants);
     }
@@ -94,9 +96,11 @@
     return null;
   }
 
-  /**
-   * @see com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter#getNumberOfStatements(com.ibm.wala.ipa.callgraph.CGNode)
-   */
+  @Override
+  public IRView getIRView(CGNode node) {
+    return getIR(node);
+  }
+
   @Override
   public int getNumberOfStatements(CGNode node) {
     assert understands(node);
@@ -111,7 +115,7 @@
     if (node == null) {
       throw new IllegalArgumentException("node is null");
     }
-    if (!(node.getContext() instanceof GetMethodContext)) {
+    if (!(node.getContext().isA(GetMethodContext.class))) {
       return false;
     }
     MethodReference mRef = node.getMethod().getReference();
@@ -127,7 +131,7 @@
     GetMethodContext context = (GetMethodContext) node.getContext();
     TypeReference tr = context.getType().getTypeReference();
     if (tr != null) {
-      return new NonNullSingletonIterator<NewSiteReference>(NewSiteReference.make(0, tr));
+      return new NonNullSingletonIterator<>(NewSiteReference.make(0, tr));
     }
     return EmptyIterator.instance();
   }
@@ -144,7 +148,7 @@
    * @param cls the class
    * @param name the name
    */
-  private Collection<IMethod> getDeclaredNormalMethods(IClass cls,Atom name) {
+  private static Collection<IMethod> getDeclaredNormalMethods(IClass cls,Atom name) {
     Collection<IMethod> result = HashSetFactory.make();
     for (IMethod m : cls.getDeclaredMethods()) {
       if (!m.isInit() && !m.isClinit() && m.getSelector().getName().equals(name)) {
@@ -160,9 +164,9 @@
    * @param cls the class
    * @param name the name
    */
-  private Collection<IMethod> getAllNormalPublicMethods(IClass cls,Atom name) {
+  private static Collection<IMethod> getAllNormalPublicMethods(IClass cls,Atom name) {
     Collection<IMethod> result = HashSetFactory.make();
-    Collection<IMethod> allMethods = null;
+    Collection<? extends IMethod> allMethods = null;
     allMethods = cls.getAllMethods();
     for (IMethod m : allMethods) {
       if (!m.isInit() && !m.isClinit() && m.isPublic() && m.getSelector().getName().equals(name)) {
@@ -180,17 +184,17 @@
    * @param returnValues the possible return values for this method
    * @return the statements
    */
-  private SSAInstruction[] getParticularMethodStatements
+  private static SSAInstruction[] getParticularMethodStatements
       (
         MethodReference ref,
         Collection<IMethod> returnValues,
-        GetMethodContext context,
+        Context context,
         Map<Integer, ConstantValue> constants
        ) {
-    ArrayList<SSAInstruction> statements = new ArrayList<SSAInstruction>();
+    ArrayList<SSAInstruction> statements = new ArrayList<>();
     int nextLocal = ref.getNumberOfParameters() + 2;
-    IClass cls = context.getType().getType();
-    SSAInstructionFactory insts = context.getType().getType().getClassLoader().getInstructionFactory();
+    IClass cls = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType();
+    SSAInstructionFactory insts = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType().getClassLoader().getInstructionFactory();
     if (cls != null) {
       for (IMethod m : returnValues) {
         int c = nextLocal++;
@@ -211,13 +215,13 @@
     return result;
   }
 
-  private SSAInstruction[] makeGetMethodStatements
+  private static SSAInstruction[] makeGetMethodStatements
         (
-          GetMethodContext context,
+          Context context,
           Map<Integer,ConstantValue> constants,
           Atom name
         ) {
-    IClass cls = context.getType().getType();
+    IClass cls = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType();
     if (cls == null) {
       return getParticularMethodStatements(GET_METHOD, null, context, constants);
     } else {
@@ -228,8 +232,8 @@
   /**
    * Create statements for {@link Class#getDeclaredMethod(String, Class...)}.
    */
-  private SSAInstruction[] makeGetDeclaredMethodStatements(GetMethodContext context, Map<Integer, ConstantValue> constants,Atom name) {
-    IClass cls = context.getType().getType();
+  private static SSAInstruction[] makeGetDeclaredMethodStatements(Context context, Map<Integer, ConstantValue> constants,Atom name) {
+    IClass cls = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType();
     if (cls == null) {
       return getParticularMethodStatements(GET_DECLARED_METHOD, null, context, constants);
     } else {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetMethodContext.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetMethodContext.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetMethodContext.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetMethodContext.java	2019-01-29 17:08:39.000000000 +0000
@@ -83,10 +83,17 @@
     this.name = name;
   }
 
+  class NameItem implements ContextItem {
+    String name() { return getName(); }
+  };
+
   @Override
   public ContextItem get(ContextKey name) {
+    
     if (name == ContextKey.RECEIVER) {
       return type;
+    } else if (name == ContextKey.NAME) {
+      return new NameItem();
     } else if (name == ContextKey.PARAMETERS[0]) {
       if (type instanceof PointType) {
         IClass cls = ((PointType) type).getIClass();
@@ -103,7 +110,7 @@
 
   @Override
   public String toString() {
-    return "GetMethodContext<" + type + ", " + name + ">";
+    return "GetMethodContext<" + type + ", " + name + '>';
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetMethodContextSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetMethodContextSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetMethodContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/GetMethodContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -66,7 +66,7 @@
    */
   @Override
   public Context getCalleeTarget(CGNode caller,CallSiteReference site,IMethod callee,InstanceKey[] receiver) {
-    if (receiver != null && receiver.length > 0 && mayUnderstand(caller, site, callee, receiver[0])) {
+    if (receiver != null && receiver.length > 0 && mayUnderstand(callee, receiver[0])) {
       if (DEBUG) {
         System.out.print("site := " + site + ", receiver := " + receiver[0]);
       }
@@ -82,7 +82,7 @@
         String sym = symbolTable.getStringValue(use);
         if (DEBUG) {
           System.out.println(invokeInstructions);
-          System.out.println(", with constant := `" + sym + "`");
+          System.out.println(", with constant := `" + sym + '`');
           for (InstanceKey instanceKey:receiver) {
             System.out.println(" " + instanceKey);
           }
@@ -114,7 +114,7 @@
    * If <tt>instance</tt> is a {@link ConstantKey} and its value is an instance of {@link IClass},
    * return that value. Otherwise, return <tt>null</tt>.
    */
-  private IClass getTypeConstant(InstanceKey instance) {
+  private static IClass getTypeConstant(InstanceKey instance) {
     if (instance instanceof ConstantKey) {
       ConstantKey c = (ConstantKey) instance;
       if (c.getValue() instanceof IClass) {
@@ -132,7 +132,7 @@
    */
   protected static ConstantKey<String> makeConstantKey(IClassHierarchy cha,String str) {
     IClass cls = cha.lookupClass(TypeReference.JavaLangString);
-    ConstantKey<String> ck = new ConstantKey<String>(str,cls);
+    ConstantKey<String> ck = new ConstantKey<>(str,cls);
     return ck;
   }
 
@@ -147,7 +147,7 @@
    * This object understands a dispatch to {@link java.lang.Class#getMethod(String, Class...)}
    * or {@link java.lang.Class#getDeclaredMethod} when the receiver is a type constant.
    */
-  private boolean mayUnderstand(CGNode caller,CallSiteReference site,IMethod targetMethod,InstanceKey instance) {
+  private static boolean mayUnderstand(IMethod targetMethod,InstanceKey instance) {
     return UNDERSTOOD_METHOD_REFS.contains(targetMethod.getReference())
         && getTypeConstant(instance) != null;
   }
@@ -161,7 +161,7 @@
 
   @Override
   public IntSet getRelevantParameters(CGNode caller, CallSiteReference site) {
-    if (site.isDispatch() || site.getDeclaredTarget().getNumberOfParameters() > 0) {
+    if (UNDERSTOOD_METHOD_REFS.contains(site.getDeclaredTarget())) {
       return thisParameter;
     } else {
       return EmptyIntSet.instance;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/java7/MethodHandles.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/java7/MethodHandles.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/java7/MethodHandles.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/java7/MethodHandles.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,26 +13,33 @@
 import java.lang.ref.SoftReference;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.function.Predicate;
 
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
+import com.ibm.wala.classLoader.SyntheticMethod;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ipa.callgraph.ContextItem;
 import com.ibm.wala.ipa.callgraph.ContextKey;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
 import com.ibm.wala.ipa.callgraph.propagation.ConstantKey;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
+import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.propagation.cfa.DelegatingSSAContextInterpreter;
 import com.ibm.wala.ipa.summaries.MethodSummary;
 import com.ibm.wala.ipa.summaries.SummarizedMethod;
 import com.ibm.wala.shrikeBT.IInvokeInstruction.Dispatch;
 import com.ibm.wala.ssa.ConstantValue;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAFieldAccessInstruction;
 import com.ibm.wala.ssa.SSAGetInstruction;
@@ -43,18 +50,19 @@
 import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.MapIterator;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.intset.IntSet;
 import com.ibm.wala.util.intset.IntSetUtil;
+import com.ibm.wala.util.intset.MutableIntSet;
 
 public class MethodHandles {
 
+  private static final IntSet params = IntSetUtil.make(new int[] {1, 2});
+
   private static final IntSet self = IntSetUtil.make(new int[0]);
-  
+
   private static ContextKey METHOD_KEY = new ContextKey() {
     @Override
     public String toString() {
@@ -62,23 +70,83 @@
     }
   };
   
-  public static class MethodItem implements ContextItem {
-    private final MethodReference method;
+  private static ContextKey CLASS_KEY = new ContextKey() {
+    @Override
+    public String toString() {
+      return "CLASS_KEY";
+    }
+  };
+  
+  private static ContextKey NAME_KEY = new ContextKey() {
+    @Override
+    public String toString() {
+      return "NAME_KEY";
+    }
+  };
+  
+  private static class HandlesItem<T> implements ContextItem {
+    private final T item;
 
-    public MethodItem(MethodReference method) {
-      super();
-      this.method = method;
+    public HandlesItem(T method) {
+      this.item = method;
+    }
+
+    @Override
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((item == null) ? 0 : item.hashCode());
+      return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      HandlesItem other = (HandlesItem) obj;
+      if (item == null) {
+        if (other.item != null)
+          return false;
+      } else if (!item.equals(other.item))
+        return false;
+      return true;
+    }
+  }
+ 
+  public static class FindContext implements Context {
+    private final Context base;
+    private final TypeReference cls;
+    private final String selector;
+    
+    public FindContext(Context base, TypeReference cls, String methodName) {
+      this.base = base;
+      this.cls = cls;
+      this.selector = methodName;
     }
 
-    public MethodReference getMethod() {
-      return method;
+    @Override
+    public ContextItem get(ContextKey name) {
+      if (CLASS_KEY.equals(name)) {
+        return new HandlesItem<>(cls);
+      } else if (NAME_KEY.equals(name)) {
+        return new HandlesItem<>(selector);
+      } else {
+
+        return base.get(name);
+      }
     }
 
     @Override
     public int hashCode() {
       final int prime = 31;
       int result = 1;
-      result = prime * result + ((method == null) ? 0 : method.hashCode());
+      result = prime * result + ((base == null) ? 0 : base.hashCode());
+      result = prime * result + ((cls == null) ? 0 : cls.hashCode());
+      result = prime * result + ((selector == null) ? 0 : selector.hashCode());
       return result;
     }
 
@@ -90,17 +158,29 @@
         return false;
       if (getClass() != obj.getClass())
         return false;
-      MethodItem other = (MethodItem) obj;
-      if (method == null) {
-        if (other.method != null)
+      FindContext other = (FindContext) obj;
+      if (base == null) {
+        if (other.base != null)
           return false;
-      } else if (!method.equals(other.method))
+      } else if (!base.equals(other.base))
+        return false;
+      if (cls == null) {
+        if (other.cls != null)
+          return false;
+      } else if (!cls.equals(other.cls))
+        return false;
+      if (selector == null) {
+        if (other.selector != null)
+          return false;
+      } else if (!selector.equals(other.selector))
         return false;
       return true;
     }
+    
+    
   }
   
-  public static class MethodContext implements Context {
+  private static class MethodContext implements Context {
     private final Context base;
     private final MethodReference method;
         
@@ -112,7 +192,7 @@
     @Override
     public ContextItem get(ContextKey name) {
       if (METHOD_KEY.equals(name)) {
-        return new MethodItem(method);
+        return new HandlesItem<>(method);
       } else {
         return base.get(name);
       }
@@ -155,7 +235,7 @@
     }
   }
   
-  public static class ContextSelectorImpl implements ContextSelector {
+  private static class ContextSelectorImpl implements ContextSelector {
     private final ContextSelector base;
     
     public ContextSelectorImpl(ContextSelector base) {
@@ -165,7 +245,7 @@
     @Override
     public Context getCalleeTarget(CGNode caller, CallSiteReference site, IMethod callee, InstanceKey[] actualParameters) {
       Context baseContext = base.getCalleeTarget(caller, site, callee, actualParameters);
-      if ((isInvoke(callee) || isType(callee)) && callee.getDeclaringClass().getReference().equals(TypeReference.JavaLangInvokeMethodHandle)) {
+      if ((isInvoke(callee) || isType(callee)) && callee.getReference().getDeclaringClass().getName().equals(TypeReference.JavaLangInvokeMethodHandle.getName())) {
         if (actualParameters != null && actualParameters.length > 0) {
           InstanceKey selfKey = actualParameters[0];
           if (selfKey instanceof ConstantKey && ((ConstantKey)selfKey).getConcreteType().getReference().equals(TypeReference.JavaLangInvokeMethodHandle)) {
@@ -174,15 +254,66 @@
           }
         }
       }
+      
+      if (isFindStatic(callee)  && callee.getDeclaringClass().getReference().equals(TypeReference.JavaLangInvokeMethodHandlesLookup)) {
+        if (actualParameters != null && actualParameters.length > 2) {
+          InstanceKey classKey = actualParameters[1];
+          InstanceKey nameKey = actualParameters[2];
+          if (classKey instanceof ConstantKey && ((ConstantKey)classKey).getConcreteType().getReference().equals(TypeReference.JavaLangClass) &&
+              nameKey instanceof ConstantKey && ((ConstantKey)nameKey).getConcreteType().getReference().equals(TypeReference.JavaLangString)) {
+            return new FindContext(baseContext, ((IClass)((ConstantKey)classKey).getValue()).getReference(), (String)((ConstantKey)nameKey).getValue());
+          }
+        }
+      }
+      
       return baseContext;
     }
 
     @Override
     public IntSet getRelevantParameters(CGNode caller, CallSiteReference site) {
-      return self;
+      MutableIntSet x = IntSetUtil.makeMutableCopy(base.getRelevantParameters(caller, site));
+      x.addAll(isFindStatic(site.getDeclaredTarget())? params: self);
+      return x;
+    }
+  }
+  
+  private static class InvokeExactTargetSelector implements MethodTargetSelector {
+    private final MethodTargetSelector base;
+    private final Map<MethodReference, SyntheticMethod> impls = HashMapFactory.make();
+    
+    public InvokeExactTargetSelector(MethodTargetSelector base) {
+      this.base = base;
+    }
+
+    @Override
+    public IMethod getCalleeTarget(CGNode caller, CallSiteReference site, IClass receiver) {
+      MethodReference target = site.getDeclaredTarget();
+      if (isInvokeExact(target)) {
+        if (! impls.containsKey(target)) {
+          SyntheticMethod invokeExactTrampoline = new SyntheticMethod(target, receiver.getClassHierarchy().lookupClass(TypeReference.JavaLangInvokeMethodHandle), false, false);
+          impls.put(target, invokeExactTrampoline);
+        }
+        
+        return impls.get(target);
+      }
+      
+      return base.getCalleeTarget(caller, site, receiver);
     }
   }
   
+  private static boolean isInvokeExact(MethodReference target) {
+    return target.getDeclaringClass().getName().equals(TypeReference.JavaLangInvokeMethodHandle.getName()) &&
+        target.getName().toString().equals("invokeExact");
+  }
+
+  private static boolean isFindStatic(MethodReference node) {
+    return node.getName().toString().startsWith("findStatic");
+  }
+  
+  private static boolean isFindStatic(IMethod node) {
+    return isFindStatic(node.getReference());
+  }
+
   private static boolean isInvoke(IMethod node) {
     return node.getName().toString().startsWith("invoke");
   }
@@ -199,8 +330,12 @@
     return isType(node.getMethod());
   }
 
-  public static class ContextInterpreterImpl implements SSAContextInterpreter {
-    private final Map<CGNode, SoftReference<IR>> irs = HashMapFactory.make();
+  private static boolean isFindStatic(CGNode node) {
+    return isFindStatic(node.getMethod());
+  }
+
+  private abstract static class HandlersContextInterpreterImpl implements SSAContextInterpreter {
+    protected final Map<CGNode, SoftReference<IR>> irs = HashMapFactory.make();
 
     @Override
     public Iterator<NewSiteReference> iterateNewSites(CGNode node) {
@@ -209,32 +344,19 @@
 
     public Iterator<FieldReference> iterateFields(CGNode node, Predicate<SSAInstruction> filter) {
       return 
-          new MapIterator<SSAInstruction,FieldReference>(
-              new FilterIterator<SSAInstruction>(getIR(node).iterateNormalInstructions(), filter), 
-              new Function<SSAInstruction,FieldReference>() {
-                @Override
-                public FieldReference apply(SSAInstruction object) {
-                  return ((SSAFieldAccessInstruction)object).getDeclaredField();
-                }                
-              });
+          new MapIterator<>(
+              new FilterIterator<>(getIR(node).iterateNormalInstructions(), filter), 
+              object -> ((SSAFieldAccessInstruction)object).getDeclaredField());
     }
     
     @Override
     public Iterator<FieldReference> iterateFieldsRead(CGNode node) {
-      return iterateFields(node, new Predicate<SSAInstruction>() {
-        @Override public boolean test(SSAInstruction o) {
-          return o instanceof SSAGetInstruction;
-        }
-      });
+      return iterateFields(node, SSAGetInstruction.class::isInstance);
     }
     
     @Override
     public Iterator<FieldReference> iterateFieldsWritten(CGNode node) {
-      return iterateFields(node, new Predicate<SSAInstruction>() {
-        @Override public boolean test(SSAInstruction o) {
-          return o instanceof SSAPutInstruction;
-        }
-      });
+      return iterateFields(node, SSAPutInstruction.class::isInstance);
     }
 
     @Override
@@ -243,13 +365,72 @@
     }
 
     @Override
+    public Iterator<CallSiteReference> iterateCallSites(CGNode node) {
+      return getIR(node).iterateCallSites();
+    }
+
+    @Override
+    public IRView getIRView(CGNode node) {
+      return getIR(node);
+    }
+
+    @Override
+    public DefUse getDU(CGNode node) {
+      return new DefUse(getIR(node));
+    }
+
+    @Override
+    public int getNumberOfStatements(CGNode node) {
+      return getIR(node).getInstructions().length;
+    }
+
+    @Override
+    public ControlFlowGraph<SSAInstruction, ISSABasicBlock> getCFG(CGNode n) {
+      return getIR(n).getControlFlowGraph();
+    }
+
+  }
+  
+  private static class FindContextInterpreterImpl extends HandlersContextInterpreterImpl {
+    
+    @Override
     public boolean understands(CGNode node) {
-      return (isInvoke(node) || isType(node)) && node.getContext() instanceof MethodContext;
+      return isFindStatic(node) && node.getContext().isA(FindContext.class);
     }
 
     @Override
-    public Iterator<CallSiteReference> iterateCallSites(CGNode node) {
-      return getIR(node).iterateCallSites();
+    public IR getIR(CGNode node) {
+      if (!irs.containsKey(node) || irs.get(node).get() == null) {
+        MethodSummary code = new MethodSummary(node.getMethod().getReference());
+        SummarizedMethod m = new SummarizedMethod(node.getMethod().getReference(), code, node.getMethod().getDeclaringClass());
+        SSAInstructionFactory insts = node.getMethod().getDeclaringClass().getClassLoader().getLanguage().instructionFactory();
+        assert node.getContext().isA(FindContext.class);
+        
+        @SuppressWarnings("unchecked")
+        IClass cls = node.getClassHierarchy().lookupClass(((HandlesItem<TypeReference>)node.getContext().get(CLASS_KEY)).item);
+        @SuppressWarnings("unchecked")
+        String selector = ((HandlesItem<String>)node.getContext().get(NAME_KEY)).item;
+        
+        int vn = 10;
+        for(IMethod handleMethod : cls.getAllMethods()) {
+           if (handleMethod.getName().toString().contains(selector)) {  
+            code.addStatement(insts.LoadMetadataInstruction(code.getNextProgramCounter(), vn, TypeReference.JavaLangInvokeMethodHandle, handleMethod.getReference()));
+            code.addStatement(insts.ReturnInstruction(code.getNextProgramCounter(), vn , false));
+            vn++;
+          }
+        }
+        irs.put(node, new SoftReference<>(m.makeIR(node.getContext(), SSAOptions.defaultOptions())));
+      }
+
+      return irs.get(node).get();
+    }
+  }
+    
+  private static class InvokeContextInterpreterImpl extends HandlersContextInterpreterImpl {
+      
+    @Override
+    public boolean understands(CGNode node) {
+      return (isInvoke(node) || isType(node)) && node.getContext().isA(MethodContext.class);
     }
 
     @Override
@@ -258,9 +439,10 @@
         MethodSummary code = new MethodSummary(node.getMethod().getReference());
         SummarizedMethod m = new SummarizedMethod(node.getMethod().getReference(), code, node.getMethod().getDeclaringClass());
         SSAInstructionFactory insts = node.getMethod().getDeclaringClass().getClassLoader().getLanguage().instructionFactory();
-        assert node.getContext() instanceof MethodContext;
+        assert node.getContext().isA(MethodContext.class);
         MethodReference ref = ((MethodContext)node.getContext()).method;
         boolean isStatic = node.getClassHierarchy().resolveMethod(ref).isStatic();
+        boolean isVoid = ref.getReturnType().equals(TypeReference.Void);
         if (isInvoke(node)) {
           String name = node.getMethod().getName().toString();
           if ("invokeWithArguments".equals(name)) {
@@ -274,34 +456,39 @@
             CallSiteReference site = CallSiteReference.make(nargs+1, ref, isStatic? Dispatch.STATIC: Dispatch.SPECIAL);
             code.addStatement(insts.InvokeInstruction(code.getNextProgramCounter(), 2*nargs+3, params, 2*nargs+4, site, null));
             code.addStatement(insts.ReturnInstruction(code.getNextProgramCounter(), 2*nargs+3, false));
-          } else {
-            int nargs = node.getMethod().getNumberOfParameters();
+          } else if ("invokeExact".equals(name)) {
+            int nargs = node.getMethod().getReference().getNumberOfParameters();
+            int params[] = new int[nargs];
+            if (nargs == ref.getNumberOfParameters() + (isStatic? 0: 1)) {
+              for(int i = 0; i < nargs; i++) {
+                params[i] = i+2;
+              }
+              CallSiteReference site = CallSiteReference.make(0, ref, isStatic? Dispatch.STATIC: Dispatch.SPECIAL);
+              if (isVoid) {
+                code.addStatement(insts.InvokeInstruction(code.getNextProgramCounter(), params, nargs+2, site, null));              
+              } else {
+                code.addStatement(insts.InvokeInstruction(code.getNextProgramCounter(), nargs+2, params, nargs+3, site, null));
+                code.addStatement(insts.ReturnInstruction(code.getNextProgramCounter(), nargs+2, false));
+              }
+            } 
           }
         } else {
           assert isType(node);
           code.addStatement(insts.LoadMetadataInstruction(code.getNextProgramCounter(), 2, TypeReference.JavaLangInvokeMethodType, ref.getDescriptor()));
           code.addStatement(insts.ReturnInstruction(code.getNextProgramCounter(), 2, false));
         }
-        irs.put(node, new SoftReference<IR>(m.makeIR(node.getContext(), SSAOptions.defaultOptions())));
+        irs.put(node, new SoftReference<>(m.makeIR(node.getContext(), SSAOptions.defaultOptions())));
       }
 
       return irs.get(node).get();
     }
+  }
+  
+  public static void analyzeMethodHandles(AnalysisOptions options, SSAPropagationCallGraphBuilder builder) {
+    options.setSelector(new InvokeExactTargetSelector(options.getMethodTargetSelector()));
 
-    @Override
-    public DefUse getDU(CGNode node) {
-      return new DefUse(getIR(node));
-    }
-
-    @Override
-    public int getNumberOfStatements(CGNode node) {
-      return getIR(node).getInstructions().length;
-    }
-
-    @Override
-    public ControlFlowGraph<SSAInstruction, ISSABasicBlock> getCFG(CGNode n) {
-      return getIR(n).getControlFlowGraph();
-    }
-    
+    builder.setContextSelector(new ContextSelectorImpl(builder.getContextSelector()));
+    builder.setContextInterpreter(new DelegatingSSAContextInterpreter(new InvokeContextInterpreterImpl(), builder.getCFAContextInterpreter()));
+    builder.setContextInterpreter(new DelegatingSSAContextInterpreter(new FindContextInterpreterImpl(), builder.getCFAContextInterpreter()));
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/JavaLangClassContextInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/JavaLangClassContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/JavaLangClassContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/JavaLangClassContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,6 +15,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import com.ibm.wala.analysis.typeInference.TypeAbstraction;
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.cfg.InducedCFG;
 import com.ibm.wala.classLoader.CallSiteReference;
@@ -22,11 +23,14 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.ContextKey;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.summaries.SyntheticIR;
 import com.ibm.wala.ssa.ConstantValue;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAArrayStoreInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
@@ -105,9 +109,9 @@
     }
 /** BEGIN Custom change: caching */
     
-    final JavaTypeContext context = (JavaTypeContext) node.getContext();
+    final Context context = node.getContext();
     final IMethod method = node.getMethod();
-    final String hashKey = method.toString() + "@" + context.toString();
+    final String hashKey = method.toString() + '@' + context.toString();
     
     IR result = cache.get(hashKey);
     
@@ -122,7 +126,12 @@
     return result;
   }
 
-  private IR makeIR(IMethod method, JavaTypeContext context) {
+  @Override
+  public IRView getIRView(CGNode node) {
+    return getIR(node);
+  }
+
+  private static IR makeIR(IMethod method, Context context) {
     Map<Integer, ConstantValue> constants = HashMapFactory.make();
     if (method.getReference().equals(GET_CONSTRUCTOR)) {
       SSAInstruction instrs[] = makeGetCtorStatements(context, constants);
@@ -186,7 +195,7 @@
     if (node == null) {
       throw new IllegalArgumentException("node is null");
     }
-    if (!(node.getContext() instanceof JavaTypeContext)) {
+    if (!(node.getContext().isA(JavaTypeContext.class))) {
       return false;
     }
     MethodReference mRef = node.getMethod().getReference();
@@ -201,10 +210,10 @@
       throw new IllegalArgumentException("node is null");
     }
     assert understands(node);
-    JavaTypeContext context = (JavaTypeContext) node.getContext();
-    TypeReference tr = context.getType().getTypeReference();
+    Context context = node.getContext();
+    TypeReference tr = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getTypeReference();
     if (tr != null) {
-      return new NonNullSingletonIterator<NewSiteReference>(NewSiteReference.make(0, tr));
+      return new NonNullSingletonIterator<>(NewSiteReference.make(0, tr));
     }
     return EmptyIterator.instance();
   }
@@ -218,7 +227,7 @@
   /**
    * Get all non-constructor, non-class-initializer methods declared by a class
    */
-  private Collection<IMethod> getDeclaredNormalMethods(IClass cls) {
+  private static Collection<IMethod> getDeclaredNormalMethods(IClass cls) {
     Collection<IMethod> result = HashSetFactory.make();
     for (IMethod m : cls.getDeclaredMethods()) {
       if (!m.isInit() && !m.isClinit()) {
@@ -231,9 +240,9 @@
   /**
    * Get all non-constructor, non-class-initializer methods declared by a class and all its superclasses
    */
-  private Collection<IMethod> getAllNormalPublicMethods(IClass cls) {
+  private static Collection<IMethod> getAllNormalPublicMethods(IClass cls) {
     Collection<IMethod> result = HashSetFactory.make();
-    Collection<IMethod> allMethods = null;
+    Collection<? extends IMethod> allMethods = null;
     allMethods = cls.getAllMethods();
     for (IMethod m : allMethods) {
       if (!m.isInit() && !m.isClinit() && m.isPublic()) {
@@ -246,7 +255,7 @@
   /**
    * Get all the constructors of a class
    */
-  private Collection<IMethod> getConstructors(IClass cls) {
+  private static Collection<IMethod> getConstructors(IClass cls) {
     Collection<IMethod> result = HashSetFactory.make();
     for (IMethod m : cls.getDeclaredMethods()) {
       if (m.isInit()) {
@@ -259,7 +268,7 @@
   /**
    * Get all the public constructors of a class
    */
-  private Collection<IMethod> getPublicConstructors(IClass cls) {
+  private static Collection<IMethod> getPublicConstructors(IClass cls) {
     Collection<IMethod> result = HashSetFactory.make();
     for (IMethod m : cls.getDeclaredMethods()) {
       if (m.isInit() && m.isPublic()) {
@@ -274,13 +283,13 @@
    * 
    * @param returnValues the possible return values for this method.
    */
-  private SSAInstruction[] getMethodArrayStatements(MethodReference ref, Collection<IMethod> returnValues, JavaTypeContext context,
+  private static SSAInstruction[] getMethodArrayStatements(MethodReference ref, Collection<IMethod> returnValues, Context context,
       Map<Integer, ConstantValue> constants) {
-    ArrayList<SSAInstruction> statements = new ArrayList<SSAInstruction>();
+    ArrayList<SSAInstruction> statements = new ArrayList<>();
     int nextLocal = ref.getNumberOfParameters() + 2;
     int retValue = nextLocal++;
-    IClass cls = context.getType().getType();
-    SSAInstructionFactory insts = context.getType().getType().getClassLoader().getInstructionFactory();
+    IClass cls = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType();
+    SSAInstructionFactory insts = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType().getClassLoader().getInstructionFactory();
     if (cls != null) {
       TypeReference arrType = ref.getReturnType();
       NewSiteReference site = new NewSiteReference(retValue, arrType);
@@ -321,12 +330,12 @@
    * 
    * @param returnValues the possible return values for this method.
    */
-  private SSAInstruction[] getParticularMethodStatements(MethodReference ref, Collection<IMethod> returnValues,
-      JavaTypeContext context, Map<Integer, ConstantValue> constants) {
-    ArrayList<SSAInstruction> statements = new ArrayList<SSAInstruction>();
+  private static SSAInstruction[] getParticularMethodStatements(MethodReference ref, Collection<IMethod> returnValues,
+      Context context, Map<Integer, ConstantValue> constants) {
+    ArrayList<SSAInstruction> statements = new ArrayList<>();
     int nextLocal = ref.getNumberOfParameters() + 2;
-    IClass cls = context.getType().getType();
-    SSAInstructionFactory insts = context.getType().getType().getClassLoader().getInstructionFactory();
+    IClass cls = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType();
+    SSAInstructionFactory insts = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType().getClassLoader().getInstructionFactory();
     if (cls != null) {
       for (IMethod m : returnValues) {
         int c = nextLocal++;
@@ -350,8 +359,8 @@
   /**
    * create statements for getConstructor()
    */
-  private SSAInstruction[] makeGetCtorStatements(JavaTypeContext context, Map<Integer, ConstantValue> constants) {
-    IClass cls = context.getType().getType();
+  private static SSAInstruction[] makeGetCtorStatements(Context context, Map<Integer, ConstantValue> constants) {
+    IClass cls = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType();
     if (cls == null) {
       return getParticularMethodStatements(GET_CONSTRUCTOR, null, context, constants);
     } else {
@@ -360,8 +369,8 @@
   }
 
   // TODO
-  private SSAInstruction[] makeGetCtorsStatements(JavaTypeContext context, Map<Integer, ConstantValue> constants) {
-    IClass cls = context.getType().getType();
+  private static SSAInstruction[] makeGetCtorsStatements(Context context, Map<Integer, ConstantValue> constants) {
+    IClass cls = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType();
     if (cls == null) {
       return getMethodArrayStatements(GET_DECLARED_CONSTRUCTORS, null, context, constants);
     } else {
@@ -369,8 +378,8 @@
     }
   }
 
-  private SSAInstruction[] makeGetMethodStatements(JavaTypeContext context, Map<Integer, ConstantValue> constants) {
-    IClass cls = context.getType().getType();
+  private static SSAInstruction[] makeGetMethodStatements(Context context, Map<Integer, ConstantValue> constants) {
+    IClass cls = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType();
     if (cls == null) {
       return getParticularMethodStatements(GET_METHOD, null, context, constants);
     } else {
@@ -378,8 +387,8 @@
     }
   }
 
-  private SSAInstruction[] makeGetMethodsStatments(JavaTypeContext context, Map<Integer, ConstantValue> constants) {
-    IClass cls = context.getType().getType();
+  private static SSAInstruction[] makeGetMethodsStatments(Context context, Map<Integer, ConstantValue> constants) {
+    IClass cls = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType();
     if (cls == null) {
       return getMethodArrayStatements(GET_METHODS, null, context, constants);
     } else {
@@ -390,8 +399,8 @@
   /**
    * create statements for getConstructor()
    */
-  private SSAInstruction[] makeGetDeclCtorStatements(JavaTypeContext context, Map<Integer, ConstantValue> constants) {
-    IClass cls = context.getType().getType();
+  private static SSAInstruction[] makeGetDeclCtorStatements(Context context, Map<Integer, ConstantValue> constants) {
+    IClass cls = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType();
     if (cls == null) {
       return getParticularMethodStatements(GET_DECLARED_CONSTRUCTOR, null, context, constants);
     } else {
@@ -399,8 +408,8 @@
     }
   }
 
-  private SSAInstruction[] makeGetDeclCtorsStatements(JavaTypeContext context, Map<Integer, ConstantValue> constants) {
-    IClass cls = context.getType().getType();
+  private static SSAInstruction[] makeGetDeclCtorsStatements(Context context, Map<Integer, ConstantValue> constants) {
+    IClass cls = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType();
     if (cls == null) {
       return getMethodArrayStatements(GET_DECLARED_CONSTRUCTORS, null, context, constants);
     } else {
@@ -411,8 +420,8 @@
   /**
    * create statements for getDeclaredMethod()
    */
-  private SSAInstruction[] makeGetDeclaredMethodStatements(JavaTypeContext context, Map<Integer, ConstantValue> constants) {
-    IClass cls = context.getType().getType();
+  private static SSAInstruction[] makeGetDeclaredMethodStatements(Context context, Map<Integer, ConstantValue> constants) {
+    IClass cls = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType();
     if (cls == null) {
       return getParticularMethodStatements(GET_DECLARED_METHOD, null, context, constants);
     } else {
@@ -423,8 +432,8 @@
   /**
    * create statements for getDeclaredMethod()
    */
-  private SSAInstruction[] makeGetDeclaredMethodsStatements(JavaTypeContext context, Map<Integer, ConstantValue> constants) {
-    IClass cls = context.getType().getType();
+  private static SSAInstruction[] makeGetDeclaredMethodsStatements(Context context, Map<Integer, ConstantValue> constants) {
+    IClass cls = ((TypeAbstraction)context.get(ContextKey.RECEIVER)).getType();
     if (cls == null) {
       return getMethodArrayStatements(GET_DECLARED_METHODS, null, context, constants);
     } else {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/JavaLangClassContextSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/JavaLangClassContextSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/JavaLangClassContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/JavaLangClassContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,13 +50,13 @@
    */
   @Override
   public Context getCalleeTarget(CGNode caller, CallSiteReference site, IMethod callee, InstanceKey[] receiver) {
-    if (receiver != null && receiver.length > 0 && mayUnderstand(caller, site, callee, receiver[0])) {
+    if (receiver != null && receiver.length > 0 && mayUnderstand(callee, receiver[0])) {
       return new JavaTypeContext(new PointType(getTypeConstant(receiver[0])));
     }
     return null;
   }
 
-  private IClass getTypeConstant(InstanceKey instance) {
+  private static IClass getTypeConstant(InstanceKey instance) {
     if (instance instanceof ConstantKey) {
       ConstantKey c = (ConstantKey) instance;
       if (c.getValue() instanceof IClass) {
@@ -82,7 +82,7 @@
   /**
    * This object may understand a dispatch to Class.getContructor when the receiver is a type constant.
    */
-  private boolean mayUnderstand(CGNode caller, CallSiteReference site, IMethod targetMethod, InstanceKey instance) {
+  private static boolean mayUnderstand(IMethod targetMethod, InstanceKey instance) {
     return UNDERSTOOD_METHOD_REFS.contains(targetMethod.getReference()) && getTypeConstant(instance) != null;
   }
 
@@ -90,10 +90,10 @@
 
   @Override
   public IntSet getRelevantParameters(CGNode caller, CallSiteReference site) {
-    if (site.isDispatch() || site.getDeclaredTarget().getNumberOfParameters() > 0) {
+    if (UNDERSTOOD_METHOD_REFS.contains(site.getDeclaredTarget())) {
       return thisParameter;
     } else {
       return EmptyIntSet.instance;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/JavaTypeContext.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/JavaTypeContext.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/JavaTypeContext.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/JavaTypeContext.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,6 @@
 import com.ibm.wala.ipa.callgraph.propagation.FilteredPointerKey;
 
 /**
- * @brief
  *  Implements a Context which corresponds to a given type abstraction.
  *  Thus, this maps the name "TYPE" to a JavaTypeAbstraction.
  * TODO
@@ -55,7 +54,7 @@
 
   @Override
   public String toString() {
-    return "JavaTypeContext<" + type + ">";
+    return "JavaTypeContext<" + type + '>';
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectionContextInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectionContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectionContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectionContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,14 +16,15 @@
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.NewSiteReference;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.DelegatingSSAContextInterpreter;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.types.FieldReference;
@@ -34,7 +35,7 @@
 public class ReflectionContextInterpreter {
 
   public static SSAContextInterpreter createReflectionContextInterpreter(IClassHierarchy cha, AnalysisOptions options,
-      AnalysisCache cache) {
+      IAnalysisCacheView iAnalysisCacheView) {
     
     if (options == null) {
       throw new IllegalArgumentException("null options");
@@ -90,6 +91,11 @@
       }
 
       @Override
+      public IRView getIRView(CGNode node) {
+        return getIR(node);
+      }
+
+      @Override
       public DefUse getDU(CGNode node) {
         // TODO Auto-generated method stub
         return null;
@@ -104,7 +110,7 @@
 
     if (options.getReflectionOptions().getNumFlowToCastIterations() > 0) {
       // need the factory bypass interpreter
-      result = new DelegatingSSAContextInterpreter(new FactoryBypassInterpreter(options, cache), result);
+      result = new DelegatingSSAContextInterpreter(new FactoryBypassInterpreter(options, iAnalysisCacheView), result);
     }
     if (!options.getReflectionOptions().isIgnoreStringConstants()) {
       result = new DelegatingSSAContextInterpreter(new GetClassContextInterpeter(), new DelegatingSSAContextInterpreter(
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,6 +20,8 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.ContextKey;
 import com.ibm.wala.ipa.callgraph.propagation.ConstantKey;
 import com.ibm.wala.ipa.callgraph.propagation.ReceiverInstanceContext;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
@@ -29,6 +31,7 @@
 import com.ibm.wala.ssa.ConstantValue;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSACheckCastInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
@@ -68,12 +71,12 @@
     if (DEBUG) {
       System.err.println("generating IR for " + node);
     }
-    ReceiverInstanceContext recv = (ReceiverInstanceContext) node.getContext();
-    ConstantKey c = (ConstantKey) recv.getReceiver();
+    Context recv = node.getContext();
+    ConstantKey c = (ConstantKey) recv.get(ContextKey.RECEIVER);
     IMethod m = (IMethod) c.getValue();
 /** BEGIN Custom change: caching */
     final IMethod method = node.getMethod();
-    final String hashKey = method.toString() + "@" + recv.toString();
+    final String hashKey = method.toString() + '@' + recv.toString();
     
     IR result = cache.get(hashKey);
     
@@ -86,6 +89,11 @@
     return result;
   }
 
+  @Override
+  public IRView getIRView(CGNode node) {
+    return getIR(node);
+  }
+
   /*
    * @see com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter#getNumberOfStatements(com.ibm.wala.ipa.callgraph.CGNode)
    */
@@ -103,11 +111,11 @@
     if (node == null) {
       throw new IllegalArgumentException("node is null");
     }
-    if (!(node.getContext() instanceof ReceiverInstanceContext)) {
+    if (!(node.getContext().isA(ReceiverInstanceContext.class))) {
       return false;
     }
-    ReceiverInstanceContext r = (ReceiverInstanceContext) node.getContext();
-    if (!(r.getReceiver() instanceof ConstantKey)) {
+    Context r = node.getContext();
+    if (!(r.get(ContextKey.RECEIVER) instanceof ConstantKey)) {
       return false;
     }
     return node.getMethod().getReference().equals(METHOD_INVOKE) || node.getMethod().getReference().equals(CTOR_NEW_INSTANCE);
@@ -140,7 +148,7 @@
    * @param method is something like Method.invoke or Construction.newInstance
    * @param target is the method being called reflectively
    */
-  private IR makeIR(IMethod method, IMethod target, ReceiverInstanceContext context) {
+  private IR makeIR(IMethod method, IMethod target, Context recv) {
     SSAInstructionFactory insts = method.getDeclaringClass().getClassLoader().getInstructionFactory();
 
     SpecializedMethod m = new SpecializedMethod(method, method.getDeclaringClass(), method.isStatic(), false);
@@ -181,7 +189,7 @@
     for (int j = nextArg; j < nargs; j++) {
       // load the next parameter into v_temp.
       int indexConst = nextLocal++;
-      constants.put(new Integer(indexConst), new ConstantValue(nextParameter++));
+      constants.put(Integer.valueOf(indexConst), new ConstantValue(nextParameter++));
       int temp = nextLocal++;
       m.addInstruction(null, insts.ArrayLoadInstruction(m.allInstructions.size(), temp, parametersVn, indexConst, TypeReference.JavaLangObject), false);
       pc++;
@@ -219,7 +227,7 @@
     SSAInstruction[] instrs = new SSAInstruction[m.allInstructions.size()];
     m.allInstructions.<SSAInstruction> toArray(instrs);
 
-    return new SyntheticIR(method, context, new InducedCFG(instrs, method, context), instrs, SSAOptions.defaultOptions(), constants);
+    return new SyntheticIR(method, recv, new InducedCFG(instrs, method, recv), instrs, SSAOptions.defaultOptions(), constants);
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/ReflectiveInvocationSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -40,16 +40,16 @@
    * Creates a callee target based on the following criteria:
    * <ol>
    * <li>If the method being invoked through reflection is definitely static, then do not create a callee target for any
-   * <code>callee</code> method that is not static. In this case, return <code>null</code>.
-   * <li>If the method being invoked through reflection takes a constant number of parameters, <code>n</code>, then do not create a
-   * callee target for any <code>callee</code> method that takes a number of parameters different from <code>n</code>. In this case,
-   * return <code>null</code>.
-   * <li>Otherwise, return a new {@link ReceiverInstanceContext} for <code>receiver</code>.
+   * {@code callee} method that is not static. In this case, return {@code null}.
+   * <li>If the method being invoked through reflection takes a constant number of parameters, {@code n}, then do not create a
+   * callee target for any {@code callee} method that takes a number of parameters different from {@code n}. In this case,
+   * return {@code null}.
+   * <li>Otherwise, return a new {@link ReceiverInstanceContext} for {@code receiver}.
    * </ol>
    */
   @Override
   public Context getCalleeTarget(CGNode caller, CallSiteReference site, IMethod callee, InstanceKey[] receiver) {
-    if (receiver == null || receiver.length == 0 || !mayUnderstand(caller, site, callee, receiver[0])) {
+    if (receiver == null || receiver.length == 0 || !mayUnderstand(callee, receiver[0])) {
       return null;
     }
     IR ir = caller.getIR();
@@ -105,9 +105,10 @@
   /**
    * This object may understand a dispatch to Constructor.newInstance().
    */
-  private boolean mayUnderstand(CGNode caller, CallSiteReference site, IMethod targetMethod, InstanceKey instance) {
+  private static boolean mayUnderstand(IMethod targetMethod, InstanceKey instance) {
     if (instance instanceof ConstantKey) {
-      if (targetMethod.getReference().equals(ReflectiveInvocationInterpreter.METHOD_INVOKE) || isConstructorConstant(instance)
+      if (targetMethod.getReference().equals(ReflectiveInvocationInterpreter.METHOD_INVOKE) || 
+          isConstructorConstant(instance)
           && targetMethod.getReference().equals(ReflectiveInvocationInterpreter.CTOR_NEW_INSTANCE)) {
         return true;
       }
@@ -115,7 +116,7 @@
     return false;
   }
 
-  private boolean isConstructorConstant(InstanceKey instance) {
+  private static boolean isConstructorConstant(InstanceKey instance) {
     if (instance instanceof ConstantKey) {
       ConstantKey c = (ConstantKey) instance;
       if (c.getConcreteType().getReference().equals(TypeReference.JavaLangReflectConstructor)) {
@@ -129,10 +130,11 @@
 
   @Override
   public IntSet getRelevantParameters(CGNode caller, CallSiteReference site) {
-    if (site.isDispatch() || site.getDeclaredTarget().getNumberOfParameters() > 0) {
+    if (site.getDeclaredTarget().equals(ReflectiveInvocationInterpreter.METHOD_INVOKE) || 
+        site.getDeclaredTarget().equals(ReflectiveInvocationInterpreter.CTOR_NEW_INSTANCE)) {
       return thisParameter;
     } else {
       return EmptyIntSet.instance;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/stackMachine/AbstractIntStackMachine.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/stackMachine/AbstractIntStackMachine.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/stackMachine/AbstractIntStackMachine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/stackMachine/AbstractIntStackMachine.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.analysis.stackMachine;
 
-import java.util.Iterator;
-
 import com.ibm.wala.cfg.ShrikeCFG;
 import com.ibm.wala.cfg.ShrikeCFG.BasicBlock;
 import com.ibm.wala.dataflow.graph.AbstractMeetOperator;
@@ -54,8 +52,12 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.CancelRuntimeException;
+import com.ibm.wala.util.collections.Iterator2Iterable;
+import com.ibm.wala.util.graph.INodeWithNumber;
 import com.ibm.wala.util.shrike.ShrikeUtil;
 
+import java.util.Arrays;
+
 /**
  * Skeleton of functionality to propagate information through the Java bytecode stack machine using ShrikeBT.
  * <p>
@@ -186,7 +188,7 @@
       }
     };
 
-    IKilldallFramework<BasicBlock, MachineState> problem = new BasicFramework<BasicBlock, MachineState>(cfg, xferFunctions);
+    IKilldallFramework<BasicBlock, MachineState> problem = new BasicFramework<>(cfg, xferFunctions);
     solver = new DataflowSolver<BasicBlock, MachineState>(problem) {
       private MachineState entry;
 
@@ -215,9 +217,8 @@
         /*
          * Add only the entry variable to the work list.
          */
-        for (Iterator it = getFixedPointSystem().getStatementsThatUse(entry); it.hasNext();) {
-          AbstractStatement s = (AbstractStatement) it.next();
-          addToWorkList(s);
+        for (INodeWithNumber s : Iterator2Iterable.make(getFixedPointSystem().getStatementsThatUse(entry))) {
+          addToWorkList((AbstractStatement) s);
         }
       }
 
@@ -346,7 +347,7 @@
    * @param bb the basic block at whose entry the meet occurs
    * @return true if the lhs value changes. false otherwise.
    */
-  private boolean meet(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
+  private static boolean meet(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
 
     boolean changed = meetStacks(lhs, rhs, bb, meeter);
 
@@ -362,7 +363,7 @@
    * @param bb the basic block at whose entry the meet occurs
    * @return true if the lhs value changes. false otherwise.
    */
-  private boolean meetForCatchBlock(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
+  private static boolean meetForCatchBlock(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
 
     boolean changed = meetStacksAtCatchBlock(lhs, bb, meeter);
     changed |= meetLocals(lhs, rhs, bb, meeter);
@@ -377,7 +378,7 @@
    * @param bb the basic block at whose entry the meet occurs
    * @return true if the lhs value changes. false otherwise.
    */
-  private boolean meetStacksAtCatchBlock(IVariable lhs, BasicBlock bb, Meeter meeter) {
+  private static boolean meetStacksAtCatchBlock(IVariable lhs, BasicBlock bb, Meeter meeter) {
     boolean changed = false;
     MachineState L = (MachineState) lhs;
 
@@ -412,7 +413,7 @@
    * @param bb the basic block at whose entry the meet occurs
    * @return true if the lhs value changes. false otherwise.
    */
-  private boolean meetStacks(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
+  private static boolean meetStacks(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
     boolean changed = false;
     MachineState L = (MachineState) lhs;
 
@@ -465,7 +466,7 @@
    * @param bb the basic block at whose entry the meet occurs
    * @return true if the lhs value changes. false otherwise.
    */
-  private boolean meetLocals(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
+  private static boolean meetLocals(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
 
     boolean changed = false;
     MachineState L = (MachineState) lhs;
@@ -606,9 +607,7 @@
         stack = new int[stackHeight + 1 ];
         this.stackHeight = 0;
       } else {
-        int[] newStack = new int[ Math.max(stack.length, stackHeight) * 2 + 1 ];
-        System.arraycopy(stack, 0, newStack, 0, stack.length);
-        stack = newStack;
+        stack = Arrays.copyOf(stack, Math.max(stack.length, stackHeight) * 2 + 1);
       }
     }
 
@@ -633,9 +632,6 @@
 
     /**
      * set the value of local i to symbol j
-     * 
-     * @param i
-     * @param j
      */
     public void setLocal(int i, int j) {
       if (locals == null || locals.length < i+1) {
@@ -649,7 +645,6 @@
     }
 
     /**
-     * @param i
      * @return the number of the symbol corresponding to local i
      */
     public int getLocal(int i) {
@@ -683,8 +678,8 @@
             return true;
 
       if (locals != null)
-        for (int i = 0; i < locals.length; i++)
-          if (locals[i] == val)
+        for (int local : locals)
+          if (local == val)
             return true;
 
       return false;
@@ -695,47 +690,37 @@
       if (isTOP()) {
         return "<TOP>@" + System.identityHashCode(this);
       }
-      StringBuffer result = new StringBuffer("<");
-      result.append("S");
+      StringBuilder result = new StringBuilder("<");
+      result.append('S');
       if (stackHeight == 0) {
         result.append("[empty]");
       } else {
         result.append(array2StringBuffer(stack, stackHeight));
       }
-      result.append("L");
-      result.append(array2StringBuffer(locals, locals.length));
-      result.append(">");
+      result.append('L');
+      result.append(array2StringBuffer(locals, locals==null?0:locals.length));
+      result.append('>');
       return result.toString();
     }
 
-    private StringBuffer array2StringBuffer(int[] array, int n) {
-      StringBuffer result = new StringBuffer("[");
+    private StringBuilder array2StringBuffer(int[] array, int n) {
+      StringBuilder result = new StringBuilder("[");
       if (array == null) {
         result.append(OPTIMISTIC ? "TOP" : "BOTTOM");
       } else {
         for (int i = 0; i < n - 1; i++) {
-          result.append(array[i]).append(",");
+          result.append(array[i]).append(',');
         }
         result.append(array[n - 1]);
       }
-      result.append("]");
+      result.append(']');
       return result;
     }
 
     @Override
     public void copyState(MachineState other) {
-      if (other.stack == null) {
-        stack = null;
-      } else {
-        stack = new int[other.stack.length];
-        System.arraycopy(other.stack, 0, stack, 0, other.stack.length);
-      }
-      if (other.locals == null) {
-        locals = null;
-      } else {
-        locals = new int[other.locals.length];
-        System.arraycopy(other.locals, 0, locals, 0, other.locals.length);
-      }
+      stack = other.stack == null ? null : other.stack.clone();
+      locals = other.locals == null ? null : other.locals.clone();
       stackHeight = other.stackHeight;
     }
 
@@ -857,14 +842,14 @@
       currentSuccessorBlock = null;
       IInstruction[] instructions = getInstructions();
       if (DEBUG) {
-        System.err.println(("Entry to BB" + cfg.getNumber(basicBlock) + " " + workingState));
+        System.err.println(("Entry to BB" + cfg.getNumber(basicBlock) + ' ' + workingState));
       }
       for (int i = basicBlock.getFirstInstructionIndex(); i <= basicBlock.getLastInstructionIndex(); i++) {
         currentInstructionIndex = i;
         instructions[i].visit(visitor);
 
         if (DEBUG) {
-          System.err.println(("After " + instructions[i] + " " + workingState));
+          System.err.println(("After " + instructions[i] + ' ' + workingState));
         }
       }
       return workingState;
@@ -877,13 +862,13 @@
       currentSuccessorBlock = to;
       IInstruction[] instructions = getInstructions();
       if (DEBUG) {
-        System.err.println(("Entry to BB" + cfg.getNumber(from) + " " + workingState));
+        System.err.println(("Entry to BB" + cfg.getNumber(from) + ' ' + workingState));
       }
       for (int i = from.getFirstInstructionIndex(); i <= from.getLastInstructionIndex(); i++) {
         currentInstructionIndex = i;
         instructions[i].visit(edgeVisitor);
         if (DEBUG) {
-          System.err.println(("After " + instructions[i] + " " + workingState));
+          System.err.println(("After " + instructions[i] + ' ' + workingState));
         }
       }
       return workingState;
@@ -912,9 +897,6 @@
      */
     protected class BasicStackMachineVisitor extends IInstruction.Visitor {
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitArrayLength(ArrayLengthInstruction)
-       */
       @Override
       public void visitArrayLength(ArrayLengthInstruction instruction) {
 
@@ -922,9 +904,6 @@
         workingState.push(UNANALYZED);
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitArrayLoad(IArrayLoadInstruction)
-       */
       @Override
       public void visitArrayLoad(IArrayLoadInstruction instruction) {
         workingState.pop();
@@ -932,9 +911,6 @@
         workingState.push(UNANALYZED);
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitArrayStore(IArrayStoreInstruction)
-       */
       @Override
       public void visitArrayStore(IArrayStoreInstruction instruction) {
         workingState.pop();
@@ -942,17 +918,11 @@
         workingState.pop();
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitBinaryOp(IBinaryOpInstruction)
-       */
       @Override
       public void visitBinaryOp(IBinaryOpInstruction instruction) {
         workingState.pop();
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitComparison(IComparisonInstruction)
-       */
       @Override
       public void visitComparison(IComparisonInstruction instruction) {
         workingState.pop();
@@ -960,35 +930,23 @@
         workingState.push(UNANALYZED);
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitConditionalBranch(IConditionalBranchInstruction)
-       */
       @Override
       public void visitConditionalBranch(IConditionalBranchInstruction instruction) {
         workingState.pop();
         workingState.pop();
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitConstant(ConstantInstruction)
-       */
       @Override
       public void visitConstant(ConstantInstruction instruction) {
         workingState.push(UNANALYZED);
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitConversion(IConversionInstruction)
-       */
       @Override
       public void visitConversion(IConversionInstruction instruction) {
         workingState.pop();
         workingState.push(UNANALYZED);
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitDup(DupInstruction)
-       */
       @Override
       public void visitDup(DupInstruction instruction) {
 
@@ -1019,9 +977,6 @@
 
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitGet(IGetInstruction)
-       */
       @Override
       public void visitGet(IGetInstruction instruction) {
         popN(instruction);
@@ -1034,18 +989,12 @@
         }
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitInstanceof(IInstanceofInstruction)
-       */
       @Override
       public void visitInstanceof(IInstanceofInstruction instruction) {
         workingState.pop();
         workingState.push(UNANALYZED);
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitInvoke(IInvokeInstruction)
-       */
       @Override
       public void visitInvoke(IInvokeInstruction instruction) {
         popN(instruction);
@@ -1056,44 +1005,29 @@
         }
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitMonitor(MonitorInstruction)
-       */
       @Override
       public void visitMonitor(MonitorInstruction instruction) {
         workingState.pop();
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitLocalLoad(ILoadInstruction)
-       */
       @Override
       public void visitLocalLoad(ILoadInstruction instruction) {
         int t = workingState.getLocal(instruction.getVarIndex());
         workingState.push(t);
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitLocalStore(IStoreInstruction)
-       */
       @Override
       public void visitLocalStore(IStoreInstruction instruction) {
         int index = instruction.getVarIndex();
         workingState.setLocal(index, workingState.pop());
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitNew(NewInstruction)
-       */
       @Override
       public void visitNew(NewInstruction instruction) {
         popN(instruction);
         workingState.push(UNANALYZED);
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitPop(PopInstruction)
-       */
       @Override
       public void visitPop(PopInstruction instruction) {
         if (instruction.getPoppedCount() > 0) {
@@ -1101,41 +1035,26 @@
         }
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitPut(IPutInstruction)
-       */
       @Override
       public void visitPut(IPutInstruction instruction) {
         popN(instruction);
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitShift(IShiftInstruction)
-       */
       @Override
       public void visitShift(IShiftInstruction instruction) {
         workingState.pop();
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitSwap(SwapInstruction)
-       */
       @Override
       public void visitSwap(SwapInstruction instruction) {
         workingState.swap();
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitSwitch(SwitchInstruction)
-       */
       @Override
       public void visitSwitch(SwitchInstruction instruction) {
         workingState.pop();
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitThrow(ThrowInstruction)
-       */
       @Override
       public void visitThrow(ThrowInstruction instruction) {
         int exceptionType = workingState.pop();
@@ -1143,13 +1062,10 @@
         workingState.push(exceptionType);
       }
 
-      /**
-       * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitUnaryOp(IUnaryOpInstruction)
-       */
       @Override
       public void visitUnaryOp(IUnaryOpInstruction instruction) {
         // treated as a no-op in basic scheme
       }
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/ConeType.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/ConeType.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/ConeType.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/ConeType.java	2019-01-29 17:08:39.000000000 +0000
@@ -85,7 +85,7 @@
       return false;
     }
     if (!type.getClassHierarchy().equals(other.type.getClassHierarchy())) {
-      Assertions.UNREACHABLE("different chas " + this + " " + other);
+      Assertions.UNREACHABLE("different chas " + this + ' ' + other);
     }
     return type.equals(other.type);
   }
@@ -106,7 +106,7 @@
   /**
    * @return an Iterator of IClass that implement this interface
    */
-  public Iterator iterateImplementors() {
+  public Iterator<IClass> iterateImplementors() {
     return type.getClassHierarchy().getImplementors(getType().getReference()).iterator();
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/JavaPrimitiveType.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/JavaPrimitiveType.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/JavaPrimitiveType.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/JavaPrimitiveType.java	2019-01-29 17:08:39.000000000 +0000
@@ -36,6 +36,8 @@
 
   public static final PrimitiveType DOUBLE = makePrimitive(TypeReference.Double, 64);
 
+  public static final PrimitiveType VOID = makePrimitive(TypeReference.Void, 0);
+
   public static void init() {
     
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/PointType.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/PointType.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/PointType.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/PointType.java	2019-01-29 17:08:39.000000000 +0000
@@ -98,7 +98,7 @@
     }
     PointType other = (PointType) obj;
     if (!type.getClassHierarchy().equals(other.type.getClassHierarchy())) {
-      Assertions.UNREACHABLE("different chas " + this + " " + other);
+      Assertions.UNREACHABLE("different chas " + this + ' ' + other);
     }
     return type.equals(other.type);
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeInference.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeInference.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeInference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeInference.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,6 +51,7 @@
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.CancelRuntimeException;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 
 /**
@@ -149,7 +150,7 @@
       TypeReference t = ir.getParameterType(i);
 
       if (DEBUG) {
-        System.err.println("parameter " + parameterValueNumbers[i] + " " + t);
+        System.err.println("parameter " + parameterValueNumbers[i] + ' ' + t);
       }
 
       if (t.isReferenceType()) {
@@ -178,8 +179,7 @@
       }
     }
 
-    for (Iterator<SSAInstruction> it = ir.iterateNormalInstructions(); it.hasNext();) {
-      SSAInstruction s = it.next();
+    for (SSAInstruction s : Iterator2Iterable.make(ir.iterateNormalInstructions())) {
       if (s instanceof SSAAbstractInvokeInstruction) {
         SSAAbstractInvokeInstruction call = (SSAAbstractInvokeInstruction) s;
         TypeVariable v = getVariable(call.getException());
@@ -217,8 +217,7 @@
             x = new TypeReference[]{ language.getThrowableType() };
           }
           if (x != null) {
-            for (int i = 0; i < x.length; i++) {
-              TypeReference tx = x[i];
+            for (TypeReference tx : x) {
               IClass tc = cha.lookupClass(tx);
               if (tc != null) {
                 v.setType(v.getType().meet(new ConeType(tc)));
@@ -267,7 +266,7 @@
       return "delared type := " + type;
     }
 
-    public boolean isNullary() {
+    public static boolean isNullary() {
       return true;
     }
 
@@ -299,7 +298,7 @@
     public byte evaluate(TypeVariable lhs, TypeVariable[] rhs) {
 
       if (DEBUG) {
-        System.err.print("PhiOperator.meet " + lhs + " ");
+        System.err.print("PhiOperator.meet " + lhs + ' ');
         for (IVariable v : rhs) {
           System.err.print(v + " ");
         }
@@ -308,9 +307,8 @@
 
       TypeAbstraction lhsType = lhs.getType();
       TypeAbstraction meet = TypeAbstraction.TOP;
-      for (int i = 0; i < rhs.length; i++) {
-        if (rhs[i] != null && rhs[i].getType() != null) {
-          TypeVariable r = rhs[i];
+      for (TypeVariable r : rhs) {
+        if (r != null && r.getType() != null) {
           meet = meet.meet(r.getType());
         }
       }
@@ -386,9 +384,8 @@
     public byte evaluate(TypeVariable lhs, TypeVariable[] rhs) {
       TypeAbstraction lhsType = lhs.getType();
       TypeAbstraction meet = TypeAbstraction.TOP;
-      for (int i = 0; i < rhs.length; i++) {
-        if (rhs[i] != null  && rhs[i].getType() != null) {
-          TypeVariable r = rhs[i];
+      for (TypeVariable r : rhs) {
+        if (r != null  && r.getType() != null) {
           meet = meet.meet(r.getType());
         }
       }
@@ -523,7 +520,7 @@
       if (!doPrimitives) {
         result = null;
       } else {
-        result = new DeclaredTypeOperator(language.getPrimitive(language.getConstantType(new Integer(1))));
+        result = new DeclaredTypeOperator(language.getPrimitive(language.getConstantType(Integer.valueOf(1))));
       }
     }
 
@@ -625,7 +622,7 @@
     @Override
     public void visitComparison(SSAComparisonInstruction instruction) {
       if (doPrimitives) {
-        result = new DeclaredTypeOperator(language.getPrimitive(language.getConstantType(new Integer(0))));
+        result = new DeclaredTypeOperator(language.getPrimitive(language.getConstantType(Integer.valueOf(0))));
       }
     }
 
@@ -668,8 +665,8 @@
 
     private TypeAbstraction meetDeclaredExceptionTypes(SSAGetCaughtExceptionInstruction s) {
       ExceptionHandlerBasicBlock bb = (ExceptionHandlerBasicBlock) ir.getControlFlowGraph().getNode(s.getBasicBlockNumber());
-      Iterator it = bb.getCaughtExceptionTypes();
-      TypeReference t = (TypeReference) it.next();
+      Iterator<TypeReference> it = bb.getCaughtExceptionTypes();
+      TypeReference t = it.next();
       IClass klass = cha.lookupClass(t);
       TypeAbstraction result = null;
       if (klass == null) {
@@ -680,7 +677,7 @@
         result = new ConeType(klass);
       }
       while (it.hasNext()) {
-        t = (TypeReference) it.next();
+        t = it.next();
         IClass tClass = cha.lookupClass(t);
         if (tClass == null) {
           result = BOTTOM;
@@ -727,8 +724,8 @@
 
     @Override
     public IVariable makeVariable(int valueNumber) {
-      SymbolTable st = ir.getSymbolTable();
       if (doPrimitives) {
+        SymbolTable st = ir.getSymbolTable();
         if (st.isConstant(valueNumber)) {
           if (st.isBooleanConstant(valueNumber)) {
             return new TypeVariable(language.getPrimitive(language.getConstantType(Boolean.TRUE)));
@@ -752,8 +749,9 @@
     if (valueNumber < 0) {
       throw new IllegalArgumentException("bad value number " + valueNumber);
     }
-    assert getVariable(valueNumber) != null : "null variable for value number " + valueNumber;
-    return getVariable(valueNumber).getType();
+    TypeVariable variable = getVariable(valueNumber);
+    assert variable != null : "null variable for value number " + valueNumber;
+    return variable.getType();
   }
 
   public TypeAbstraction getConstantType(int valueNumber) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeVariable.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeVariable.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeVariable.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/analysis/typeInference/TypeVariable.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,4 +48,4 @@
   public String toString() {
     return type.toString();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/AbstractCFG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/AbstractCFG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/AbstractCFG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/AbstractCFG.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,11 +18,12 @@
 
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.shrikeBT.Constants;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.CompoundIterator;
 import com.ibm.wala.util.collections.EmptyIterator;
+import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.IteratorPlusOne;
 import com.ibm.wala.util.collections.IteratorPlusTwo;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
@@ -42,7 +43,7 @@
 /**
  * Common functionality for {@link ControlFlowGraph} implementations.
  */
-public abstract class AbstractCFG<I, T extends IBasicBlock<I>> implements ControlFlowGraph<I, T>, Constants {
+public abstract class AbstractCFG<I, T extends IBasicBlock<I>> implements ControlFlowGraph<I, T>, MinimalCFG<T>, Constants {
 
   /**
    * The method this AbstractCFG represents
@@ -52,25 +53,25 @@
   /**
    * An object to track nodes in this cfg
    */
-  final private DelegatingNumberedNodeManager<T> nodeManager = new DelegatingNumberedNodeManager<T>();
+  final private DelegatingNumberedNodeManager<T> nodeManager = new DelegatingNumberedNodeManager<>();
 
   /**
    * An object to track most normal edges in this cfg
    */
-  final private SparseNumberedEdgeManager<T> normalEdgeManager = new SparseNumberedEdgeManager<T>(nodeManager, 2,
+  final private SparseNumberedEdgeManager<T> normalEdgeManager = new SparseNumberedEdgeManager<>(nodeManager, 2,
       BasicNaturalRelation.SIMPLE);
 
   /**
    * An object to track not-to-exit exceptional edges in this cfg
    */
-  final private SparseNumberedEdgeManager<T> exceptionalEdgeManager = new SparseNumberedEdgeManager<T>(nodeManager, 0,
+  final private SparseNumberedEdgeManager<T> exceptionalEdgeManager = new SparseNumberedEdgeManager<>(nodeManager, 0,
       BasicNaturalRelation.SIMPLE);
 
   /**
    * An object to track not-to-exit exceptional edges in this cfg, indexed by block number. exceptionalEdges[i] is a list of block
    * numbers that are non-exit exceptional successors of block i, in order of increasing "catch scope".
    */
-  final private SimpleVector<SimpleIntVector> exceptionalSuccessors = new SimpleVector<SimpleIntVector>();
+  final private SimpleVector<SimpleIntVector> exceptionalSuccessors = new SimpleVector<>();
 
   /**
    * Which basic blocks have a normal edge to exit()?
@@ -227,13 +228,10 @@
       throw new IllegalArgumentException("N is null");
     }
     if (N.equals(exit())) {
-      return Predicate.filter(iterator(), new Predicate<T>() {
-        @Override
-        public boolean test(T o) {
-          int i = getNumber(o);
-          return normalToExit.get(i) || exceptionalToExit.get(i);
-        }
-      }).iterator();
+      return new FilterIterator<>(iterator(), o -> {
+        int i = getNumber(o);
+        return normalToExit.get(i) || exceptionalToExit.get(i);
+      });
     } else {
       int number = getNumber(N);
       boolean normalIn = getNumberOfNormalIn(N) > 0;
@@ -308,9 +306,9 @@
   public Iterator<T> getSuccNodes(T N) {
     int number = getNumber(N);
     if (normalToExit.get(number) && exceptionalToExit.get(number)) {
-      return new CompoundIterator<T>(iterateNormalSuccessorsWithoutExit(number), iterateExceptionalSuccessors(number));
+      return new CompoundIterator<>(iterateNormalSuccessorsWithoutExit(number), iterateExceptionalSuccessors(number));
     } else {
-      return new CompoundIterator<T>(iterateNormalSuccessors(number), iterateExceptionalSuccessors(number));
+      return new CompoundIterator<>(iterateNormalSuccessors(number), iterateExceptionalSuccessors(number));
     }
   }
 
@@ -320,7 +318,7 @@
    */
   private Iterator<T> iterateExceptionalSuccessors(int number) {
     if (exceptionalEdgeManager.hasAnySuccessor(number)) {
-      List<T> result = new ArrayList<T>();
+      List<T> result = new ArrayList<>();
       SimpleIntVector v = exceptionalSuccessors.get(number);
       for (int i = 0; i <= v.getMaxIndex(); i++) {
         result.add(getNode(v.get(i)));
@@ -331,7 +329,7 @@
       return result.iterator();
     } else {
       if (exceptionalToExit.get(number)) {
-        return new NonNullSingletonIterator<T>(exit());
+        return new NonNullSingletonIterator<>(exit());
       } else {
         return EmptyIterator.instance();
       }
@@ -340,13 +338,10 @@
 
   Iterator<T> iterateExceptionalPredecessors(T N) {
     if (N.equals(exit())) {
-      return Predicate.filter(iterator(), new Predicate<T>() {
-        @Override
-        public boolean test(T o) {
-          int i = getNumber(o);
-          return exceptionalToExit.get(i);
-        }
-      }).iterator();
+      return new FilterIterator<>(iterator(), o -> {
+        int i = getNumber(o);
+        return exceptionalToExit.get(i);
+      });
     } else {
       return exceptionalEdgeManager.getPredNodes(N);
     }
@@ -354,13 +349,10 @@
 
   Iterator<T> iterateNormalPredecessors(T N) {
     if (N.equals(exit())) {
-      return Predicate.filter(iterator(), new Predicate<T>() {
-        @Override
-        public boolean test(T o) {
-          int i = getNumber(o);
-          return normalToExit.get(i);
-        }
-      }).iterator();
+      return new FilterIterator<>(iterator(), o -> {
+        int i = getNumber(o);
+        return normalToExit.get(i);
+      });
     } else {
       int number = getNumber(N);
       if (number > 0 && fallThru.get(number - 1)) {
@@ -374,7 +366,7 @@
   private Iterator<T> iterateNormalSuccessors(int number) {
     if (fallThru.get(number)) {
       if (normalToExit.get(number)) {
-        return new IteratorPlusTwo<T>(normalEdgeManager.getSuccNodes(number), getNode(number + 1), exit());
+        return new IteratorPlusTwo<>(normalEdgeManager.getSuccNodes(number), getNode(number + 1), exit());
       } else {
         return IteratorPlusOne.make(normalEdgeManager.getSuccNodes(number), getNode(number + 1));
       }
@@ -395,9 +387,6 @@
     }
   }
 
-  /**
-   * @param n
-   */
   @Override
   public void addNode(T n) {
     nodeManager.addNode(n);
@@ -545,14 +534,13 @@
 
   @Override
   public String toString() {
-    StringBuffer s = new StringBuffer("");
-    for (Iterator<T> it = iterator(); it.hasNext();) {
-      T bb = it.next();
-      s.append("BB").append(getNumber(bb)).append("\n");
+    StringBuilder s = new StringBuilder();
+    for (T bb : this) {
+      s.append("BB").append(getNumber(bb)).append('\n');
 
       Iterator<T> succNodes = getSuccNodes(bb);
       while (succNodes.hasNext()) {
-        s.append("    -> BB").append(getNumber(succNodes.next())).append("\n");
+        s.append("    -> BB").append(getNumber(succNodes.next())).append('\n');
       }
     }
     return s.toString();
@@ -601,9 +589,9 @@
     if (b == null) {
       throw new IllegalArgumentException("b is null");
     }
-    List<T> result = new ArrayList<T>();
-    for (Iterator<T> it = iterateExceptionalSuccessors(b.getNumber()); it.hasNext();) {
-      result.add(it.next());
+    List<T> result = new ArrayList<>();
+    for (T s : Iterator2Iterable.make(iterateExceptionalSuccessors(b.getNumber()))) {
+      result.add(s);
     }
     return result;
   }
@@ -624,7 +612,7 @@
    */
   @Override
   public Iterator<T> iterateNodes(IntSet s) {
-    return new NumberedNodeIterator<T>(s, this);
+    return new NumberedNodeIterator<>(s, this);
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/cdg/ControlDependenceGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/cdg/ControlDependenceGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/cdg/ControlDependenceGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/cdg/ControlDependenceGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,11 +15,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import com.ibm.wala.cfg.ControlFlowGraph;
-import com.ibm.wala.cfg.IBasicBlock;
+import com.ibm.wala.cfg.MinimalCFG;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.graph.AbstractNumberedGraph;
 import com.ibm.wala.util.graph.NumberedEdgeManager;
@@ -33,12 +33,12 @@
 /**
  * Control Dependence Graph
  */
-public class ControlDependenceGraph<I, T extends IBasicBlock<I>> extends AbstractNumberedGraph<T> {
+public class ControlDependenceGraph<T> extends AbstractNumberedGraph<T> {
 
   /**
    * Governing control flow-graph. The control dependence graph is computed from this cfg.
    */
-  private final ControlFlowGraph<I, T> cfg;
+  private final MinimalCFG<T> cfg;
 
   /**
    * the EdgeManager for the CDG. It implements the edge part of the standard Graph abstraction, using the control-dependence edges
@@ -50,40 +50,37 @@
    * If requested, this is a map from parentXchild Pairs representing edges in the CDG to the labels of the control flow edges that
    * edge corresponds to. The labels are Boolean.True or Boolean.False for conditionals and an Integer for a switch label.
    */
-  private Map<Pair, Set<Object>> edgeLabels;
+  private Map<Pair<T,T>, Set<? extends Object>> edgeLabels;
 
   /**
    * This is the heart of the CDG computation. Based on Cytron et al., this is the reverse dominance frontier based algorithm for
    * computing control dependence edges.
    * 
-   * @return Map: node n -> {x : n is control-dependent on x}
+   * @return Map: node n -&gt; {x : n is control-dependent on x}
    */
   private Map<T, Set<T>> buildControlDependence(boolean wantEdgeLabels) {
     Map<T, Set<T>> controlDependence = HashMapFactory.make(cfg.getNumberOfNodes());
 
-    DominanceFrontiers<T> RDF = new DominanceFrontiers<T>(GraphInverter.invert(cfg), cfg.exit());
+    DominanceFrontiers<T> RDF = new DominanceFrontiers<>(GraphInverter.invert(cfg), cfg.exit());
 
     if (wantEdgeLabels) {
       edgeLabels = HashMapFactory.make();
     }
 
-    for (Iterator<? extends T> ns = cfg.iterator(); ns.hasNext();) {
+    for (T name : cfg) {
       HashSet<T> s = HashSetFactory.make(2);
-      controlDependence.put(ns.next(), s);
+      controlDependence.put(name, s);
     }
 
-    for (Iterator<? extends T> ns = cfg.iterator(); ns.hasNext();) {
-      T y = ns.next();
-      for (Iterator<T> ns2 = RDF.getDominanceFrontier(y); ns2.hasNext();) {
-        T x = ns2.next();
+    for (T y : cfg) {
+      for (T x : Iterator2Iterable.make(RDF.getDominanceFrontier(y))) {
         controlDependence.get(x).add(y);
         if (wantEdgeLabels) {
-          Set<Object> labels = HashSetFactory.make();
+           HashSet<Object> labels = HashSetFactory.make();
           edgeLabels.put(Pair.make(x, y), labels);
-          for (Iterator<? extends T> ss = cfg.getSuccNodes(x); ss.hasNext();) {
-            T s = ss.next();
+          for (T s : Iterator2Iterable.make(cfg.getSuccNodes(x))) {
             if (RDF.isDominatedBy(s, y)) {
-              labels.add(s);
+              labels.add(makeEdgeLabel(x, y, s));
             }
           }
         }
@@ -93,7 +90,11 @@
     return controlDependence;
   }
 
-  /**
+  protected Object makeEdgeLabel(@SuppressWarnings("unused") T from, @SuppressWarnings("unused") T to, T s) {
+    return s;
+  }  
+
+   /**
    * Given the control-dependence edges in a forward direction (i.e. edges from control parents to control children), this method
    * creates an EdgeManager that provides the edge half of the Graph abstraction.
    */
@@ -101,15 +102,14 @@
     return new NumberedEdgeManager<T>() {
       Map<T, Set<T>> backwardEdges = HashMapFactory.make(forwardEdges.size());
       {
-        for (Iterator<? extends T> x = cfg.iterator(); x.hasNext();) {
+        for (T name : cfg) {
           Set<T> s = HashSetFactory.make();
-          backwardEdges.put(x.next(), s);
+          backwardEdges.put(name, s);
         }
-        for (Iterator<T> ps = forwardEdges.keySet().iterator(); ps.hasNext();) {
-          T p = ps.next();
-          for (Iterator ns = ((Set) forwardEdges.get(p)).iterator(); ns.hasNext();) {
-            Object n = ns.next();
-            backwardEdges.get(n).add(p);
+        for (Map.Entry<T, Set<T>> entry : forwardEdges.entrySet()) {
+          for (T t : entry.getValue()) {
+            Object n = t;
+            backwardEdges.get(n).add(entry.getKey());
           }
         }
       }
@@ -127,7 +127,7 @@
         MutableIntSet x = IntSetUtil.make();
         if (backwardEdges.containsKey(node)) {
           for(T pred : backwardEdges.get(node)) {
-            x.add(pred.getNumber());
+            x.add(cfg.getNumber(pred));
           }
         }
         return x;
@@ -154,7 +154,7 @@
         MutableIntSet x = IntSetUtil.make();
         if (forwardEdges.containsKey(node)) {
           for(T succ : forwardEdges.get(node)) {
-            x.add(succ.getNumber());
+            x.add(cfg.getNumber(succ));
           }
         }
         return x;
@@ -202,17 +202,15 @@
 
   @Override
   public String toString() {
-    StringBuffer sb = new StringBuffer();
-    for (Iterator<? extends T> ns = iterator(); ns.hasNext();) {
-      T n = ns.next();
-      sb.append(n.toString()).append("\n");
-      for (Iterator ss = getSuccNodes(n); ss.hasNext();) {
-        Object s = ss.next();
+    StringBuilder sb = new StringBuilder();
+    for (T n : this) {
+      sb.append(n.toString()).append('\n');
+      for (T s : Iterator2Iterable.make(getSuccNodes(n))) {
         sb.append("  --> ").append(s);
         if (edgeLabels != null)
-          for (Iterator labels = ((Set) edgeLabels.get(Pair.make(n, s))).iterator(); labels.hasNext();)
-            sb.append("\n   label: ").append(labels.next());
-        sb.append("\n");
+          for (Object name : edgeLabels.get(Pair.make(n, s)))
+            sb.append("\n   label: ").append(name);
+        sb.append('\n');
       }
     }
 
@@ -223,7 +221,7 @@
    * @param cfg governing control flow graph
    * @param wantEdgeLabels whether to compute edge labels for CDG edges
    */
-  public ControlDependenceGraph(ControlFlowGraph<I, T> cfg, boolean wantEdgeLabels) {
+  public ControlDependenceGraph(MinimalCFG<T> cfg, boolean wantEdgeLabels) {
     if (cfg == null) {
       throw new IllegalArgumentException("null cfg");
     }
@@ -234,11 +232,11 @@
   /**
    * @param cfg governing control flow graph
    */
-  public ControlDependenceGraph(ControlFlowGraph<I, T> cfg) {
+  public ControlDependenceGraph(MinimalCFG<T> cfg) {
     this(cfg, false);
   }
 
-  public ControlFlowGraph getControlFlowGraph() {
+  public MinimalCFG getControlFlowGraph() {
     return cfg;
   }
 
@@ -246,7 +244,7 @@
    * Return the set of edge labels for the control flow edges that cause the given edge in the CDG. Requires that the CDG be
    * constructed with wantEdgeLabels being true.
    */
-  public Set<Object> getEdgeLabels(Object from, Object to) {
+  public Set<? extends Object> getEdgeLabels(T from, T to) {
     return edgeLabels.get(Pair.make(from, to));
   }
 
@@ -265,8 +263,8 @@
       return false;
     }
 
-    for (Iterator<? extends T> pbs1 = getPredNodes(bb1); pbs1.hasNext();) {
-      if (!hasEdge(pbs1.next(), bb2)) {
+    for (T pb : Iterator2Iterable.make(getPredNodes(bb1))) {
+      if (!hasEdge(pb, bb2)) {
         return false;
       }
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/CFGSanitizer.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/CFGSanitizer.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/CFGSanitizer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/CFGSanitizer.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,6 +27,7 @@
 import com.ibm.wala.ssa.SSAThrowInstruction;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.WalaException;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.impl.SlowSparseNumberedGraph;
@@ -48,16 +49,13 @@
     ControlFlowGraph<SSAInstruction, ISSABasicBlock> cfg = ir.getControlFlowGraph();
     Graph<ISSABasicBlock> g = SlowSparseNumberedGraph.make();
     // add all nodes to the graph
-    for (Iterator<? extends ISSABasicBlock> it = cfg.iterator(); it.hasNext();) {
-      g.addNode(it.next());
+    for (ISSABasicBlock basicBlock : cfg) {
+      g.addNode(basicBlock);
     }
 
     // add all edges to the graph, except those that go to exit
-    for (Iterator it = cfg.iterator(); it.hasNext();) {
-      ISSABasicBlock b = (ISSABasicBlock) it.next();
-      for (Iterator it2 = cfg.getSuccNodes(b); it2.hasNext();) {
-        ISSABasicBlock b2 = (ISSABasicBlock) it2.next();
-
+    for (ISSABasicBlock b : cfg) {
+      for (ISSABasicBlock b2 : Iterator2Iterable.make(cfg.getSuccNodes(b))) {
         if (!b2.isExitBlock()) {
           g.addEdge(b, b2);
         }
@@ -67,9 +65,8 @@
     // now add edges to exit, ignoring undeclared exceptions
     ISSABasicBlock exit = cfg.exit();
 
-    for (Iterator it = cfg.getPredNodes(exit); it.hasNext();) {
+    for (ISSABasicBlock b : Iterator2Iterable.make(cfg.getPredNodes(exit))) {
       // for each predecessor of exit ...
-      ISSABasicBlock b = (ISSABasicBlock) it.next();
 
       SSAInstruction s = ir.getInstructions()[b.getLastInstructionIndex()];
       if (s == null) {
@@ -90,14 +87,12 @@
           Assertions.UNREACHABLE();
         }
         // remove any exceptions that are caught by catch blocks
-        for (Iterator it2 = cfg.getSuccNodes(b); it2.hasNext();) {
-          IBasicBlock c = (IBasicBlock) it2.next();
+        for (ISSABasicBlock c : Iterator2Iterable.make(cfg.getSuccNodes(b))) {
 
           if (c.isCatchBlock()) {
             SSACFG.ExceptionHandlerBasicBlock cb = (ExceptionHandlerBasicBlock) c;
 
-            for (Iterator it3 = cb.getCaughtExceptionTypes(); it3.hasNext();) {
-              TypeReference ex = (TypeReference) it3.next();
+            for (TypeReference ex : Iterator2Iterable.make(cb.getCaughtExceptionTypes())) {
               IClass exClass = cha.lookupClass(ex);
               if (exClass == null) {
                 throw new WalaException("failed to find " + ex);
@@ -125,17 +120,17 @@
           Assertions.UNREACHABLE();
         }
         if (declared != null && exceptions != null) {
-          for (int i = 0; i < exceptions.length; i++) {
+          for (TypeReference exception : exceptions) {
             boolean isDeclared = false;
-            if (exceptions[i] != null) {
-              IClass exi = cha.lookupClass(exceptions[i]);
+            if (exception != null) {
+              IClass exi = cha.lookupClass(exception);
               if (exi == null) {
-                throw new WalaException("failed to find " + exceptions[i]);
+                throw new WalaException("failed to find " + exception);
               }
-              for (int j = 0; j < declared.length; j++) {
-                IClass dc = cha.lookupClass(declared[j]);
+              for (TypeReference element : declared) {
+                IClass dc = cha.lookupClass(element);
                 if (dc == null) {
-                  throw new WalaException("failed to find " + declared[j]);
+                  throw new WalaException("failed to find " + element);
                 }
                 if (cha.isSubclassOf(exi, dc)) {
                   isDeclared = true;
@@ -158,7 +153,7 @@
    * What are the exception types which s may throw?
    */
   private static TypeReference[] computeExceptions(IClassHierarchy cha, IR ir, SSAInstruction s) throws InvalidClassFileException {
-    Collection c = null;
+    Collection<TypeReference> c = null;
     Language l = ir.getMethod().getDeclaringClass().getClassLoader().getLanguage();
     if (s instanceof SSAInvokeInstruction) {
       SSAInvokeInstruction call = (SSAInvokeInstruction) s;
@@ -170,9 +165,9 @@
       return null;
     } else {
       TypeReference[] exceptions = new TypeReference[c.size()];
-      Iterator it = c.iterator();
+      Iterator<TypeReference> it = c.iterator();
       for (int i = 0; i < exceptions.length; i++) {
-        exceptions[i] = (TypeReference) it.next();
+        exceptions[i] = it.next();
       }
       return exceptions;
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/ControlFlowGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/ControlFlowGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/ControlFlowGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/ControlFlowGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,9 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.cfg;
 
-import java.util.Collection;
-import java.util.List;
-
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.util.graph.NumberedGraph;
 import com.ibm.wala.util.intset.BitVector;
@@ -20,17 +17,7 @@
 /**
  * An interface that is common to the Shrike and SSA CFG implementations.
  */
-public interface ControlFlowGraph<I, T extends IBasicBlock<I>> extends NumberedGraph<T> {
-
-  /**
-   * Return the entry basic block in the CFG
-   */
-  public T entry();
-
-  /**
-   * @return the synthetic exit block for the cfg
-   */
-  public T exit();
+public interface ControlFlowGraph<I, T extends IBasicBlock<I>> extends NumberedGraph<T>, MinimalCFG<T> {
 
   /**
    * @return the indices of the catch blocks, as a bit vector
@@ -60,33 +47,4 @@
    * @return the Method this CFG represents
    */
   public IMethod getMethod();
-
-  /**
-   * The order of blocks returned must indicate the exception-handling scope. So the first block is the first candidate catch block,
-   * and so on. With this invariant one can compute the exceptional control flow for a given exception type.
-   * 
-   * @return the basic blocks which may be reached from b via exceptional control flow
-   */
-  public List<T> getExceptionalSuccessors(T b);
-
-  /**
-   * The order of blocks returned should be arbitrary but deterministic.
-   * 
-   * @return the basic blocks which may be reached from b via normal control flow
-   */
-  public Collection<T> getNormalSuccessors(T b);
-
-  /**
-   * The order of blocks returned should be arbitrary but deterministic.
-   * 
-   * @return the basic blocks from which b may be reached via exceptional control flow
-   */
-  public Collection<T> getExceptionalPredecessors(T b);
-
-  /**
-   * The order of blocks returned should be arbitrary but deterministic.
-   * 
-   * @return the basic blocks from which b may be reached via normal control flow
-   */
-  public Collection<T> getNormalPredecessors(T b);
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/ExceptionPruningAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/ExceptionPruningAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/ExceptionPruningAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/ExceptionPruningAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,7 +23,7 @@
  * control flow from a CFG. This is done by detecting exceptions that may always
  * (or never) appear.
  * 
- * @author Juergen Graf <graf@kit.edu>
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  * 
  */
 public interface ExceptionPruningAnalysis<I, T extends IBasicBlock<I>> {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/AnalysisUtil.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/AnalysisUtil.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/AnalysisUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/AnalysisUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,7 +16,7 @@
 
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.ipa.callgraph.CGNode;
-import com.ibm.wala.ipa.callgraph.impl.FakeRootMethod;
+import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.analysis.IExplodedBasicBlock;
@@ -27,8 +27,8 @@
  * This class has been developed as part of a student project "Studienarbeit" by Markus Herhoffer.
  * It has been adapted and integrated into the WALA project by Juergen Graf.
  *
- * @author Markus Herhoffer <markus.herhoffer@student.kit.edu>
- * @author Juergen Graf <graf@kit.edu>
+ * @author Markus Herhoffer &lt;markus.herhoffer@student.kit.edu&gt;
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  */
 public final class AnalysisUtil {
 
@@ -43,21 +43,21 @@
    *          the node to check
    * @return true if node is FakeRoot
    */
-  public static boolean isFakeRoot(CGNode node) {
-    return (node.getMethod().getName().equals(FakeRootMethod.rootMethod.getName()));
+  public static boolean isFakeRoot(CallGraph CG, CGNode node) {
+    return (node.equals(CG.getFakeRootNode()));
   }
   
   /**
-   * Returns an array of <code>int</code> with the parameter's var nums of the
-   * invoked method in <code>invokeInstruction</code>.
+   * Returns an array of {@code int} with the parameter's var nums of the
+   * invoked method in {@code invokeInstruction}.
    * 
    * @param invokeInstruction
    *          The instruction that invokes the method.
-   * @return an array of <code>int</code> with all parameter's var nums
+   * @return an array of {@code int} with all parameter's var nums
    *         including the this pointer.
    */
   public static int[] getParameterNumbers(SSAAbstractInvokeInstruction invokeInstruction) {
-    final int number = invokeInstruction.getNumberOfParameters();
+    final int number = invokeInstruction.getNumberOfPositionalParameters();
     final int[] parameterNumbers = new int[number];
     assert (parameterNumbers.length == invokeInstruction.getNumberOfUses());
 
@@ -76,7 +76,7 @@
    * @return a Set of all blocks that contain an invoke
    */
   public static Set<IExplodedBasicBlock> extractInvokeBlocks(final ControlFlowGraph<SSAInstruction, IExplodedBasicBlock> cfg) {
-    final HashSet<IExplodedBasicBlock> invokeBlocks = new HashSet<IExplodedBasicBlock>();
+    final HashSet<IExplodedBasicBlock> invokeBlocks = new HashSet<>();
 
     for (final IExplodedBasicBlock block : cfg) {
       if (block.getInstruction() instanceof SSAAbstractInvokeInstruction) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/DelegatingMethodState.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/DelegatingMethodState.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/DelegatingMethodState.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/DelegatingMethodState.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,7 @@
  * This class combines two MethodState objects. A MethodState decides if a given method call may throw an exception.
  * If the primary MethodState thinks that the call may throw an exception, the fallback MethodState is asked.
  * 
- * @author Juergen Graf <graf@kit.edu>
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  * 
  */
 class DelegatingMethodState extends MethodState {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocAnalysisResultWrapper.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocAnalysisResultWrapper.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocAnalysisResultWrapper.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocAnalysisResultWrapper.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,7 +23,7 @@
 /**
  * A wrapper for the interprocedural analysis result.
  * 
- * @author Juergen Graf <graf@kit.edu>
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  *
  */
 class InterprocAnalysisResultWrapper implements InterprocAnalysisResult<SSAInstruction, IExplodedBasicBlock> {
@@ -58,7 +58,7 @@
     
     for (final Entry<CGNode, IntraprocAnalysisState> e : map.entrySet()) {
       sb.append(e.getValue().hasExceptions() ? "THROWS " : "CLEAN  ");
-      sb.append(e.getKey().toString() + "\n");
+      sb.append(e.getKey().toString()).append('\n');
     }
     
     return sb.toString();
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocMethodState.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocMethodState.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocMethodState.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocMethodState.java	2019-01-29 17:08:39.000000000 +0000
@@ -24,8 +24,8 @@
  * This class has been developed as part of a student project "Studienarbeit" by Markus Herhoffer.
  * It has been adapted and integrated into the WALA project by Juergen Graf.
  * 
- * @author Markus Herhoffer <markus.herhoffer@student.kit.edu>
- * @author Juergen Graf <graf@kit.edu>
+ * @author Markus Herhoffer &lt;markus.herhoffer@student.kit.edu&gt;
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  * 
  */
 class InterprocMethodState extends MethodState {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocNullPointerAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocNullPointerAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocNullPointerAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocNullPointerAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 
 package com.ibm.wala.cfg.exc.inter;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -54,8 +55,8 @@
  * This class has been developed as part of a student project "Studienarbeit" by Markus Herhoffer.
  * It has been adapted and integrated into the WALA project by Juergen Graf.
  * 
- * @author Markus Herhoffer <markus.herhoffer@student.kit.edu>
- * @author Juergen Graf <graf@kit.edu>
+ * @author Markus Herhoffer &lt;markus.herhoffer@student.kit.edu&gt;
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  * 
  */
 public final class InterprocNullPointerAnalysis {
@@ -65,7 +66,8 @@
   private final MethodState defaultMethodState;
   private final Map<CGNode, IntraprocAnalysisState> states;
   private final boolean optHasExceptions;
-
+  private CallGraph cg;
+  
   public static InterprocNullPointerAnalysis compute(final TypeReference[] ignoredExceptions, final CallGraph cg,
       final MethodState defaultMethodState, final IProgressMonitor progress, boolean optHasExceptions)
           throws WalaException, UnsoundGraphException, CancelException {
@@ -78,7 +80,7 @@
   private InterprocNullPointerAnalysis(final TypeReference[] ignoredExceptions, final MethodState defaultMethodState, boolean optHasExceptions) {
     this.ignoredExceptions = ignoredExceptions;
     this.defaultMethodState = defaultMethodState;
-    this.states = new HashMap<CGNode, IntraprocAnalysisState>();
+    this.states = new HashMap<>();
     this.optHasExceptions = optHasExceptions;
   }
 
@@ -88,6 +90,7 @@
     }
 
     // we filter out everything we do not need now
+    this.cg = cg;
     this.cgFiltered = computeFilteredCallgraph(cg);
 
     // we start with the first node
@@ -96,27 +99,23 @@
   }
 
   /**
-   * Finds all invokes in a given <code>startNode</code> and traverses als
+   * Finds all invokes in a given {@code startNode} and traverses als
    * successors recursively.
    * 
    * @param startNode
    *          The node to start
    * @param paramState
-   *          The parameter states of the <code>startNode</code>. May be
-   *          <code>null</code>
-   * @throws UnsoundGraphException
-   * @throws CancelException
-   * @throws WalaException
+   *          The parameter states of the {@code startNode}. May be
+   *          {@code null}
    */
   private void findAndInjectInvokes(final CGNode startNode, final ParameterState paramState, final Set<CGNode> visited,
       final IProgressMonitor progress) throws UnsoundGraphException, CancelException, WalaException {
     assert paramState != null;
 
-    if (visited.contains(startNode)) {
+    if (!visited.add(startNode)) {
       return;
     }    
-    visited.add(startNode);
-    
+
     MonitorUtil.throwExceptionIfCanceled(progress);
     
     final Map<CGNode, Map<SSAAbstractInvokeInstruction, ParameterState>> firstPass =
@@ -142,7 +141,7 @@
   private void analysisSecondPass(final CGNode startNode, final ParameterState paramState,
       final IProgressMonitor progress) throws UnsoundGraphException, CancelException {
     final IR ir = startNode.getIR();
-    if (!AnalysisUtil.isFakeRoot(startNode) && !(ir == null || ir.isEmptyIR())) {
+    if (!AnalysisUtil.isFakeRoot(cg, startNode) && !(ir == null || ir.isEmptyIR())) {
       final MethodState ims =  new InterprocMethodState(startNode, cgFiltered, states);
       final MethodState mState = (defaultMethodState != null
           ? new DelegatingMethodState(defaultMethodState, ims) : ims);
@@ -163,7 +162,7 @@
   private Map<CGNode, Map<SSAAbstractInvokeInstruction, ParameterState>> analysisFirstPass(final CGNode startNode,
       final ParameterState paramState, final IProgressMonitor progress) throws UnsoundGraphException, CancelException {
     final Map<CGNode, Map<SSAAbstractInvokeInstruction, ParameterState>> result =
-        new HashMap<CGNode, Map<SSAAbstractInvokeInstruction, ParameterState>>();
+        new HashMap<>();
     final IR ir = startNode.getIR();
 
     if (!startNode.getMethod().isStatic()) {
@@ -195,7 +194,7 @@
         final Set<CGNode> targets = cgFiltered.getPossibleTargets(startNode, invokeInstruction.getCallSite());
 
         for (final CGNode target : targets) {
-          final HashMap<SSAAbstractInvokeInstruction, ParameterState> stateMap = new HashMap<SSAAbstractInvokeInstruction, ParameterState>();
+          final HashMap<SSAAbstractInvokeInstruction, ParameterState> stateMap = new HashMap<>();
           stateMap.put(invokeInstruction, paramStateOfInvokeBlock);
           result.put(target, stateMap);
         }
@@ -218,7 +217,7 @@
    * Reduces the Callgraph to only the nodes that we need
    */
   private static CallGraph computeFilteredCallgraph(final CallGraph cg) {
-    final HashSet<Atom> filterSet = new HashSet<Atom>();
+    final HashSet<Atom> filterSet = new HashSet<>();
     final Atom worldClinit = Atom.findOrCreateAsciiAtom("fakeWorldClinit");
     filterSet.add(worldClinit);
     filterSet.add(MethodReference.initAtom);
@@ -230,7 +229,7 @@
   /**
    * Filter for CallGraphs
    * 
-   * @author Markus Herhoffer <markus.herhoffer@student.kit.edu>
+   * @author Markus Herhoffer &lt;markus.herhoffer@student.kit.edu&gt;
    * 
    */
   private static class CallGraphFilter {
@@ -254,26 +253,15 @@
      * @return the filtered CallGraph
      */
     private CallGraph filter(final CallGraph fullCG) {
-      final HashSet<CGNode> nodes = new HashSet<CGNode>();
 
-      // fill all nodes into a set
-      for (final CGNode n : fullCG) {
-        nodes.add(n);
-      }
-
-      final HashSet<CGNode> nodesToRemove = new HashSet<CGNode>();
-      // collect all nodes that we do not need
-      for (final CGNode node : nodes) {
-        for (final Atom method : filter) {
-          if (node.getMethod().getName().equals(method)) {
-            nodesToRemove.add(node);
-          }
-        }
-      }
-      nodes.removeAll(nodesToRemove);
+      // collect nodes not named for exclusion
+      final HashSet<CGNode> nodes = new HashSet<>();
+      fullCG.forEach(node -> {
+        if (!filter.contains(node.getMethod().getName()))
+          nodes.add(node);
+      });
 
-      final HashSet<CGNode> partialRoots = new HashSet<CGNode>();
-      partialRoots.add(fullCG.getFakeRootNode());
+      final Set<CGNode> partialRoots = Collections.singleton(fullCG.getFakeRootNode());
 
       // delete the nodes
       final PartialCallGraph partialCG1 = PartialCallGraph.make(fullCG, partialRoots, nodes);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/IntraprocAnalysisState.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/IntraprocAnalysisState.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/IntraprocAnalysisState.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/IntraprocAnalysisState.java	2019-01-29 17:08:39.000000000 +0000
@@ -31,18 +31,18 @@
  * This class has been developed as part of a student project "Studienarbeit" by Markus Herhoffer.
  * It has been adapted and integrated into the WALA project by Juergen Graf.
  * 
- * @author Markus Herhoffer <markus.herhoffer@student.kit.edu>
- * @author Juergen Graf <graf@kit.edu>
+ * @author Markus Herhoffer &lt;markus.herhoffer@student.kit.edu&gt;
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  * 
  */
 final class IntraprocAnalysisState implements ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> {
 
   private final ControlFlowGraph<SSAInstruction, IExplodedBasicBlock> cfg;
   private final HashMap<IExplodedBasicBlock, NullPointerState> statesOfSsaVars =
-      new HashMap<IExplodedBasicBlock, NullPointerState>();
-  private final HashMap<IExplodedBasicBlock, Object[]> valuesOfSsaVars = new HashMap<IExplodedBasicBlock, Object[]>();
+      new HashMap<>();
+  private final HashMap<IExplodedBasicBlock, Object[]> valuesOfSsaVars = new HashMap<>();
   private final HashMap<IExplodedBasicBlock, int[]> numbersOfSsaVarsThatAreParemerters =
-      new HashMap<IExplodedBasicBlock, int[]>();
+      new HashMap<>();
   private final boolean noAnalysisPossible;
   private final int deletedEdges;
   private boolean throwsException = true;
@@ -67,15 +67,12 @@
    * attributes.
    * 
    * @param intra
-   *          The <code>node</code>'s intraprocedural analysis
+   *          The {@code node}'s intraprocedural analysis
    * @param node
    *          the node itself
-   * @throws UnsoundGraphException
-   * @throws CancelException
    */
   IntraprocAnalysisState(final ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intra, final CGNode node,
-      final ControlFlowGraph<SSAInstruction, IExplodedBasicBlock> cfg, final int deletedEdges)
-      throws UnsoundGraphException, CancelException {
+      final ControlFlowGraph<SSAInstruction, IExplodedBasicBlock> cfg, final int deletedEdges) {
     this.cfg = cfg;
     this.noAnalysisPossible = false;
     this.deletedEdges = deletedEdges;
@@ -177,12 +174,10 @@
     }
 
     final String ls = System.getProperty("line.separator");
-    final StringBuffer output = new StringBuffer();
-    output.append(statesOfSsaVars.toString() + ls);
-    output.append(valuesOfSsaVars.toString() + ls);
-    output.append(numbersOfSsaVarsThatAreParemerters.toString());
 
-    return output.toString();
+    return statesOfSsaVars + ls +
+            valuesOfSsaVars + ls +
+            numbersOfSsaVarsThatAreParemerters;
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/InterprocAnalysisResult.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/InterprocAnalysisResult.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/InterprocAnalysisResult.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/InterprocAnalysisResult.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,7 @@
 /**
  * Interface to retrieve the result of the interprocedural analysis.
  * 
- * @author Juergen Graf <graf@kit.edu>
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  */
 public interface InterprocAnalysisResult<I, T extends IBasicBlock<I>> {
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/ExplodedCFGNullPointerAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/ExplodedCFGNullPointerAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/ExplodedCFGNullPointerAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/ExplodedCFGNullPointerAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,7 +27,7 @@
 /**
  * Intraprocedural null pointer analysis for the exploded control flow graph.
  * 
- * @author Juergen Graf <graf@kit.edu>
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  *
  */
 public class ExplodedCFGNullPointerAnalysis implements ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> {
@@ -54,7 +54,7 @@
   public int compute(IProgressMonitor progress) throws UnsoundGraphException, CancelException {
     ControlFlowGraph<SSAInstruction, IExplodedBasicBlock> orig = ExplodedControlFlowGraph.make(ir);
 
-    intra = new IntraprocNullPointerAnalysis<IExplodedBasicBlock>(ir, orig, ignoredExceptions, initialState, mState);
+    intra = new IntraprocNullPointerAnalysis<>(ir, orig, ignoredExceptions, initialState, mState);
     intra.run(progress);
     
     return intra.getNumberOfDeletedEdges();
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/IntraprocNullPointerAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/IntraprocNullPointerAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/IntraprocNullPointerAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/IntraprocNullPointerAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 
 package com.ibm.wala.cfg.exc.intra;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -19,7 +20,6 @@
 import java.util.Set;
 
 import com.ibm.wala.cfg.ControlFlowGraph;
-import com.ibm.wala.dataflow.graph.DataflowSolver;
 import com.ibm.wala.ipa.cfg.PrunedCFG;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.ISSABasicBlock;
@@ -58,7 +58,7 @@
 /**
  * Intraprocedural dataflow analysis to detect impossible NullPointerExceptions.
  * 
- * @author Juergen Graf <graf@kit.edu>
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  *
  */
 public class IntraprocNullPointerAnalysis<T extends ISSABasicBlock> {
@@ -85,12 +85,10 @@
       maxVarNum = ir.getSymbolTable().getMaxValueNumber();
     }
     
-    this.ignoreExceptions = new HashSet<TypeReference>();
+    this.ignoreExceptions = new HashSet<>();
     
     if (ignoreExceptions != null) {
-      for (TypeReference tRef : ignoreExceptions) {
-          this.ignoreExceptions.add(tRef);
-      }
+      this.ignoreExceptions.addAll(Arrays.asList(ignoreExceptions));
     }
     
     this.initialState = initialState;
@@ -99,7 +97,7 @@
 
   private static <T extends ISSABasicBlock> List<T> 
       searchNodesWithPathToCatchAll(ControlFlowGraph<SSAInstruction, T> cfg) {
-    final List<T> nodes = new LinkedList<T>();
+    final List<T> nodes = new LinkedList<>();
 
     for (final T exp : cfg) {
       final List<T> excSucc = cfg.getExceptionalSuccessors(exp);
@@ -135,14 +133,13 @@
         pruned = cfg;
       } else {
         final List<T> catched = searchNodesWithPathToCatchAll(cfg);
-        final NullPointerFrameWork<T> problem = new NullPointerFrameWork<T>(cfg, ir);
-        final int[] paramValNum = ir.getParameterValueNumbers();
+        final NullPointerFrameWork<T> problem = new NullPointerFrameWork<>(cfg, ir);
       
-        solver = new NullPointerSolver<T>(problem, maxVarNum, paramValNum, initialState);
+        solver = new NullPointerSolver<>(problem, maxVarNum, cfg.entry(), ir, initialState);
         
         solver.solve(progress);
         
-        final Graph<T> deleted = createDeletedGraph(solver);
+        final Graph<T> deleted = createDeletedGraph();
         
         for (final T ch : catched) {
           deleted.addNode(ch);
@@ -153,7 +150,7 @@
         for (T node : deleted) {
           deletedEdges += deleted.getSuccNodeCount(node);
         }
-        final NegativeGraphFilter<T> filter = new NegativeGraphFilter<T>(deleted);
+        final NegativeGraphFilter<T> filter = new NegativeGraphFilter<>(deleted);
         
         final PrunedCFG<SSAInstruction, T> newCfg = PrunedCFG.make(cfg, filter);
 
@@ -162,8 +159,8 @@
     }
   }
   
-  private Graph<T> createDeletedGraph(NullPointerSolver<T> solver) {
-    NegativeCFGBuilderVisitor nCFGbuilder = new NegativeCFGBuilderVisitor(solver);
+  private Graph<T> createDeletedGraph() {
+    NegativeCFGBuilderVisitor nCFGbuilder = new NegativeCFGBuilderVisitor();
     for (T bb : cfg) {
       nCFGbuilder.work(bb);
     }
@@ -195,56 +192,15 @@
       // empty IR ... so states have not changed and we can return the initial state as a save approximation 
       return new NullPointerState(maxVarNum, ir.getSymbolTable(), initialState);
     } else {
-      return solver.getIn(block);
-    }
-  }
-  
-  private class NullPointerSolver<B extends ISSABasicBlock> extends DataflowSolver<B, NullPointerState> {
-
-    private final int maxVarNum;
-    private final ParameterState parameterState;
-
-    private NullPointerSolver(NullPointerFrameWork<B> problem, int maxVarNum, int[] paramVarNum) {
-      this(problem, maxVarNum, paramVarNum, null);
-    }
-    
-    private NullPointerSolver(NullPointerFrameWork<B> problem, int maxVarNum, int[] paramVarNum, ParameterState initialState) {
-      super(problem);
-      this.maxVarNum = maxVarNum;
-      this.parameterState = initialState;
-    }
-    
-    /* (non-Javadoc)
-     * @see com.ibm.wala.dataflow.graph.DataflowSolver#makeEdgeVariable(java.lang.Object, java.lang.Object)
-     */
-    @Override
-    protected NullPointerState makeEdgeVariable(B src, B dst) {
-      return new NullPointerState(maxVarNum, ir.getSymbolTable(), parameterState);
-    }
-
-    /* (non-Javadoc)
-     * @see com.ibm.wala.dataflow.graph.DataflowSolver#makeNodeVariable(java.lang.Object, boolean)
-     */
-    @Override
-    protected NullPointerState makeNodeVariable(B n, boolean IN) {
-      return new NullPointerState(maxVarNum, ir.getSymbolTable(), parameterState);
+      return solver.getOut(block);
     }
-
-    @Override
-    protected NullPointerState[] makeStmtRHS(int size) {
-      return new NullPointerState[size];
-    }
-    
   }
   
   private class NegativeCFGBuilderVisitor implements IVisitor {
 
     private final Graph<T> deleted;
-    private final NullPointerSolver<T> solver;
-    
-    private NegativeCFGBuilderVisitor(NullPointerSolver<T> solver) {
-      this.solver = solver;
-      this.deleted = new SparseNumberedGraph<T>(2);
+    private NegativeCFGBuilderVisitor() {
+      this.deleted = new SparseNumberedGraph<>(2);
       for (T bb : cfg) {
         deleted.addNode(bb);
       }
@@ -263,7 +219,7 @@
       SSAInstruction instr = NullPointerTransferFunctionProvider.getRelevantInstruction(bb);
       
       if (instr != null) {
-        currentState = solver.getIn(bb);
+        currentState = getState(bb);
         currentBlock = bb;
         instr.visit(this);
         currentState = null;
@@ -287,7 +243,7 @@
         return mState != null && !mState.throwsException((SSAAbstractInvokeInstruction) instr);  
       } else {
         Collection<TypeReference> exc = instr.getExceptionTypes();
-        Set<TypeReference> myExcs = new HashSet<TypeReference>(exc);
+        Set<TypeReference> myExcs = new HashSet<>(exc);
         myExcs.removeAll(ignoreExceptions);
         
         return myExcs.size() == 1 && myExcs.contains(TypeReference.JavaLangNullPointerException);
@@ -298,10 +254,11 @@
       assert instr.isPEI();
       
       if (instr instanceof SSAAbstractInvokeInstruction) {
+        assert ((SSAAbstractInvokeInstruction) instr).isStatic();
         return mState != null && !mState.throwsException((SSAAbstractInvokeInstruction) instr); 
       } else {
         Collection<TypeReference> exc = instr.getExceptionTypes();
-        Set<TypeReference> myExcs = new HashSet<TypeReference>(exc);
+        Set<TypeReference> myExcs = new HashSet<>(exc);
         myExcs.removeAll(ignoreExceptions);
         
         return myExcs.isEmpty();
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MethodState.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MethodState.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MethodState.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MethodState.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,7 @@
  * Provides a way for the nullpointer analysis to decide whether or not a called method
  * may throw an exception.
  * 
- * @author Juergen Graf <graf@kit.edu>
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  *
  */
 public abstract class MethodState {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MutableCFG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MutableCFG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MutableCFG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MutableCFG.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,7 +26,7 @@
 /**
  * A modifiable control flow graph.
  * 
- * @author Juergen Graf <graf@kit.edu>
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  *
  */
 public class MutableCFG<X, T extends IBasicBlock<X>> extends SparseNumberedGraph<T> implements ControlFlowGraph<X, T> {
@@ -38,7 +38,7 @@
   }
   
   public static <I, T extends IBasicBlock<I>> MutableCFG<I, T> copyFrom(ControlFlowGraph<I, T> cfg) {
-    MutableCFG<I, T> mutable = new MutableCFG<I, T>(cfg);
+    MutableCFG<I, T> mutable = new MutableCFG<>(cfg);
     
     for (T node : cfg) {
       mutable.addNode(node);
@@ -108,7 +108,7 @@
   public List<T> getExceptionalSuccessors(T b) {
     final List<T> origSucc = orig.getExceptionalSuccessors(b);
     final IntSet allSuccs = this.getSuccNodeNumbers(b);
-    final List<T> thisSuccs = new LinkedList<T>();
+    final List<T> thisSuccs = new LinkedList<>();
     
     for (final T block : origSucc) {
       if (allSuccs.contains(block.getNumber())) {
@@ -122,7 +122,7 @@
   @Override
   public Collection<T> getNormalSuccessors(T b) {
     final List<T> excSuccs = getExceptionalSuccessors(b);
-    final List<T> thisSuccs = new LinkedList<T>();
+    final List<T> thisSuccs = new LinkedList<>();
     
     final Iterator<T> succs = getSuccNodes(b);
     while (succs.hasNext()) {
@@ -139,7 +139,7 @@
   public Collection<T> getExceptionalPredecessors(T b) {
     final Collection<T> origPreds = orig.getExceptionalPredecessors(b);
     final IntSet allPreds = this.getPredNodeNumbers(b);
-    final List<T> thisPreds = new LinkedList<T>();
+    final List<T> thisPreds = new LinkedList<>();
     
     for (final T block : origPreds) {
       if (allPreds.contains(block.getNumber())) {
@@ -153,7 +153,7 @@
   @Override
   public Collection<T> getNormalPredecessors(T b) {
     final Collection<T> excPreds = getExceptionalPredecessors(b);
-    final List<T> thisPreds = new LinkedList<T>();
+    final List<T> thisPreds = new LinkedList<>();
     
     final Iterator<T> preds = getPredNodes(b);
     while (preds.hasNext()) {
@@ -166,4 +166,4 @@
     return thisPreds;
   }
   
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NegativeGraphFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NegativeGraphFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NegativeGraphFilter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NegativeGraphFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,7 @@
  * An EdgeFilter that ignores all edges contained in a given graph. This ca be used
  * to subtract a subgraph from its main graph.
  * 
- * @author Juergen Graf <graf@kit.edu>
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  *
  */
 public class NegativeGraphFilter<T extends IBasicBlock<?>> implements EdgeFilter<T> {
@@ -46,4 +46,4 @@
     return !deleted.hasEdge(src, dst);
   }
   
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerFrameWork.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerFrameWork.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerFrameWork.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerFrameWork.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,15 +26,15 @@
  * functions are not distribute (similar to constant propagation). Therefore we remove 
  * back edges in the flow graph.
  * 
- * @author Juergen Graf <graf@kit.edu>
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  *
  */
-class NullPointerFrameWork<T extends ISSABasicBlock> implements IKilldallFramework<T, NullPointerState> {
+public class NullPointerFrameWork<T extends ISSABasicBlock> implements IKilldallFramework<T, NullPointerState> {
 
   private final Graph<T> flow;
   private final NullPointerTransferFunctionProvider<T> transferFunct;
   
-  NullPointerFrameWork(ControlFlowGraph<SSAInstruction, T> cfg, IR ir) {
+  public NullPointerFrameWork(ControlFlowGraph<SSAInstruction, T> cfg, IR ir) {
     final IBinaryNaturalRelation backEdges = Acyclic.computeBackEdges(cfg, cfg.entry());
     boolean hasBackEdge = backEdges.iterator().hasNext();
     if (hasBackEdge) {
@@ -52,7 +52,7 @@
       this.flow = cfg;
     }
 
-    this.transferFunct = new NullPointerTransferFunctionProvider<T>(cfg, ir);
+    this.transferFunct = new NullPointerTransferFunctionProvider<>(cfg, ir);
   }
   
   /* (non-Javadoc)
@@ -71,4 +71,4 @@
     return transferFunct;
   }
   
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerSolver.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerSolver.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerSolver.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerSolver.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.cfg.exc.intra;
+
+import com.ibm.wala.cfg.exc.intra.NullPointerState.State;
+import com.ibm.wala.dataflow.graph.DataflowSolver;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.ISSABasicBlock;
+
+/**
+ * Intraprocedural dataflow analysis to detect impossible NullPointerExceptions.
+ * 
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
+ *
+ */
+public class NullPointerSolver<B extends ISSABasicBlock> extends DataflowSolver<B, NullPointerState> {
+
+  private final int maxVarNum;
+  private final ParameterState parameterState;
+  private final B entry;
+  private final IR ir;
+
+  public NullPointerSolver(NullPointerFrameWork<B> problem, int maxVarNum, IR ir, B entry) {
+    this(problem, maxVarNum, entry, ir, ParameterState.createDefault(ir.getMethod()));
+  }
+  
+  public NullPointerSolver(NullPointerFrameWork<B> problem, int maxVarNum, B entry, IR ir, ParameterState initialState) {
+    super(problem);
+    this.maxVarNum = maxVarNum;
+    this.parameterState = initialState;
+    this.entry = entry;
+    this.ir = ir;
+  }
+  
+  /* (non-Javadoc)
+   * @see com.ibm.wala.dataflow.graph.DataflowSolver#makeEdgeVariable(java.lang.Object, java.lang.Object)
+   */
+  @Override
+  protected NullPointerState makeEdgeVariable(B src, B dst) {
+    return new NullPointerState(maxVarNum, ir.getSymbolTable(), parameterState);
+  }
+
+  /* (non-Javadoc)
+   * @see com.ibm.wala.dataflow.graph.DataflowSolver#makeNodeVariable(java.lang.Object, boolean)
+   */
+  @Override
+  protected NullPointerState makeNodeVariable(B n, boolean IN) {
+    if (IN && n.equals(entry)) {
+      return new NullPointerState(maxVarNum, ir.getSymbolTable(), parameterState, State.BOTH);
+    } else {
+      return new NullPointerState(maxVarNum, ir.getSymbolTable(), parameterState, State.UNKNOWN);
+    }
+  }
+
+  @Override
+  protected NullPointerState[] makeStmtRHS(int size) {
+    return new NullPointerState[size];
+  }
+  
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerState.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerState.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerState.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerState.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,8 @@
 
 package com.ibm.wala.cfg.exc.intra;
 
+import java.util.Collection;
+
 import com.ibm.wala.dataflow.graph.AbstractMeetOperator;
 import com.ibm.wala.fixpoint.AbstractVariable;
 import com.ibm.wala.fixpoint.FixedPointConstants;
@@ -20,21 +22,25 @@
 /**
  * States for the ssa variables.
  * 
- * @author Juergen Graf <graf@kit.edu>
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  *
  */
 public class NullPointerState extends AbstractVariable<NullPointerState> {
   
   /*
    * Inital state is UNKNOWN.
-   * Lattice: UNKNOWN < { NULL, NOT_NULL } < BOTH
+   * Lattice: BOTH < { NULL, NOT_NULL } < UNKNOWN
    */
-  public enum State { UNKNOWN, BOTH, NULL, NOT_NULL };
+  public enum State { UNKNOWN, BOTH, NULL, NOT_NULL }
   
   // maps ssa variable number -> State
   private final State[] vars;
   
   NullPointerState(int maxVarNum, SymbolTable symbolTable, ParameterState parameterState) {
+    this(maxVarNum, symbolTable, parameterState, State.UNKNOWN);
+  }
+
+  NullPointerState(int maxVarNum, SymbolTable symbolTable, ParameterState parameterState, State defaultState) {
     this.vars = new State[maxVarNum + 1];
     
     // Initialize the states
@@ -46,7 +52,7 @@
           vars[i] = State.NOT_NULL;
         }
       } else {
-        vars[i] = State.UNKNOWN;
+        vars[i] = defaultState;
       }
     }
     
@@ -70,7 +76,7 @@
    * <pre>
    * v3 = phi v1, v2
    * ^ := Meet-operator
-   * f := phiValueMeetFunction(3, {1, 2}) = v1,v2,v3 -> v1,v2,[v1 ^ v2]
+   * f := phiValueMeetFunction(3, {1, 2}) = v1,v2,v3 -&gt; v1,v2,[v1 ^ v2]
    * 
    * f(1,?,?) ^ f(?,1,?) = 1,?,? ^ ?,1,? = 1,1,?
    * 
@@ -95,6 +101,10 @@
     return IndentityFunction.INSTANCE;
   }
   
+  static UnaryOperator<NullPointerState> phisFunction(Collection<UnaryOperator<NullPointerState>> phiFunctions) {
+    return new OperatorUtil.UnaryOperatorSequence<>(phiFunctions);
+  }
+
   boolean isNeverNull(int varNum) {
     assert varNum > 0 && varNum < vars.length;
     
@@ -113,10 +123,8 @@
   @Override
   public void copyState(NullPointerState v) {
     assert v.vars.length == vars.length;
-    
-    for (int i = 0; i < v.vars.length; i++) {
-      vars[i] = v.vars[i];
-    }
+
+    System.arraycopy(v.vars, 0, vars, 0, v.vars.length);
   }
 
   /**
@@ -124,7 +132,7 @@
    * <pre>
    * ? == unknown, 1 == not null, 0 == null, * == both
    * 
-   * meet | ? | 0 | 1 | * |  <- rhs
+   * meet | ? | 0 | 1 | * |  &lt;- rhs
    * -----|---|---|---|---|
    *    ? | ? | 0 | 1 | * |
    * -----|---|---|---|---|
@@ -167,42 +175,6 @@
     return changed;
   }
   
-  /**
-   * This is a intersect operator for the NullPointerState variables. It is used by the
-   * phi values.
-   * <pre>
-   * ? == unknown, 1 == not null, 0 == null, * == both
-   * 
-   * meet | ? | 0 | 1 | * |  <- rhs
-   * -----|---|---|---|---|
-   *    ? | ? | ? | ? | * |
-   * -----|---|---|---|---|
-   *    0 | ? | 0 | * | * |
-   * -----|---|---|---|---|
-   *    1 | ? | * | 1 | * |
-   * -----|---|---|---|---|
-   *    * | * | * | * | * |
-   * ----------------------
-   *    ^
-   *    |
-   *   lhs
-   * </pre> 
-   */
-  boolean intersect(final int varNum, final State state) {
-    final State lhs = vars[varNum];
-    
-    if (lhs != State.BOTH && state != lhs) {
-      if (state != State.BOTH && (lhs == State.UNKNOWN || state == State.UNKNOWN)){
-        vars[varNum] = State.UNKNOWN;
-        return true;
-      } else {
-        vars[varNum] = State.BOTH;
-        return true;
-      }
-    } else {
-      return false;
-    }
-  }
 
   boolean nullify(int varNum) {
     if (vars[varNum] != State.NULL) {
@@ -246,9 +218,9 @@
   
   @Override
   public String toString() {
-    StringBuffer buf = new StringBuffer("<");
-    for (int i = 0; i < vars.length; i++) {
-      switch (vars[i]) {
+    StringBuilder buf = new StringBuilder("<");
+    for (State var : vars) {
+      switch (var) {
       case BOTH:
         buf.append('*');
         break;
@@ -287,7 +259,6 @@
     /* (non-Javadoc)
      * @see com.ibm.wala.fixedpoint.impl.AbstractOperator#evaluate(com.ibm.wala.fixpoint.IVariable, com.ibm.wala.fixpoint.IVariable[])
      */
-    @SuppressWarnings("rawtypes")
     @Override
     public byte evaluate(NullPointerState lhs, NullPointerState[] rhs) {
       boolean changed = false;
@@ -336,15 +307,17 @@
     
     @Override
     public byte evaluate(NullPointerState lhs, NullPointerState rhs) {
-      byte state = FixedPointConstants.NOT_CHANGED;
-      
+      boolean changed = false;
+      if (!lhs.equals(rhs)) {
+        lhs.copyState(rhs);
+        changed = true;
+      }
+      lhs.vars[varNum] = State.UNKNOWN;
       for (int from : fromVars) {
-        if (lhs.intersect(varNum, rhs.vars[from])) {
-          state = FixedPointConstants.CHANGED;
-        }
+          changed |= lhs.meet(varNum, rhs.vars[from]);
       }
-        
-      return state;
+      
+      return (changed ? FixedPointConstants.CHANGED : FixedPointConstants.NOT_CHANGED);
     }
 
     /* (non-Javadoc)
@@ -385,7 +358,7 @@
      */
     @Override
     public String toString() {
-      StringBuffer str = new StringBuffer("Meet(" + varNum + ", [");
+      StringBuilder str = new StringBuilder("PhiValueMeet(" + varNum + ", [");
       
       for (int i = 0; i < fromVars.length; i++) {
         str.append(fromVars[i]);
@@ -399,6 +372,7 @@
 
   }
   
+  
   private static class NullifyFunction extends UnaryOperator<NullPointerState> {
 
     private final int varNum;
@@ -447,7 +421,7 @@
      */
     @Override
     public String toString() {
-      return "Nullify(" + varNum + ")";
+      return "Nullify(" + varNum + ')';
     }
     
   }
@@ -501,7 +475,7 @@
      */
     @Override
     public String toString() {
-      return "Denullify(" + varNum + ")";
+      return "Denullify(" + varNum + ')';
     }
     
   }
@@ -549,7 +523,5 @@
     public String toString() {
       return "Id";
     }
-    
   }
-
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerTransferFunctionProvider.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerTransferFunctionProvider.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerTransferFunctionProvider.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerTransferFunctionProvider.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 
 package com.ibm.wala.cfg.exc.intra;
 
+import java.util.ArrayList;
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.cfg.Util;
 import com.ibm.wala.dataflow.graph.AbstractMeetOperator;
@@ -47,9 +48,10 @@
 import com.ibm.wala.ssa.SSAUnaryOpInstruction;
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.ssa.analysis.IExplodedBasicBlock;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 /**
- * @author Juergen Graf <graf@kit.edu>
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  *
  */
 class NullPointerTransferFunctionProvider<T extends ISSABasicBlock> implements ITransferFunctionProvider<T, NullPointerState> {
@@ -90,6 +92,7 @@
   public UnaryOperator<NullPointerState> getEdgeTransferFunction(T src, T dst) {
     SSAInstruction instr = getRelevantInstruction(src);
     
+    assert !(instr instanceof SSAPhiInstruction);
     if (instr != null && cfg.hasEdge(src, dst)) {
       instr.visit(visitor);
       if (visitor.noIdentity) {
@@ -133,8 +136,20 @@
    * @see com.ibm.wala.dataflow.graph.ITransferFunctionProvider#getNodeTransferFunction(java.lang.Object)
    */
   @Override
-  public UnaryOperator<NullPointerState> getNodeTransferFunction(T node) {
-    throw new UnsupportedOperationException("We do not have such a thing dude!");
+  public UnaryOperator<NullPointerState> getNodeTransferFunction(final T node) {
+    final ArrayList<UnaryOperator<NullPointerState>> phiTransferFunctions = new ArrayList<>(1);
+    for (SSAPhiInstruction phi : Iterator2Iterable.make(node.iteratePhis())) {
+      int[] uses = new int[phi.getNumberOfUses()];
+      for (int i = 0; i < uses.length; i++) {
+        uses[i] = phi.getUse(i);
+      }
+      phiTransferFunctions.add(NullPointerState.phiValueMeetFunction(phi.getDef(), uses));
+    }
+    if (phiTransferFunctions.size() > 0) {
+      return NullPointerState.phisFunction(phiTransferFunctions);
+    } else {
+      return NullPointerState.identityFunction();
+    }
   }
 
   /* (non-Javadoc)
@@ -150,7 +165,7 @@
    */
   @Override
   public boolean hasNodeTransferFunctions() {
-    return false;
+    return true;
   }
   
   private static class TransferFunctionSSAVisitor implements IVisitor {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/OperatorUtil.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/OperatorUtil.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/OperatorUtil.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/OperatorUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,74 @@
+package com.ibm.wala.cfg.exc.intra;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import com.ibm.wala.fixpoint.FixedPointConstants;
+import com.ibm.wala.fixpoint.IVariable;
+import com.ibm.wala.fixpoint.UnaryOperator;
+
+/**
+ * Combinators for {@link UnaryOperator}
+ * 
+ * @author Martin Hecker, martin.hecker@kit.edu 
+ */
+public class OperatorUtil {
+  
+  /**
+   * An operator of the form lhs = op_1(op_2(..op_n(rhs)..))
+   * 
+   * @author Martin Hecker, martin.hecker@kit.edu 
+   */
+  public static class UnaryOperatorSequence<T extends IVariable<T>> extends UnaryOperator<T> {
+    
+    final UnaryOperator<T>[] operators;
+    
+    @SuppressWarnings("unchecked")
+    public UnaryOperatorSequence(Collection<UnaryOperator<T>> operators) {
+      if (operators.size() == 0 ) throw new IllegalArgumentException("Empty Operator-Sequence");
+      this.operators = operators.toArray(new UnaryOperator[0]);
+    }
+    
+    @SafeVarargs
+    public UnaryOperatorSequence(UnaryOperator<T>... operators) {
+      if (operators.length == 0 ) throw new IllegalArgumentException("Empty Operator-Sequence");
+      this.operators = Arrays.copyOf(operators, operators.length);
+    }
+  
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null) return false;
+      if (getClass() != o.getClass()) return false;
+      
+      UnaryOperatorSequence other = (UnaryOperatorSequence) o;
+      return operators.equals(other.operators);
+    }
+  
+    @Override
+    public int hashCode() {
+      return operators.hashCode();
+    }
+    
+    @Override
+    public String toString() {
+      return Arrays.toString(operators);
+    }
+    
+    @Override
+    public byte evaluate(T lhs, T rhs) {
+      assert (operators.length > 0);
+      int result = operators[0].evaluate(lhs, rhs);
+      
+      for (int i = 1 ; i < operators.length; i++) {
+        byte changed = operators[i].evaluate(lhs, lhs);
+        result =   ((result | changed) & FixedPointConstants.CHANGED_MASK)
+                 | ((result | changed) & FixedPointConstants.SIDE_EFFECT_MASK)
+                 | ((result & changed) & FixedPointConstants.FIXED_MASK);
+      }
+      
+      return (byte) result;
+    }
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/ParameterState.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/ParameterState.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/ParameterState.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/ParameterState.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,7 +27,7 @@
 public class ParameterState extends AbstractVariable<ParameterState> {
   /*
    * Inital state is UNKNOWN.
-   * Lattice: UNKNOWN < { NULL, NOT_NULL } < BOTH
+   * Lattice: BOTH < { NULL, NOT_NULL } < UNKNOWN 
    * 
    * public enum State { UNKNOWN, BOTH, NULL, NOT_NULL }; as defined in NullPointerState
    * 
@@ -36,7 +36,7 @@
   public static final int NO_THIS_PTR = -1;
   
   // maps the parmeter's varNum --> State
-  private final HashMap<Integer, State> params = new HashMap<Integer, State>();
+  private final HashMap<Integer, State> params = new HashMap<>();
   
   public static ParameterState createDefault(IMethod m) {
     ParameterState p = new ParameterState();
@@ -53,14 +53,14 @@
   }
   
   /**
-   * Constructor to make a <code>ParameteState</code> out of a regular <code>NullPointerState</code>.
+   * Constructor to make a {@code ParameteState} out of a regular {@code NullPointerState}.
    * 
-   * @param state The <code>NullPointerState</code> to parse.
-   * @param parameterNumbers The numbers of parameters in <code>state</code>
+   * @param state The {@code NullPointerState} to parse.
+   * @param parameterNumbers The numbers of parameters in {@code state}
    */
   public ParameterState(NullPointerState state, int[] parameterNumbers) {
     //by convention the first ssa vars are the parameters
-    for (int i=1; i < parameterNumbers.length; i++){
+    for (int i=0; i < parameterNumbers.length; i++){
       params.put(i, state.getState(parameterNumbers[i]));
     }
   }
@@ -69,8 +69,8 @@
     State prev = params.get(varNum);
     if (prev != null) {
       switch (prev) {
-      case BOTH:
-        if (state != State.BOTH) {
+      case UNKNOWN:
+        if (state != State.UNKNOWN) {
           throw new IllegalArgumentException("Try to set " + prev + " to " + state);
         }
         break;
@@ -84,6 +84,8 @@
           throw new IllegalArgumentException("Try to set " + prev + " to " + state);
         }
         break;
+      default:
+        throw new UnsupportedOperationException(String.format("unexpected previous state %s", prev));
       }
     }
     params.put(varNum, state);
@@ -97,11 +99,14 @@
    * Returns the state of an specified parameter.
    * 
    * @param varNum The SSA var num of the parameter
-   * @return the state of the parameter defined with <code>varNum</code>
+   * @return the state of the parameter defined with {@code varNum}
    */
   public State getState(int varNum) {
     State state = params.get(varNum);
-    return (state == null ? State.UNKNOWN : state);
+    if (state == null) {
+      throw new IllegalArgumentException("No mapping for variable " + varNum + "in ParameterState " + this.toString());
+    }
+    return state;
   }
 
   @Override
@@ -109,12 +114,9 @@
     throw new UnsupportedOperationException();
   }
   
-  /**
-   * {@inheritDoc}
-   */
   @Override
   public String toString() {
-    StringBuffer buf = new StringBuffer("<");
+    StringBuilder buf = new StringBuilder("<");
     Set<Entry<Integer, State>> paramsSet = params.entrySet();
         
     for (Entry<Integer, State> param : paramsSet){
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/SSACFGNullPointerAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/SSACFGNullPointerAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/SSACFGNullPointerAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/SSACFGNullPointerAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -45,7 +45,7 @@
   public int compute(IProgressMonitor progress) throws UnsoundGraphException, CancelException {
     ControlFlowGraph<SSAInstruction, ISSABasicBlock> orig = ir.getControlFlowGraph();
 
-    intra = new IntraprocNullPointerAnalysis<ISSABasicBlock>(ir, orig, ignoredExceptions, initialState, mState);
+    intra = new IntraprocNullPointerAnalysis<>(ir, orig, ignoredExceptions, initialState, mState);
     intra.run(progress);
 
     return intra.getNumberOfDeletedEdges();
@@ -96,4 +96,4 @@
     return intra.getState(bb);
   }
   
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/NullPointerAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/NullPointerAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/NullPointerAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/NullPointerAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -31,7 +31,7 @@
  * Tries to detect impossible (or always appearing) NullPointerExceptions and removes impossible
  * control flow from the CFG.
  * 
- * @author Juergen Graf <graf@kit.edu>
+ * @author Juergen Graf &lt;graf@kit.edu&gt;
  *
  */
 public final class NullPointerAnalysis { 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/IBasicBlock.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/IBasicBlock.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/IBasicBlock.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/IBasicBlock.java	2019-01-29 17:08:39.000000000 +0000
@@ -24,7 +24,7 @@
    * is an index into the instruction array that contains all the instructions
    * for the method.
    * 
-   * If the result is < 0, the block has no instructions
+   * If the result is &lt; 0, the block has no instructions
    * 
    * @return the instruction index for the first instruction in the basic block.
    */
@@ -35,7 +35,7 @@
    * is an index into the instruction array that contains all the instructions
    * for the method.
    * 
-   * If the result is < 0, the block has no instructions
+   * If the result is &lt; 0, the block has no instructions
    * 
    * @return the instruction index for the last instruction in the basic block
    */
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/InducedCFG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/InducedCFG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/InducedCFG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/InducedCFG.java	2019-01-29 17:08:39.000000000 +0000
@@ -53,7 +53,7 @@
   private static final boolean DEBUG = false;
 
   /**
-   * A partial map from Instruction -> BasicBlock
+   * A partial map from Instruction -&gt; BasicBlock
    */
   private final BasicBlock[] i2block;
 
@@ -120,8 +120,7 @@
    * Compute outgoing edges in the control flow graph.
    */
   private void computeEdges() {
-    for (Iterator it = iterator(); it.hasNext();) {
-      BasicBlock b = (BasicBlock) it.next();
+    for (BasicBlock b : this) {
       if (b.equals(exit()))
         continue;
       b.computeOutgoingEdges();
@@ -129,7 +128,7 @@
     clearPis(getInstructions());
   }
 
-  private void clearPis(SSAInstruction[] instructions) {
+  private static void clearPis(SSAInstruction[] instructions) {
     for (int i = 0; i < instructions.length; i++) {
       if (instructions[i] instanceof SSAPiInstruction) {
         instructions[i] = null;
@@ -216,7 +215,7 @@
   /**
    * set to null any slots in the array with phi instructions
    */
-  private void clearPhis(SSAInstruction[] instructions) {
+  private static void clearPhis(SSAInstruction[] instructions) {
     for (int i = 0; i < instructions.length; i++) {
       if (instructions[i] instanceof SSAPhiInstruction) {
         instructions[i] = null;
@@ -394,7 +393,7 @@
 
     public void addPhi(SSAPhiInstruction phiInstruction) {
       if (phis == null) {
-        phis = new ArrayList<SSAPhiInstruction>(1);
+        phis = new ArrayList<>(1);
       }
       phis.add(phiInstruction);
     }
@@ -407,7 +406,7 @@
 
     public void addPi(SSAPiInstruction piInstruction) {
       if (pis == null) {
-        pis = new ArrayList<SSAPiInstruction>(1);
+        pis = new ArrayList<>(1);
       }
       pis.add(piInstruction);
     }
@@ -471,8 +470,7 @@
           int tgtNd = getIndexFromIIndex(tgt);  // index in instructions-array
           BasicBlock target = null;
 
-          for (Iterator it = InducedCFG.this.iterator(); it.hasNext();) {
-            final BasicBlock candid = (BasicBlock) it.next();
+          for (BasicBlock candid : InducedCFG.this) {
             if (candid.getFirstInstructionIndex() == tgtNd) {
               target = candid;
               break;
@@ -480,7 +478,7 @@
           }
 
           if (target == null) {
-            System.err.println("Error retreiving the Node with IIndex " + tgt + " (in array at " + tgtNd + ")");
+            System.err.println("Error retreiving the Node with IIndex " + tgt + " (in array at " + tgtNd + ')');
             System.err.println("The associated Instruction " + instructions[tgtNd] + " does not start a basic block");
             assert(false); // It will fail anyway
           }
@@ -616,23 +614,22 @@
 
     @Override
     public Iterator<SSAInstruction> iterator() {
-      return new ArrayIterator<SSAInstruction>(getInstructions(), getFirstInstructionIndex(), getLastInstructionIndex());
+      return new ArrayIterator<>(getInstructions(), getFirstInstructionIndex(), getLastInstructionIndex());
     }
   }
 
   @Override
   public String toString() {
-    StringBuffer s = new StringBuffer("");
-    for (Iterator it = iterator(); it.hasNext();) {
-      BasicBlock bb = (BasicBlock) it.next();
-      s.append("BB").append(getNumber(bb)).append("\n");
+    StringBuilder s = new StringBuilder();
+    for (BasicBlock bb : this) {
+      s.append("BB").append(getNumber(bb)).append('\n');
       for (int j = bb.getFirstInstructionIndex(); j <= bb.getLastInstructionIndex(); j++) {
-        s.append("  ").append(j).append("  ").append(getInstructions()[j]).append("\n");
+        s.append("  ").append(j).append("  ").append(getInstructions()[j]).append('\n');
       }
 
       Iterator<BasicBlock> succNodes = getSuccNodes(bb);
       while (succNodes.hasNext()) {
-        s.append("    -> BB").append(getNumber(succNodes.next())).append("\n");
+        s.append("    -> BB").append(getNumber(succNodes.next())).append('\n');
       }
     }
     return s.toString();
@@ -646,7 +643,7 @@
   @Override
   public int getProgramCounter(int index) {
     if (getInstructions().length <= index) {
-      throw new IllegalArgumentException("invalid index " + index + " " + getInstructions().length);
+      throw new IllegalArgumentException("invalid index " + index + ' ' + getInstructions().length);
     }
     if (getInstructions()[index] instanceof SSAInvokeInstruction) {
       return ((SSAInvokeInstruction) getInstructions()[index]).getCallSite().getProgramCounter();
@@ -697,8 +694,7 @@
 
   public Collection<SSAPhiInstruction> getAllPhiInstructions() {
     Collection<SSAPhiInstruction> result = HashSetFactory.make();
-    for (Iterator<BasicBlock> it = iterator(); it.hasNext();) {
-      BasicBlock b = it.next();
+    for (BasicBlock b : this) {
       result.addAll(b.getPhis());
     }
     return result;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/MinimalCFG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/MinimalCFG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/MinimalCFG.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/MinimalCFG.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.cfg;
+
+import java.util.Collection;
+import java.util.List;
+
+import com.ibm.wala.util.graph.NumberedGraph;
+
+public interface MinimalCFG<T> extends NumberedGraph<T> {
+
+  /**
+   * Return the entry basic block in the CFG
+   */
+  public T entry();
+
+  /**
+   * @return the synthetic exit block for the cfg
+   */
+  public T exit();
+
+  /**
+   * The order of blocks returned must indicate the exception-handling scope. So the first block is the first candidate catch block,
+   * and so on. With this invariant one can compute the exceptional control flow for a given exception type.
+   * 
+   * @return the basic blocks which may be reached from b via exceptional control flow
+   */
+  public List<T> getExceptionalSuccessors(T b);
+
+  /**
+   * The order of blocks returned should be arbitrary but deterministic.
+   * 
+   * @return the basic blocks which may be reached from b via normal control flow
+   */
+  public Collection<T> getNormalSuccessors(T b);
+
+  /**
+   * The order of blocks returned should be arbitrary but deterministic.
+   * 
+   * @return the basic blocks from which b may be reached via exceptional control flow
+   */
+  public Collection<T> getExceptionalPredecessors(T b);
+
+  /**
+   * The order of blocks returned should be arbitrary but deterministic.
+   * 
+   * @return the basic blocks from which b may be reached via normal control flow
+   */
+  public Collection<T> getNormalPredecessors(T b);
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/ShrikeCFG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/ShrikeCFG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/ShrikeCFG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/ShrikeCFG.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,7 +47,7 @@
 
   private int[] instruction2Block;
 
-  private final IBytecodeMethod method;
+  private final IBytecodeMethod<IInstruction> method;
 
   /**
    * Cache this here for efficiency
@@ -59,11 +59,11 @@
    */
   final private Set<ExceptionHandler> exceptionHandlers = HashSetFactory.make(10);
 
-  public static ShrikeCFG make(IBytecodeMethod m) {
+  public static ShrikeCFG make(IBytecodeMethod<IInstruction> m) {
     return new ShrikeCFG(m);
   }
     
-  private ShrikeCFG(IBytecodeMethod method) throws IllegalArgumentException {
+  private ShrikeCFG(IBytecodeMethod<IInstruction> method) throws IllegalArgumentException {
     super(method);
     if (method == null) {
       throw new IllegalArgumentException("method cannot be null");
@@ -81,7 +81,7 @@
   }
   
   @Override
-  public IBytecodeMethod getMethod() {
+  public IBytecodeMethod<IInstruction> getMethod() {
     return method;
   }
 
@@ -111,8 +111,7 @@
    */
   private void computeI2BMapping() {
     instruction2Block = new int[getInstructions().length];
-    for (Iterator it = iterator(); it.hasNext();) {
-      final BasicBlock b = (BasicBlock) it.next();
+    for (BasicBlock b : this) {
       for (int j = b.getFirstInstructionIndex(); j <= b.getLastInstructionIndex(); j++) {
         instruction2Block[j] = getNumber(b);
       }
@@ -123,8 +122,7 @@
    * Compute outgoing edges in the control flow graph.
    */
   private void computeEdges() {
-    for (Iterator it = iterator(); it.hasNext();) {
-      BasicBlock b = (BasicBlock) it.next();
+    for (BasicBlock b : this) {
       if (b.equals(exit())) {
         continue;
       } else if (b.equals(entry())) {
@@ -238,8 +236,8 @@
 
       IInstruction last = getInstructions()[getLastInstructionIndex()];
       int[] targets = last.getBranchTargets();
-      for (int i = 0; i < targets.length; i++) {
-        BasicBlock b = getBlockForInstruction(targets[i]);
+      for (int target : targets) {
+        BasicBlock b = getBlockForInstruction(target);
         addNormalEdgeTo(b);
       }
       addExceptionalEdges(last);
@@ -291,6 +289,10 @@
                 e.printStackTrace();
                 Assertions.UNREACHABLE();
               }
+              IMethod mTarget = cha.resolveMethod(target);
+              if (mTarget == null) {
+                goToAllHandlers = true;
+              }
             }
           }
         }
@@ -306,11 +308,11 @@
           // this var gets set to false if goToAllHandlers is true but some enclosing exception handler catches all
           // exceptions.  in such a case, we need not add an exceptional edge to the method exit
           boolean needEdgeToExitForAllHandlers = true;
-          for (int j = 0; j < hs.length; j++) {
+          for (ExceptionHandler element : hs) {
             if (DEBUG) {
-              System.err.println(" handler " + hs[j]);
+              System.err.println(" handler " + element);
             }
-            BasicBlock b = getBlockForInstruction(hs[j].getHandler());
+            BasicBlock b = getBlockForInstruction(element.getHandler());
             if (DEBUG) {
               System.err.println(" target " + b);
             }
@@ -321,20 +323,26 @@
               }
               addExceptionalEdgeTo(b);
               // if the handler catches all exceptions, we don't need to add an edge to the exit or any other handlers
-              if (hs[j].getCatchClass() == null) {
+              if (element.getCatchClass() == null) {
                 needEdgeToExitForAllHandlers = false;
                 break;
               }
             } else {
               TypeReference caughtException = null;
-              if (hs[j].getCatchClass() != null) {
-                ClassLoaderReference loader = ShrikeCFG.this.getMethod().getDeclaringClass().getReference().getClassLoader();
-                caughtException = ShrikeUtil.makeTypeReference(loader, hs[j].getCatchClass());
+              if (element.getCatchClass() != null) {
+                ClassLoaderReference loader = 
+                    element.getCatchClassLoader() == null?
+                    ShrikeCFG.this.getMethod().getDeclaringClass().getReference().getClassLoader():
+                    (ClassLoaderReference)element.getCatchClassLoader();
+                caughtException = ShrikeUtil.makeTypeReference(loader, element.getCatchClass());
                 if (DEBUG) {
                   System.err.println(" caughtException " + caughtException);
                 }
                 IClass caughtClass = cha.lookupClass(caughtException);
-                if (caughtClass == null) {
+                if (DEBUG) {
+                  System.err.println(" caughtException class " + caughtClass);
+                }
+               if (caughtClass == null) {
                   // conservatively add the edge, and raise a warning
                   addExceptionalEdgeTo(b);
                   Warnings.add(FailedExceptionResolutionWarning.create(caughtException));
@@ -351,14 +359,14 @@
                 if (!exceptionTypes.isEmpty()) {
                   addExceptionalEdgeTo(b);
                   exceptionTypes.clear();
-                  caughtException = null;
+                  assert caughtException == null;
                 }
               }
               if (caughtException != null) {
                 IClass caughtClass = cha.lookupClass(caughtException);
                 // the set "caught" should be the set of exceptions that MUST
                 // have been caught by the handlers in scope
-                ArrayList<TypeReference> caught = new ArrayList<TypeReference>(exceptionTypes.size());
+                ArrayList<TypeReference> caught = new ArrayList<>(exceptionTypes.size());
                 // check if we should add an edge to the catch block.
                 for (TypeReference t : exceptionTypes) {
                   if (t != null) {
@@ -443,7 +451,7 @@
 
     @Override
     public String toString() {
-      return "BB[Shrike]" + getNumber() + " - " + method.getDeclaringClass().getReference().getName() + "." + method.getName();
+      return "BB[Shrike]" + getNumber() + " - " + method.getDeclaringClass().getReference().getName() + '.' + method.getName();
     }
 
     /*
@@ -491,23 +499,22 @@
 
     @Override
     public Iterator<IInstruction> iterator() {
-      return new ArrayIterator<IInstruction>(getInstructions(), getFirstInstructionIndex(), getLastInstructionIndex());
+      return new ArrayIterator<>(getInstructions(), getFirstInstructionIndex(), getLastInstructionIndex());
     }
   }
 
   @Override
   public String toString() {
-    StringBuffer s = new StringBuffer("");
-    for (Iterator it = iterator(); it.hasNext();) {
-      BasicBlock bb = (BasicBlock) it.next();
-      s.append("BB").append(getNumber(bb)).append("\n");
+    StringBuilder s = new StringBuilder();
+    for (BasicBlock bb : this) {
+      s.append("BB").append(getNumber(bb)).append('\n');
       for (int j = bb.getFirstInstructionIndex(); j <= bb.getLastInstructionIndex(); j++) {
-        s.append("  ").append(j).append("  ").append(getInstructions()[j]).append("\n");
+        s.append("  ").append(j).append("  ").append(getInstructions()[j]).append('\n');
       }
 
       Iterator<BasicBlock> succNodes = getSuccNodes(bb);
       while (succNodes.hasNext()) {
-        s.append("    -> BB").append(getNumber(succNodes.next())).append("\n");
+        s.append("    -> BB").append(getNumber(succNodes.next())).append('\n');
       }
     }
     return s.toString();
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/Util.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/Util.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/cfg/Util.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/cfg/Util.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,13 +10,12 @@
  *******************************************************************************/
 package com.ibm.wala.cfg;
 
-import java.util.Iterator;
-
 import com.ibm.wala.shrikeBT.ConditionalBranchInstruction;
 import com.ibm.wala.ssa.SSAConditionalBranchInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSASwitchInstruction;
 import com.ibm.wala.ssa.SymbolTable;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 
 /**
@@ -90,8 +89,7 @@
       throw new IllegalArgumentException(b.toString() + " does not end with a conditional branch");
     }
     T fs = getNotTakenSuccessor(G, b);
-    for (Iterator<? extends T> ss = G.getSuccNodes(b); ss.hasNext();) {
-      T s = ss.next();
+    for (T s : Iterator2Iterable.make(G.getSuccNodes(b))) {
       if (s != fs)
         return s;
     }
@@ -155,11 +153,12 @@
    * constants c1 and c2, respectively.
    * 
    * Callers must resolve the constant values from the {@link SymbolTable}
-   * before calling this method. These integers are <bf>not</bf> value numbers;
+   * before calling this method. These integers are <b>not</b> value numbers;
    */
   public static <I, T extends IBasicBlock<I>> T resolveBranch(ControlFlowGraph<I, T> G, T bb, int c1, int c2) {
     SSAConditionalBranchInstruction c = (SSAConditionalBranchInstruction) getLastInstruction(G, bb);
-    switch ((ConditionalBranchInstruction.Operator) c.getOperator()) {
+    final ConditionalBranchInstruction.Operator operator = (ConditionalBranchInstruction.Operator) c.getOperator();
+    switch (operator) {
     case EQ:
       if (c1 == c2)
         return getTakenSuccessor(G, bb);
@@ -190,10 +189,9 @@
         return getTakenSuccessor(G, bb);
       else
         return getNotTakenSuccessor(G, bb);
+    default:
+      throw new UnsupportedOperationException(String.format("unexpected operator %s", operator));
     }
-
-    Assertions.UNREACHABLE();
-    return null;
   }
 
   /**
@@ -214,13 +212,13 @@
       throw new IllegalArgumentException("b is null");
     }
     int i = 0;
-    for (Iterator it = cfg.getPredNodes(b); it.hasNext();) {
-      if (it.next().equals(a)) {
+    for (T p : Iterator2Iterable.make(cfg.getPredNodes(b))) {
+      if (p.equals(a)) {
         return i;
       }
       i++;
     }
-    Assertions.UNREACHABLE("Invalid: a must be a predecessor of b! " + a + " " + b);
+    Assertions.UNREACHABLE("Invalid: a must be a predecessor of b! " + a + ' ' + b);
     return -1;
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractNestedJarFileModule.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractNestedJarFileModule.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractNestedJarFileModule.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractNestedJarFileModule.java	2019-01-29 17:08:39.000000000 +0000
@@ -57,8 +57,7 @@
       return;
     }
     cache = HashMapFactory.make();
-     try {
-      final JarInputStream stream = new JarInputStream(getNestedContents());
+     try (final JarInputStream stream = new JarInputStream(getNestedContents(), false)) {
       for (ZipEntry z = stream.getNextEntry(); z != null; z = stream.getNextEntry()) {
         final String name = z.getName();
         if (DEBUG) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/AbstractURLModule.java	2019-01-29 17:08:39.000000000 +0000
@@ -77,7 +77,7 @@
 
   @Override
   public Iterator<ModuleEntry> getEntries() {
-    return new NonNullSingletonIterator<ModuleEntry>(this);
+    return new NonNullSingletonIterator<>(this);
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClass.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClass.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -343,7 +343,7 @@
    * @see com.ibm.wala.classLoader.IClass#getAllMethods()
    */
   @Override
-  public Collection<IMethod> getAllMethods() {
+  public Collection<? extends IMethod> getAllMethods() {
     return loader.lookupClass(getClassLoader().getLanguage().getRootType().getName()).getAllMethods();
   }
 
@@ -371,6 +371,11 @@
     return false;
   }
 
+  @Override
+  public boolean isSynthetic() {
+    return false;
+  }
+
   @Override
   public Reader getSource() {
     return null;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClassLoader.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClassLoader.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClassLoader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClassLoader.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,7 +26,7 @@
   private final static boolean DEBUG = false;
 
   /**
-   * map: TypeReference -> ArrayClass
+   * map: TypeReference -&gt; ArrayClass
    */
   final private HashMap<TypeReference, ArrayClass> arrayClasses = HashMapFactory.make();
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/BytecodeClass.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/BytecodeClass.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/BytecodeClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/BytecodeClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,6 +22,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyWarning;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
@@ -31,6 +32,7 @@
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.types.annotations.Annotation;
+import com.ibm.wala.types.annotations.TypeAnnotation;
 import com.ibm.wala.types.generics.TypeSignature;
 import com.ibm.wala.util.collections.BimodalMap;
 import com.ibm.wala.util.collections.HashMapFactory;
@@ -295,17 +297,26 @@
       computeSuperclass();
     }
     if (superClass == null && !getReference().equals(TypeReference.JavaLangObject)) {
-      throw new IllegalStateException("No superclass found for " + this + " Superclass name " + superName);
+      // TODO MissingSuperClassHandling.Phantom needs to be implemented
+      if (cha instanceof ClassHierarchy && ((ClassHierarchy) cha).getSuperClassHandling().equals(ClassHierarchy.MissingSuperClassHandling.ROOT)) {
+        superClass = loader.lookupClass(loader.getLanguage().getRootType().getName());
+      } else
+        throw new NoSuperclassFoundException("No superclass found for " + this + " Superclass name " + superName);
     }
     return superClass;
   }
 
+  public TypeName getSuperName() {
+    return TypeName.findOrCreate(superName);
+  }
+
+
   /*
    * @see com.ibm.wala.classLoader.IClass#getAllFields()
    */
   @Override
   public Collection<IField> getAllFields() {
-    Collection<IField> result = new LinkedList<IField>();
+    Collection<IField> result = new LinkedList<>();
     result.addAll(getAllInstanceFields());
     result.addAll(getAllStaticFields());
     return result;
@@ -358,7 +369,7 @@
    */
   @Override
   public Collection<IField> getAllInstanceFields() {
-    Collection<IField> result = new LinkedList<IField>(getDeclaredInstanceFields());
+    Collection<IField> result = new LinkedList<>(getDeclaredInstanceFields());
     IClass s = getSuperclass();
     while (s != null) {
       result.addAll(s.getDeclaredInstanceFields());
@@ -372,7 +383,7 @@
    */
   @Override
   public Collection<IField> getAllStaticFields() {
-    Collection<IField> result = new LinkedList<IField>(getDeclaredStaticFields());
+    Collection<IField> result = new LinkedList<>(getDeclaredStaticFields());
     IClass s = getSuperclass();
     while (s != null) {
       result.addAll(s.getDeclaredStaticFields());
@@ -386,22 +397,21 @@
    */
   @Override
   public Collection<IMethod> getAllMethods() {
-    Collection<IMethod> result = new LinkedList<IMethod>();
-    Iterator<IMethod> declaredMethods = getDeclaredMethods().iterator();
-    while (declaredMethods.hasNext()) {
-      result.add(declaredMethods.next());
-    }
+    Collection<IMethod> result = new LinkedList<>(getDeclaredMethods());
     if (isInterface()) {
       for (IClass i : getDirectInterfaces()) {
         result.addAll(i.getAllMethods());
       }
+    } else {
+      // for non-interfaces, add default methods inherited from interfaces #219.
+      for (IClass i : this.getAllImplementedInterfaces())
+          for (IMethod m : i.getDeclaredMethods())
+              if (!m.isAbstract())
+                  result.add(m);
     }
     IClass s = getSuperclass();
     while (s != null) {
-      Iterator<IMethod> superDeclaredMethods = s.getDeclaredMethods().iterator();
-      while (superDeclaredMethods.hasNext()) {
-        result.add(superDeclaredMethods.next());
-      }
+      result.addAll(s.getDeclaredMethods());
       s = s.getSuperclass();
     }
     return result;
@@ -446,13 +456,14 @@
     }
 
     // check parent, caching if found
-    if (!selector.equals(MethodReference.clinitSelector) && !selector.equals(MethodReference.initSelector)) {
+    if (!selector.equals(MethodReference.clinitSelector) 
+        && !selector.getName().equals(MethodReference.initAtom)) {
       IClass superclass = getSuperclass();
       if (superclass != null) {
         IMethod inherit = superclass.getMethod(selector);
         if (inherit != null) {
           if (inheritCache == null) {
-            inheritCache = new BimodalMap<Selector, IMethod>(5);
+            inheritCache = new BimodalMap<>(5);
           }
           inheritCache.put(selector, inherit);
           return inherit;
@@ -466,7 +477,7 @@
       for(IMethod m : iface.getDeclaredMethods()) {
         if (!m.isAbstract() && m.getSelector().equals(selector)) {          
           if (inheritCache == null) {
-            inheritCache = new BimodalMap<Selector, IMethod>(5);
+            inheritCache = new BimodalMap<>(5);
           }
           inheritCache.put(selector, m);
 
@@ -477,7 +488,7 @@
     
     // no method found
     if (inheritCache == null) {
-      inheritCache = new BimodalMap<Selector, IMethod>(5);
+      inheritCache = new BimodalMap<>(5);
     }
     inheritCache.put(selector, null);
     return null;
@@ -496,8 +507,7 @@
   protected Collection<IClass> computeAllInterfacesAsCollection() {
     Collection<? extends IClass> c = getDirectInterfaces();
     Set<IClass> result = HashSetFactory.make();
-    for (Iterator<? extends IClass> it = c.iterator(); it.hasNext();) {
-      IClass klass = it.next();
+    for (IClass klass : c) {
       if (klass.isInterface()) {
         result.add(klass);
       } else {
@@ -530,9 +540,8 @@
    *         classes can not be loaded
    */
   private Collection<IClass> array2IClassSet(ImmutableByteArray[] interfaces) {
-    ArrayList<IClass> result = new ArrayList<IClass>(interfaces.length);
-    for (int i = 0; i < interfaces.length; i++) {
-      ImmutableByteArray name = interfaces[i];
+    ArrayList<IClass> result = new ArrayList<>(interfaces.length);
+    for (ImmutableByteArray name : interfaces) {
       IClass klass = null;
       klass = loader.lookupClass(TypeName.findOrCreate(name));
       if (klass == null) {
@@ -546,20 +555,20 @@
 
   protected List<IField> findDeclaredField(Atom name) {
     
-    List<IField> result = new ArrayList<IField>(1);
+    List<IField> result = new ArrayList<>(1);
     
     if (instanceFields != null) {
-      for (int i = 0; i < instanceFields.length; i++) {
-        if (instanceFields[i].getName() == name) {
-          result.add(instanceFields[i]);
+      for (IField instanceField : instanceFields) {
+        if (instanceField.getName() == name) {
+          result.add(instanceField);
         }
       }
     }
 
     if (staticFields != null) {
-      for (int i = 0; i < staticFields.length; i++) {
-        if (staticFields[i].getName() == name) {
-          result.add(staticFields[i]);
+      for (IField staticField : staticFields) {
+        if (staticField.getName() == name) {
+          result.add(staticField);
         }
       }
     }
@@ -568,7 +577,7 @@
   }
 
   protected void addFieldToList(List<FieldImpl> L, Atom name, ImmutableByteArray fieldType, int accessFlags,
-      Collection<Annotation> annotations, TypeSignature sig) {
+      Collection<Annotation> annotations, Collection<TypeAnnotation> typeAnnotations, TypeSignature sig) {
     TypeName T = null;
     if (fieldType.get(fieldType.length() - 1) == ';') {
       T = TypeName.findOrCreate(fieldType, 0, fieldType.length() - 1);
@@ -577,7 +586,7 @@
     }
     TypeReference type = TypeReference.findOrCreate(getClassLoader().getReference(), T);
     FieldReference fr = FieldReference.findOrCreate(getReference(), name, type);
-    FieldImpl f = new FieldImpl(this, fr, accessFlags, annotations, sig);
+    FieldImpl f = new FieldImpl(this, fr, accessFlags, annotations, typeAnnotations, sig);
     L.add(f);
   }
 
@@ -594,10 +603,9 @@
           if (methods.length > 5) {
             tmpMethodMap = HashMapFactory.make(methods.length);
           } else {
-            tmpMethodMap= new SmallMap<Selector, IMethod>();
+            tmpMethodMap= new SmallMap<>();
           }
-          for (int i = 0; i < methods.length; i++) {
-            IMethod m = methods[i];
+          for (IMethod m : methods) {
             tmpMethodMap.put(m.getReference().getSelector(), m);
           }
           
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/CallSiteReference.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/CallSiteReference.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/CallSiteReference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/CallSiteReference.java	2019-01-29 17:08:39.000000000 +0000
@@ -147,7 +147,7 @@
 
   @Override
   public String toString() {
-    return "invoke" + getInvocationString(getInvocationCode()) + " " + declaredTarget + "@" + getProgramCounter();
+    return "invoke" + getInvocationString(getInvocationCode()) + ' ' + declaredTarget + '@' + getProgramCounter();
   }
 
   protected String getInvocationString(IInvokeInstruction.IDispatch invocationCode) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,7 +25,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
 
@@ -35,10 +34,8 @@
 import com.ibm.wala.ssa.SSAInstructionFactory;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeName;
-import com.ibm.wala.util.collections.HashCodeComparator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.collections.Iterator2Collection;
 import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.config.SetOfClasses;
 import com.ibm.wala.util.io.FileProvider;
@@ -96,6 +93,7 @@
    * @param parent parent loader for delegation
    * @param exclusions set of classes to exclude from loading
    */
+  @SuppressWarnings("unused")
   public ClassLoaderImpl(ClassLoaderReference loader, ArrayClassLoader arrayClassLoader, IClassLoader parent,
       SetOfClasses exclusions, IClassHierarchy cha) {
 
@@ -119,18 +117,14 @@
    * 
    * @param M the module
    * @return the Set of source files in the module
-   * @throws IOException
    */
+  @SuppressWarnings("unused")
   private Set<ModuleEntry> getSourceFiles(Module M) throws IOException {
     if (DEBUG_LEVEL > 0) {
       System.err.println("Get source files for " + M);
     }
-    TreeSet<ModuleEntry> sortedEntries = new TreeSet<ModuleEntry>(HashCodeComparator.instance());
-    sortedEntries.addAll(Iterator2Collection.toSet(M.getEntries()));
-
     HashSet<ModuleEntry> result = HashSetFactory.make();
-    for (Iterator it = sortedEntries.iterator(); it.hasNext();) {
-      ModuleEntry entry = (ModuleEntry) it.next();
+    for (ModuleEntry entry : Iterator2Iterable.make(M.getEntries())) {
       if (DEBUG_LEVEL > 0) {
         System.err.println("consider entry for source information: " + entry);
       }
@@ -151,17 +145,14 @@
    * 
    * @param M the module
    * @return the Set of class Files in the module
-   * @throws IOException
    */
+  @SuppressWarnings("unused")
   private Set<ModuleEntry> getClassFiles(Module M) throws IOException {
     if (DEBUG_LEVEL > 0) {
       System.err.println("Get class files for " + M);
     }
-    TreeSet<ModuleEntry> sortedEntries = new TreeSet<ModuleEntry>(HashCodeComparator.instance());
-    sortedEntries.addAll(Iterator2Collection.toSet(M.getEntries()));
     HashSet<ModuleEntry> result = HashSetFactory.make();
-    for (Iterator it = sortedEntries.iterator(); it.hasNext();) {
-      ModuleEntry entry = (ModuleEntry) it.next();
+    for (ModuleEntry entry : Iterator2Iterable.make(M.getEntries())) {
       if (DEBUG_LEVEL > 0) {
         System.err.println("ClassLoaderImpl.getClassFiles:Got entry: " + entry);
       }
@@ -186,20 +177,8 @@
   /**
    * Remove from s any class file module entries which already are in t
    */
-  private void removeClassFiles(Set<ModuleEntry> s, Set<ModuleEntry> t) {
-    Set<String> old = HashSetFactory.make();
-    for (Iterator<ModuleEntry> it = t.iterator(); it.hasNext();) {
-      ModuleEntry m = it.next();
-      old.add(m.getClassName());
-    }
-    HashSet<ModuleEntry> toRemove = HashSetFactory.make();
-    for (Iterator<ModuleEntry> it = s.iterator(); it.hasNext();) {
-      ModuleEntry m = it.next();
-      if (old.contains(m.getClassName())) {
-        toRemove.add(m);
-      }
-    }
-    s.removeAll(toRemove);
+  private static void removeClassFiles(Set<ModuleEntry> s, Set<ModuleEntry> t) {
+    s.removeAll(t);
   }
 
   /**
@@ -246,13 +225,14 @@
   /**
    * Set up the set of classes loaded by this object.
    */
+  @SuppressWarnings("unused")
   private void loadAllClasses(Collection<ModuleEntry> moduleEntries, Map<String, Object> fileContents) {
-    for (Iterator<ModuleEntry> it = moduleEntries.iterator(); it.hasNext();) {
-      ModuleEntry entry = it.next();
+    for (ModuleEntry entry : moduleEntries) {
       if (!entry.isClassFile()) {
         continue;
       }
 
+      @SuppressWarnings("NonConstantStringShouldBeStringBuffer")
       String className = entry.getClassName().replace('.', '/');
 
       if (DEBUG_LEVEL > 0) {
@@ -268,7 +248,7 @@
 
       ShrikeClassReaderHandle entryReader = new ShrikeClassReaderHandle(entry);
 
-      className = "L" + className;
+      className = 'L' + className;
       if (DEBUG_LEVEL > 0) {
         System.err.println("Load class " + className);
       }
@@ -294,7 +274,7 @@
             // so we can null out and re-read class file contents
             loadedClasses.put(T, new ShrikeClass(entryReader, this, cha));
             if (DEBUG_LEVEL > 1) {
-              System.err.println("put " + T + " ");
+              System.err.println("put " + T + ' ');
             }
           } else {
             Warnings.add(InvalidClassFile.create(className));
@@ -320,11 +300,10 @@
       return null;
     }
     Map<String, Object> result = HashMapFactory.make();
-    try {
-      JarInputStream s = new JarInputStream(new ByteArrayInputStream(jarFileContents));
+    try (final JarInputStream s = new JarInputStream(new ByteArrayInputStream(jarFileContents), false)) {
       JarEntry entry = null;
       while ((entry = s.getNextJarEntry()) != null) {
-        byte[] entryBytes = getEntryBytes(entry, entrySizesForFile.get(entry.getName()), s);
+        byte[] entryBytes = getEntryBytes(entrySizesForFile.get(entry.getName()), s);
         if (entryBytes == null) {
           return null;
         }
@@ -334,9 +313,10 @@
           if (nestedResult == null) {
             return null;
           }
-          for (String entryName : nestedResult.keySet()) {
+          for (Map.Entry<String, Object> nestedEntry : nestedResult.entrySet()) {
+            final String entryName = nestedEntry.getKey();
             if (!result.containsKey(entryName)) {
-              result.put(entryName, nestedResult.get(entryName));
+              result.put(entryName, nestedEntry.getValue());
             }
           }
         } else if (FileSuffixes.isClassFile(name) || FileSuffixes.isSourceFile(name)) {
@@ -349,7 +329,7 @@
     return result;
   }
 
-  private byte[] getEntryBytes(JarEntry entry, Long size, InputStream is) throws IOException {
+  private static byte[] getEntryBytes(Long size, InputStream is) throws IOException {
     if (size == null) {
       return null;
     }
@@ -414,12 +394,12 @@
   /**
    * Set up mapping from type name to Module Entry
    */
+  @SuppressWarnings("unused")
   protected void loadAllSources(Set<ModuleEntry> sourceModules) {
-    for (Iterator<ModuleEntry> it = sourceModules.iterator(); it.hasNext();) {
-      ModuleEntry entry = it.next();
+    for (ModuleEntry entry : sourceModules) {
       String className = entry.getClassName().replace('.', '/');
       className = className.replace(File.separatorChar, '/');
-      className = "L" + ((className.startsWith("/")) ? className.substring(1) : className);
+      className = 'L' + ((className.startsWith("/")) ? className.substring(1) : className);
       TypeName T = TypeName.string2TypeName(className);
 
       // Note: entry.getClassName() may not return the correct class name, for example, 
@@ -454,7 +434,7 @@
         // look at substrings starting after '/' characters, in the hope
         // that we find a known class name
         while (className.indexOf('/') > 0) {
-          className = "L" + className.substring(className.indexOf('/') + 1, className.length());
+          className = 'L' + className.substring(className.indexOf('/') + 1);
           TypeName T2 = TypeName.string2TypeName(className);
           if (loadedClasses.get(T2) != null) {
             if (DEBUG_LEVEL > 0) {
@@ -482,6 +462,7 @@
    * 
    * @throws IllegalArgumentException if modules is null
    */
+  @SuppressWarnings("unused")
   @Override
   public void init(List<Module> modules) throws IOException {
 
@@ -492,8 +473,7 @@
     // module are loaded according to the given order (same as in Java VM)
     Set<ModuleEntry> classModuleEntries = HashSetFactory.make();
     Set<ModuleEntry> sourceModuleEntries = HashSetFactory.make();
-    for (Iterator<Module> it = modules.iterator(); it.hasNext();) {
-      Module archive = it.next();
+    for (Module archive : modules) {
       if (DEBUG_LEVEL > 0) {
         System.err.println("add archive: " + archive);
       }
@@ -527,14 +507,8 @@
       }
       loadAllClasses(classFiles, allClassAndSourceFileContents);
       loadAllSources(sourceFiles);
-      for (Iterator<ModuleEntry> it2 = classFiles.iterator(); it2.hasNext();) {
-        ModuleEntry file = it2.next();
-        classModuleEntries.add(file);
-      }
-      for (Iterator<ModuleEntry> it2 = sourceFiles.iterator(); it2.hasNext();) {
-        ModuleEntry file = it2.next();
-        sourceModuleEntries.add(file);
-      }
+      classModuleEntries.addAll(classFiles);
+      sourceModuleEntries.addAll(sourceFiles);
     }
   }
 
@@ -558,7 +532,7 @@
   /**
    * get the contents of a jar file. if any IO exceptions occur, catch and return null.
    */
-  private void getJarFileContents(JarFileModule archive) {
+  private static void getJarFileContents(JarFileModule archive) {
     String jarFileName = archive.getJarFile().getName();
     InputStream s = null;
     try {
@@ -594,6 +568,7 @@
   /*
    * @see com.ibm.wala.classLoader.IClassLoader#lookupClass(com.ibm.wala.types.TypeName)
    */
+  @SuppressWarnings("unused")
   @Override
   public IClass lookupClass(TypeName className) {
     if (className == null) {
@@ -658,8 +633,7 @@
   @Override
   public int getNumberOfMethods() {
     int result = 0;
-    for (Iterator<IClass> it = iterateAllClasses(); it.hasNext();) {
-      IClass klass = it.next();
+    for (IClass klass : Iterator2Iterable.make(iterateAllClasses())) {
       result += klass.getDeclaredMethods().size();
     }
     return result;
@@ -704,14 +678,9 @@
     if (toRemove == null) {
       throw new IllegalArgumentException("toRemove is null");
     }
-    for (Iterator<IClass> it = toRemove.iterator(); it.hasNext();) {
-      IClass klass = it.next();
-      if (DEBUG_LEVEL > 0) {
-        System.err.println("removing " + klass.getName());
-      }
-      loadedClasses.remove(klass.getName());
-      sourceMap.remove(klass.getName());
-    }
+    toRemove.stream().map(IClass::getName)
+            .peek(loadedClasses::remove)
+            .forEach(sourceMap::remove);
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/CodeScanner.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/CodeScanner.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/CodeScanner.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/CodeScanner.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.classLoader;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -31,6 +32,7 @@
 import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 /**
  * Simple utilities to scan {@link IMethod}s to gather information without building an IR.
@@ -38,14 +40,13 @@
 public class CodeScanner {
 
   /**
-   * @throws InvalidClassFileException
    * @throws IllegalArgumentException if m is null
    */
   public static Collection<CallSiteReference> getCallSites(IMethod m) throws InvalidClassFileException {
     if (m == null) {
       throw new IllegalArgumentException("m is null");
     }
-    if (m.isSynthetic()) {
+    if (m.isWalaSynthetic()) {
       SyntheticMethod sm = (SyntheticMethod) m;
       return getCallSites(sm.getStatements());
     } else {
@@ -54,14 +55,13 @@
   }
 
   /**
-   * @throws InvalidClassFileException
    * @throws IllegalArgumentException if m is null
    */
   public static Collection<FieldReference> getFieldsRead(IMethod m) throws InvalidClassFileException {
     if (m == null) {
       throw new IllegalArgumentException("m is null");
     }
-    if (m.isSynthetic()) {
+    if (m.isWalaSynthetic()) {
       SyntheticMethod sm = (SyntheticMethod) m;
       return getFieldsRead(sm.getStatements());
     } else {
@@ -70,14 +70,13 @@
   }
 
   /**
-   * @throws InvalidClassFileException
    * @throws IllegalArgumentException if m is null
    */
   public static Collection<FieldReference> getFieldsWritten(IMethod m) throws InvalidClassFileException {
     if (m == null) {
       throw new IllegalArgumentException("m is null");
     }
-    if (m.isSynthetic()) {
+    if (m.isWalaSynthetic()) {
       SyntheticMethod sm = (SyntheticMethod) m;
       return getFieldsWritten(sm.getStatements());
     } else {
@@ -87,14 +86,12 @@
 
   /**
    * get the element types of the arrays that m may update
-   * 
-   * @throws InvalidClassFileException
    */
   public static Collection<TypeReference> getArraysWritten(IMethod m) throws InvalidClassFileException {
     if (m == null) {
       throw new IllegalArgumentException("m is null");
     }
-    if (m.isSynthetic()) {
+    if (m.isWalaSynthetic()) {
       SyntheticMethod sm = (SyntheticMethod) m;
       return getArraysWritten(sm.getStatements());
     } else {
@@ -103,14 +100,13 @@
   }
 
   /**
-   * @throws InvalidClassFileException
    * @throws IllegalArgumentException if m is null
    */
   public static Collection<NewSiteReference> getNewSites(IMethod m) throws InvalidClassFileException {
     if (m == null) {
       throw new IllegalArgumentException("m is null");
     }
-    if (m.isSynthetic()) {
+    if (m.isWalaSynthetic()) {
       SyntheticMethod sm = (SyntheticMethod) m;
       return getNewSites(sm.getStatements());
     } else {
@@ -122,7 +118,7 @@
     if (m == null) {
       throw new IllegalArgumentException("m is null");
     }
-    if (m.isSynthetic()) {
+    if (m.isWalaSynthetic()) {
       SyntheticMethod sm = (SyntheticMethod) m;
       return hasObjectArrayLoad(sm.getStatements());
     } else {
@@ -134,7 +130,7 @@
     if (m == null) {
       throw new IllegalArgumentException("m is null");
     }
-    if (m.isSynthetic()) {
+    if (m.isWalaSynthetic()) {
       SyntheticMethod sm = (SyntheticMethod) m;
       return hasObjectArrayStore(sm.getStatements());
     } else {
@@ -146,9 +142,9 @@
     if (m == null) {
       throw new IllegalArgumentException("m is null");
     }
-    if (m.isSynthetic()) {
+    if (m.isWalaSynthetic()) {
       SyntheticMethod sm = (SyntheticMethod) m;
-      return getCaughtExceptions(m.getDeclaringClass().getClassLoader().getLanguage(), sm.getStatements());
+      return getCaughtExceptions(sm.getStatements());
     } else {
       return getShrikeBTCaughtExceptions((ShrikeCTMethod) m);
     }
@@ -158,14 +154,13 @@
    * Return the types this method may cast to
    * 
    * @return iterator of TypeReference
-   * @throws InvalidClassFileException
    * @throws IllegalArgumentException if m is null
    */
-  public static Iterator iterateCastTypes(IMethod m) throws InvalidClassFileException {
+  public static Iterator<TypeReference> iterateCastTypes(IMethod m) throws InvalidClassFileException {
     if (m == null) {
       throw new IllegalArgumentException("m is null");
     }
-    if (m.isSynthetic()) {
+    if (m.isWalaSynthetic()) {
       SyntheticMethod sm = (SyntheticMethod) m;
       return iterateCastTypes(sm.getStatements());
     } else {
@@ -173,7 +168,7 @@
     }
   }
 
-  private static Iterator iterateShrikeBTCastTypes(ShrikeCTMethod wrapper) throws InvalidClassFileException {
+  private static Iterator<TypeReference> iterateShrikeBTCastTypes(ShrikeCTMethod wrapper) throws InvalidClassFileException {
     return wrapper.getCastTypes();
   }
 
@@ -182,8 +177,7 @@
   }
 
   private static boolean hasShrikeBTObjectArrayStore(ShrikeCTMethod M) throws InvalidClassFileException {
-    for (Iterator it = M.getArraysWritten(); it.hasNext();) {
-      TypeReference t = (TypeReference) it.next();
+    for (TypeReference t : Iterator2Iterable.make(M.getArraysWritten())) {
       if (t.isReferenceType()) {
         return true;
       }
@@ -191,14 +185,12 @@
     return false;
   }
 
-  private static Collection<CallSiteReference> getCallSitesFromShrikeBT(IBytecodeMethod M) throws InvalidClassFileException {
+  private static Collection<CallSiteReference> getCallSitesFromShrikeBT(IBytecodeMethod<?> M) throws InvalidClassFileException {
     return M.getCallSites();
   }
 
   /**
-   * @param M
    * @return Iterator of TypeReference
-   * @throws InvalidClassFileException
    */
   private static Collection<NewSiteReference> getNewSitesFromShrikeBT(ShrikeCTMethod M) throws InvalidClassFileException {
     return M.getNewSites();
@@ -206,35 +198,34 @@
 
   private static List<FieldReference> getFieldsReadFromShrikeBT(ShrikeCTMethod M) throws InvalidClassFileException {
     // TODO move the logic here from ShrikeCTMethodWrapper
-    LinkedList<FieldReference> result = new LinkedList<FieldReference>();
-    for (Iterator<FieldReference> it = M.getFieldsRead(); it.hasNext();) {
-      result.add(it.next());
+    LinkedList<FieldReference> result = new LinkedList<>();
+    for (FieldReference fr : Iterator2Iterable.make(M.getFieldsRead())) {
+      result.add(fr);
     }
     return result;
   }
 
   private static List<FieldReference> getFieldsWrittenFromShrikeBT(ShrikeCTMethod M) throws InvalidClassFileException {
     // TODO move the logic here from ShrikeCTMethodWrapper
-    LinkedList<FieldReference> result = new LinkedList<FieldReference>();
-    for (Iterator<FieldReference> it = M.getFieldsWritten(); it.hasNext();) {
-      result.add(it.next());
+    LinkedList<FieldReference> result = new LinkedList<>();
+    for (FieldReference fr : Iterator2Iterable.make(M.getFieldsWritten())) {
+      result.add(fr);
     }
     return result;
   }
 
   private static List<TypeReference> getArraysWrittenFromShrikeBT(ShrikeCTMethod M) throws InvalidClassFileException {
     // TODO move the logic here from ShrikeCTMethodWrapper
-    List<TypeReference> result = new LinkedList<TypeReference>();
-    for (Iterator<TypeReference> it = M.getArraysWritten(); it.hasNext();) {
-      result.add(it.next());
+    List<TypeReference> result = new LinkedList<>();
+    for (TypeReference tr : Iterator2Iterable.make(M.getArraysWritten())) {
+      result.add(tr);
     }
     return result;
   }
 
   private static boolean hasShrikeBTObjectArrayLoad(ShrikeCTMethod M) throws InvalidClassFileException {
-    for (Iterator it = M.getArraysRead(); it.hasNext();) {
-      TypeReference t = (TypeReference) it.next();
-      if (t.isReferenceType()) {
+    for (TypeReference tr : Iterator2Iterable.make(M.getArraysRead())) {
+      if (tr.isReferenceType()) {
         return true;
       }
     }
@@ -242,10 +233,10 @@
   }
 
   /**
-   * @return Set <TypeReference>
+   * @return {@link Set}&lt;{@link TypeReference}&gt;
    * @throws IllegalArgumentException if statements == null
    */
-  public static Set<TypeReference> getCaughtExceptions(final Language l, SSAInstruction[] statements) throws IllegalArgumentException {
+  public static Set<TypeReference> getCaughtExceptions(SSAInstruction[] statements) throws IllegalArgumentException {
     if (statements == null) {
       throw new IllegalArgumentException("statements == null");
     }
@@ -257,8 +248,7 @@
         result.addAll(t);
       }
     };
-    for (int i = 0; i < statements.length; i++) {
-      SSAInstruction s = statements[i];
+    for (SSAInstruction s : statements) {
       if (s != null) {
         s.visit(v);
       }
@@ -274,13 +264,11 @@
       throw new IllegalArgumentException("statements == null");
     }
     final HashSet<TypeReference> result = HashSetFactory.make(10);
-    for (int i = 0; i < statements.length; i++) {
-      if (statements[i] != null) {
-        if (statements[i] instanceof SSACheckCastInstruction) {
-          SSACheckCastInstruction c = (SSACheckCastInstruction) statements[i];
-          for(TypeReference t : c.getDeclaredResultTypes()) {
-            result.add(t);
-          }
+    for (SSAInstruction statement : statements) {
+      if (statement != null) {
+        if (statement instanceof SSACheckCastInstruction) {
+          SSACheckCastInstruction c = (SSACheckCastInstruction) statement;
+          result.addAll(Arrays.asList(c.getDeclaredResultTypes()));
         }
       }
     }
@@ -292,15 +280,14 @@
    * @return List of InvokeInstruction
    */
   private static List<CallSiteReference> getCallSites(SSAInstruction[] statements) {
-    final List<CallSiteReference> result = new LinkedList<CallSiteReference>();
+    final List<CallSiteReference> result = new LinkedList<>();
     Visitor v = new Visitor() {
       @Override
       public void visitInvoke(SSAInvokeInstruction instruction) {
         result.add(instruction.getCallSite());
       }
     };
-    for (int i = 0; i < statements.length; i++) {
-      SSAInstruction s = statements[i];
+    for (SSAInstruction s : statements) {
       if (s != null) {
         s.visit(v);
       }
@@ -313,15 +300,14 @@
    * @return List of InvokeInstruction
    */
   private static List<NewSiteReference> getNewSites(SSAInstruction[] statements) {
-    final List<NewSiteReference> result = new LinkedList<NewSiteReference>();
+    final List<NewSiteReference> result = new LinkedList<>();
     Visitor v = new Visitor() {
       @Override
       public void visitNew(SSANewInstruction instruction) {
         result.add(instruction.getNewSite());
       }
     };
-    for (int i = 0; i < statements.length; i++) {
-      SSAInstruction s = statements[i];
+    for (SSAInstruction s : statements) {
       if (s != null) {
         s.visit(v);
       }
@@ -338,15 +324,14 @@
     if (statements == null) {
       throw new IllegalArgumentException("statements == null");
     }
-    final List<FieldReference> result = new LinkedList<FieldReference>();
+    final List<FieldReference> result = new LinkedList<>();
     Visitor v = new Visitor() {
       @Override
       public void visitGet(SSAGetInstruction instruction) {
         result.add(instruction.getDeclaredField());
       }
     };
-    for (int i = 0; i < statements.length; i++) {
-      SSAInstruction s = statements[i];
+    for (SSAInstruction s : statements) {
       if (s != null) {
         s.visit(v);
       }
@@ -363,15 +348,14 @@
     if (statements == null) {
       throw new IllegalArgumentException("statements == null");
     }
-    final List<FieldReference> result = new LinkedList<FieldReference>();
+    final List<FieldReference> result = new LinkedList<>();
     Visitor v = new Visitor() {
       @Override
       public void visitPut(SSAPutInstruction instruction) {
         result.add(instruction.getDeclaredField());
       }
     };
-    for (int i = 0; i < statements.length; i++) {
-      SSAInstruction s = statements[i];
+    for (SSAInstruction s : statements) {
       if (s != null) {
         s.visit(v);
       }
@@ -388,7 +372,7 @@
     if (statements == null) {
       throw new IllegalArgumentException("statements == null");
     }
-    final List<TypeReference> result = new LinkedList<TypeReference>();
+    final List<TypeReference> result = new LinkedList<>();
     Visitor v = new Visitor() {
 
       @Override
@@ -397,8 +381,7 @@
       }
       
     };
-    for (int i = 0; i < statements.length; i++) {
-      SSAInstruction s = statements[i];
+    for (SSAInstruction s : statements) {
       if (s != null) {
         s.visit(v);
       }
@@ -422,8 +405,7 @@
       }
     }
     ScanVisitor v = new ScanVisitor();
-    for (int i = 0; i < statements.length; i++) {
-      SSAInstruction s = statements[i];
+    for (SSAInstruction s : statements) {
       if (s != null) {
         s.visit(v);
       }
@@ -450,8 +432,7 @@
       }
     }
     ScanVisitor v = new ScanVisitor();
-    for (int i = 0; i < statements.length; i++) {
-      SSAInstruction s = statements[i];
+    for (SSAInstruction s : statements) {
       if (s != null) {
         s.visit(v);
       }
@@ -461,4 +442,4 @@
     }
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/CompoundModule.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/CompoundModule.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/CompoundModule.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/CompoundModule.java	2019-01-29 17:08:39.000000000 +0000
@@ -32,14 +32,12 @@
   }
 
   public SourceModule[] getConstituents() {
-    SourceModule[] stuff = new SourceModule[ constituents.length ];
-    System.arraycopy(constituents, 0, stuff, 0, constituents.length);
-    return stuff;
+    return constituents.clone();
   }
   
   @Override
   public Iterator<ModuleEntry> getEntries() {
-    return new NonNullSingletonIterator<ModuleEntry>(this);
+    return new NonNullSingletonIterator<>(this);
   }
   
   @Override
@@ -103,7 +101,7 @@
   }
 
   public class Reader extends java.io.Reader {
-    private final List<Pair<Integer,URL>> locations = new ArrayList<Pair<Integer,URL>>();
+    private final List<Pair<Integer,URL>> locations = new ArrayList<>();
     private int line = 0;
     private int index = 0;
     private LineNumberReader currentReader;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/DirectoryTreeModule.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/DirectoryTreeModule.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/DirectoryTreeModule.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/DirectoryTreeModule.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,11 +50,11 @@
     Set<FileModule> result = HashSetFactory.make();
     File[] files = dir.listFiles();
     if (files != null) {
-      for (int i = 0; i < files.length; i++) {
-        if (files[i].isDirectory()) {
-          result.addAll(getEntriesRecursive(files[i]));
-        } else if (includeFile(files[i])) {
-          FileModule fileModule = makeFile(files[i]);
+      for (File file : files) {
+        if (file.isDirectory()) {
+          result.addAll(getEntriesRecursive(file));
+        } else if (includeFile(file)) {
+          FileModule fileModule = makeFile(file);
           if (fileModule != null) {
             result.add(fileModule);
           }
@@ -80,7 +80,7 @@
 
   @Override
   public String toString() {
-    return getClass().getName() + ":" + getPath();
+    return getClass().getName() + ':' + getPath();
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/FieldImpl.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/FieldImpl.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/FieldImpl.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/FieldImpl.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,6 +18,7 @@
 import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.types.annotations.Annotation;
+import com.ibm.wala.types.annotations.TypeAnnotation;
 import com.ibm.wala.types.generics.TypeSignature;
 import com.ibm.wala.util.strings.Atom;
 
@@ -34,14 +35,22 @@
   private final int accessFlags;
   
   private final Collection<Annotation> annotations;
+  
+  private final Collection<TypeAnnotation> typeAnnotations;
 
   private final TypeSignature genericSignature;
   
   public FieldImpl(IClass declaringClass, FieldReference canonicalRef, int accessFlags, Collection<Annotation> annotations, TypeSignature sig) {
+    this(declaringClass, canonicalRef, accessFlags, annotations, null, sig);
+  }
+  
+  public FieldImpl(IClass declaringClass, FieldReference canonicalRef, int accessFlags, Collection<Annotation> annotations,
+      Collection<TypeAnnotation> typeAnnotations, TypeSignature sig) {
     this.declaringClass = declaringClass;
     this.fieldRef = canonicalRef;
     this.accessFlags = accessFlags;
     this.annotations = annotations;
+    this.typeAnnotations = typeAnnotations;
     this.genericSignature = sig;
     if (declaringClass == null) {
       throw new IllegalArgumentException("null declaringClass");
@@ -156,5 +165,7 @@
     return annotations == null ? null : Collections.unmodifiableCollection(annotations);
   }
 
- 
-}
\ No newline at end of file
+  public Collection<TypeAnnotation> getTypeAnnotations() {
+    return typeAnnotations == null ? null : Collections.unmodifiableCollection(typeAnnotations);
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/FileModule.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/FileModule.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/FileModule.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/FileModule.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,7 +49,7 @@
    */
   @Override
   public Iterator<ModuleEntry> getEntries() {
-    return new NonNullSingletonIterator<ModuleEntry>(this);
+    return new NonNullSingletonIterator<>(this);
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/IBytecodeMethod.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/IBytecodeMethod.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/IBytecodeMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/IBytecodeMethod.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,7 +13,6 @@
 import java.util.Collection;
 
 import com.ibm.wala.shrikeBT.ExceptionHandler;
-import com.ibm.wala.shrikeBT.IInstruction;
 import com.ibm.wala.shrikeBT.IndirectionData;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.types.annotations.Annotation;
@@ -21,7 +20,7 @@
 /**
  * A method which originated in bytecode, decoded by Shrike
  */
-public interface IBytecodeMethod extends IMethod {
+public interface IBytecodeMethod<I>extends IMethod {
 
   /**
    * @return the bytecode index corresponding to instruction i in the getInstructions() array
@@ -29,6 +28,11 @@
   int getBytecodeIndex(int i) throws InvalidClassFileException;
 
   /**
+   * @return the instuction index i in the getInstructions() array corresponding to the bytecode index bcIndex
+   */
+  int getInstructionIndex(int bcIndex) throws InvalidClassFileException;
+
+  /**
    * @return the Shrike representation of the exception handlers
    */
   ExceptionHandler[][] getHandlers() throws InvalidClassFileException;
@@ -36,7 +40,7 @@
   /**
    * @return the Shrike instructions decoded from the bytecode
    */
-  IInstruction[] getInstructions() throws InvalidClassFileException;
+  I[] getInstructions() throws InvalidClassFileException;
 
   /**there 
    * @return the call sites declared in the bytecode for this method
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/IClass.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/IClass.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/IClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/IClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -55,6 +55,11 @@
   boolean isPrivate();
 
   /**
+   * @return true iff this class is synthetic, i.e., compiler-generated
+   */
+  boolean isSynthetic();
+
+  /**
    * Return the integer that encodes the class's modifiers, as defined by the JVM specification
    * 
    * @return the integer that encodes the class's modifiers, as defined by the JVM specification
@@ -90,12 +95,12 @@
   /**
    * Finds a field.
    * 
-   * @throws IllegalStateException if the class contains multiple fields with name <code>name</code>.
+   * @throws IllegalStateException if the class contains multiple fields with name {@code name}.
    */
   IField getField(Atom name);
 
   /**
-   * Finds a field, given a name and a type.  Returns <code>null</code> if not found.
+   * Finds a field, given a name and a type.  Returns {@code null} if not found.
    */
   IField getField(Atom name, TypeName type);
   
@@ -135,7 +140,7 @@
   /**
    * @return an Iterator of the IMethods declared by this class.
    */
-  Collection<IMethod> getDeclaredMethods();
+  Collection<? extends IMethod> getDeclaredMethods();
 
   /**
    * Compute the instance fields declared by this class or any of its superclasses.
@@ -155,7 +160,7 @@
   /**
    * Compute the methods declared by this class or any of its superclasses.
    */
-  Collection<IMethod> getAllMethods();
+  Collection<? extends IMethod> getAllMethods();
 
   /**
    * Compute the instance fields declared by this class.
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/IClassLoader.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/IClassLoader.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/IClassLoader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/IClassLoader.java	2019-01-29 17:08:39.000000000 +0000
@@ -114,7 +114,6 @@
   /**
    * Initialize internal data structures.
    * 
-   * @throws IOException
    * @throws IllegalArgumentException if modules is null
    */
   public void init(List<Module> modules) throws IOException;
@@ -122,7 +121,7 @@
   /**
    * blow away references to any classes in the set
    * 
-   * @param toRemove Collection<IClass>
+   * @param toRemove Collection&lt;IClass&gt;
    */
   public abstract void removeAll(Collection<IClass> toRemove);
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/IMethod.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/IMethod.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/IMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/IMethod.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,7 +43,14 @@
   boolean isNative();
 
   /**
-   * Did someone synthesize this method? (As opposed to reading it from a class file)
+   * Is the implementation of this method a model generated by WALA?
+   * For compiler-generated synthetic methods, refer to {@link #isSynthetic()}
+   */
+  boolean isWalaSynthetic();
+
+  /**
+   * Is this method synthetic, i.e., compiler-generated (this refers to the
+   * synthetic flag in java/dex bytecode)
    */
   boolean isSynthetic();
 
@@ -104,7 +111,6 @@
 
   /**
    * @return an array of the exception types declared by the throws clause for this method, or null if there are none
-   * @throws InvalidClassFileException
    */
   TypeReference[] getDeclaredExceptions() throws InvalidClassFileException, UnsupportedOperationException;
 
@@ -153,4 +159,9 @@
    * @return true iff the local variable table information for this method is available
    */
   boolean hasLocalVariableTable();
+  
+  default int getNumberOfDefaultParameters() {
+    return 0;
+  }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarFileEntry.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarFileEntry.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarFileEntry.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarFileEntry.java	2019-01-29 17:08:39.000000000 +0000
@@ -73,7 +73,7 @@
 
   @Override
   public String toString() {
-    return jarFileModule.getJarFile().getName() + ":" + getName();
+    return jarFileModule.getJarFile().getName() + ':' + getName();
   }
 
   /*
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java	2019-01-29 17:08:39.000000000 +0000
@@ -29,26 +29,20 @@
 /**
  * Read in a jar file from an input stream. Most parts are copied from the NestedJarFileModule class
  * and adapted to work with an input stream. 
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  */
-public class JarStreamModule implements Module {
+public class JarStreamModule extends JarInputStream implements Module {
 
   private static final boolean DEBUG = false;
 
-  private final JarInputStream stream;
-
   /**
    * For efficiency, we cache the byte[] holding each ZipEntry's contents; this will help avoid multiple unzipping TODO: use a soft
    * reference?
    */
   private HashMap<String, byte[]> cache = null;
 
-  public JarStreamModule(JarInputStream stream) {
-    if (stream == null) {
-      throw new IllegalArgumentException("null stream");
-    }
-    
-    this.stream = stream;
+  public JarStreamModule(InputStream stream) throws IOException {
+    super(stream);
   }
 
   public InputStream getInputStream(String name) {
@@ -63,7 +57,7 @@
     }
     cache = HashMapFactory.make();
     try {
-      for (ZipEntry z = stream.getNextEntry(); z != null; z = stream.getNextEntry()) {
+      for (ZipEntry z = getNextEntry(); z != null; z = getNextEntry()) {
         final String name = z.getName();
         if (DEBUG) {
           System.err.println(("got entry: " + name));
@@ -71,10 +65,10 @@
         if (FileSuffixes.isClassFile(name) || FileSuffixes.isSourceFile(name)) {
           ByteArrayOutputStream out = new ByteArrayOutputStream();
           byte[] temp = new byte[1024];
-          int n = stream.read(temp);
+          int n = read(temp);
           while (n != -1) {
             out.write(temp, 0, n);
-            n = stream.read(temp);
+            n = read(temp);
           }
           byte[] bb = out.toByteArray();
           cache.put(name, bb);
@@ -102,6 +96,7 @@
   /*
    * @see com.ibm.wala.classLoader.Module#getEntries()
    */
+  @Override
   public Iterator<ModuleEntry> getEntries() {
     populateCache();
     final Iterator<String> it = cache.keySet().iterator();
@@ -119,16 +114,19 @@
         }
       }
 
+      @Override
       public boolean hasNext() {
         return next != null;
       }
 
+      @Override
       public ModuleEntry next() {
         ModuleEntry result = new Entry(next);
         advance();
         return result;
       }
 
+      @Override
       public void remove() {
         Assertions.UNREACHABLE();
       }
@@ -149,6 +147,7 @@
     /*
      * @see com.ibm.wala.classLoader.ModuleEntry#getName()
      */
+    @Override
     public String getName() {
       return name;
     }
@@ -156,6 +155,7 @@
     /*
      * @see com.ibm.wala.classLoader.ModuleEntry#isClassFile()
      */
+    @Override
     public boolean isClassFile() {
       return FileSuffixes.isClassFile(getName());
     }
@@ -163,6 +163,7 @@
     /*
      * @see com.ibm.wala.classLoader.ModuleEntry#getInputStream()
      */
+    @Override
     public InputStream getInputStream() {
       return JarStreamModule.this.getInputStream(name);
     }
@@ -170,6 +171,7 @@
     /*
      * @see com.ibm.wala.classLoader.ModuleEntry#isModuleFile()
      */
+    @Override
     public boolean isModuleFile() {
       return false;
     }
@@ -177,6 +179,7 @@
     /*
      * @see com.ibm.wala.classLoader.ModuleEntry#asModule()
      */
+    @Override
     public Module asModule() {
       Assertions.UNREACHABLE();
       return null;
@@ -190,6 +193,7 @@
     /*
      * @see com.ibm.wala.classLoader.ModuleEntry#getClassName()
      */
+    @Override
     public String getClassName() {
       return FileSuffixes.stripSuffix(getName());
     }
@@ -197,6 +201,7 @@
     /*
      * @see com.ibm.wala.classLoader.ModuleEntry#isSourceFile()
      */
+    @Override
     public boolean isSourceFile() {
       return FileSuffixes.isSourceFile(getName());
     }
@@ -242,14 +247,14 @@
 
   @Override
   public String toString() {
-    return "Jar input stream " + stream.toString();
+    return "Jar input stream " + super.toString();
   }
 
   @Override
   public int hashCode() {
     final int prime = 31;
     int result = 1;
-    result = prime * result + (stream.hashCode());
+    result = prime * result + (super.hashCode());
     return result;
   }
 
@@ -262,7 +267,7 @@
     if (getClass() != obj.getClass())
       return false;
     JarStreamModule other = (JarStreamModule) obj;
-    return stream.equals(other.stream);
+    return super.equals(other);
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/JavaLanguage.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/JavaLanguage.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/JavaLanguage.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/JavaLanguage.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,19 @@
 
 import com.ibm.wala.analysis.typeInference.JavaPrimitiveType;
 import com.ibm.wala.analysis.typeInference.PrimitiveType;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.impl.AbstractRootMethod;
+import com.ibm.wala.ipa.callgraph.impl.FakeRootClass;
+import com.ibm.wala.ipa.callgraph.impl.FakeRootMethod;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.ipa.modref.ExtendedHeapModel;
+import com.ibm.wala.ipa.modref.ModRef.ModVisitor;
+import com.ibm.wala.ipa.modref.ModRef.RefVisitor;
 import com.ibm.wala.shrikeBT.ConstantInstruction;
 import com.ibm.wala.shrikeBT.ConstantInstruction.ClassToken;
 import com.ibm.wala.shrikeBT.Constants;
@@ -35,6 +47,7 @@
 import com.ibm.wala.shrikeCT.ConstantPoolParser.ReferenceToken;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.ssa.SSAAbstractBinaryInstruction;
+import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSAAddressOfInstruction;
 import com.ibm.wala.ssa.SSAArrayLengthInstruction;
 import com.ibm.wala.ssa.SSAArrayLoadInstruction;
@@ -229,7 +242,7 @@
     }
 
     @Override
-    public SSAInvokeInstruction InvokeInstruction(int iindex, int result, int[] params, int exception, CallSiteReference site, BootstrapMethod bootstrap) {
+    public SSAAbstractInvokeInstruction InvokeInstruction(int iindex, int result, int[] params, int exception, CallSiteReference site, BootstrapMethod bootstrap) {
       if (bootstrap != null) {
         return new SSAInvokeDynamicInstruction(iindex, result, params, exception, site, bootstrap) {
           @Override
@@ -423,6 +436,9 @@
   private static final Collection<TypeReference> newArrayExceptions = Collections.unmodifiableCollection(Arrays
       .asList(new TypeReference[] { TypeReference.JavaLangOutOfMemoryError, TypeReference.JavaLangNegativeArraySizeException }));
 
+  private static final Collection<TypeReference> newSafeArrayExceptions = Collections.unmodifiableCollection(Arrays
+      .asList(new TypeReference[] { TypeReference.JavaLangOutOfMemoryError}));
+
   private static final Collection<TypeReference> exceptionInInitializerError = Collections
       .singleton(TypeReference.JavaLangExceptionInInitializerError);
 
@@ -464,7 +480,9 @@
   public static Collection<TypeReference> getNewArrayExceptions() {
     return newArrayExceptions;
   }
-
+  public static Collection<TypeReference> getNewSafeArrayExceptions() {
+    return newSafeArrayExceptions;
+  }
   public static Collection<TypeReference> getNewScalarExceptions() {
     return newScalarExceptions;
   }
@@ -541,8 +559,7 @@
   }
 
   /**
-   * @return Collection<TypeReference>, set of exception types a call to a declared target might throw.
-   * @throws InvalidClassFileException
+   * @return {@link Collection}&lt;{@link TypeReference}&gt;, set of exception types a call to a declared target might throw.
    * @throws IllegalArgumentException if target is null
    * @throws IllegalArgumentException if cha is null
    */
@@ -556,7 +573,7 @@
     if (target == null) {
       throw new IllegalArgumentException("target is null");
     }
-    ArrayList<TypeReference> set = new ArrayList<TypeReference>(cha.getJavaLangRuntimeExceptionTypes());
+    ArrayList<TypeReference> set = new ArrayList<>(cha.getJavaLangRuntimeExceptionTypes());
     set.addAll(cha.getJavaLangErrorTypes());
 
     IClass klass = cha.lookupClass(target.getDeclaringClass());
@@ -719,7 +736,7 @@
       return ShrikeUtil.makeTypeReference(ClassLoaderReference.Application, ((ClassToken) value).getTypeName());
     } else if (value instanceof ReferenceToken) {
       ReferenceToken tok = (ReferenceToken)value;
-      TypeReference cls = ShrikeUtil.makeTypeReference(ClassLoaderReference.Application, "L" + tok.getClassName());
+      TypeReference cls = ShrikeUtil.makeTypeReference(ClassLoaderReference.Application, 'L' + tok.getClassName());
       return MethodReference.findOrCreate(cls, new Selector(Atom.findOrCreateUnicodeAtom(tok.getElementName()), Descriptor.findOrCreateUTF8(tok.getDescriptor())));
     } else if (value instanceof MethodHandle || value instanceof MethodType) {
       return value;
@@ -739,7 +756,7 @@
     return TypeReference.JavaLangString;
   }
   
-  {
+  static {
     JavaPrimitiveType.init();
   }
   
@@ -754,4 +771,27 @@
     return MethodReference.findOrCreate(this, loader, instruction.getClassType(), instruction.getMethodName(),
         instruction.getMethodSignature());
   }
+
+  @Override
+  public boolean methodsHaveDeclaredParameterTypes() {
+    return true;
+  }
+
+  @Override
+  public AbstractRootMethod getFakeRootMethod(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
+    return new FakeRootMethod(new FakeRootClass(ClassLoaderReference.Primordial, cha), options, cache); 
+  }
+
+  @Override
+  public <T extends InstanceKey> RefVisitor<T, ? extends ExtendedHeapModel> makeRefVisitor(CGNode n, Collection<PointerKey> result,
+      PointerAnalysis<T> pa, ExtendedHeapModel h) {
+    return new RefVisitor<>(n, result, pa, h);
+  }
+
+  @Override
+  public <T extends InstanceKey> ModVisitor<T, ? extends ExtendedHeapModel> makeModVisitor(CGNode n, Collection<PointerKey> result,
+      PointerAnalysis<T> pa, ExtendedHeapModel h, boolean ignoreAllocHeapDefs) {
+    return new ModVisitor<>(n, result, h, pa, ignoreAllocHeapDefs);
+  }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/JVMClass.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/JVMClass.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/JVMClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/JVMClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -65,6 +65,15 @@
     return result;
   }
 
+  /*
+   * @see com.ibm.wala.classLoader.IClass#isSynthetic()
+   */
+  @Override
+  public boolean isSynthetic() {
+    boolean result = ((modifiers & Constants.ACC_SYNTHETIC) != 0);
+    return result;
+  }
+
   /**
    * @see com.ibm.wala.classLoader.IClass#getClassInitializer()
    */
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/LanguageImpl.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/LanguageImpl.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/LanguageImpl.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/LanguageImpl.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,6 +12,9 @@
 
 import java.util.Set;
 
+import com.ibm.wala.cfg.InducedCFG;
+import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.util.collections.HashSetFactory;
 
 /**
@@ -65,4 +68,17 @@
   public String toString() {
     return getName().toString();
   }
+  
+  @Override
+  public
+  InducedCFG makeInducedCFG(SSAInstruction[] instructions, IMethod method, Context context) {
+    return new InducedCFG(instructions, method, context);
+  }
+
+  @Override
+  public boolean modelConstant(Object o) {
+    return o instanceof String;
+  }
+  
+  
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/Language.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/Language.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/Language.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/Language.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,8 +15,21 @@
 
 import com.ibm.wala.analysis.typeInference.PrimitiveType;
 import com.ibm.wala.analysis.typeInference.TypeInference;
+import com.ibm.wala.cfg.InducedCFG;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.impl.AbstractRootMethod;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.ipa.modref.ExtendedHeapModel;
+import com.ibm.wala.ipa.modref.ModRef;
+import com.ibm.wala.ipa.modref.ModRef.RefVisitor;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
+import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAInstructionFactory;
 import com.ibm.wala.ssa.SSALoadMetadataInstruction;
 import com.ibm.wala.types.MethodReference;
@@ -74,7 +87,7 @@
 
   /**
    * Is t the type of the language's null value? Should return true if
-   * <code>t == null</code> (?).
+   * {@code t == null} (?).
    */
   boolean isNullType(TypeReference t);
 
@@ -139,4 +152,22 @@
    * @see TypeInference
    */
   PrimitiveType getPrimitive(TypeReference reference);
+  
+  /**
+   * do MethodReference objects have declared parameter types?
+   */
+  boolean methodsHaveDeclaredParameterTypes();
+   
+  AbstractRootMethod getFakeRootMethod(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache);
+ 
+  InducedCFG makeInducedCFG(SSAInstruction[] instructions, IMethod method, Context context);
+  
+  boolean modelConstant(Object o);
+  
+  <T extends InstanceKey> RefVisitor<T, ? extends ExtendedHeapModel> makeRefVisitor(CGNode n, Collection<PointerKey> result,
+      PointerAnalysis<T> pa, ExtendedHeapModel h);
+  
+  <T extends InstanceKey> ModRef.ModVisitor<T, ? extends ExtendedHeapModel> makeModVisitor(CGNode n,
+      Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h,
+      boolean ignoreAllocHeapDefs);
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/NewSiteReference.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/NewSiteReference.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/NewSiteReference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/NewSiteReference.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,6 +48,6 @@
 
   @Override
   public String toString() {
-    return "NEW " + declaredType + "@" + getProgramCounter();
+    return "NEW " + declaredType + '@' + getProgramCounter();
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/NoSuperclassFoundException.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/NoSuperclassFoundException.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/NoSuperclassFoundException.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/NoSuperclassFoundException.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,14 @@
+package com.ibm.wala.classLoader;
+
+/**
+ * Indicates the superclass for a class was not found in the
+ * {@link com.ibm.wala.ipa.callgraph.AnalysisScope}
+ */
+public class NoSuperclassFoundException extends RuntimeException {
+
+  static final long serialVersionUID = 333L;
+
+  public NoSuperclassFoundException(String message) {
+    super(message);
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/PhantomClass.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/PhantomClass.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/PhantomClass.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/PhantomClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,107 @@
+package com.ibm.wala.classLoader;
+
+import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.types.Selector;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.strings.Atom;
+
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * dummy class representing a missing superclass
+ */
+public class PhantomClass extends SyntheticClass {
+
+  /**
+   * @param T type reference describing this class
+   */
+  public PhantomClass(TypeReference T, IClassHierarchy cha) {
+    super(T, cha);
+  }
+
+  @Override
+  public boolean isPublic() {
+    return false;
+  }
+
+  @Override
+  public boolean isPrivate() {
+    return false;
+  }
+
+  @Override
+  public int getModifiers() throws UnsupportedOperationException {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public IClass getSuperclass() {
+    return getClassHierarchy().getRootClass();
+  }
+
+  @Override
+  public Collection<? extends IClass> getDirectInterfaces() {
+    return Collections.emptySet();
+  }
+
+  @Override
+  public Collection<IClass> getAllImplementedInterfaces() {
+    return Collections.emptySet();
+  }
+
+  @Override
+  public IMethod getMethod(Selector selector) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public IField getField(Atom name) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public IMethod getClassInitializer() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Collection<? extends IMethod> getDeclaredMethods() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Collection<IField> getAllInstanceFields() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Collection<IField> getAllStaticFields() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Collection<IField> getAllFields() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Collection<? extends IMethod> getAllMethods() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Collection<IField> getDeclaredInstanceFields() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Collection<IField> getDeclaredStaticFields() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public boolean isReferenceType() {
+    return true;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ProgramCounter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ProgramCounter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ProgramCounter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ProgramCounter.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,8 +52,6 @@
    * 
    * Note: must use these objects with extreme care; this only works if you never mix ProgramLocations from different methods in the
    * same collection.
-   * 
-   * @see java.lang.Object#equals(Object)
    */
   @Override
   public boolean equals(Object obj) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeBTMethod.java	2019-01-29 17:08:39.000000000 +0000
@@ -145,69 +145,84 @@
     }
     if (result == null) {
       result = computeBCInfo();
-      bcInfo = new SoftReference<BytecodeInfo>(result);
+      bcInfo = new SoftReference<>(result);
     }
     return result;
   }
 
   /**
    * Return the program counter (bytecode index) for a particular Shrike instruction index.
-   * 
-   * @throws InvalidClassFileException
    */
   public int getBytecodeIndex(int instructionIndex) throws InvalidClassFileException {
     return getBCInfo().pcMap[instructionIndex];
   }
 
   /**
-   * Return the number of Shrike instructions for this method.
+   * Return the Shrike instruction index for a particular valid program counter (bytecode index), or -1 if 
+   * the Shrike instriction index could not be determined. 
    * 
-   * @throws InvalidClassFileException
+   * This ShrikeBTMethod must not be native.
    */
-  public int getNumShrikeInstructions() throws InvalidClassFileException {
-    return getBCInfo().pcMap.length;
+  public int getInstructionIndex(int bcIndex) throws InvalidClassFileException {
+    if (isNative()) {
+      throw new UnsupportedOperationException("getInstructionIndex(int bcIndex) is only supported for non-native bytecode");
+    }
+
+    final BytecodeInfo info = getBCInfo();
+    if (info.decoder.containsSubroutines()) return -1;
+
+    final int[] pcMap = info.pcMap;
+    assert isSorted(pcMap);
+
+    int iindex = Arrays.binarySearch(pcMap, bcIndex);
+    if (iindex < 0) return -1;
+
+    // Unfortunately, pcMap is not always *strictly* sorted: given bcIndex, there may be multiple adjacent indices
+    // i,j such that pcMap[i] == bcIndex == pcMap[j]. We pick the least such index.
+    while (iindex > 0 && pcMap[iindex - 1] == bcIndex) iindex--;
+    return iindex;
   }
 
-  /**
-   * @throws InvalidClassFileException
-   */
-  public Collection<CallSiteReference> getCallSites() throws InvalidClassFileException {
-    Collection<CallSiteReference> empty = Collections.emptySet();
-    if (isNative()) {
-      return empty;
+  private static boolean isSorted(int[] a) {
+    for (int i = 0; i < a.length - 1; i++) {
+      if (a[i+1] < a[i]) return false;
     }
-    return (getBCInfo().callSites == null) ? empty : Collections.unmodifiableCollection(Arrays.asList(getBCInfo().callSites));
+    return true;
   }
 
   /**
-   * @throws InvalidClassFileException
+   * Return the number of Shrike instructions for this method.
    */
-  Collection<NewSiteReference> getNewSites() throws InvalidClassFileException {
-    Collection<NewSiteReference> empty = Collections.emptySet();
-    if (isNative()) {
-      return empty;
-    }
+  public int getNumShrikeInstructions() throws InvalidClassFileException {
+    return getBCInfo().pcMap.length;
+  }
 
-    return (getBCInfo().newSites == null) ? empty : Collections.unmodifiableCollection(Arrays.asList(getBCInfo().newSites));
+  public Collection<CallSiteReference> getCallSites() throws InvalidClassFileException {
+    return isNative() || getBCInfo().callSites == null
+            ? Collections.emptySet()
+            : Collections.unmodifiableCollection(Arrays.asList(getBCInfo().callSites));
+  }
+
+  Collection<NewSiteReference> getNewSites() throws InvalidClassFileException {
+    return (isNative() || getBCInfo().newSites == null)
+            ? Collections.emptySet()
+            : Collections.unmodifiableCollection(Arrays.asList(getBCInfo().newSites));
   }
 
   /**
-   * @return Set <TypeReference>, the exceptions that statements in this method may throw,
-   * @throws InvalidClassFileException
+   * @return {@link Set}&lt;{@link TypeReference}&gt;, the exceptions that statements in this method may throw,
    */
   public Collection<TypeReference> getImplicitExceptionTypes() throws InvalidClassFileException {
     if (isNative()) {
       return Collections.emptySet();
     }
-    return (getBCInfo().implicitExceptions == null) ? Arrays.asList(new TypeReference[0]) : Arrays
+    return (getBCInfo().implicitExceptions == null) ? Collections.emptyList() : Arrays
         .asList(getBCInfo().implicitExceptions);
   }
 
   /**
    * Do a cheap pass over the bytecodes to collect some mapping information. Some methods require this as a pre-req to accessing
    * ShrikeCT information.
-   * 
-   * @throws InvalidClassFileException
    */
   private BytecodeInfo computeBCInfo() throws InvalidClassFileException {
     BytecodeInfo result = new BytecodeInfo();
@@ -229,7 +244,6 @@
 
   /**
    * @return true iff this method has a monitorenter or monitorexit
-   * @throws InvalidClassFileException
    */
   public boolean hasMonitorOp() throws InvalidClassFileException {
     if (isNative()) {
@@ -240,7 +254,6 @@
 
   /**
    * @return Set of FieldReference
-   * @throws InvalidClassFileException
    */
   public Iterator<FieldReference> getFieldsWritten() throws InvalidClassFileException {
     if (isNative()) {
@@ -256,7 +269,6 @@
 
   /**
    * @return Iterator of FieldReference
-   * @throws InvalidClassFileException
    */
   public Iterator<FieldReference> getFieldsRead() throws InvalidClassFileException {
     if (isNative()) {
@@ -272,9 +284,8 @@
 
   /**
    * @return Iterator of TypeReference
-   * @throws InvalidClassFileException
    */
-  public Iterator getArraysRead() throws InvalidClassFileException {
+  public Iterator<TypeReference> getArraysRead() throws InvalidClassFileException {
     if (isNative()) {
       return EmptyIterator.instance();
     }
@@ -283,7 +294,6 @@
 
   /**
    * @return Iterator of TypeReference
-   * @throws InvalidClassFileException
    */
   public Iterator<TypeReference> getArraysWritten() throws InvalidClassFileException {
     if (isNative()) {
@@ -299,9 +309,8 @@
 
   /**
    * @return Iterator of TypeReference
-   * @throws InvalidClassFileException
    */
-  public Iterator getCastTypes() throws InvalidClassFileException {
+  public Iterator<TypeReference> getCastTypes() throws InvalidClassFileException {
     if (isNative()) {
       return EmptyIterator.instance();
     }
@@ -406,7 +415,10 @@
   }
 
   @Override
-  public boolean isSynthetic() {
+  public boolean isSynthetic() { return ((getModifiers() & Constants.ACC_SYNTHETIC) != 0); }
+
+  @Override
+  public boolean isWalaSynthetic() {
     return false;
   }
 
@@ -424,8 +436,6 @@
 
   /**
    * Walk through the bytecodes and collect trivial information.
-   * 
-   * @throws InvalidClassFileException
    */
   protected abstract void processDebugInfo(BytecodeInfo bcInfo) throws InvalidClassFileException;
 
@@ -461,75 +471,69 @@
     copyVisitorSetsToArrays(simpleVisitor, info);
   }
 
-  private void copyVisitorSetsToArrays(SimpleVisitor simpleVisitor, BytecodeInfo info) {
+  private static void copyVisitorSetsToArrays(SimpleVisitor simpleVisitor, BytecodeInfo info) {
     info.newSites = new NewSiteReference[simpleVisitor.newSites.size()];
     int i = 0;
-    for (Iterator<NewSiteReference> it = simpleVisitor.newSites.iterator(); it.hasNext();) {
-      info.newSites[i++] = it.next();
+    for (NewSiteReference newSiteReference : simpleVisitor.newSites) {
+      info.newSites[i++] = newSiteReference;
     }
 
     info.fieldsRead = new FieldReference[simpleVisitor.fieldsRead.size()];
     i = 0;
-    for (Iterator<FieldReference> it = simpleVisitor.fieldsRead.iterator(); it.hasNext();) {
-      info.fieldsRead[i++] = it.next();
+    for (FieldReference fieldReference : simpleVisitor.fieldsRead) {
+      info.fieldsRead[i++] = fieldReference;
     }
 
     info.fieldsRead = new FieldReference[simpleVisitor.fieldsRead.size()];
     i = 0;
-    for (Iterator<FieldReference> it = simpleVisitor.fieldsRead.iterator(); it.hasNext();) {
-      info.fieldsRead[i++] = it.next();
+    for (FieldReference fieldReference : simpleVisitor.fieldsRead) {
+      info.fieldsRead[i++] = fieldReference;
     }
 
     info.fieldsWritten = new FieldReference[simpleVisitor.fieldsWritten.size()];
     i = 0;
-    for (Iterator<FieldReference> it = simpleVisitor.fieldsWritten.iterator(); it.hasNext();) {
-      info.fieldsWritten[i++] = it.next();
+    for (FieldReference fieldReference : simpleVisitor.fieldsWritten) {
+      info.fieldsWritten[i++] = fieldReference;
     }
 
     info.callSites = new CallSiteReference[simpleVisitor.callSites.size()];
     i = 0;
-    for (Iterator<CallSiteReference> it = simpleVisitor.callSites.iterator(); it.hasNext();) {
-      info.callSites[i++] = it.next();
+    for (CallSiteReference callSiteReference : simpleVisitor.callSites) {
+      info.callSites[i++] = callSiteReference;
     }
 
     info.arraysRead = new TypeReference[simpleVisitor.arraysRead.size()];
     i = 0;
-    for (Iterator<TypeReference> it = simpleVisitor.arraysRead.iterator(); it.hasNext();) {
-      info.arraysRead[i++] = it.next();
+    for (TypeReference typeReference : simpleVisitor.arraysRead) {
+      info.arraysRead[i++] = typeReference;
     }
 
     info.arraysWritten = new TypeReference[simpleVisitor.arraysWritten.size()];
     i = 0;
-    for (Iterator<TypeReference> it = simpleVisitor.arraysWritten.iterator(); it.hasNext();) {
-      info.arraysWritten[i++] = it.next();
+    for (TypeReference typeReference : simpleVisitor.arraysWritten) {
+      info.arraysWritten[i++] = typeReference;
     }
 
     info.implicitExceptions = new TypeReference[simpleVisitor.implicitExceptions.size()];
     i = 0;
-    for (Iterator it = simpleVisitor.implicitExceptions.iterator(); it.hasNext();) {
-      info.implicitExceptions[i++] = (TypeReference) it.next();
+    for (TypeReference typeReference : simpleVisitor.implicitExceptions) {
+      info.implicitExceptions[i++] = typeReference;
     }
 
     info.castTypes = new TypeReference[simpleVisitor.castTypes.size()];
     i = 0;
-    for (Iterator<TypeReference> it = simpleVisitor.castTypes.iterator(); it.hasNext();) {
-      info.castTypes[i++] = it.next();
+    for (TypeReference typeReference : simpleVisitor.castTypes) {
+      info.castTypes[i++] = typeReference;
     }
 
     info.hasMonitorOp = simpleVisitor.hasMonitorOp;
   }
 
-  /**
-   * @see java.lang.Object#toString()
-   */
   @Override
   public String toString() {
     return getReference().toString();
   }
 
-  /**
-   * @see java.lang.Object#equals(Object)
-   */
   @Override
   public boolean equals(Object obj) {
     // instanceof is OK because this class is final.
@@ -542,9 +546,6 @@
     }
   }
 
-  /**
-   * @see java.lang.Object#hashCode()
-   */
   @Override
   public int hashCode() {
     return 9661 * getReference().hashCode();
@@ -606,7 +607,7 @@
       instructionIndex = i;
     }
 
-    public int getProgramCounter() throws InvalidClassFileException {
+    public int getProgramCounter() {
       return info.pcMap[instructionIndex];
     }
 
@@ -619,12 +620,7 @@
     public void visitNew(NewInstruction instruction) {
       ClassLoaderReference loader = getReference().getDeclaringClass().getClassLoader();
       TypeReference t = ShrikeUtil.makeTypeReference(loader, instruction.getType());
-      try {
-        newSites.add(NewSiteReference.make(getProgramCounter(), t));
-      } catch (InvalidClassFileException e) {
-        e.printStackTrace();
-        Assertions.UNREACHABLE();
-      }
+      newSites.add(NewSiteReference.make(getProgramCounter(), t));
     }
 
     @Override
@@ -649,12 +645,7 @@
       MethodReference m = MethodReference.findOrCreate(loader.getLanguage(), loader.getReference(), instruction.getClassType(),
           instruction.getMethodName(), instruction.getMethodSignature());
       int programCounter = 0;
-      try {
-        programCounter = getProgramCounter();
-      } catch (InvalidClassFileException e) {
-        e.printStackTrace();
-        Assertions.UNREACHABLE();
-      }
+      programCounter = getProgramCounter();
       CallSiteReference site = null;
       site = CallSiteReference.make(programCounter, m, instruction.getInvocationCode());
       callSites.add(site);
@@ -740,10 +731,6 @@
 
   /**
    * Clients should not modify the returned array. TODO: clone to avoid the problem?
-   * 
-   * @throws InvalidClassFileException
-   * 
-   * @see com.ibm.wala.classLoader.IMethod#getDeclaredExceptions()
    */
   @Override
   public TypeReference[] getDeclaredExceptions() throws InvalidClassFileException {
@@ -766,7 +753,7 @@
 
       TypeReference[] result = new TypeReference[strings.length];
       for (int i = 0; i < result.length; i++) {
-        result[i] = TypeReference.findOrCreate(loader, TypeName.findOrCreate(ImmutableByteArray.make("L" + strings[i])));
+        result[i] = TypeReference.findOrCreate(loader, TypeName.findOrCreate(ImmutableByteArray.make('L' + strings[i])));
       }
       return result;
     } catch (InvalidClassFileException e) {
@@ -779,6 +766,7 @@
   /*
    * @see com.ibm.wala.classLoader.IMethod#getSourcePosition(int)
    */
+  @Override
   public SourcePosition getSourcePosition(int bcIndex) throws InvalidClassFileException {
     return (getBCInfo().positionMap == null) ? null : getBCInfo().positionMap[bcIndex];
   }
@@ -786,6 +774,7 @@
   /*
    * @see com.ibm.wala.classLoader.IMethod#getParameterSourcePosition(int)
    */
+  @Override
   public SourcePosition getParameterSourcePosition(int paramNum) throws InvalidClassFileException {
     return (getBCInfo().paramPositionMap == null) ? null : getBCInfo().paramPositionMap[paramNum];
   }
@@ -804,8 +793,7 @@
   }
 
   /**
-   * @return Set <TypeReference>
-   * @throws InvalidClassFileException
+   * @return {@link Set}&lt;{@link TypeReference}&gt;
    */
   public Set<TypeReference> getCaughtExceptionTypes() throws InvalidClassFileException {
 
@@ -815,9 +803,9 @@
     }
     HashSet<TypeReference> result = HashSetFactory.make(10);
     ClassLoaderReference loader = getReference().getDeclaringClass().getClassLoader();
-    for (int i = 0; i < handlers.length; i++) {
-      for (int j = 0; j < handlers[i].length; j++) {
-        TypeReference t = ShrikeUtil.makeTypeReference(loader, handlers[i][j].getCatchClass());
+    for (ExceptionHandler[] handler : handlers) {
+      for (ExceptionHandler element : handler) {
+        TypeReference t = ShrikeUtil.makeTypeReference(loader, element.getCatchClass());
         if (t == null) {
           t = TypeReference.JavaLangThrowable;
         }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeClass.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeClass.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 
 import com.ibm.wala.ipa.cha.IClassHierarchy;
@@ -25,9 +24,13 @@
 import com.ibm.wala.shrikeCT.InnerClassesReader;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.shrikeCT.SignatureReader;
+import com.ibm.wala.shrikeCT.SourceFileReader;
+import com.ibm.wala.shrikeCT.TypeAnnotationsReader;
+import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.types.annotations.Annotation;
+import com.ibm.wala.types.annotations.TypeAnnotation;
 import com.ibm.wala.types.generics.ClassSignature;
 import com.ibm.wala.types.generics.TypeSignature;
 import com.ibm.wala.util.collections.HashSetFactory;
@@ -77,8 +80,8 @@
   private void computeFields() throws InvalidClassFileException {
     ClassReader cr = reader.get();
     int fieldCount = cr.getFieldCount();
-    List<FieldImpl> instanceList = new ArrayList<FieldImpl>(fieldCount);
-    List<FieldImpl> staticList = new ArrayList<FieldImpl>(fieldCount);
+    List<FieldImpl> instanceList = new ArrayList<>(fieldCount);
+    List<FieldImpl> staticList = new ArrayList<>(fieldCount);
     try {
       for (int i = 0; i < fieldCount; i++) {
         int accessFlags = cr.getFieldAccessFlags(i);
@@ -89,6 +92,11 @@
         annotations.addAll(getRuntimeVisibleAnnotations(i));
         annotations = annotations.isEmpty() ? null : annotations;
         
+        Collection<TypeAnnotation> typeAnnotations = HashSetFactory.make();
+        typeAnnotations.addAll(getRuntimeInvisibleTypeAnnotations(i));
+        typeAnnotations.addAll(getRuntimeVisibleTypeAnnotations(i));
+        typeAnnotations = typeAnnotations.isEmpty() ? null : typeAnnotations;
+        
         TypeSignature sig = null;
         SignatureReader signatureReader = getSignatureReader(i);
         if (signatureReader != null) {
@@ -99,9 +107,9 @@
         }
         
         if ((accessFlags & ClassConstants.ACC_STATIC) == 0) {
-          addFieldToList(instanceList, name, b, accessFlags, annotations, sig);
+          addFieldToList(instanceList, name, b, accessFlags, annotations, typeAnnotations, sig);
         } else {
-          addFieldToList(staticList, name, b, accessFlags, annotations, sig);
+          addFieldToList(staticList, name, b, accessFlags, annotations, typeAnnotations, sig);
         }
       }
       instanceFields = new IField[instanceList.size()];
@@ -115,9 +123,6 @@
     }
   }
 
-  /**
-   * @throws InvalidClassFileException
-   */
   private void computeModifiers() throws InvalidClassFileException {
     modifiers = reader.get().getAccessFlags();
   }
@@ -132,7 +137,7 @@
     try {
       String s = reader.get().getSuperName();
       if (s != null) {
-        superName = ImmutableByteArray.make("L" + s);
+        superName = ImmutableByteArray.make('L' + s);
       }
     } catch (InvalidClassFileException e) {
       Assertions.UNREACHABLE();
@@ -150,7 +155,7 @@
       String[] s = reader.get().getInterfaceNames();
       interfaceNames = new ImmutableByteArray[s.length];
       for (int i = 0; i < interfaceNames.length; i++) {
-        interfaceNames[i] = ImmutableByteArray.make("L" + s[i]);
+        interfaceNames[i] = ImmutableByteArray.make('L' + s[i]);
       }
     } catch (InvalidClassFileException e) {
       Assertions.UNREACHABLE();
@@ -159,8 +164,6 @@
 
   /**
    * initialize the declared methods array
-   * 
-   * @throws InvalidClassFileException
    */
   @Override
   protected ShrikeCTMethod[] computeDeclaredMethods() throws InvalidClassFileException {
@@ -183,7 +186,7 @@
    *           iff Shrike can't read this class
    */
   private void computeTypeReference() throws InvalidClassFileException {
-    String className = "L" + reader.get().getName();
+    String className = 'L' + reader.get().getName();
     ImmutableByteArray name = ImmutableByteArray.make(className);
 
     typeReference = TypeReference.findOrCreate(getClassLoader().getReference(), TypeName.findOrCreate(name));
@@ -219,8 +222,8 @@
   public void clearSoftCaches() {
     // toss optional information from each method.
     if (methodMap != null) {
-      for (Iterator it = getDeclaredMethods().iterator(); it.hasNext();) {
-        ShrikeCTMethod m = (ShrikeCTMethod) it.next();
+      for (IMethod iMethod : getDeclaredMethods()) {
+        ShrikeCTMethod m = (ShrikeCTMethod) iMethod;
         m.clearCaches();
       }
     }
@@ -268,6 +271,47 @@
     return AnnotationsReader.getReaderForAnnotation(runtimeInvisable ? AnnotationType.RuntimeInvisibleAnnotations
         : AnnotationType.RuntimeVisibleAnnotations, attrs);
   }
+  
+  public Collection<TypeAnnotation> getTypeAnnotations(boolean runtimeInvisible) throws InvalidClassFileException {
+    TypeAnnotationsReader r = getTypeAnnotationsReader(runtimeInvisible);
+    final ClassLoaderReference clRef = getClassLoader().getReference();
+    return TypeAnnotation.getTypeAnnotationsFromReader(
+        r,
+        TypeAnnotation.targetConverterAtClassFile(clRef),
+        clRef
+    );
+  }
+
+  private TypeAnnotationsReader getTypeAnnotationsReader(boolean runtimeInvisible) throws InvalidClassFileException {
+    ClassReader r = reader.get();
+    ClassReader.AttrIterator attrs = new ClassReader.AttrIterator();
+    r.initClassAttributeIterator(attrs);
+    
+    return TypeAnnotationsReader.getReaderForAnnotationAtClassfile(
+        runtimeInvisible ? TypeAnnotationsReader.AnnotationType.RuntimeInvisibleTypeAnnotations
+                         : TypeAnnotationsReader.AnnotationType.RuntimeVisibleTypeAnnotations,
+        attrs,
+        getSignatureReader(-1)
+    );
+  }
+
+  interface GetReader<T> {
+    T getReader(ClassReader.AttrIterator iter) throws InvalidClassFileException;
+  }
+  
+  static <T> T getReader(ClassReader.AttrIterator iter, String attrName, GetReader<T> reader) {
+    // search for the attribute
+    try {
+      for (; iter.isValid(); iter.advance()) {
+        if (iter.getName().equals(attrName)) {
+          return reader.getReader(iter);
+        }
+      }
+    } catch (InvalidClassFileException e) {
+      Assertions.UNREACHABLE();
+    }
+    return null;
+  }
 
   private InnerClassesReader getInnerClassesReader() throws InvalidClassFileException {
     ClassReader r = reader.get();
@@ -289,6 +333,13 @@
     return result;
   }
 
+  SourceFileReader getSourceFileReader() {
+    ClassReader.AttrIterator attrs = new ClassReader.AttrIterator();
+    getReader().initClassAttributeIterator(attrs);
+
+    return getReader(attrs, "SourceFile", SourceFileReader::new);
+  }
+
   private AnnotationsReader getFieldAnnotationsReader(boolean runtimeInvisible, int fieldIndex) throws InvalidClassFileException {
     ClassReader.AttrIterator iter = new AttrIterator();
     reader.get().initFieldAttributeIterator(fieldIndex, iter);
@@ -315,6 +366,43 @@
     AnnotationsReader r = getFieldAnnotationsReader(runtimeInvisible, fieldIndex);
     return Annotation.getAnnotationsFromReader(r, getClassLoader().getReference());
   }
+  
+  
+  
+  private TypeAnnotationsReader getFieldTypeAnnotationsReader(boolean runtimeInvisible, int fieldIndex) throws InvalidClassFileException {
+    ClassReader.AttrIterator iter = new AttrIterator();
+    reader.get().initFieldAttributeIterator(fieldIndex, iter);
+
+    return TypeAnnotationsReader.getReaderForAnnotationAtFieldInfo(
+        runtimeInvisible ? TypeAnnotationsReader.AnnotationType.RuntimeInvisibleTypeAnnotations
+                         : TypeAnnotationsReader.AnnotationType.RuntimeVisibleTypeAnnotations,
+        iter
+    );
+    
+  }
+  /**
+   * read the runtime-invisible type annotations from the class file
+   */
+  public Collection<TypeAnnotation> getRuntimeInvisibleTypeAnnotations(int fieldIndex) throws InvalidClassFileException {
+    return getFieldTypeAnnotations(fieldIndex, true);
+  }
+
+  /**
+   * read the runtime-visible type annotations from the class file
+   */
+  public Collection<TypeAnnotation> getRuntimeVisibleTypeAnnotations(int fieldIndex) throws InvalidClassFileException {
+    return getFieldTypeAnnotations(fieldIndex, false);
+  }
+  
+  protected Collection<TypeAnnotation> getFieldTypeAnnotations(int fieldIndex, boolean runtimeInvisible) throws InvalidClassFileException {
+    TypeAnnotationsReader r = getFieldTypeAnnotationsReader(runtimeInvisible, fieldIndex);
+    final ClassLoaderReference clRef = getClassLoader().getReference();
+    return TypeAnnotation.getTypeAnnotationsFromReader(
+        r,
+        TypeAnnotation.targetConverterAtFieldInfo(),
+        clRef
+    );
+  }
 
   private SignatureReader getSignatureReader(int index) throws InvalidClassFileException {
     ClassReader r = reader.get();
@@ -328,7 +416,7 @@
     SignatureReader result = null;
     try {
       for (; attrs.isValid(); attrs.advance()) {
-        if (attrs.getName().toString().equals("Signature")) {
+        if (attrs.getName().equals("Signature")) {
           result = new SignatureReader(attrs);
           break;
         }
@@ -356,8 +444,6 @@
   /**
    * Does the class file indicate that this class is a member of some other
    * class?
-   * 
-   * @throws InvalidClassFileException
    */
   public boolean isInnerClass() throws InvalidClassFileException {
     InnerClassesReader r = getInnerClassesReader();
@@ -374,8 +460,6 @@
 
   /**
    * Does the class file indicate that this class is a static inner class?
-   * 
-   * @throws InvalidClassFileException
    */
   public boolean isStaticInnerClass() throws InvalidClassFileException {
     InnerClassesReader r = getInnerClassesReader();
@@ -396,8 +480,6 @@
 
   /**
    * If this is an inner class, return the outer class. Else return null.
-   * 
-   * @throws InvalidClassFileException
    */
   public TypeReference getOuterClass() throws InvalidClassFileException {
     if (!isInnerClass()) {
@@ -408,7 +490,7 @@
       if (s.equals(getName().toString().substring(1))) {
         String outer = r.getOuterClass(s);
         if (outer != null) {
-          return TypeReference.findOrCreate(getClassLoader().getReference(), "L" + outer);
+          return TypeReference.findOrCreate(getClassLoader().getReference(), 'L' + outer);
         }
       }
     }
@@ -419,4 +501,4 @@
   public Module getContainer() {
     return reader.getModuleEntry().getContainer();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTMethod.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTMethod.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeCTMethod.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,6 +13,7 @@
 import java.io.IOException;
 import java.util.Collection;
 
+import com.ibm.wala.classLoader.ShrikeClass.GetReader;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeBT.Decoder;
 import com.ibm.wala.shrikeBT.IndirectionData;
@@ -27,11 +28,14 @@
 import com.ibm.wala.shrikeCT.LineNumberTableReader;
 import com.ibm.wala.shrikeCT.LocalVariableTableReader;
 import com.ibm.wala.shrikeCT.SignatureReader;
+import com.ibm.wala.shrikeCT.SourceFileReader;
 import com.ibm.wala.shrikeCT.SourcePositionTableReader;
 import com.ibm.wala.shrikeCT.SourcePositionTableReader.Position;
+import com.ibm.wala.shrikeCT.TypeAnnotationsReader;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.types.annotations.Annotation;
+import com.ibm.wala.types.annotations.TypeAnnotation;
 import com.ibm.wala.types.generics.MethodTypeSignature;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Assertions;
@@ -149,17 +153,18 @@
 /** BEGIN Custom change: precise positions */
   
   private static final class SPos implements SourcePosition {
-
+    String fileName;
     final int firstLine;
     final int lastLine;
     final int firstCol;
     final int lastCol;
     
-    private SPos(int firstLine, int lastLine, int firstCol, int lastCol) {
+    private SPos(String fileName, int firstLine, int lastLine, int firstCol, int lastCol) {
       this.firstLine = firstLine;
       this.lastLine = lastLine;
       this.firstCol = firstCol;
       this.lastCol = lastCol;
+      this.fileName = fileName;
     }
 
 
@@ -215,9 +220,8 @@
     
     @Override
     public String toString() {
-      return "(" + firstLine + "," + firstCol + "-" + lastLine + "," + lastCol + ")";
+      return fileName + '(' + firstLine + ',' + firstCol + '-' + lastLine + ',' + lastCol + ')';
     }
-    
   }
 /** END Custom change: precise positions */
   
@@ -237,7 +241,8 @@
     
     bcInfo.paramPositionMap = new SPos[getNumberOfParameters()];
     if (param != null) {
-      SPos paramPos = new SPos(param.firstLine, param.lastLine, param.firstCol, param.lastCol);
+      String fileName = ((ShrikeClass)getDeclaringClass()).getSourceFileReader().getSourceFile();
+      SPos paramPos = new SPos(fileName, param.firstLine, param.lastLine, param.firstCol, param.lastCol);
       for (int i = 0; i < getNumberOfParameters(); i++) {
         bcInfo.paramPositionMap[i] = paramPos;
       }
@@ -255,10 +260,15 @@
     }
     
     if (pos != null) {
+      String sourceFile = null;
+      SourceFileReader reader = ((ShrikeClass)getDeclaringClass()).getSourceFileReader();
+      if (reader != null) {
+        sourceFile = reader.getSourceFile();
+      }
       bcInfo.positionMap = new SPos[pos.length];
       for (int i = 0; i < pos.length; i++) {
         Position p = pos[i];
-        bcInfo.positionMap[i] = new SPos(p.firstLine, p.lastLine, p.firstCol, p.lastCol);
+        bcInfo.positionMap[i] = new SPos(sourceFile, p.firstLine, p.lastLine, p.firstCol, p.lastCol);
       }
     }
 /** END Custom change: : precise bytecode positions */
@@ -274,8 +284,8 @@
     }
 
     if (localNumber > getMaxLocals()) {
-      throw new IllegalArgumentException("illegal local number: " + localNumber + ", method " + getDeclaringClass().getName() + 
-              "." + getName() + " uses at most " + getMaxLocals());
+      throw new IllegalArgumentException("illegal local number: " + localNumber + ", method " + getDeclaringClass().getName() +
+              '.' + getName() + " uses at most " + getMaxLocals());
     }
 
     if (map == null) {
@@ -329,61 +339,23 @@
     return ((ShrikeClass) getDeclaringClass()).getReader();
   }
 
-  private CodeReader getCodeReader() {
+  private <T> T getReader(String attrName, GetReader<T> reader) {
     ClassReader.AttrIterator iter = new AttrIterator();
     getClassReader().initMethodAttributeIterator(shrikeMethodIndex, iter);
 
-    // search for the code attribute
-    CodeReader code = null;
-    try {
-      for (; iter.isValid(); iter.advance()) {
-        if (iter.getName().equals("Code")) {
-          code = new CodeReader(iter);
-          break;
-        }
-      }
-    } catch (InvalidClassFileException e) {
-      Assertions.UNREACHABLE();
-    }
-    return code;
+    return ShrikeClass.getReader(iter, attrName, reader);
   }
 
+  private CodeReader getCodeReader() {
+    return getReader("Code", CodeReader::new);
+  }
+ 
   private ExceptionsReader getExceptionReader() {
-    ClassReader.AttrIterator iter = new AttrIterator();
-    getClassReader().initMethodAttributeIterator(shrikeMethodIndex, iter);
-
-    // search for the desired attribute
-    ExceptionsReader result = null;
-    try {
-      for (; iter.isValid(); iter.advance()) {
-        if (iter.getName().equals("Exceptions")) {
-          result = new ExceptionsReader(iter);
-          break;
-        }
-      }
-    } catch (InvalidClassFileException e) {
-      Assertions.UNREACHABLE();
-    }
-    return result;
+    return getReader("Exceptions", ExceptionsReader::new);
   }
-
+ 
   private SignatureReader getSignatureReader() {
-    ClassReader.AttrIterator iter = new AttrIterator();
-    getClassReader().initMethodAttributeIterator(shrikeMethodIndex, iter);
-
-    // search for the desired attribute
-    SignatureReader result = null;
-    try {
-      for (; iter.isValid(); iter.advance()) {
-        if (iter.getName().equals("Signature")) {
-          result = new SignatureReader(iter);
-          break;
-        }
-      }
-    } catch (InvalidClassFileException e) {
-      Assertions.UNREACHABLE();
-    }
-    return result;
+    return getReader("Signature", SignatureReader::new);
   }
 
   private AnnotationsReader getAnnotationsReader(AnnotationType type) {
@@ -392,6 +364,22 @@
 
     return AnnotationsReader.getReaderForAnnotation(type, iter);
   }
+  
+  private TypeAnnotationsReader getTypeAnnotationsReaderAtMethodInfo(TypeAnnotationsReader.AnnotationType type) {
+    ClassReader.AttrIterator iter = new AttrIterator();
+    getClassReader().initMethodAttributeIterator(shrikeMethodIndex, iter);
+
+    return TypeAnnotationsReader.getReaderForAnnotationAtMethodInfo(type, iter, getExceptionReader(), getSignatureReader());
+  }
+  
+  private TypeAnnotationsReader getTypeAnnotationsReaderAtCode(TypeAnnotationsReader.AnnotationType type) {
+    final CodeReader codeReader = getCodeReader();
+    if (codeReader == null) return null;
+    
+    ClassReader.AttrIterator iter = new ClassReader.AttrIterator();
+    codeReader.initAttributeIterator(iter);
+    return TypeAnnotationsReader.getReaderForAnnotationAtCode(type, iter, getCodeReader());
+  }
 
   private String computeGenericsSignature() throws InvalidClassFileException {
     SignatureReader reader = getSignatureReader();
@@ -416,7 +404,6 @@
    * TODO: cache?
    * 
    * @return raw "Signature" attribute from the bytecode
-   * @throws InvalidClassFileException
    */
   private String getGenericsSignature() throws InvalidClassFileException {
     return computeGenericsSignature();
@@ -424,8 +411,6 @@
 
   /**
    * UNDER CONSTRUCTION
-   * 
-   * @throws InvalidClassFileException
    */
   public MethodTypeSignature getMethodTypeSignature() throws InvalidClassFileException {
     String sig = getGenericsSignature();
@@ -452,6 +437,32 @@
         : AnnotationType.RuntimeVisibleAnnotations);
     return Annotation.getAnnotationsFromReader(r, getDeclaringClass().getClassLoader().getReference());
   }
+  
+  public Collection<TypeAnnotation> getTypeAnnotationsAtMethodInfo(boolean runtimeInvisible) throws InvalidClassFileException {
+    TypeAnnotationsReader r = getTypeAnnotationsReaderAtMethodInfo(
+        runtimeInvisible ? TypeAnnotationsReader.AnnotationType.RuntimeInvisibleTypeAnnotations
+                         : TypeAnnotationsReader.AnnotationType.RuntimeVisibleTypeAnnotations
+    );
+    final ClassLoaderReference clRef = getDeclaringClass().getClassLoader().getReference();
+    return TypeAnnotation.getTypeAnnotationsFromReader(
+        r,
+        TypeAnnotation.targetConverterAtMethodInfo(clRef),
+        clRef
+    );
+  }
+  
+  public Collection<TypeAnnotation> getTypeAnnotationsAtCode(boolean runtimeInvisible) throws InvalidClassFileException {
+    TypeAnnotationsReader r = getTypeAnnotationsReaderAtCode(
+        runtimeInvisible ? TypeAnnotationsReader.AnnotationType.RuntimeInvisibleTypeAnnotations
+                         : TypeAnnotationsReader.AnnotationType.RuntimeVisibleTypeAnnotations
+    );
+    final ClassLoaderReference clRef = getDeclaringClass().getClassLoader().getReference();
+    return TypeAnnotation.getTypeAnnotationsFromReader(
+        r,
+        TypeAnnotation.targetConverterAtCode(clRef, this),
+        clRef
+    );
+  }
 
   @Override
   public Collection<Annotation> getAnnotations() {
@@ -470,6 +481,7 @@
    * element gives the annotations on the corresponding parameter. Note that the
    * 'this' parameter for an instance method cannot have annotations.
    */
+  @Override
   public Collection<Annotation>[] getParameterAnnotations() {
     int numAnnotatedParams = isStatic() ? getNumberOfParameters() : getNumberOfParameters() - 1;
     @SuppressWarnings("unchecked")
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeIRFactory.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeIRFactory.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeIRFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/ShrikeIRFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,34 +10,41 @@
  *******************************************************************************/
 package com.ibm.wala.classLoader;
 
+import java.util.Collection;
+
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.cfg.ShrikeCFG;
 import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.shrikeBT.IInstruction;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
+import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.IRFactory;
+import com.ibm.wala.ssa.SSAArrayLengthInstruction;
 import com.ibm.wala.ssa.SSABuilder;
 import com.ibm.wala.ssa.SSACFG;
 import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.SSANewInstruction;
 import com.ibm.wala.ssa.SSAOptions;
 import com.ibm.wala.ssa.ShrikeIndirectionData;
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.ssa.analysis.DeadAssignmentElimination;
+import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.WalaRuntimeException;
 
 /**
  * An {@link IRFactory} that for methods that originate from Shrike.
  */
-public class ShrikeIRFactory implements IRFactory<IBytecodeMethod> {
+public class ShrikeIRFactory implements IRFactory<IBytecodeMethod<IInstruction>> {
 
   public final static boolean buildLocalMap = true;
 
-  public ControlFlowGraph makeCFG(final IBytecodeMethod method, Context C) {
+  public ControlFlowGraph makeCFG(final IBytecodeMethod<IInstruction> method) {
     return ShrikeCFG.make(method);
   }
 
   @Override
-  public IR makeIR(final IBytecodeMethod method, Context C, final SSAOptions options) throws IllegalArgumentException {
+  public IR makeIR(final IBytecodeMethod<IInstruction> method, Context C, final SSAOptions options) throws IllegalArgumentException {
 
     if (method == null) {
       throw new IllegalArgumentException("null method");
@@ -48,7 +55,7 @@
     } catch (InvalidClassFileException e) {
       throw new WalaRuntimeException("bad method bytecodes", e);
     }
-    final ShrikeCFG shrikeCFG = (ShrikeCFG) makeCFG(method, C);
+    final ShrikeCFG shrikeCFG = (ShrikeCFG) makeCFG(method);
 
     final SymbolTable symbolTable = new SymbolTable(method.getNumberOfParameters());
     final SSAInstruction[] newInstrs = new SSAInstruction[shrikeInstructions.length];
@@ -68,7 +75,45 @@
       private void eliminateDeadPhis() {
         DeadAssignmentElimination.perform(this);
       }
-
+      private void pruneExceptionsForSafeArrayCreations() {
+        DefUse du = new DefUse(this);
+        for (int i = 0; i < newInstrs.length; i++) {
+          SSAInstruction instr = newInstrs[i];
+          if (instr instanceof SSANewInstruction) {
+            SSANewInstruction newInstr = (SSANewInstruction) instr;
+            if (newInstr.getConcreteType().isArrayType()) {
+              boolean isSafe = true;
+              final int[] params = new int[newInstr.getNumberOfUses()];
+              for (int u = 0; u < newInstr.getNumberOfUses(); u++) {
+                int vLength = newInstr.getUse(u);
+                params[u] = vLength;
+                isSafe &= (isNonNegativeConstant(vLength) || isDefdByArrayLength(vLength, du));
+              }
+              if (isSafe) {
+                // newInstr is either obtained from
+                //   JavaLanguage.JavaInstructionFactory#NewInstruction(int iindex, int result, NewSiteReference site, int[] params)
+                // or
+                //   JavaLanguage.JavaInstructionFactory#NewInstruction(int iindex, int result, NewSiteReference site)
+                // , both provide anonymous subclasses of SSANewInstruction which differ
+                // from SSANewInstruction only in the implementation of getExceptionTypes().
+                // Hence, it is OK to just defining a new anonymous subclasses of SSANewInstruction, overriding getExceptionTypes().
+                newInstrs[i] = new SSANewInstruction(newInstr.iindex, newInstr.getDef(), newInstr.getNewSite(), params) {
+                  @Override
+                  public Collection<TypeReference> getExceptionTypes() {
+                    return JavaLanguage.getNewSafeArrayExceptions();
+                  }
+                };
+              }
+            }
+          }
+        }
+      }
+      private boolean isNonNegativeConstant(int vLength) {
+        return symbolTable.isIntegerConstant(vLength) && symbolTable.getIntValue(vLength) >= 0;
+      }
+      private boolean isDefdByArrayLength(int vLength, DefUse du) {
+        return du.getDef(vLength) instanceof SSAArrayLengthInstruction;
+      }
       @Override
       protected String instructionPosition(int instructionIndex) {
         try {
@@ -78,7 +123,7 @@
           if (lineNumber == -1) {
             return "";
           } else {
-            return "(line " + lineNumber + ")";
+            return "(line " + lineNumber + ')';
           }
         } catch (InvalidClassFileException e) {
           return "";
@@ -102,6 +147,7 @@
         indirectionData = builder.getIndirectionData();
         
         eliminateDeadPhis();
+        pruneExceptionsForSafeArrayCreations();
 
         setupLocationMap();
       }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/SourceFileModule.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/SourceFileModule.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/SourceFileModule.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/SourceFileModule.java	2019-01-29 17:08:39.000000000 +0000
@@ -73,7 +73,7 @@
     try {
       return getFile().toURI().toURL();
     } catch (MalformedURLException e) {
-      throw new Error("error making URL for " + getFile());
+      throw new Error("error making URL for " + getFile(), e);
     }
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/SyntheticClass.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/SyntheticClass.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/SyntheticClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/SyntheticClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,7 +16,6 @@
 import java.util.Collections;
 
 import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.types.annotations.Annotation;
@@ -73,11 +72,10 @@
   /**
    * By default, a synthetic class is "loaded" by the primordial loader.
    * Subclasses may override as necessary.
-   * @see com.ibm.wala.classLoader.IClass#getClassLoader()
    */
   @Override
   public IClassLoader getClassLoader() {
-    return cha.getLoader(ClassLoaderReference.Primordial);
+    return cha.getLoader(T.getClassLoader());
   }
 
   /* 
@@ -96,6 +94,16 @@
     return false;
   }
 
+  /*
+   * These classes are generated by WALA, not by any
+   * compiler, therefore it always returns false
+   * @see com.ibm.wala.classLoader.IClass#isSynthetic()
+   */
+  @Override
+  public boolean isSynthetic() {
+    return false;
+  }
+
   /* 
    * @see com.ibm.wala.classLoader.IClass#getReference()
    */
@@ -124,7 +132,7 @@
   public boolean isArrayClass() {
     return false;
   }
-  
+
   @Override
   public IClassHierarchy getClassHierarchy() {
     return cha;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/SyntheticMethod.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/SyntheticMethod.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/classLoader/SyntheticMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/classLoader/SyntheticMethod.java	2019-01-29 17:08:39.000000000 +0000
@@ -41,7 +41,7 @@
 
   protected final IMethod resolvedMethod;
 
-  protected final IClass declaringClass;
+  public final IClass declaringClass;
 
   private final boolean isStatic;
 
@@ -71,17 +71,11 @@
     this.isFactory = isFactory;
   }
 
-  /**
-   * @see com.ibm.wala.classLoader.IMethod#isClinit()
-   */
   @Override
   public boolean isClinit() {
     return method.getSelector().equals(MethodReference.clinitSelector);
   }
 
-  /**
-   * @see com.ibm.wala.classLoader.IMethod#isInit()
-   */
   @Override
   public boolean isInit() {
     return method.getSelector().equals(MethodReference.initSelector);
@@ -95,25 +89,16 @@
     return isStatic;
   }
 
-  /**
-   * @see com.ibm.wala.classLoader.IMethod#isNative()
-   */
   @Override
   public boolean isNative() {
     return false;
   }
 
-  /**
-   * @see com.ibm.wala.classLoader.IMethod#isAbstract()
-   */
   @Override
   public boolean isAbstract() {
     return false;
   }
 
-  /**
-   * @see com.ibm.wala.classLoader.IMethod#isPrivate()
-   */
   @Override
   public boolean isPrivate() {
     return false;
@@ -129,17 +114,11 @@
     return false;
   }
 
-  /**
-   * @see com.ibm.wala.classLoader.IMethod#isFinal()
-   */
   @Override
   public boolean isFinal() {
     return false;
   }
 
-  /**
-   * @see com.ibm.wala.classLoader.IMethod#isBridge()
-   */
   @Override
   public boolean isBridge() {
     return false;
@@ -153,17 +132,16 @@
     return false;
   }
 
-  /**
-   * @see com.ibm.wala.classLoader.IMethod#isSynthetic()
-   */
   @Override
-  public boolean isSynthetic() {
+  public boolean isWalaSynthetic() {
     return true;
   }
 
-  /**
-   * @see com.ibm.wala.classLoader.IMethod#getReference()
-   */
+  @Override
+  public boolean isSynthetic() {
+    return false;
+  }
+
   @Override
   public MethodReference getReference() {
     return method;
@@ -175,7 +153,7 @@
    * NOTE: SIDE EFFECT!!! ... nulls out phi instructions in the instruction array!
    */
   public InducedCFG makeControlFlowGraph(SSAInstruction[] instructions) {
-    return new InducedCFG(instructions, this, Everywhere.EVERYWHERE);
+    return this.getDeclaringClass().getClassLoader().getLanguage().makeInducedCFG(instructions, this, Everywhere.EVERYWHERE);
   }
 
   public BytecodeStream getBytecodeStream() throws UnsupportedOperationException {
@@ -209,7 +187,7 @@
 
   @Override
   public String toString() {
-    StringBuffer s = new StringBuffer("synthetic ");
+    StringBuilder s = new StringBuilder("synthetic ");
     if (isFactoryMethod()) {
       s.append(" factory ");
     }
@@ -271,7 +249,7 @@
    * @param options options governing SSA construction
    */
   @Deprecated
-  public SSAInstruction[] getStatements(SSAOptions options) {
+  public SSAInstruction[] getStatements(@SuppressWarnings("unused") SSAOptions options) {
     return NO_STATEMENTS;
   }
 
@@ -301,10 +279,6 @@
     }
   }
 
-  /**
-   * 
-   * @see com.ibm.wala.classLoader.IMethod#getNumberOfParameters()
-   */
   @Override
   public int getNumberOfParameters() {
     int n = method.getNumberOfParameters();
@@ -337,6 +311,7 @@
   /*
    * @see com.ibm.wala.classLoader.IMethod#getSourcePosition(int)
    */
+  @Override
   public SourcePosition getSourcePosition(int bcIndex) throws InvalidClassFileException {
     return null;
   }
@@ -344,6 +319,7 @@
   /*
    * @see com.ibm.wala.classLoader.IMethod#getParameterSourcePosition(int)
    */
+  @Override
   public SourcePosition getParameterSourcePosition(int paramNum) throws InvalidClassFileException {
     return null;
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/client/AbstractAnalysisEngine.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/client/AbstractAnalysisEngine.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/client/AbstractAnalysisEngine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/client/AbstractAnalysisEngine.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,6 @@
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.jar.JarFile;
 
 import com.ibm.wala.analysis.pointers.BasicHeapGraph;
@@ -21,18 +20,23 @@
 import com.ibm.wala.classLoader.ClassLoaderFactoryImpl;
 import com.ibm.wala.classLoader.JarFileModule;
 import com.ibm.wala.classLoader.Module;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Util;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.ipa.slicer.SDG;
+import com.ibm.wala.ipa.slicer.Slicer.ControlDependenceOptions;
+import com.ibm.wala.ipa.slicer.Slicer.DataDependenceOptions;
 import com.ibm.wala.ssa.DefaultIRFactory;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.util.CancelException;
@@ -48,7 +52,7 @@
  * Some clients choose to build on this, but many don't. I usually don't in new code; I usually don't find the re-use enabled by
  * this class compelling. I would probably nuke this except for some legacy code that uses it.
  */
-public abstract class AbstractAnalysisEngine implements AnalysisEngine {
+public abstract class AbstractAnalysisEngine<I extends InstanceKey, X extends CallGraphBuilder<I>, Y> implements AnalysisEngine {
 
   public interface EntrypointBuilder {
     Iterable<Entrypoint> createEntrypoints(AnalysisScope scope, IClassHierarchy cha);
@@ -74,7 +78,7 @@
   /**
    * The modules to analyze
    */
-  protected Collection<Module> moduleFiles;
+  protected Collection<? extends Module> moduleFiles;
 
   /**
    * A representation of the analysis scope
@@ -89,7 +93,7 @@
   /**
    * A cache of IRs and stuff
    */
-  private AnalysisCache cache = makeDefaultCache();
+  private IAnalysisCacheView cache = makeDefaultCache();
 
   /**
    * The standard J2SE libraries to analyze
@@ -114,25 +118,20 @@
   /**
    * Results of pointer analysis
    */
-  protected PointerAnalysis<InstanceKey> pointerAnalysis;
+  protected PointerAnalysis<? super I> pointerAnalysis;
 
   /**
    * Graph view of flow of pointers between heap abstractions
    */
   private HeapGraph heapGraph;
 
-  private EntrypointBuilder entrypointBuilder = new EntrypointBuilder() {
-    @Override
-    public Iterable<Entrypoint> createEntrypoints(AnalysisScope scope, IClassHierarchy cha) {
-      return makeDefaultEntrypoints(scope, cha);
-    }
-  };
+  private EntrypointBuilder entrypointBuilder = this::makeDefaultEntrypoints;
 
-  protected abstract CallGraphBuilder getCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache);
+  protected abstract CallGraphBuilder<? super I> getCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache2);
 
-  protected CallGraphBuilder buildCallGraph(IClassHierarchy cha, AnalysisOptions options, boolean savePointerAnalysis,
+  protected CallGraphBuilder<? super I> buildCallGraph(IClassHierarchy cha, AnalysisOptions options, boolean savePointerAnalysis,
       IProgressMonitor monitor) throws IllegalArgumentException, CancelException {
-    CallGraphBuilder builder = getCallGraphBuilder(cha, options, cache);
+    CallGraphBuilder<? super I> builder = getCallGraphBuilder(cha, options, cache);
 
     cg = builder.makeCallGraph(options, monitor);
 
@@ -144,14 +143,12 @@
   }
 
   @Override
-  public void setModuleFiles(Collection moduleFiles) {
+  public void setModuleFiles(Collection<? extends Module> moduleFiles) {
     this.moduleFiles = moduleFiles;
   }
 
   /**
    * Set up the AnalysisScope object
-   * 
-   * @throws IOException
    */
   public void buildAnalysisScope() throws IOException {
     if (j2seLibs == null) {
@@ -162,8 +159,8 @@
         .getClassLoader());
 
     // add standard libraries
-    for (int i = 0; i < j2seLibs.length; i++) {
-      scope.addToScope(scope.getPrimordialLoader(), j2seLibs[i]);
+    for (Module j2seLib : j2seLibs) {
+      scope.addToScope(scope.getPrimordialLoader(), j2seLib);
     }
 
     // add user stuff
@@ -178,7 +175,7 @@
     IClassHierarchy cha = null;
     ClassLoaderFactory factory = makeClassLoaderFactory(getScope().getExclusions());
     try {
-      cha = ClassHierarchy.make(getScope(), factory);
+      cha = ClassHierarchyFactory.make(getScope(), factory);
     } catch (ClassHierarchyException e) {
       System.err.println("Class Hierarchy construction failed");
       System.err.println(e.toString());
@@ -195,8 +192,8 @@
     return cha;
   }
 
-  protected void setClassHierarchy(IClassHierarchy cha) {
-    this.cha = cha;
+  protected IClassHierarchy setClassHierarchy(IClassHierarchy cha) {
+    return this.cha = cha;
   }
 
   /**
@@ -211,8 +208,7 @@
    */
   protected void addApplicationModulesToScope() {
     ClassLoaderReference app = scope.getApplicationLoader();
-    for (Iterator it = moduleFiles.iterator(); it.hasNext();) {
-      Object o = it.next();
+    for (Object o : moduleFiles) {
       if (!(o instanceof Module)) {
         Assertions.UNREACHABLE("Unexpected type: " + o.getClass());
       }
@@ -237,10 +233,7 @@
     if (libs == null) {
       throw new IllegalArgumentException("libs is null");
     }
-    this.j2seLibs = new Module[libs.length];
-    for (int i = 0; i < libs.length; i++) {
-      j2seLibs[i] = libs[i];
-    }
+    this.j2seLibs = libs.clone();
   }
 
   @Override
@@ -256,17 +249,21 @@
     return scope;
   }
 
-  public PointerAnalysis<InstanceKey> getPointerAnalysis() {
+  public PointerAnalysis<? super I> getPointerAnalysis() {
     return pointerAnalysis;
   }
 
   public HeapGraph getHeapGraph() {
     if (heapGraph == null) {
-      heapGraph = new BasicHeapGraph(getPointerAnalysis(), cg);
+      heapGraph = new BasicHeapGraph<>(getPointerAnalysis(), cg);
     }
     return heapGraph;
   }
 
+  public SDG<? super I> getSDG(DataDependenceOptions data, ControlDependenceOptions ctrl) {
+    return new SDG<>(getCallGraph(), getPointerAnalysis(), data, ctrl);
+  }
+  
   public String getExclusionsFile() {
     return exclusionsFile;
   }
@@ -280,8 +277,8 @@
     return new AnalysisOptions(getScope(), entrypoints);
   }
 
-  public AnalysisCache makeDefaultCache() {
-    return new AnalysisCache(new DefaultIRFactory());
+  public IAnalysisCacheView makeDefaultCache() {
+    return new AnalysisCacheImpl(new DefaultIRFactory());
   }
 
   protected Iterable<Entrypoint> makeDefaultEntrypoints(AnalysisScope scope, IClassHierarchy cha) {
@@ -294,12 +291,8 @@
 
   /**
    * Builds the call graph for the analysis scope in effect, using all of the given entry points.
-   * 
-   * @throws CancelException
-   * @throws IllegalArgumentException
-   * @throws IOException
    */
-  public CallGraphBuilder defaultCallGraphBuilder() throws IllegalArgumentException, CancelException, IOException {
+  public CallGraphBuilder<? super I> defaultCallGraphBuilder() throws IllegalArgumentException, CancelException, IOException {
     buildAnalysisScope();
     IClassHierarchy cha = buildClassHierarchy();
     setClassHierarchy(cha);
@@ -313,7 +306,7 @@
     return defaultCallGraphBuilder().makeCallGraph(options, null);
   }
 
-  public AnalysisCache getCache() {
+  public IAnalysisCacheView getCache() {
     return cache;
   }
 
@@ -321,4 +314,9 @@
     return options;
   }
 
+  @SuppressWarnings("unused")
+  public Y performAnalysis(PropagationCallGraphBuilder builder) throws CancelException {
+    return null;
+    
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/client/AbstractEngineStopwatch.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/client/AbstractEngineStopwatch.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/client/AbstractEngineStopwatch.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/client/AbstractEngineStopwatch.java	2019-01-29 17:08:39.000000000 +0000
@@ -38,13 +38,13 @@
 
   @Override
   public final String report() {
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     long total = 0;
     for (int i = 0; i < getNumberOfCategories(); i++) {
       total += stopwatch[i].getElapsedMillis();
-      result.append(getCategoryNames()[i] + ": " + stopwatch[i].getElapsedMillis() + "\n");
+      result.append(getCategoryNames()[i]).append(": ").append(stopwatch[i].getElapsedMillis()).append('\n');
     }
-    result.append("Total       : " + total + "\n");
+    result.append("Total       : ").append(total).append('\n');
     return result.toString();
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/client/AnalysisEngine.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/client/AnalysisEngine.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/client/AnalysisEngine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/client/AnalysisEngine.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,7 +26,7 @@
    * 
    * @param moduleFiles A non-null Collection of module files: (EARFile, WARFile, ApplicationClientFile, EJBJarFile).
    */
-  void setModuleFiles(Collection moduleFiles);
+  void setModuleFiles(Collection<? extends Module> moduleFiles);
 
   /**
    * Specify the jar files that represent the standard J2SE libraries
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/BackwardsSupergraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/BackwardsSupergraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/BackwardsSupergraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/BackwardsSupergraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,8 +11,8 @@
 package com.ibm.wala.dataflow.IFDS;
 
 import java.util.Iterator;
+import java.util.function.Predicate;
 
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.Iterator2Collection;
 import com.ibm.wala.util.debug.Assertions;
@@ -52,13 +52,12 @@
   }
 
   public static <T, P> BackwardsSupergraph<T, P> make(ISupergraph<T, P> forwardGraph) {
-    return new BackwardsSupergraph<T, P>(forwardGraph);
+    return new BackwardsSupergraph<>(forwardGraph);
   }
 
   /**
    * TODO: for now, this is not inverted.
-   * 
-   * @see com.ibm.wala.dataflow.IFDS.ISupergraph#getProcedureGraph()
+   *
    */
   @Override
   public Graph<? extends P> getProcedureGraph() {
@@ -76,30 +75,29 @@
   /**
    * a filter that accepts only exit nodes from the original graph.
    */
-  private class ExitFilter extends Predicate {
+  private class ExitFilter implements Predicate<T> {
     /*
      * @see com.ibm.wala.util.Filter#accepts(java.lang.Object)
      */
     @Override
-    @SuppressWarnings("unchecked")
-    public boolean test(Object o) {
-      return delegate.isExit((T) o);
+    public boolean test(T o) {
+      return delegate.isExit(o);
     }
   }
 
   /**
    * get the "called" (sic) nodes for a return site; i.e., the exit nodes that flow directly to this return site.
-   * 
-   * @see com.ibm.wala.dataflow.IFDS.ISupergraph#getCalledNodes(java.lang.Object)
+   *
    */
+  @SuppressWarnings("unused")
   @Override
   public Iterator<T> getCalledNodes(T ret) {
     if (DEBUG_LEVEL > 1) {
       System.err.println(getClass() + " getCalledNodes " + ret);
       System.err.println("called nodes: "
-          + Iterator2Collection.toSet(new FilterIterator<Object>(getSuccNodes(ret), exitFilter)));
+          + Iterator2Collection.toSet(new FilterIterator<>(getSuccNodes(ret), exitFilter)));
     }
-    return new FilterIterator<T>(getSuccNodes(ret), exitFilter);
+    return new FilterIterator<>(getSuccNodes(ret), exitFilter);
   }
 
   /**
@@ -109,20 +107,11 @@
    */
   @Override
   public Iterator<T> getNormalSuccessors(final T ret) {
-    Iterator<? extends Object> allPreds = delegate.getPredNodes(ret);
-    Predicate sameProc = new Predicate<T>() {
-      @Override public boolean test(T o) {
-        // throw out the exit node, which can be a predecessor due to tail recursion.
-        return getProcOf(ret).equals(getProcOf(o)) && !delegate.isExit(o);
-      }
-    };
-    Iterator<Object> sameProcPreds = new FilterIterator<Object>(allPreds, sameProc);
-    Predicate notCall = new Predicate<T>() {
-      @Override public boolean test(T o) {
-        return !delegate.isCall(o);
-      }
-    };
-    return new FilterIterator<T>(sameProcPreds, notCall);
+    Iterator<T> allPreds = delegate.getPredNodes(ret);
+    Predicate<T> sameProc = o -> getProcOf(ret).equals(getProcOf(o)) && !delegate.isExit(o);
+    Iterator<T> sameProcPreds = new FilterIterator<>(allPreds, sameProc);
+    Predicate<T> notCall = o -> !delegate.isCall(o);
+    return new FilterIterator<>(sameProcPreds, notCall);
   }
 
   /*
@@ -386,4 +375,4 @@
     Assertions.UNREACHABLE();
     return null;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/BoundedPartiallyBalancedSolver.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/BoundedPartiallyBalancedSolver.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/BoundedPartiallyBalancedSolver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/BoundedPartiallyBalancedSolver.java	2019-01-29 17:08:39.000000000 +0000
@@ -28,7 +28,7 @@
   
   public static <T, P, F> BoundedPartiallyBalancedSolver<T, P, F> createdBoundedPartiallyBalancedSolver(PartiallyBalancedTabulationProblem<T, P, F> p, int bound,
       IProgressMonitor monitor) {
-    return new BoundedPartiallyBalancedSolver<T, P, F>(p, bound, monitor);
+    return new BoundedPartiallyBalancedSolver<>(p, bound, monitor);
   }
 
   private final int bound;
@@ -47,7 +47,7 @@
       return super.propagate(s_p, i, n, j);
     } else {
       if (VERBOSE) {
-        System.err.println("Suppressing propagation; reached bound " + s_p + " " + i + " " + n + " " + j);
+        System.err.println("Suppressing propagation; reached bound " + s_p + ' ' + i + ' ' + n + ' ' + j);
       }
       return false;
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/BoundedTabulationSolver.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/BoundedTabulationSolver.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/BoundedTabulationSolver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/BoundedTabulationSolver.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,7 +26,7 @@
 
   public static <T, P, F> BoundedTabulationSolver<T, P, F> createBoundedTabulationSolver(TabulationProblem<T, P, F> p, int bound,
       IProgressMonitor monitor) {
-    return new BoundedTabulationSolver<T, P, F>(p, bound, monitor);
+    return new BoundedTabulationSolver<>(p, bound, monitor);
   }
 
   private final int bound;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/CallFlowEdges.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/CallFlowEdges.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/CallFlowEdges.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/CallFlowEdges.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,37 +25,38 @@
 public class CallFlowEdges {
 
   /**
-   * A map from integer -> (IBinaryNonNegativeIntRelation)
+   * A map from integer -&gt; (IBinaryNonNegativeIntRelation)
    * 
-   * For a fact d2, edges[d2] gives a relation R=(c,d1) s.t. (<c, d1> -> <s_p,d2>) was recorded as a call flow edge.
+   * For a fact d2, edges[d2] gives a relation R=(c,d1) s.t. (&lt;c, d1&gt; -&gt; &lt;s_p,d2&gt;) was recorded as a call flow edge.
    * 
-   * Note that we handle paths of the form <c, d1> -> <s_p,d1> specially, below.
+   * Note that we handle paths of the form &lt;c, d1&gt; -&gt; &lt;s_p,d1&gt; specially, below.
    * 
    * TODO: more representation optimization. A special representation for triples? sparse representations for CFG? exploit shorts
    * for ints?
    */
-  private final SparseVector<IBinaryNaturalRelation> edges = new SparseVector<IBinaryNaturalRelation>(1, 1.1f);
+  private final SparseVector<IBinaryNaturalRelation> edges = new SparseVector<>(1, 1.1f);
 
   /**
-   * a map from integer d1 -> int set.
+   * a map from integer d1 -&gt; int set.
    * 
-   * for fact d1, identityPaths[d1] gives the set of block numbers C s.t. for c \in C, <c, d1> -> <s_p, d1> is an edge.
+   * for fact d1, identityPaths[d1] gives the set of block numbers C s.t. for c \in C, &lt;c, d1&gt; -&gt; &lt;s_p, d1&gt; is an edge.
    */
-  private final SparseVector<IntSet> identityEdges = new SparseVector<IntSet>(1, 1.1f);
+  private final SparseVector<IntSet> identityEdges = new SparseVector<>(1, 1.1f);
 
   public CallFlowEdges() {
   }
 
   /**
-   * Record that we've discovered a call edge <c,d1> -> <s_p, d2>
+   * Record that we've discovered a call edge &lt;c,d1&gt; -&gt; &lt;s_p, d2&gt;
    * 
    * @param c global number identifying the call site node
    * @param d1 source fact at the call edge
    * @param d2 result fact (result of the call flow function)
    */
+  @SuppressWarnings("unused")
   public void addCallEdge(int c, int d1, int d2) {
     if (TabulationSolver.DEBUG_LEVEL > 0) {
-      System.err.println("addCallEdge " + c + " " + d1 + " " + d2);
+      System.err.println("addCallEdge " + c + ' ' + d1 + ' ' + d2);
     }
     if (d1 == d2) {
       BimodalMutableIntSet s = (BimodalMutableIntSet) identityEdges.get(d1);
@@ -76,10 +77,9 @@
   }
 
   /**
-   * @param c
-   * @param d2
-   * @return set of d1 s.t. <c, d1> -> <s_p, d2> was recorded as call flow, or null if none found.
+   * @return set of d1 s.t. {@literal <c, d1> -> <s_p, d2>} was recorded as call flow, or null if none found.
    */
+  @SuppressWarnings("unused")
   public IntSet getCallFlowSources(int c, int d2) {
     if (c < 0) {
       throw new IllegalArgumentException("invalid c : " + c);
@@ -111,16 +111,15 @@
       }
     }
     if (TabulationSolver.DEBUG_LEVEL > 0) {
-      System.err.println("getCallFlowSources " + c + " " + d2 + " " + result);
+      System.err.println("getCallFlowSources " + c + ' ' + d2 + ' ' + result);
     }
     return result;
   }
 
   /**
-   * 
-   * @param d2
-   * @return set of c s.t. <c, d1> -> <s_p, d2> was recorded as call flow (for some d1), or null if none found.
+   * @return set of c s.t. {@literal <c, d1> -> <s_p, d2>} was recorded as call flow (for some d1), or null if none found.
    */
+  @SuppressWarnings("unused")
   public IntSet getCallFlowSourceNodes(int d2) {
     IntSet s = identityEdges.get(d2);
     IBinaryNaturalRelation R = edges.get(d2);
@@ -138,14 +137,14 @@
       }
     }
     if (TabulationSolver.DEBUG_LEVEL > 0) {
-      System.err.println("getCallFlowSources " + d2 + " " + result);
+      System.err.println("getCallFlowSources " + d2 + ' ' + result);
     }
     return result;
 
   }
 
   // TODO optimize
-  private IntSet getDomain(IBinaryNaturalRelation r) {
+  private static IntSet getDomain(IBinaryNaturalRelation r) {
     MutableIntSet result = MutableSparseIntSet.makeEmpty();
     int maxKeyValue = r.maxKeyValue();
     for (int i = 0; i <= maxKeyValue; i++) {
@@ -156,4 +155,4 @@
     return result;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IBinaryReturnFlowFunction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IBinaryReturnFlowFunction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IBinaryReturnFlowFunction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IBinaryReturnFlowFunction.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,7 +25,7 @@
   /**
    * @param call_d factoid of the caller at the call site
    * @param exit_d factoid of the callee at the exit site
-   * @return set of ret_d such that (<call_d, exit_d>, ret_d) is an edge in this distributive function's graph representation, or
+   * @return set of ret_d such that ({@literal <call_d, exit_d>}, ret_d) is an edge in this distributive function's graph representation, or
    *         null if there are none
    */
   public SparseIntSet getTargets(int call_d, int exit_d);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/ICFGSupergraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/ICFGSupergraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/ICFGSupergraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/ICFGSupergraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,23 +22,18 @@
 package com.ibm.wala.dataflow.IFDS;
 
 import java.util.Iterator;
+import java.util.function.Predicate;
 
 import com.ibm.wala.cfg.ControlFlowGraph;
-import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
-import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
-import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ipa.cfg.BasicBlockInContext;
 import com.ibm.wala.ipa.cfg.ExplodedInterproceduralCFG;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.analysis.IExplodedBasicBlock;
 import com.ibm.wala.util.collections.EmptyIterator;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.Graph;
@@ -54,19 +49,14 @@
  */
 public class ICFGSupergraph implements ISupergraph<BasicBlockInContext<IExplodedBasicBlock>, CGNode> {
 
-  private final AnalysisCache analysisCache;
-  
-  private final AnalysisOptions options = new AnalysisOptions();
-
   private final ExplodedInterproceduralCFG icfg;
 
-  protected ICFGSupergraph(ExplodedInterproceduralCFG icfg, AnalysisCache cache) {
+  protected ICFGSupergraph(ExplodedInterproceduralCFG icfg) {
     this.icfg = icfg;
-    this.analysisCache = cache;
   }
 
-  public static ICFGSupergraph make(CallGraph cg, AnalysisCache cache) {
-    ICFGSupergraph w = new ICFGSupergraph(ExplodedInterproceduralCFG.make(cg), cache);
+  public static ICFGSupergraph make(CallGraph cg) {
+    ICFGSupergraph w = new ICFGSupergraph(ExplodedInterproceduralCFG.make(cg));
     return w;
   }
 
@@ -79,18 +69,6 @@
     return icfg.getCallGraph().getClassHierarchy();
   }
 
-  public IR getIR(IMethod m, Context c) {
-    //AnalysisOptions options = new AnalysisOptions();
-    IR ir = analysisCache.getSSACache().findOrCreateIR(m, c, options.getSSAOptions());
-    return ir;
-  }
-
-  public IR getIR(CGNode n) {
-    //AnalysisOptions options = new AnalysisOptions();
-    IR ir = analysisCache.getSSACache().findOrCreateIR(n.getMethod(), n.getContext(), options.getSSAOptions());
-    return ir;
-  }
-
   @Override
   public byte classifyEdge(BasicBlockInContext<IExplodedBasicBlock> src, BasicBlockInContext<IExplodedBasicBlock> dest) {
     if (isCall(src)) {
@@ -117,12 +95,8 @@
 
   @Override
   public Iterator<? extends BasicBlockInContext<IExplodedBasicBlock>> getCalledNodes(BasicBlockInContext<IExplodedBasicBlock> call) {
-    final Predicate<BasicBlockInContext<IExplodedBasicBlock>> isEntryFilter = new Predicate<BasicBlockInContext<IExplodedBasicBlock>>() {
-      @Override public boolean test(BasicBlockInContext<IExplodedBasicBlock> o) {
-        return o.isEntryBlock();
-      }
-    };
-    return new FilterIterator<BasicBlockInContext<IExplodedBasicBlock>>(getSuccNodes(call), isEntryFilter);
+    final Predicate<BasicBlockInContext<IExplodedBasicBlock>> isEntryFilter = BasicBlockInContext::isEntryBlock;
+    return new FilterIterator<>(getSuccNodes(call), isEntryFilter);
   }
 
   @Override
@@ -140,7 +114,7 @@
   @Override
   public BasicBlockInContext<IExplodedBasicBlock> getLocalBlock(CGNode procedure, int i) {
     IExplodedBasicBlock b = icfg.getCFG(procedure).getNode(i);
-    return new BasicBlockInContext<IExplodedBasicBlock>(procedure, b);
+    return new BasicBlockInContext<>(procedure, b);
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IdentityFlowFunction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IdentityFlowFunction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IdentityFlowFunction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IdentityFlowFunction.java	2019-01-29 17:08:39.000000000 +0000
@@ -38,4 +38,4 @@
     return "Identity Flow";
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IdentityFlowFunctions.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IdentityFlowFunctions.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IdentityFlowFunctions.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IdentityFlowFunctions.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,13 +42,6 @@
   }
   
   /* 
-   * @see com.ibm.wala.dataflow.IFDS.IFlowFunctionMap#getReturnFlowFunction(java.lang.Object, java.lang.Object, java.lang.Object)
-   */
-  public IFlowFunction getReturnFlowFunction(T src, T dest) {
-    return IdentityFlowFunction.identity();
-  }
-
-  /* 
    * @see com.ibm.wala.dataflow.IFDS.IFlowFunctionMap#getCallToReturnFlowFunction(java.lang.Object, java.lang.Object)
    */
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IFlowFunctionMap.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IFlowFunctionMap.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IFlowFunctionMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IFlowFunctionMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,9 +18,7 @@
 public interface IFlowFunctionMap<T> {
 
   /**
-   * @param src
-   * @param dest
-   * @return the flow function for a "normal" edge in the supergraph from src->dest
+   * @return the flow function for a "normal" edge in the supergraph from src -&gt; dest
    */
   public IUnaryFlowFunction getNormalFlowFunction(T src, T dest);
 
@@ -29,30 +27,24 @@
    * @param dest the entry of the callee
    * @param ret the block that will be returned to, in the caller. This can be null .. signifying that facts can flow
    *        into the callee but not return
-   * @return the flow function for a "call" edge in the supergraph from src->dest
+   * @return the flow function for a "call" edge in the supergraph from src -&gt; dest
    */
   public IUnaryFlowFunction getCallFlowFunction(T src, T dest, T ret);
 
   /**
    * @param call supergraph node of the call instruction for this return edge.
-   * @param src
-   * @param dest
-   * @return the flow function for a "return" edge in the supergraph from src->dest
+   * @return the flow function for a "return" edge in the supergraph from src -&gt; dest
    */
   public IFlowFunction getReturnFlowFunction(T call, T src, T dest);
 
   /**
-   * @param src
-   * @param dest
-   * @return the flow function for a "call-to-return" edge in the supergraph from src->dest
+   * @return the flow function for a "call-to-return" edge in the supergraph from src -&gt; dest
    */
   public IUnaryFlowFunction getCallToReturnFlowFunction(T src, T dest);
 
   /**
-   * @param src
-   * @param dest
-   * @return the flow function for a "call-to-return" edge in the supergraph from src->dest, when the supergraph does
-   *         not contain any callees of src. This happens via, e.g., slicing.
+   * @return the flow function for a "call-to-return" edge in the supergraph from src -&gt; dest,
+   *         when the supergraph does not contain any callees of src. This happens via, e.g., slicing.
    */
   public IUnaryFlowFunction getCallNoneToReturnFlowFunction(T src, T dest);
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IPartiallyBalancedFlowFunctions.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IPartiallyBalancedFlowFunctions.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IPartiallyBalancedFlowFunctions.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IPartiallyBalancedFlowFunctions.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,9 +19,7 @@
    * This version should work when the "call" instruction was never reached normally. This applies only when using partially
    * balanced parentheses.
    * 
-   * @param src
-   * @param dest
-   * @return the flow function for a "return" edge in the supergraph from src->dest
+   * @return the flow function for a "return" edge in the supergraph from src -&lt; dest
    */
   public IFlowFunction getUnbalancedReturnFlowFunction(T src, T dest);
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IReversibleFlowFunction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IReversibleFlowFunction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IReversibleFlowFunction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IReversibleFlowFunction.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,6 @@
 public interface IReversibleFlowFunction extends IUnaryFlowFunction {
 
   /**
-   * @param d2
    * @return set of d1 such that (d1,d2) is an edge in this distributive function's graph representation, or null if there are none
    */
   public IntSet getSources(int d2);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/ISupergraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/ISupergraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/ISupergraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/ISupergraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -68,7 +68,7 @@
   Iterator<? extends T> getReturnSites(T call, P callee);
 
   /**
-   * @param r a "return" node in the supergraph
+   * @param ret a "return" node in the supergraph
    * @param callee a "called" "procedure" in the supergraph. if callee is null, answer return sites for which no callee was found.
    * @return the corresponding call nodes. There may be many.
    */
@@ -133,4 +133,4 @@
    */
   byte classifyEdge(T src, T dest);
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IUnaryFlowFunction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IUnaryFlowFunction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IUnaryFlowFunction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/IUnaryFlowFunction.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,6 @@
 public interface IUnaryFlowFunction extends IFlowFunction {
 
   /**
-   * @param d1
    * @return set of d2 such that (d1,d2) is an edge in this distributive function's graph representation, or null if there are none
    */
   public IntSet getTargets(int d1);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalPathEdges.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalPathEdges.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalPathEdges.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalPathEdges.java	2019-01-29 17:08:39.000000000 +0000
@@ -33,11 +33,11 @@
   private final static boolean PARANOID = false;
 
   /**
-   * A map from integer (d2) -> (IBinaryNonNegativeIntRelation)
+   * A map from integer (d2) -&gt; (IBinaryNonNegativeIntRelation)
    * 
-   * For fact d2, paths[d2] gives a relation R=(n,d1) s.t. (<s_p, d1> -> <n,d2>) is a path edge.
+   * For fact d2, paths[d2] gives a relation R=(n,d1) s.t. (&lt;s_p, d1&gt; -&gt; &lt;n,d2&gt;) is a path edge.
    * 
-   * Note that we handle paths of the form <s_p, d1> -> <n,d1> specially, below. We also handle paths of the form <s_p, 0> -> <n,
+   * Note that we handle paths of the form &lt;s_p, d1&gt; -&gt; &lt;n,d1&gt; specially, below. We also handle paths of the form &lt;s_p, 0&gt; -&gt; &lt;n,
    * d1> specially below.
    * 
    * We choose this somewhat convoluted representation for the following reasons: 1) of the (n, d1, d2) tuple-space, we expect the
@@ -50,7 +50,7 @@
    * TODO: more representation optimization. A special representation for triples? sparse representations for CFG? exploit shorts
    * for ints?
    */
-  private final SparseVector<IBinaryNaturalRelation> paths = new SparseVector<IBinaryNaturalRelation>(1, 1.1f);
+  private final SparseVector<IBinaryNaturalRelation> paths = new SparseVector<>(1, 1.1f);
 
   /**
    * If this is non-null, it holds a redundant representation of the paths information, designed to make getReachable(II) faster.
@@ -58,9 +58,9 @@
    * space or time of the non-merging IFDS solver, for which the original paths representation works well. Is there a better data
    * structure tradeoff?
    * 
-   * A map from integer (d1) -> (IBinaryNonNegativeIntRelation)
+   * A map from integer (d1) -&gt; (IBinaryNonNegativeIntRelation)
    * 
-   * For fact d1, paths[d1] gives a relation R=(n,d2) s.t. (<s_p, d1> -> <n,d2>) is a path edge.
+   * For fact d1, paths[d1] gives a relation R=(n,d2) s.t. (&lt;s_p, d1&gt; -&gt; &lt;n,d2&gt;) is a path edge.
    * 
    * 
    * We choose this somewhat convoluted representation for the following reasons: 1) of the (n, d1, d2) tuple-space, we expect the
@@ -71,34 +71,32 @@
   private final SparseVector<IBinaryNaturalRelation> altPaths;
 
   /**
-   * a map from integer d1 -> int set.
+   * a map from integer d1 -&gt; int set.
    * 
-   * for fact d1, identityPaths[d1] gives the set of block numbers N s.t. for n \in N, <s_p, d1> -> <n, d1> is a path edge.
+   * for fact d1, identityPaths[d1] gives the set of block numbers N s.t. for n \in N, &lt;s_p, d1&gt; -&gt; &lt;n, d1&gt; is a path edge.
    */
-  private final SparseVector<IntSet> identityPaths = new SparseVector<IntSet>(1, 1.1f);
+  private final SparseVector<IntSet> identityPaths = new SparseVector<>(1, 1.1f);
 
   /**
-   * a map from integer d2 -> int set
+   * a map from integer d2 -&gt; int set
    * 
-   * for fact d2, zeroPaths[d2] gives the set of block numbers N s.t. for n \in N, <s_p, 0> -> <n, d2> is a path edge.
+   * for fact d2, zeroPaths[d2] gives the set of block numbers N s.t. for n \in N, &lt;s_p, 0&gt; -&gt; &lt;n, d2&gt; is a path edge.
    */
-  private final SparseVector<IntSet> zeroPaths = new SparseVector<IntSet>(1, 1.1f);
+  private final SparseVector<IntSet> zeroPaths = new SparseVector<>(1, 1.1f);
 
   /**
    * @param fastMerge if true, the representation uses extra space in order to support faster merge operations
    */
   public LocalPathEdges(boolean fastMerge) {
-    altPaths = fastMerge ? new SparseVector<IBinaryNaturalRelation>(1, 1.1f) : null;
+    altPaths = fastMerge ? new SparseVector<>(1, 1.1f) : null;
   }
 
   /**
    * Record that in this procedure we've discovered a same-level realizable path from (s_p,d_i) to (n,d_j)
    * 
-   * @param i
    * @param n local block number of the basic block n
-   * 
-   * @param j
    */
+  @SuppressWarnings("unused")
   public void addPathEdge(int i, int n, int j) {
 
     if (i == 0) {
@@ -137,6 +135,7 @@
    * 
    * @param n local block number of the basic block n
    */
+  @SuppressWarnings("unused")
   private void addIdentityPathEdge(int i, int n) {
     BitVectorIntSet s = (BitVectorIntSet) identityPaths.get(i);
     if (s == null) {
@@ -164,9 +163,8 @@
    * Record that in this procedure we've discovered a same-level realizable path from (s_p,0) to (n,d_j)
    * 
    * @param n local block number of the basic block n
-   * 
-   * @param j
    */
+  @SuppressWarnings("unused")
   private void addZeroPathEdge(int n, int j) {
 
     BitVectorIntSet z = (BitVectorIntSet) zeroPaths.get(j);
@@ -190,16 +188,15 @@
   }
 
   /**
-   * N.B: If we're using the ZERO_PATH_SHORT_CIRCUIT, then we may have <s_p, d1> -> <n, d2> implicitly represented since we also
-   * have <s_p, 0> -> <n,d2>. However, getInverse() <b> will NOT </b> return these implicit d1 bits in the result. This translates
+   * N.B: If we're using the ZERO_PATH_SHORT_CIRCUIT, then we may have &lt;s_p, d1&gt; -&gt; &lt;n, d2&gt; implicitly represented since we also
+   * have &lt;s_p, 0&gt; -&gt; &lt;n,d2&gt;. However, getInverse() &lt;b&gt; will NOT &lt;/b&gt; return these implicit d1 bits in the result. This translates
    * to saying that the caller had better not care about any other d1 other than d1==0 if d1==0 is present. This happens to be true
    * in the single use of getInverse() in the tabulation solver, which uses getInverse() to propagate flow from an exit node back to
    * the caller's return site(s). Since we know that we will see flow from fact 0 to the return sites(s), we don't care about other
    * facts that may induce the same flow to the return site(s).
    * 
    * @param n local block number of a basic block n
-   * @param d2
-   * @return the sparse int set of d1 s.t. <s_p, d1> -> <n, d2> are recorded as path edges. null if none found
+   * @return the sparse int set of d1 s.t. {@literal <s_p, d1> -> <n, d2>} are recorded as path edges. null if none found
    */
   public IntSet getInverse(int n, int d2) {
     IBinaryNaturalRelation R = paths.get(d2);
@@ -273,10 +270,8 @@
   }
 
   /**
-   * @param i
    * @param n local block number of a basic block n
-   * @param j
-   * @return true iff we have a path edge <s_p,i>-><n, j>
+   * @return true iff we have a path edge {@literal <s_p,i> -> <n, j>}
    */
   public boolean contains(int i, int n, int j) {
 
@@ -309,9 +304,7 @@
   }
 
   /**
-   * 
-   * @param n
-   * @return set of d2 s.t. d1->d2 is a path edge for node n.
+   * @return set of d2 s.t. d1 -&gt; d2 is a path edge for node n.
    */
   public IntSet getReachable(int n, int d1) {
     if (PARANOID) {
@@ -323,7 +316,7 @@
   /**
    * Note that this is really slow!!!
    * 
-   * @return set of d2 s.t. d1->d2 is a path edge for node n
+   * @return set of d2 s.t. d1 -&gt; d2 is a path edge for node n
    */
   private IntSet getReachableSlow(int n, int d1) {
     MutableSparseIntSet result = MutableSparseIntSet.makeEmpty();
@@ -331,10 +324,10 @@
       // this is convoluted on purpose for efficiency: to avoid random access to
       // the sparse vector, we do parallel iteration with the vector's indices
       // and contents. TODO: better data structure?
-      Iterator contents = paths.iterator();
+      Iterator<IBinaryNaturalRelation> contents = paths.iterator();
       for (IntIterator it = paths.iterateIndices(); it.hasNext();) {
         int d2 = it.next();
-        IBinaryNaturalRelation R = (IBinaryNaturalRelation) contents.next();
+        IBinaryNaturalRelation R = contents.next();
         if (R != null && R.contains(n, d1)) {
           result.add(d2);
         }
@@ -350,10 +343,10 @@
       // this is convoluted on purpose for efficiency: to avoid random access to
       // the sparse vector, we do parallel iteration with the vector's indices
       // and contents. TODO: better data structure?
-      Iterator contents = zeroPaths.iterator();
+      Iterator<IntSet> contents = zeroPaths.iterator();
       for (IntIterator it = zeroPaths.iterateIndices(); it.hasNext();) {
         int d2 = it.next();
-        BitVectorIntSet s = (BitVectorIntSet) contents.next();
+        IntSet s = contents.next();
         if (s != null && s.contains(n)) {
           result.add(d2);
         }
@@ -363,7 +356,7 @@
   }
 
   /**
-   * @return set of d2 s.t. d1->d2 is a path edge for node n
+   * @return set of d2 s.t. d1 -&gt; d2 is a path edge for node n
    */
   private IntSet getReachableFast(int n, int d1) {
 
@@ -378,7 +371,7 @@
    * TODO: optimize this based on altPaths
    * 
    * @param n the local block number of a node
-   * @return set of d2 s.t \exists d1 s.t. d1->d2 is a path edge for node n
+   * @return set of d2 s.t \exists d1 s.t. d1 -&gt; d2 is a path edge for node n
    */
   public IntSet getReachable(int n) {
     MutableSparseIntSet result = MutableSparseIntSet.makeEmpty();
@@ -386,10 +379,10 @@
       // this is convoluted on purpose for efficiency: to avoid random access to
       // the sparse vector, we do parallel iteration with the vector's indices
       // and contents. TODO: better data structure?
-      Iterator contents = paths.iterator();
+      Iterator<IBinaryNaturalRelation> contents = paths.iterator();
       for (IntIterator it = paths.iterateIndices(); it.hasNext();) {
         int d2 = it.next();
-        IBinaryNaturalRelation R = (IBinaryNaturalRelation) contents.next();
+        IBinaryNaturalRelation R = contents.next();
         if (R != null && R.anyRelated(n)) {
           result.add(d2);
         }
@@ -399,10 +392,10 @@
       // this is convoluted on purpose for efficiency: to avoid random access to
       // the sparse vector, we do parallel iteration with the vector's indices
       // and contents. TODO: better data structure?
-      Iterator contents = identityPaths.iterator();
+      Iterator<IntSet> contents = identityPaths.iterator();
       for (IntIterator it = identityPaths.iterateIndices(); it.hasNext();) {
         int d1 = it.next();
-        BitVectorIntSet s = (BitVectorIntSet) contents.next();
+        IntSet s = contents.next();
         if (s != null && s.contains(n)) {
           result.add(d1);
         }
@@ -412,10 +405,10 @@
       // this is convoluted on purpose for efficiency: to avoid random access to
       // the sparse vector, we do parallel iteration with the vector's indices
       // and contents. TODO: better data structure?
-      Iterator contents = zeroPaths.iterator();
+      Iterator<IntSet> contents = zeroPaths.iterator();
       for (IntIterator it = zeroPaths.iterateIndices(); it.hasNext();) {
         int d2 = it.next();
-        BitVectorIntSet s = (BitVectorIntSet) contents.next();
+        IntSet s = contents.next();
         if (s != null && s.contains(n)) {
           result.add(d2);
         }
@@ -450,4 +443,4 @@
     }
     return result;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalSummaryEdges.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalSummaryEdges.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalSummaryEdges.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalSummaryEdges.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.dataflow.IFDS;
 
-import java.util.Iterator;
-
 import com.ibm.wala.util.collections.SparseVector;
 import com.ibm.wala.util.intset.BasicNaturalRelation;
 import com.ibm.wala.util.intset.IBinaryNaturalRelation;
@@ -27,10 +25,10 @@
 public class LocalSummaryEdges {
 
   /**
-   * A map from integer n -> (IBinaryNonNegativeIntRelation)
+   * A map from integer n -&gt; (IBinaryNonNegativeIntRelation)
    * 
    * Let s_p be an entry to this procedure, and x be an exit. n is a integer which uniquely identifies an (s_p,x) relation. For any
-   * such n, summaries[n] gives a relation R=(d1,d2) s.t. (<s_p, d1> -> <x,d2>) is a summary edge.
+   * such n, summaries[n] gives a relation R=(d1,d2) s.t. (&lt;s_p, d1&gt; -&gt; &lt;x,d2&gt;) is a summary edge.
    * 
    * Note that this representation is a little different from the representation described in the PoPL 95 paper. We cache summary
    * edges at the CALLEE, not at the CALLER!!! This allows us to avoid eagerly installing summary edges at all call sites to a
@@ -41,7 +39,7 @@
    * 
    * TODO: more representation optimization.
    */
-  private final SparseVector<IBinaryNaturalRelation> summaries = new SparseVector<IBinaryNaturalRelation>(1, 1.1f);
+  private final SparseVector<IBinaryNaturalRelation> summaries = new SparseVector<>(1, 1.1f);
 
   /**
    * Let (s_p,x) be an entry-exit pair, and let l := the long whose high word is s_p and low word is x.
@@ -63,7 +61,7 @@
   }
 
   /**
-   * Record a summary edge for the flow d1 -> d2 from an entry s_p to an exit x.
+   * Record a summary edge for the flow d1 -&gt; d2 from an entry s_p to an exit x.
    * 
    * @param s_p local block number an entry
    * @param x local block number of an exit block
@@ -106,7 +104,7 @@
    * @param s_p local block number an entry
    * @param x local block number of an exit block
    * @param d1 source dataflow fact
-   * @return set of d2 s.t. d1->d2 recorded as a summary edge for (s_p,x), or null if none
+   * @return set of d2 s.t. d1 -&gt; d2 recorded as a summary edge for (s_p,x), or null if none
    */
   public IntSet getSummaryEdges(int s_p, int x, int d1) {
     int n = getIndexForEntryExitPair(s_p, x);
@@ -124,7 +122,7 @@
    * @param s_p local block number an entry
    * @param x local block number of an exit block
    * @param d2 target dataflow fact
-   * @return set of d1 s.t. d1->d2 recorded as a summary edge for (s_p,x), or null if none
+   * @return set of d1 s.t. d1 -&gt; d2 recorded as a summary edge for (s_p,x), or null if none
    */
   public IntSet getInvertedSummaryEdgesForTarget(int s_p, int x, int d2) {
     int n = getIndexForEntryExitPair(s_p, x);
@@ -133,8 +131,7 @@
       return null;
     } else {
       MutableSparseIntSet result = MutableSparseIntSet.makeEmpty();
-      for (Iterator it = R.iterator(); it.hasNext();) {
-        IntPair p = (IntPair) it.next();
+      for (IntPair p : R) {
         if (p.getY() == d2) {
           result.add(p.getX());
         }
@@ -156,4 +153,4 @@
     return result;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyBalancedTabulationSolver.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyBalancedTabulationSolver.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyBalancedTabulationSolver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyBalancedTabulationSolver.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,10 +11,9 @@
 package com.ibm.wala.dataflow.IFDS;
 
 import java.util.Collection;
-import java.util.Iterator;
-
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.intset.IntIterator;
@@ -22,8 +21,8 @@
 
 /**
  * Utilities for dealing with tabulation with partially balanced parentheses.
- * 
- * @param <T> type of node in the supergraph 
+ *
+ * @param <T> type of node in the supergraph
  * @param <P> type of a procedure (like a box in an RSM)
  * @param <F> type of factoids propagated when solving this problem
  */
@@ -31,7 +30,7 @@
 
   public static <T, P, F> PartiallyBalancedTabulationSolver<T, P, F> createPartiallyBalancedTabulationSolver(
       PartiallyBalancedTabulationProblem<T, P, F> p, IProgressMonitor monitor) {
-    return new PartiallyBalancedTabulationSolver<T, P, F>(p, monitor);
+    return new PartiallyBalancedTabulationSolver<>(p, monitor);
   }
 
   private final Collection<Pair<T,Integer>> unbalancedSeeds = HashSetFactory.make();
@@ -46,8 +45,7 @@
     if (result && wasUsedAsUnbalancedSeed(s_p, i) && supergraph.isExit(n)) {
       // j was reached from an entry seed. if there are any facts which are reachable from j, even without
       // balanced parentheses, we can use these as new seeds.
-      for (Iterator<? extends T> it2 = supergraph.getSuccNodes(n); it2.hasNext();) {
-        T retSite = it2.next();
+      for (T retSite : Iterator2Iterable.make(supergraph.getSuccNodes(n))) {
         PartiallyBalancedTabulationProblem<T, P, F> problem = (PartiallyBalancedTabulationProblem<T, P, F>) getProblem();
         IFlowFunction f = problem.getFunctionMap().getUnbalancedReturnFlowFunction(n, retSite);
         // for each fact that can be reached by the return flow ...
@@ -61,6 +59,7 @@
               T fakeEntry = problem.getFakeEntry(retSite);
               PathEdge<T> seed = PathEdge.createPathEdge(fakeEntry, d3, retSite, d3);
               addSeed(seed);
+              newUnbalancedExplodedReturnEdge(s_p,  i, n, j);
             }
           }
         } else {
@@ -88,4 +87,14 @@
   private boolean wasUsedAsUnbalancedSeed(T s_p, int i) {
    return unbalancedSeeds.contains(Pair.make(s_p, i));
   }
+
+  /**
+   * A path edge &lt;s_p, i&gt; -&gt; &lt;n, j&gt; was propagated, and &lt;s_p, i&gt; was an unbalanced seed.
+   * So, we added a new seed callerSeed (to some return site) in the caller.  To be overridden
+   * in subclasses.
+   */
+  @SuppressWarnings("unused")
+  protected void newUnbalancedExplodedReturnEdge(T s_p, int i, T n, int j) {
+
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PathEdge.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PathEdge.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PathEdge.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PathEdge.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,7 @@
 
 
 /**
- * an individual edge <entry, d1> -> <target, d2>
+ * an individual edge &lt;entry, d1&gt; -&gt; &lt;target, d2&gt;
  * 
  * @param <T> node type in the supergraph
  */
@@ -30,7 +30,7 @@
     if (n == null) {
       throw new IllegalArgumentException("null n");
     }
-    return new PathEdge<T>(s_p, d1, n, d2);
+    return new PathEdge<>(s_p, d1, n, d2);
   }
   
   private PathEdge(T s_p, int d1, T n, int d2) {
@@ -42,17 +42,7 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer();
-    result.append("<");
-    result.append(entry.toString());
-    result.append(",");
-    result.append(d1);
-    result.append("> -> <");
-    result.append(target.toString());
-    result.append(",");
-    result.append(d2);
-    result.append(">");
-    return result.toString();
+    return '<' + entry.toString() + ',' + d1 + "> -> <" + target + ',' + d2 + '>';
   }
 
   @Override
@@ -107,4 +97,4 @@
   public T getTarget() {
     return target;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/SingletonFlowFunction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/SingletonFlowFunction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/SingletonFlowFunction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/SingletonFlowFunction.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,7 +13,7 @@
 import com.ibm.wala.util.intset.SparseIntSet;
 
 /**
- * A flow function which has only the edge 0 -> dest
+ * A flow function which has only the edge 0 -&gt; dest
  */
 public class SingletonFlowFunction implements IReversibleFlowFunction {
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationCancelException.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationCancelException.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationCancelException.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationCancelException.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,6 +19,7 @@
  */
 public class TabulationCancelException extends CancelException {
 
+  private static final long serialVersionUID = 4073189707860241945L;
   private final Result result;
 
   protected TabulationCancelException(Exception cause, Result r) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationDomain.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationDomain.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationDomain.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationDomain.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,7 +21,7 @@
 public interface TabulationDomain<F,T> extends OrdinalSetMapping<F> {
 
   /**
-   * returns <code>true</code> if p1 should be processed before
+   * returns {@code true} if p1 should be processed before
    * p2 by the {@link TabulationSolver}
    * 
    * For example, if this domain supports a partial order on facts, return true
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationResult.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationResult.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationResult.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationResult.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,7 +15,7 @@
 import com.ibm.wala.util.intset.IntSet;
 
 /**
- * The solution of a tabulation problem: a mapping from supergraph node -> bit vector representing the dataflow facts that hold at
+ * The solution of a tabulation problem: a mapping from supergraph node -&gt; bit vector representing the dataflow facts that hold at
  * the entry to the supergraph node.
  * 
  * @param <T> type of node in the supergraph
@@ -42,10 +42,7 @@
   public Collection<T> getSupergraphNodesReached();
 
   /**
-   * @param n1
-   * @param d1
-   * @param n2
-   * @return set of d2 s.t. (n1,d1) -> (n2,d2) is recorded as a summary edge, or null if none found
+   * @return set of d2 s.t. (n1,d1) -&gt; (n2,d2) is recorded as a summary edge, or null if none found
    */
   public IntSet getSummaryTargets(T n1, int d1, T n2);
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,7 +14,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -30,6 +29,7 @@
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Heap;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.MapUtil;
 import com.ibm.wala.util.collections.ToStringComparator;
 import com.ibm.wala.util.heapTrace.HeapTracer;
@@ -52,7 +52,7 @@
  * <li>it stores summary edges at each callee instead of at each call site.
  * </ul>
  * <p>
- * 
+ *
  * @param <T> type of node in the supergraph
  * @param <P> type of a procedure (like a box in an RSM)
  * @param <F> type of factoids propagated when solving this problem
@@ -110,24 +110,24 @@
   private final TabulationProblem<T, P, F> problem;
 
   /**
-   * A map from Object (entry node in supergraph) -> LocalPathEdges.
-   * 
-   * Logically, this represents a set of edges (s_p,d_i) -> (n, d_j). The data structure is chosen to attempt to save space over
+   * A map from Object (entry node in supergraph) -&gt; LocalPathEdges.
+   *
+   * Logically, this represents a set of edges (s_p,d_i) -&gt; (n, d_j). The data structure is chosen to attempt to save space over
    * representing each edge explicitly.
    */
   final private Map<T, LocalPathEdges> pathEdges = HashMapFactory.make();
 
   /**
-   * A map from Object (entry node in supergraph) -> CallFlowEdges.
-   * 
-   * Logically, this represents a set of edges (c,d_i) -> (s_p, d_j). The data structure is chosen to attempt to save space over
+   * A map from Object (entry node in supergraph) -&gt; CallFlowEdges.
+   *
+   * Logically, this represents a set of edges (c,d_i) -&gt; (s_p, d_j). The data structure is chosen to attempt to save space over
    * representing each edge explicitly.
    */
   final private Map<T, CallFlowEdges> callFlowEdges = HashMapFactory.make();
 
   /**
-   * A map from Object (procedure) -> LocalSummaryEdges.
-   * 
+   * A map from Object (procedure) -&gt; LocalSummaryEdges.
+   *
    */
   final protected Map<P, LocalSummaryEdges> summaryEdges = HashMapFactory.make();
 
@@ -152,7 +152,7 @@
   protected final IProgressMonitor progressMonitor;
 
   /**
-   * the path edge currently being processed in the main loop of {@link #forwardTabulateSLRPs()}; <code>null</code> if
+   * the path edge currently being processed in the main loop of {@link #forwardTabulateSLRPs()}; {@code null} if
    * {@link #forwardTabulateSLRPs()} is not currently running. Note that if we are applying a summary edge in
    * {@link #processExit(PathEdge)}, curPathEdge is modified to be the path edge terminating at the call node in the caller, to
    * match the behavior in {@link #processCall(PathEdge)}.
@@ -161,7 +161,7 @@
 
   /**
    * the summary edge currently being applied in {@link #processCall(PathEdge)} or {@link #processExit(PathEdge)}, or
-   * <code>null</code> if summary edges are not currently being processed.
+   * {@code null} if summary edges are not currently being processed.
    */
   private PathEdge<T> curSummaryEdge;
 
@@ -191,12 +191,12 @@
    * @throws IllegalArgumentException if p is null
    */
   public static <T, P, F> TabulationSolver<T, P, F> make(TabulationProblem<T, P, F> p) {
-    return new TabulationSolver<T, P, F>(p, null);
+    return new TabulationSolver<>(p, null);
   }
 
   /**
    * Solve the dataflow problem.
-   * 
+   *
    * @return a representation of the result
    */
   public TabulationResult<T, P, F> solve() throws CancelException {
@@ -238,9 +238,8 @@
 
   /**
    * See POPL 95 paper for this algorithm, Figure 3
-   * 
-   * @throws CancelException
    */
+  @SuppressWarnings("unused")
   private void forwardTabulateSLRPs() throws CancelException {
     assert curPathEdge == null : "curPathEdge should not be non-null here";
     if (worklist == null) {
@@ -293,7 +292,7 @@
   /**
    * For some reason (either a bug in our code that defeats soft references, or a bad policy in the GC), leaving soft reference
    * caches to clear themselves out doesn't work. Help it out.
-   * 
+   *
    * It's unfortunate that this method exits.
    */
   protected void tendToSoftCaches() {
@@ -305,7 +304,7 @@
   }
 
   /**
-   * 
+   *
    */
   protected final void performVerboseAction() {
     verboseCounter++;
@@ -323,15 +322,13 @@
 
   /**
    * Handle lines [33-37] of the algorithm
-   * 
-   * @param edge
    */
+  @SuppressWarnings("unused")
   private void processNormal(final PathEdge<T> edge) {
     if (DEBUG_LEVEL > 0) {
       System.err.println("process normal: " + edge);
     }
-    for (Iterator<? extends T> it = supergraph.getSuccNodes(edge.target); it.hasNext();) {
-      final T m = it.next();
+    for (T m : Iterator2Iterable.make(supergraph.getSuccNodes(edge.target))) {
       if (DEBUG_LEVEL > 0) {
         System.err.println("normal successor: " + m);
       }
@@ -341,11 +338,9 @@
         System.err.println(" reached: " + D3);
       }
       if (D3 != null) {
-        D3.foreach(new IntSetAction() {
-          @Override
-          public void act(int d3) {
-            propagate(edge.entry, edge.d1, m, d3);
-          }
+        D3.foreach(d3 -> {
+          newNormalExplodedEdge(edge, m, d3);
+          propagate(edge.entry, edge.d1, m, d3);
         });
       }
     }
@@ -353,10 +348,11 @@
 
   /**
    * Handle lines [21 - 32] of the algorithm, propagating information from an exit node.
-   * 
+   *
    * Note that we've changed the way we record summary edges. Summary edges are now associated with a callee (s_p,exit), where the
    * original algorithm used a call, return pair in the caller.
    */
+  @SuppressWarnings("unused")
   protected void processExit(final PathEdge<T> edge) {
     if (DEBUG_LEVEL > 0) {
       System.err.println("process exit: " + edge);
@@ -390,14 +386,14 @@
 
   /**
    * Propagate information for an "exit" edge to the appropriate return sites
-   * 
-   * [23] for each d5 s.t. <s_p,d2> -> <returnSite(c),d5> ..
-   * 
+   *
+   * [23] for each d5 s.t. {@literal <s_p,d2> -> <returnSite(c),d5>} ..
+   *
    * @param edge the edge being processed
-   * @param succ numbers of the nodes that are successors of edge.n (the return block in the callee) in the call graph.
    * @param c a call site of edge.s_p
-   * @param D4 set of d1 s.t. <c, d1> -> <edge.s_p, edge.d2> was recorded as call flow
+   * @param D4 set of d1 s.t. {@literal <c, d1> -> <edge.s_p, edge.d2>} was recorded as call flow
    */
+  @SuppressWarnings("unused")
   private void propagateToReturnSites(final PathEdge<T> edge, final T c, final IntSet D4) {
     P proc = supergraph.getProcOf(c);
     final T[] entries = supergraph.getEntriesForProcedure(proc);
@@ -407,10 +403,9 @@
     // note that we might have different summary edges for each
     // potential return site, and different flow functions from this
     // exit block to each return site.
-    for (Iterator<? extends T> retSites = supergraph.getReturnSites(c, supergraph.getProcOf(edge.target)); retSites.hasNext();) {
-      final T retSite = retSites.next();
+    for (T retSite : Iterator2Iterable.make(supergraph.getReturnSites(c, supergraph.getProcOf(edge.target)))) {
       if (DEBUG_LEVEL > 1) {
-        System.err.println("candidate return site: " + retSite + " " + supergraph.getNumber(retSite));
+        System.err.println("candidate return site: " + retSite + ' ' + supergraph.getNumber(retSite));
       }
       // note: since we might have multiple exit nodes for the callee, (to handle exceptional returns)
       // not every return site might be valid for this exit node (edge.n).
@@ -432,12 +427,7 @@
           System.err.println("D4" + D4);
           System.err.println("D5 " + D5);
         }
-        IntSetAction action = new IntSetAction() {
-          @Override
-          public void act(final int d4) {
-            propToReturnSite(c, entries, retSite, d4, D5);
-          }
-        };
+        IntSetAction action = d4 -> propToReturnSite(c, entries, retSite, d4, D5, edge);
         D4.foreach(action);
       }
     }
@@ -445,41 +435,40 @@
 
   /**
    * Propagate information for an "exit" edge to a caller return site
-   * 
-   * [23] for each d5 s.t. <s_p,d2> -> <returnSite(c),d5> ..
-   * 
+   *
+   * [23] for each d5 s.t. {@literal <s_p,d2> -> <returnSite(c),d5>} ..
+   *
    * @param edge the edge being processed
    * @param c a call site of edge.s_p
-   * @param D4 set of d1 s.t. <c, d1> -> <edge.s_p, edge.d2> was recorded as call flow
+   * @param D4 set of d1 s.t. {@literal <c, d1> -> <edge.s_p, edge.d2>} was recorded as call flow
    * @param entries the blocks in the supergraph that are entries for the procedure of c
    * @param retSite the return site being propagated to
    * @param retf the flow function
    */
-  private void propagateToReturnSiteWithBinaryFlowFunction(final PathEdge edge, final T c, final IntSet D4, final T[] entries,
+  private void propagateToReturnSiteWithBinaryFlowFunction(final PathEdge<T> edge, final T c, final IntSet D4, final T[] entries,
       final T retSite, final IFlowFunction retf) {
-    D4.foreach(new IntSetAction() {
-      @Override
-      public void act(final int d4) {
-        final IntSet D5 = computeBinaryFlow(d4, edge.d2, (IBinaryReturnFlowFunction) retf);
-        propToReturnSite(c, entries, retSite, d4, D5);
-      }
-
+    D4.foreach(d4 -> {
+      final IntSet D5 = computeBinaryFlow(d4, edge.d2, (IBinaryReturnFlowFunction) retf);
+      propToReturnSite(c, entries, retSite, d4, D5, edge);
     });
   }
 
   /**
    * Propagate information to a particular return site.
-   * 
+   *
    * @param c the corresponding call site
    * @param entries entry nodes in the caller
    * @param retSite the return site
-   * @param d4 a fact s.t. <c, d4> -> <callee, d2> was recorded as call flow and <callee, d2> is the source of the summary edge
-   *          being applied
+   * @param d4 a fact s.t. {@literal <c, d4> -> <callee, d2>} was
+   *          recorded as call flow and {@literal <callee, d2>} is the
+   *          source of the summary edge being applied
    * @param D5 facts to propagate to return site
+   * @param edge the path edge ending at the exit site of the callee
    */
-  private void propToReturnSite(final T c, final T[] entries, final T retSite, final int d4, final IntSet D5) {
+  private void propToReturnSite(final T c, final T[] entries, final T retSite, final int d4, final IntSet D5, final PathEdge<T> edge) {
     if (D5 != null) {
       D5.foreach(new IntSetAction() {
+        @SuppressWarnings("unused")
         @Override
         public void act(final int d5) {
           // [26 - 28]
@@ -490,8 +479,7 @@
           // with respect to one s_profOf(c), we have to propagate
           // for each
           // potential entry node s_p /in s_procof(c)
-          for (int i = 0; i < entries.length; i++) {
-            final T s_p = entries[i];
+          for (final T s_p : entries) {
             if (DEBUG_LEVEL > 1) {
               System.err.println(" do entry " + s_p);
             }
@@ -500,13 +488,11 @@
               System.err.println("D3" + D3);
             }
             if (D3 != null) {
-              D3.foreach(new IntSetAction() {
-                @Override
-                public void act(int d3) {
-                  // set curPathEdge to be consistent with its setting in processCall() when applying a summary edge
-                  curPathEdge = PathEdge.createPathEdge(s_p, d3, c, d4);
-                  propagate(s_p, d3, retSite, d5);
-                }
+              D3.foreach(d3 -> {
+                // set curPathEdge to be consistent with its setting in processCall() when applying a summary edge
+                curPathEdge = PathEdge.createPathEdge(s_p, d3, c, d4);
+                newSummaryEdge(curPathEdge, edge, retSite, d5);
+                propagate(s_p, d3, retSite, d5);
               });
             }
           }
@@ -516,10 +502,8 @@
   }
 
   /**
-   * @param s_p
-   * @param n
    * @param d2 note that s_p must be an entry for procof(n)
-   * @return set of d1 s.t. <s_p, d1> -> <n, d2> is a path edge, or null if none found
+   * @return set of d1 s.t. {@literal <s_p, d1> -> <n, d2>} is a path edge, or null if none found
    */
   protected IntSet getInversePathEdges(T s_p, T n, int d2) {
     int number = supergraph.getLocalBlockNumber(n);
@@ -533,6 +517,7 @@
   /**
    * Handle lines [14 - 19] of the algorithm, propagating information into and across a call site.
    */
+  @SuppressWarnings("unused")
   protected void processCall(final PathEdge<T> edge) {
     if (DEBUG_LEVEL > 0) {
       System.err.println("process call: " + edge);
@@ -543,20 +528,18 @@
 
     Collection<T> allReturnSites = HashSetFactory.make();
     // populate allReturnSites with return sites for missing calls.
-    for (Iterator<? extends T> it = supergraph.getReturnSites(edge.target, null); it.hasNext();) {
-      allReturnSites.add(it.next());
+    for (T retSite : Iterator2Iterable.make(supergraph.getReturnSites(edge.target, null))) {
+      allReturnSites.add(retSite);
     }
     // [14 - 16]
     boolean hasCallee = false;
-    for (Iterator<? extends T> it = supergraph.getCalledNodes(edge.target); it.hasNext();) {
+    for (T callee : Iterator2Iterable.make(supergraph.getCalledNodes(edge.target))) {
       hasCallee = true;
-      final T callee = it.next();
       processParticularCallee(edge, c, allReturnSites, callee);
     }
     // special logic: in backwards problems, a "call" node can have
     // "normal" successors as well. deal with these.
-    for (Iterator<? extends T> it = supergraph.getNormalSuccessors(edge.target); it.hasNext();) {
-      final T m = it.next();
+    for (T m : Iterator2Iterable.make(supergraph.getNormalSuccessors(edge.target))) {
       if (DEBUG_LEVEL > 0) {
         System.err.println("normal successor: " + m);
       }
@@ -566,11 +549,9 @@
         System.err.println("normal successor reached: " + D3);
       }
       if (D3 != null) {
-        D3.foreach(new IntSetAction() {
-          @Override
-          public void act(int d3) {
-            propagate(edge.entry, edge.d1, m, d3);
-          }
+        D3.foreach(d3 -> {
+          newNormalExplodedEdge(edge, m, d3);
+          propagate(edge.entry, edge.d1, m, d3);
         });
       }
     }
@@ -592,13 +573,11 @@
         System.err.println("reached: " + reached);
       }
       if (reached != null) {
-        reached.foreach(new IntSetAction() {
-          @Override
-          public void act(int x) {
-            assert x >= 0;
-            assert edge.d1 >= 0;
-            propagate(edge.entry, edge.d1, returnSite, x);
-          }
+        reached.foreach(x -> {
+          assert x >= 0;
+          assert edge.d1 >= 0;
+          newNormalExplodedEdge(edge, returnSite, x);
+          propagate(edge.entry, edge.d1, returnSite, x);
         });
       }
     }
@@ -606,12 +585,13 @@
 
   /**
    * handle a particular callee for some call node.
-   * 
+   *
    * @param edge the path edge being processed
    * @param callNodeNum the number of the call node in the supergraph
    * @param allReturnSites a set collecting return sites for the call. This set is mutated with the return sites for this callee.
    * @param calleeEntry the entry node of the callee in question
    */
+  @SuppressWarnings("unused")
   protected void processParticularCallee(final PathEdge<T> edge, final int callNodeNum, Collection<T> allReturnSites, final T calleeEntry) {
     if (DEBUG_LEVEL > 0) {
       System.err.println(" process callee: " + calleeEntry);
@@ -645,66 +625,56 @@
       final CallFlowEdges callFlow = findOrCreateCallFlowEdges(calleeEntry);
       final int s_p_num = supergraph.getLocalBlockNumber(calleeEntry);
 
-      reached.foreach(new IntSetAction() {
-        @Override
-        public void act(final int d1) {
-          // we get reuse if we _don't_ propagate a new fact to the callee entry
-          final boolean gotReuse = !propagate(calleeEntry, d1, calleeEntry, d1);
-          recordCall(edge.target, calleeEntry, d1, gotReuse);
-          // cache the fact that we've flowed <c, d2> -> <callee, d1> by a
-          // call flow
-          callFlow.addCallEdge(callNodeNum, edge.d2, d1);
-          // handle summary edges now as well. this is different from the PoPL
-          // 95 paper.
-          if (summaries != null) {
-            // for each exit from the callee
-            P p = supergraph.getProcOf(calleeEntry);
-            T[] exits = supergraph.getExitsForProcedure(p);
-            for (int e = 0; e < exits.length; e++) {
-              final T exit = exits[e];
-              if (DEBUG_LEVEL > 0) {
-                assert supergraph.containsNode(exit);
-              }
-              int x_num = supergraph.getLocalBlockNumber(exit);
-              // reachedBySummary := {d2} s.t. <callee,d1> -> <exit,d2>
-              // was recorded as a summary edge
-              IntSet reachedBySummary = summaries.getSummaryEdges(s_p_num, x_num, d1);
-              if (reachedBySummary != null) {
-                for (final T returnSite : returnSitesForCallee) {
-                  // if "exit" is a valid exit from the callee to the return
-                  // site being processed
-                  if (supergraph.hasEdge(exit, returnSite)) {
-                    final IFlowFunction retf = flowFunctionMap.getReturnFlowFunction(edge.target, exit, returnSite);
-                    reachedBySummary.foreach(new IntSetAction() {
-                      @Override
-                      public void act(int d2) {
-                        assert curSummaryEdge == null : "curSummaryEdge should be null here";
-                        curSummaryEdge = PathEdge.createPathEdge(calleeEntry, d1, exit, d2);
-                        if (retf instanceof IBinaryReturnFlowFunction) {
-                          final IntSet D5 = computeBinaryFlow(edge.d2, d2, (IBinaryReturnFlowFunction) retf);
-                          if (D5 != null) {
-                            D5.foreach(new IntSetAction() {
-                              @Override
-                              public void act(int d5) {
-                                propagate(edge.entry, edge.d1, returnSite, d5);
-                              }
-                            });
-                          }
-                        } else {
-                          final IntSet D5 = computeFlow(d2, (IUnaryFlowFunction) retf);
-                          if (D5 != null) {
-                            D5.foreach(new IntSetAction() {
-                              @Override
-                              public void act(int d5) {
-                                propagate(edge.entry, edge.d1, returnSite, d5);
-                              }
-                            });
-                          }
-                        }
-                        curSummaryEdge = null;
+      reached.foreach(d1 -> {
+        // we get reuse if we _don't_ propagate a new fact to the callee entry
+        final boolean gotReuse = !propagate(calleeEntry, d1, calleeEntry, d1);
+        recordCall(edge.target, calleeEntry, d1, gotReuse);
+        newCallExplodedEdge(edge, calleeEntry, d1);
+        // cache the fact that we've flowed <c, d2> -> <callee, d1> by a
+        // call flow
+        callFlow.addCallEdge(callNodeNum, edge.d2, d1);
+        // handle summary edges now as well. this is different from the PoPL
+        // 95 paper.
+        if (summaries != null) {
+          // for each exit from the callee
+          P p = supergraph.getProcOf(calleeEntry);
+          T[] exits = supergraph.getExitsForProcedure(p);
+          for (final T exit : exits) {
+            if (DEBUG_LEVEL > 0) {
+              assert supergraph.containsNode(exit);
+            }
+            int x_num = supergraph.getLocalBlockNumber(exit);
+            // reachedBySummary := {d2} s.t. <callee,d1> -> <exit,d2>
+            // was recorded as a summary edge
+            IntSet reachedBySummary = summaries.getSummaryEdges(s_p_num, x_num, d1);
+            if (reachedBySummary != null) {
+              for (final T returnSite : returnSitesForCallee) {
+                // if "exit" is a valid exit from the callee to the return
+                // site being processed
+                if (supergraph.hasEdge(exit, returnSite)) {
+                  final IFlowFunction retf = flowFunctionMap.getReturnFlowFunction(edge.target, exit, returnSite);
+                  reachedBySummary.foreach(d2 -> {
+                    assert curSummaryEdge == null : "curSummaryEdge should be null here";
+                    curSummaryEdge = PathEdge.createPathEdge(calleeEntry, d1, exit, d2);
+                    if (retf instanceof IBinaryReturnFlowFunction) {
+                      final IntSet D51 = computeBinaryFlow(edge.d2, d2, (IBinaryReturnFlowFunction) retf);
+                      if (D51 != null) {
+                        D51.foreach(d5 -> {
+                          newSummaryEdge(edge, curSummaryEdge, returnSite, d5);
+                          propagate(edge.entry, edge.d1, returnSite, d5);
+                        });
+                      }
+                    } else {
+                      final IntSet D52 = computeFlow(d2, (IUnaryFlowFunction) retf);
+                      if (D52 != null) {
+                        D52.foreach(d5 -> {
+                          newSummaryEdge(edge, curSummaryEdge, returnSite, d5);
+                          propagate(edge.entry, edge.d1, returnSite, d5);
+                        });
                       }
-                    });
-                  }
+                    }
+                    curSummaryEdge = null;
+                  });
                 }
               }
             }
@@ -716,19 +686,19 @@
 
   /**
    * invoked when a callee is processed with a particular entry fact
-   * 
-   * @param callNode
-   * @param callee
+   *
    * @param d1 the entry fact
    * @param gotReuse whether existing summary edges were applied
    */
+  @SuppressWarnings("unused")
   protected void recordCall(T callNode, T callee, int d1, boolean gotReuse) {
   }
 
   /**
    * @return f(call_d, exit_d);
-   * 
+   *
    */
+  @SuppressWarnings("unused")
   protected IntSet computeBinaryFlow(int call_d, int exit_d, IBinaryReturnFlowFunction f) {
     if (DEBUG_LEVEL > 0) {
       System.err.println("got binary flow function " + f);
@@ -739,8 +709,9 @@
 
   /**
    * @return f(d1)
-   * 
+   *
    */
+  @SuppressWarnings("unused")
   protected IntSet computeFlow(int d1, IUnaryFlowFunction f) {
     if (DEBUG_LEVEL > 0) {
       System.err.println("got flow function " + f);
@@ -766,7 +737,7 @@
     return worklist.take();
   }
 
-  private PathEdge peekFromWorkList() {
+  private PathEdge<T> peekFromWorkList() {
     // horrible. don't use in performance-critical
     assert worklist != null;
     PathEdge<T> result = worklist.take();
@@ -775,14 +746,15 @@
   }
 
   /**
-   * Propagate the fact <s_p,i> -> <n, j> has arisen as a path edge. Returns <code>true</code> iff the path edge was not previously
+   * Propagate the fact &lt;s_p,i&gt; -&gt; &lt;n, j&gt; has arisen as a path edge. Returns &lt;code&gt;true&lt;/code&gt; iff the path edge was not previously
    * observed.
-   * 
+   *
    * @param s_p entry block
    * @param i dataflow fact on entry
    * @param n reached block
    * @param j dataflow fact reached
    */
+  @SuppressWarnings("unused")
   protected boolean propagate(T s_p, int i, T n, int j) {
     int number = supergraph.getLocalBlockNumber(n);
     if (number < 0) {
@@ -797,7 +769,7 @@
 
     if (!pLocal.contains(i, number, j)) {
       if (DEBUG_LEVEL > 0) {
-        System.err.println("propagate " + s_p + "  " + i + " " + number + " " + j);
+        System.err.println("propagate " + s_p + "  " + i + ' ' + number + ' ' + j);
       }
       pLocal.addPathEdge(i, number, j);
       addToWorkList(s_p, i, n, j);
@@ -811,11 +783,11 @@
   }
 
   /**
-   * Merging: suppose we're doing propagate <s_p,i> -> <n,j> but we already have path edges <s_p,i> -> <n, x>, <s_p,i> -> <n,y>, and
-   * <s_p,i> -><n, z>.
-   * 
-   * let \alpha be the merge function. then instead of <s_p,i> -> <n,j>, we propagate <s_p,i> -> <n, \alpha(j,x,y,z) > !!!
-   * 
+   * Merging: suppose we're doing propagate &lt;s_p,i&gt; -&gt; &lt;n,j&gt; but we already have path edges &lt;s_p,i&gt; -&gt; &lt;n, x&gt;, &lt;s_p,i&gt; -&gt; &lt;n,y&gt;, and
+   * &lt;s_p,i&gt; -&gt;&lt;n, z&gt;.
+   *
+   * let \alpha be the merge function. then instead of &lt;s_p,i&gt; -&gt; &lt;n,j&gt;, we propagate &lt;s_p,i&gt; -&gt; &lt;n, \alpha(j,x,y,z) &gt; !!!
+   *
    * return -1 if no fact should be propagated
    */
   private int merge(T s_p, int i, T n, int j) {
@@ -840,6 +812,7 @@
     }
   }
 
+  @SuppressWarnings("unused")
   protected void addToWorkList(T s_p, int i, T n, int j) {
     if (worklist == null) {
       worklist = makeWorklist();
@@ -883,7 +856,7 @@
 
   /**
    * get the bitvector of facts that hold at the entry to a given node
-   * 
+   *
    * @return IntSet representing the bitvector
    */
   public IntSet getResult(T node) {
@@ -898,15 +871,15 @@
     	for (PathEdge<T> seed : pSeeds) {
     		allEntries.add(seed.entry);
     	}
-    }    
+    }
 
     for (T entry : allEntries){
     	LocalPathEdges lp = pathEdges.get(entry);
     	if (lp != null) {
     		result.addAll(lp.getReachable(n));
     	}
-    }    	
-    
+    }
+
     return result;
   }
 
@@ -914,7 +887,7 @@
 
     /**
      * get the bitvector of facts that hold at the entry to a given node
-     * 
+     *
      * @return IntSet representing the bitvector
      */
     @Override
@@ -925,37 +898,31 @@
     @Override
     public String toString() {
 
-      StringBuffer result = new StringBuffer();
-      TreeMap<Object, TreeSet<T>> map = new TreeMap<Object, TreeSet<T>>(ToStringComparator.instance());
+      StringBuilder result = new StringBuilder();
+      TreeMap<Object, TreeSet<T>> map = new TreeMap<>(ToStringComparator.instance());
 
-      Comparator<Object> c = new Comparator<Object>() {
-        @Override
-        public int compare(Object o1, Object o2) {
-          if (!(o1 instanceof IBasicBlock)) {
-            return -1;
-          }
-          IBasicBlock bb1 = (IBasicBlock) o1;
-          IBasicBlock bb2 = (IBasicBlock) o2;
-          return bb1.getNumber() - bb2.getNumber();
+      Comparator<Object> c = (o1, o2) -> {
+        if (!(o1 instanceof IBasicBlock)) {
+          return -1;
         }
+        IBasicBlock bb1 = (IBasicBlock) o1;
+        IBasicBlock bb2 = (IBasicBlock) o2;
+        return bb1.getNumber() - bb2.getNumber();
       };
-      for (Iterator<? extends T> it = supergraph.iterator(); it.hasNext();) {
-        T n = it.next();
+      for (T n : supergraph) {
         P proc = supergraph.getProcOf(n);
         TreeSet<T> s = map.get(proc);
         if (s == null) {
-          s = new TreeSet<T>(c);
+          s = new TreeSet<>(c);
           map.put(proc, s);
         }
         s.add(n);
       }
 
-      for (Iterator<Map.Entry<Object, TreeSet<T>>> it = map.entrySet().iterator(); it.hasNext();) {
-        Map.Entry<Object, TreeSet<T>> e = it.next();
+      for (Entry<Object, TreeSet<T>> e : map.entrySet()) {
         Set<T> s = e.getValue();
-        for (Iterator<T> it2 = s.iterator(); it2.hasNext();) {
-          T o = it2.next();
-          result.append(o + " : " + getResult(o) + "\n");
+        for (T o : s) {
+          result.append(o).append(" : ").append(getResult(o)).append('\n');
         }
       }
       return result.toString();
@@ -988,10 +955,7 @@
     }
 
     /**
-     * @param n1
-     * @param d1
-     * @param n2
-     * @return set of d2 s.t. (n1,d1) -> (n2,d2) is recorded as a summary edge, or null if none found
+     * @return set of d2 s.t. (n1,d1) -&gt; (n2,d2) is recorded as a summary edge, or null if none found
      */
     @Override
     public IntSet getSummaryTargets(T n1, int d1, T n2) {
@@ -1031,9 +995,10 @@
   }
 
   /**
-   * @return set of d1 s.t. (n1,d1) -> (n2,d2) is recorded as a summary edge, or null if none found
+   * @return set of d1 s.t. (n1,d1) -&gt; (n2,d2) is recorded as a summary edge, or null if none found
    * @throws UnsupportedOperationException unconditionally
    */
+  @SuppressWarnings("unused")
   public IntSet getSummarySources(T n2, int d2, T n1) throws UnsupportedOperationException {
     throw new UnsupportedOperationException("not currently supported.  be careful");
     // LocalSummaryEdges summaries = summaryEdges.get(supergraph.getProcOf(n1));
@@ -1064,4 +1029,41 @@
   protected PathEdge<T> getCurSummaryEdge() {
     return curSummaryEdge;
   }
+
+  /**
+   * Indicates that due to a path edge &lt;s_p, d1&gt; -&gt; &lt;n, d2&gt; (the 'edge'
+   * parameter) and a normal flow function application, a new path edge &lt;s_p,
+   * d1&gt; -&gt; &lt;m, d3&gt; was created. To be overridden in subclasses. We also use
+   * this function to record call-to-return flow.
+   *
+   */
+  @SuppressWarnings("unused")
+  protected void newNormalExplodedEdge(PathEdge<T> edge, T m, int d3) {
+
+  }
+
+  /**
+   * Indicates that due to a path edge 'edge' &lt;s_p, d1&gt; -&gt; &lt;n, d2&gt; and
+   * application of a call flow function, a new path edge &lt;calleeEntry, d3&gt; -&gt;
+   * &lt;calleeEntry, d3&gt; was created. To be overridden in subclasses.
+   *
+   */
+  @SuppressWarnings("unused")
+  protected void newCallExplodedEdge(PathEdge<T> edge, T calleeEntry, int d3) {
+
+  }
+
+  /**
+   * Combines [25] and [26-28]. In the caller we have a path edge
+   * 'edgeToCallSite' &lt;s_c, d3&gt; -&gt; &lt;c, d4&gt;, where c is the call site. In the
+   * callee, we have path edge 'calleeSummaryEdge' &lt;s_p, d1&gt; -&gt; &lt;e_p, d2&gt;. Of
+   * course, there is a call edge &lt;c, d4&gt; -&gt; &lt;s_p, d1&gt;. Finally, we have a
+   * return edge &lt;e_p, d2&gt; -&gt; &lt;returnSite, d5&gt;.
+   */
+  @SuppressWarnings("unused")
+  protected void newSummaryEdge(PathEdge<T> edgeToCallSite, PathEdge<T> calleeSummaryEdge, T returnSite, int d5) {
+
+  }
+
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/UnorderedDomain.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/UnorderedDomain.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/UnorderedDomain.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/UnorderedDomain.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,6 +17,8 @@
  */
 public class UnorderedDomain<T, U> extends MutableMapping<T> implements TabulationDomain<T, U> {
 
+  private static final long serialVersionUID = -988075488958891635L;
+
   /*
    * @see com.ibm.wala.dataflow.IFDS.TabulationDomain#isWeakerThan(int, int)
    */
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/ssa/SSAInference.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/ssa/SSAInference.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/dataflow/ssa/SSAInference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/dataflow/ssa/SSAInference.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,8 +11,6 @@
 
 package com.ibm.wala.dataflow.ssa;
 
-import java.util.Iterator;
-
 import com.ibm.wala.analysis.typeInference.TypeInference;
 import com.ibm.wala.fixedpoint.impl.DefaultFixedPointSolver;
 import com.ibm.wala.fixedpoint.impl.NullaryOperator;
@@ -21,6 +19,7 @@
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SymbolTable;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 /**
  * This class performs intra-procedural propagation over an SSA form.
@@ -31,7 +30,7 @@
  * 
  * @see TypeInference for the canonical client of this machinery.
  */
-public abstract class SSAInference<T extends IVariable<?>> extends DefaultFixedPointSolver<T> {
+public abstract class SSAInference<T extends IVariable<T>> extends DefaultFixedPointSolver<T> {
   static final boolean DEBUG = false;
 
   /**
@@ -49,11 +48,10 @@
    */
   private IVariable[] vars;
 
-  public interface OperatorFactory<T extends IVariable> {
+  public interface OperatorFactory<T extends IVariable<T>> {
     /**
      * Get the dataflow operator induced by an instruction in SSA form.
      * 
-     * @param instruction
      * @return dataflow operator for the instruction, or null if the instruction is not applicable to the dataflow system.
      */
     AbstractOperator<T> get(SSAInstruction instruction);
@@ -82,20 +80,16 @@
 
   private void createEquations(OperatorFactory<T> opFactory) {
     SSAInstruction[] instructions = ir.getInstructions();
-    for (int i = 0; i < instructions.length; i++) {
-      SSAInstruction s = instructions[i];
+    for (SSAInstruction s : instructions) {
       makeEquationForInstruction(opFactory, s);
     }
-    for (Iterator it = ir.iteratePhis(); it.hasNext();) {
-      SSAInstruction s = (SSAInstruction) it.next();
+    for (SSAInstruction s : Iterator2Iterable.make(ir.iteratePhis())) {
       makeEquationForInstruction(opFactory, s);
     }
-    for (Iterator it = ir.iteratePis(); it.hasNext();) {
-      SSAInstruction s = (SSAInstruction) it.next();
+    for (SSAInstruction s : Iterator2Iterable.make(ir.iteratePis())) {
       makeEquationForInstruction(opFactory, s);
     }
-    for (Iterator it = ir.iterateCatchInstructions(); it.hasNext();) {
-      SSAInstruction s = (SSAInstruction) it.next();
+    for (SSAInstruction s : Iterator2Iterable.make(ir.iterateCatchInstructions())) {
       makeEquationForInstruction(opFactory, s);
     }
   }
@@ -158,9 +152,9 @@
    */
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer("Type inference : \n");
+    StringBuilder result = new StringBuilder("Type inference : \n");
     for (int i = 0; i < vars.length; i++) {
-      result.append("v").append(i).append("  ").append(vars[i]).append("\n");
+      result.append('v').append(i).append("  ").append(vars[i]).append('\n');
     }
     return result.toString();
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/DemandRefinementPointsTo.java	2019-01-29 17:08:39.000000000 +0000
@@ -45,6 +45,8 @@
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Predicate;
 
 import com.ibm.wala.analysis.reflection.InstanceKeyWithNode;
 import com.ibm.wala.classLoader.CallSiteReference;
@@ -113,7 +115,6 @@
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSANewInstruction;
 import com.ibm.wala.ssa.SSAPutInstruction;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.ArraySet;
 import com.ibm.wala.util.collections.ArraySetMultiMap;
 import com.ibm.wala.util.collections.HashMapFactory;
@@ -127,9 +128,7 @@
 import com.ibm.wala.util.collections.Util;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.intset.IntSet;
-import com.ibm.wala.util.intset.IntSetAction;
 import com.ibm.wala.util.intset.MutableIntSet;
 import com.ibm.wala.util.intset.MutableIntSetFactory;
 import com.ibm.wala.util.intset.MutableMapping;
@@ -179,10 +178,8 @@
   private void sanityCheckCG() {
     if (PARANOID) {
       for (CGNode callee : cg) {
-        for (Iterator<? extends CGNode> predNodes = cg.getPredNodes(callee); predNodes.hasNext();) {
-          CGNode caller = predNodes.next();
-          for (Iterator<CallSiteReference> iterator = cg.getPossibleSites(caller, callee); iterator.hasNext();) {
-            CallSiteReference site = iterator.next();
+        for (CGNode caller : Iterator2Iterable.make(cg.getPredNodes(callee))) {
+          for (CallSiteReference site : Iterator2Iterable.make(cg.getPossibleSites(caller, callee))) {
             try {
               caller.getIR().getCalls(site);
             } catch (IllegalArgumentException e) {
@@ -229,7 +226,7 @@
      * The budget specified in the {@link RefinementPolicy} was exceeded on all refinement passes
      */
     BUDGETEXCEEDED
-  };
+  }
 
   /**
    * re-initialize state for a new query
@@ -247,9 +244,9 @@
    * @param pk the pointer key
    * @param ikeyPred the desired predicate that each instance key in the points-to set should ideally satisfy
    * @return a pair consisting of (1) a {@link PointsToResult} indicating whether a points-to set satisfying the predicate was
-   *         computed, and (2) the last computed points-to set for the variable (possibly <code>null</code> if no points-to set
+   *         computed, and (2) the last computed points-to set for the variable (possibly {@code null} if no points-to set
    *         could be computed in the budget)
-   * @throws IllegalArgumentException if <code>pk</code> is not a {@link LocalPointerKey}; to eventually be fixed
+   * @throws IllegalArgumentException if {@code pk} is not a {@link LocalPointerKey}; to eventually be fixed
    */
   public Pair<PointsToResult, Collection<InstanceKey>> getPointsTo(PointerKey pk, Predicate<InstanceKey> ikeyPred)
       throws IllegalArgumentException {
@@ -259,11 +256,6 @@
     return Pair.make(p.fst, finalP2Set);
   }
 
-  /**
-   * @param pk
-   * @param ikeyPred
-   * @return
-   */
   private Pair<PointsToResult, Collection<InstanceKeyAndState>> getPointsToWithStates(PointerKey pk, Predicate<InstanceKey> ikeyPred) {
     if (!(pk instanceof com.ibm.wala.ipa.callgraph.propagation.LocalPointerKey)) {
       throw new IllegalArgumentException("only locals for now");
@@ -286,13 +278,7 @@
       throw new IllegalArgumentException("p2SetWithStates == null");
     }
     Collection<T> finalP2Set = Iterator2Collection.toSet(new MapIterator<WithState<T>, T>(p2SetWithStates.iterator(),
-        new Function<WithState<T>, T>() {
-
-          @Override
-          public T apply(WithState<T> object) {
-            return object.getWrapped();
-          }
-        }));
+        WithState::getWrapped));
     return finalP2Set;
   }
 
@@ -302,8 +288,6 @@
    * @param cg the underlying call graph for the analysis
    * @param model the heap model to be used for the analysis
    * @param mam indicates what code reads or writes each field
-   * @param cha
-   * @param options
    * @param stateMachineFactory factory for state machines to track additional properties like calling context
    */
   public static DemandRefinementPointsTo makeWithDefaultFlowGraph(CallGraph cg, HeapModel model, MemoryAccessMap mam,
@@ -406,7 +390,7 @@
    * @param ikeyPred the desired predicate that each instance key in the points-to set should ideally satisfy
    * @param pa a pre-computed points-to analysis
    * @return a {@link PointsToResult} indicating whether a points-to set satisfying the predicate was computed
-   * @throws IllegalArgumentException if <code>pk</code> is not a {@link LocalPointerKey}; to eventually be fixed
+   * @throws IllegalArgumentException if {@code pk} is not a {@link LocalPointerKey}; to eventually be fixed
    */
   public PointsToResult pointsToPassesPred(PointerKey pk, Predicate<InstanceKey> ikeyPred, PointerAnalysis<InstanceKey> pa)
       throws IllegalArgumentException {
@@ -501,38 +485,32 @@
   /**
    * do all instance keys in p2set pass ikeyPred?
    */
-  private boolean passesPred(Collection<InstanceKeyAndState> curP2Set, final Predicate<InstanceKey> ikeyPred) {
-    return Util.forAll(curP2Set, new Predicate<InstanceKeyAndState>() {
-
-      @Override
-      public boolean test(InstanceKeyAndState t) {
-        return ikeyPred.test(t.getInstanceKey());
-      }
-    });
+  private static boolean passesPred(Collection<InstanceKeyAndState> curP2Set, final Predicate<InstanceKey> ikeyPred) {
+    return Util.forAll(curP2Set, t -> ikeyPred.test(t.getInstanceKey()));
   }
 
   /**
-   * @return the points-to set of <code>pk</code>, or <code>null</code> if the points-to set can't be computed in the allocated
+   * @return the points-to set of {@code pk}, or {@code null} if the points-to set can't be computed in the allocated
    *         budget
    */
   @Override
   public Collection<InstanceKey> getPointsTo(PointerKey pk) {
-    return getPointsTo(pk, Predicate.<InstanceKey> falsePred()).snd;
+    return getPointsTo(pk, k -> { return false; }).snd;
   }
 
   /**
-   * @return the points-to set of <code>pk</code>, including the {@link State}s attached to the {@link InstanceKey}s, or
-   *         <code>null</code> if the points-to set can't be computed in the allocated budget
+   * @return the points-to set of {@code pk}, including the {@link State}s attached to the {@link InstanceKey}s, or
+   *         {@code null} if the points-to set can't be computed in the allocated budget
    */
   public Collection<InstanceKeyAndState> getPointsToWithStates(PointerKey pk) {
-    return getPointsToWithStates(pk, Predicate.<InstanceKey> falsePred()).snd;
+    return getPointsToWithStates(pk, k -> { return false; }).snd;
   }
 
   /**
    * get all the pointer keys that some instance key can flow to
    * 
    * @return a pair consisting of (1) a {@link PointsToResult} indicating whether a flows-to set was computed, and (2) the last
-   *         computed flows-to set for the instance key (possibly <code>null</code> if no flows-to set could be computed in the
+   *         computed flows-to set for the instance key (possibly {@code null} if no flows-to set could be computed in the
    *         budget)
    */
   public Pair<PointsToResult, Collection<PointerKey>> getFlowsTo(InstanceKey ik) {
@@ -544,7 +522,7 @@
    * get all the pointer keys that some instance key with state can flow to
    * 
    * @return a pair consisting of (1) a {@link PointsToResult} indicating whether a flows-to set was computed, and (2) the last
-   *         computed flows-to set for the instance key (possibly <code>null</code> if no flows-to set could be computed in the
+   *         computed flows-to set for the instance key (possibly {@code null} if no flows-to set could be computed in the
    *         budget)
    */
   public Pair<PointsToResult, Collection<PointerKey>> getFlowsTo(InstanceKeyAndState ikAndState) {
@@ -552,10 +530,6 @@
     return getFlowsToInternal(ikAndState);
   }
 
-  /**
-   * @param ik
-   * @return
-   */
   private Pair<PointsToResult, Collection<PointerKey>> getFlowsToInternal(InstanceKeyAndState ikAndState) {
     InstanceKey ik = ikAndState.getInstanceKey();
     if (!(ik instanceof InstanceKeyWithNode)) {
@@ -781,17 +755,17 @@
     /**
      * forward worklist: for initially processing points-to queries
      */
-    private final Collection<PointerKeyAndState> initWorklist = new LinkedHashSet<PointerKeyAndState>();
+    private final Collection<PointerKeyAndState> initWorklist = new LinkedHashSet<>();
 
     /**
      * worklist for variables whose points-to set has been updated
      */
-    private final Collection<PointerKeyAndState> pointsToWorklist = new LinkedHashSet<PointerKeyAndState>();
+    private final Collection<PointerKeyAndState> pointsToWorklist = new LinkedHashSet<>();
 
     /**
      * worklist for variables whose tracked points-to set has been updated
      */
-    private final Collection<PointerKeyAndState> trackedPointsToWorklist = new LinkedHashSet<PointerKeyAndState>();
+    private final Collection<PointerKeyAndState> trackedPointsToWorklist = new LinkedHashSet<>();
 
     /**
      * maps a pointer key to those on-the-fly virtual calls for which it is the receiver
@@ -856,7 +830,7 @@
     private OrdinalSet<InstanceKeyAndState> makeOrdinalSet(IntSet intSet) {
       // make a copy here, to avoid comodification during iteration
       // TODO remove the copying, do it only at necessary call sites
-      return new OrdinalSet<InstanceKeyAndState>(intSetFactory.makeCopy(intSet), ikAndStates);
+      return new OrdinalSet<>(intSetFactory.makeCopy(intSet), ikAndStates);
     }
 
     /**
@@ -876,6 +850,7 @@
       // }));
     }
 
+    @SuppressWarnings("unused")
     protected boolean addAllToP2Set(Map<PointerKeyAndState, MutableIntSet> p2setMap, PointerKeyAndState pkAndState, IntSet vals,
         IFlowLabel label) {
       final PointerKey pk = pkAndState.getPointerKey();
@@ -895,7 +870,7 @@
       boolean added = findOrCreate(p2setMap, pkAndState).addAll(vals);
       // final boolean added = p2setMap.putAll(pkAndState, vals);
       if (DEBUG && added) {
-        System.err.println("POINTS-TO ADDITION TO PK " + pkAndState + ":");
+        System.err.println("POINTS-TO ADDITION TO PK " + pkAndState + ':');
         for (InstanceKeyAndState ikAndState : makeOrdinalSet(vals)) {
           System.err.println(ikAndState);
         }
@@ -909,47 +884,32 @@
       if (typeFilter instanceof SingleClassFilter) {
         final IClass concreteType = ((SingleClassFilter) typeFilter).getConcreteType();
         final MutableIntSet tmp = intSetFactory.make();
-        vals.foreach(new IntSetAction() {
-
-          @Override
-          public void act(int x) {
-            InstanceKeyAndState ikAndState = ikAndStates.getMappedObject(x);
-            if (cha.isAssignableFrom(concreteType, ikAndState.getInstanceKey().getConcreteType())) {
-              tmp.add(x);
-            }
+        vals.foreach(x -> {
+          InstanceKeyAndState ikAndState = ikAndStates.getMappedObject(x);
+          if (cha.isAssignableFrom(concreteType, ikAndState.getInstanceKey().getConcreteType())) {
+            tmp.add(x);
           }
-
         });
         vals = tmp;
       } else if (typeFilter instanceof MultipleClassesFilter) {
         final MutableIntSet tmp = intSetFactory.make();
-        vals.foreach(new IntSetAction() {
-
-          @Override
-          public void act(int x) {
-            InstanceKeyAndState ikAndState = ikAndStates.getMappedObject(x);
-            for (IClass t : ((MultipleClassesFilter) typeFilter).getConcreteTypes()) {
-              if (cha.isAssignableFrom(t, ikAndState.getInstanceKey().getConcreteType())) {
-                tmp.add(x);
-              }
+        vals.foreach(x -> {
+          InstanceKeyAndState ikAndState = ikAndStates.getMappedObject(x);
+          for (IClass t : ((MultipleClassesFilter) typeFilter).getConcreteTypes()) {
+            if (cha.isAssignableFrom(t, ikAndState.getInstanceKey().getConcreteType())) {
+              tmp.add(x);
             }
           }
-
         });
         vals = tmp;
       } else if (typeFilter instanceof SingleInstanceFilter) {
         final InstanceKey theOnlyInstanceKey = ((SingleInstanceFilter) typeFilter).getInstance();
         final MutableIntSet tmp = intSetFactory.make();
-        vals.foreach(new IntSetAction() {
-
-          @Override
-          public void act(int x) {
-            InstanceKeyAndState ikAndState = ikAndStates.getMappedObject(x);
-            if (ikAndState.getInstanceKey().equals(theOnlyInstanceKey)) {
-              tmp.add(x);
-            }
+        vals.foreach(x -> {
+          InstanceKeyAndState ikAndState = ikAndStates.getMappedObject(x);
+          if (ikAndState.getInstanceKey().equals(theOnlyInstanceKey)) {
+            tmp.add(x);
           }
-
         });
         vals = tmp;
       } else {
@@ -982,15 +942,10 @@
     void handleCopy(final PointerKeyAndState curPkAndState, final PointerKey succPk, final IFlowLabel label) {
       assert !label.isBarred();
       State curState = curPkAndState.getState();
-      doTransition(curState, label, new Function<State, Object>() {
-
-        @Override
-        public Object apply(State nextState) {
-          PointerKeyAndState succPkAndState = new PointerKeyAndState(succPk, nextState);
-          handleCopy(curPkAndState, succPkAndState, label);
-          return null;
-        }
-
+      doTransition(curState, label, nextState -> {
+        PointerKeyAndState succPkAndState = new PointerKeyAndState(succPk, nextState);
+        handleCopy(curPkAndState, succPkAndState, label);
+        return null;
       });
     }
 
@@ -1013,7 +968,7 @@
     /**
      * @param label the label of the edge from curPk to predPk (must be barred)
      * @return those {@link PointerKeyAndState}s whose points-to sets have been queried, such that the {@link PointerKey} is predPk,
-     *         and transitioning from its state on <code>label.bar()</code> yields the state of <code>curPkAndState</code>
+     *         and transitioning from its state on {@code label.bar()} yields the state of {@code curPkAndState}
      */
     protected Collection<PointerKeyAndState> matchingPToQueried(PointerKeyAndState curPkAndState, PointerKey predPk,
         IFlowLabel label) {
@@ -1152,43 +1107,27 @@
               final PointerKeyAndState defAndState = new PointerKeyAndState(heapModel.getPointerKeyForLocal(caller, invokeInstr
                   .getDef()), receiverState);
               final PointerKey ret = heapModel.getPointerKeyForReturnValue(targetForCall);
-              doTransition(receiverState, returnLabel, new Function<State, Object>() {
-
-                @Override
-                public Object apply(State retState) {
-                  repropCallArg(defAndState, new PointerKeyAndState(ret, retState), returnLabel.bar());
-                  return null;
-                }
-
+              doTransition(receiverState, returnLabel, retState -> {
+                repropCallArg(defAndState, new PointerKeyAndState(ret, retState), returnLabel.bar());
+                return null;
               });
             }
             final PointerKeyAndState exc = new PointerKeyAndState(heapModel.getPointerKeyForLocal(caller, invokeInstr
                 .getException()), receiverState);
             final PointerKey excRet = heapModel.getPointerKeyForExceptionalReturnValue(targetForCall);
-            doTransition(receiverState, returnLabel, new Function<State, Object>() {
-
-              @Override
-              public Object apply(State excRetState) {
-                repropCallArg(exc, new PointerKeyAndState(excRet, excRetState), returnLabel.bar());
-                return null;
-              }
-
+            doTransition(receiverState, returnLabel, excRetState -> {
+              repropCallArg(exc, new PointerKeyAndState(excRet, excRetState), returnLabel.bar());
+              return null;
             });
-            for (Iterator<Integer> iter = new PointerParamValueNumIterator(targetForCall); iter.hasNext();) {
-              final int formalNum = iter.next();
+            for (int formalNum : Iterator2Iterable.make(new PointerParamValueNumIterator(targetForCall))) {
               final int actualNum = formalNum - 1;
               final ParamBarLabel paramBarLabel = ParamBarLabel.make(new CallerSiteContext(caller, call));
-              doTransition(receiverState, paramBarLabel, new Function<State, Object>() {
-
-                @Override
-                public Object apply(State formalState) {
-                  repropCallArg(
-                      new PointerKeyAndState(heapModel.getPointerKeyForLocal(targetForCall, formalNum), formalState),
-                      new PointerKeyAndState(heapModel.getPointerKeyForLocal(caller, invokeInstr.getUse(actualNum)), receiverState),
-                      paramBarLabel);
-                  return null;
-                }
-
+              doTransition(receiverState, paramBarLabel, formalState -> {
+                repropCallArg(
+                    new PointerKeyAndState(heapModel.getPointerKeyForLocal(targetForCall, formalNum), formalState),
+                    new PointerKeyAndState(heapModel.getPointerKeyForLocal(caller, invokeInstr.getUse(actualNum)), receiverState),
+                    paramBarLabel);
+                return null;
               });
             }
           }
@@ -1198,9 +1137,6 @@
 
     /**
      * handle possible updated flow in both directions for a call parameter
-     * 
-     * @param src
-     * @param dst
      */
     private void repropCallArg(PointerKeyAndState src, PointerKeyAndState dst, IFlowLabel dstToSrcLabel) {
       if (DEBUG) {
@@ -1249,17 +1185,12 @@
             if (DEBUG) {
               System.err.println("alloc " + ik + " assigned to " + curPk);
             }
-            doTransition(curState, label, new Function<State, Object>() {
-
-              @Override
-              public Object apply(State newState) {
-                InstanceKeyAndState ikAndState = new InstanceKeyAndState(ik, newState);
-                int n = ikAndStates.add(ikAndState);
-                findOrCreate(pkToP2Set, curPkAndState).add(n);
-                addToPToWorklist(curPkAndState);
-                return null;
-              }
-
+            doTransition(curState, label, newState -> {
+              InstanceKeyAndState ikAndState = new InstanceKeyAndState(ik, newState);
+              int n = ikAndStates.add(ikAndState);
+              findOrCreate(pkToP2Set, curPkAndState).add(n);
+              addToPToWorklist(curPkAndState);
+              return null;
             });
           }
 
@@ -1312,9 +1243,6 @@
 
     /**
      * handle flow from actuals to formals, and from returned values to variables at the caller
-     * 
-     * @param curPk
-     * @param handler
      */
     private void handleForwInterproc(final PointerKeyAndState curPkAndState, final CopyHandler handler) {
       PointerKey curPk = curPkAndState.getPointerKey();
@@ -1339,8 +1267,7 @@
                 // }
                 g.addSubgraphForNode(caller);
                 SSAAbstractInvokeInstruction[] callInstrs = getCallInstrs(caller, call);
-                for (int i = 0; i < callInstrs.length; i++) {
-                  SSAAbstractInvokeInstruction callInstr = callInstrs[i];
+                for (SSAAbstractInvokeInstruction callInstr : callInstrs) {
                   PointerKey actualPk = heapModel.getPointerKeyForLocal(caller, callInstr.getUse(paramPos));
                   assert g.containsNode(actualPk);
                   assert g.containsNode(localPk);
@@ -1432,9 +1359,7 @@
 
     /**
      * track a field of some instance key, as we are interested in statements that read or write to the field
-     * 
-     * @param ikAndState
-     * @param field
+     *
      * @param ikToFields either {@link #forwInstKeyToFields} or {@link #backInstKeyToFields}
      */
     private void trackInstanceField(InstanceKeyAndState ikAndState, IField field, MultiMap<InstanceKeyAndState, IField> ikToFields) {
@@ -1443,8 +1368,8 @@
     }
 
     private void addPredsOfIKeyAndStateToTrackedPointsTo(InstanceKeyAndState ikAndState) throws UnimplementedError {
-      for (Iterator<? extends Object> iter = g.getPredNodes(ikAndState.getInstanceKey(), NewLabel.v()); iter.hasNext();) {
-        PointerKey ikPred = (PointerKey) iter.next();
+      for (Object o : Iterator2Iterable.make(g.getPredNodes(ikAndState.getInstanceKey(), NewLabel.v()))) {
+        PointerKey ikPred = (PointerKey) o;
         PointerKeyAndState ikPredAndState = new PointerKeyAndState(ikPred, ikAndState.getState());
         int mappedIndex = ikAndStates.getMappedIndex(ikAndState);
         assert mappedIndex != -1;
@@ -1588,9 +1513,6 @@
 
     /**
      * handle flow from return value to callers, or from actual to formals
-     * 
-     * @param curPkAndState
-     * @param handler
      */
     private void handleBackInterproc(final PointerKeyAndState curPkAndState, final CopyHandler handler, final boolean addGraphs) {
       final PointerKey curPk = curPkAndState.getPointerKey();
@@ -1627,8 +1549,7 @@
               // }
               g.addSubgraphForNode(caller);
               SSAAbstractInvokeInstruction[] callInstrs = getCallInstrs(caller, call);
-              for (int i = 0; i < callInstrs.length; i++) {
-                SSAAbstractInvokeInstruction callInstr = callInstrs[i];
+              for (SSAAbstractInvokeInstruction callInstr : callInstrs) {
                 PointerKey returnAtCallerKey = heapModel.getPointerKeyForLocal(caller, isExceptional ? callInstr.getException()
                     : callInstr.getDef());
                 assert g.containsNode(returnAtCallerKey);
@@ -1668,8 +1589,7 @@
         LocalPointerKey localPk = (LocalPointerKey) curPk;
         CGNode caller = localPk.getNode();
         // from actual parameter to callee
-        for (Iterator<SSAAbstractInvokeInstruction> iter = g.getInstrsPassingParam(localPk); iter.hasNext();) {
-          SSAAbstractInvokeInstruction callInstr = iter.next();
+        for (SSAAbstractInvokeInstruction callInstr : Iterator2Iterable.make(g.getInstrsPassingParam(localPk))) {
           for (int i = 0; i < callInstr.getNumberOfUses(); i++) {
             if (localPk.getValueNumber() != callInstr.getUse(i))
               continue;
@@ -1722,11 +1642,8 @@
      * that the subgraph for the callee is missing?
      * 
      * @param addGraphs whether graphs should always be added
-     * @param callee
-     * @param pkAndState
-     * @return
      */
-    protected boolean calleeSubGraphMissingAndShouldNotBeAdded(boolean addGraphs, CGNode callee, PointerKeyAndState pkAndState) {
+    protected boolean calleeSubGraphMissingAndShouldNotBeAdded(boolean addGraphs, CGNode callee, @SuppressWarnings("unused") PointerKeyAndState pkAndState) {
       return !addGraphs && !g.hasSubgraphForNode(callee);
     }
 
@@ -1772,17 +1689,12 @@
 
           @Override
           public void visitAssignGlobal(final AssignGlobalLabel label, Object dst) {
-            for (Iterator<? extends Object> readIter = g.getReadsOfStaticField((StaticFieldKey) dst); readIter.hasNext();) {
-              final PointerKey predPk = (PointerKey) readIter.next();
-              doTransition(curState, AssignGlobalBarLabel.v(), new Function<State, Object>() {
-
-                @Override
-                public Object apply(State predPkState) {
-                  PointerKeyAndState predPkAndState = new PointerKeyAndState(predPk, predPkState);
-                  handleTrackedPred(trackedSet, predPkAndState, AssignGlobalBarLabel.v());
-                  return null;
-                }
-
+            for (Object o : Iterator2Iterable.make(g.getReadsOfStaticField((StaticFieldKey) dst))) {
+              final PointerKey predPk = (PointerKey) o;
+              doTransition(curState, AssignGlobalBarLabel.v(), predPkState -> {
+                PointerKeyAndState predPkAndState = new PointerKeyAndState(predPk, predPkState);
+                handleTrackedPred(trackedSet, predPkAndState, AssignGlobalBarLabel.v());
+                return null;
               });
             }
           }
@@ -1804,17 +1716,11 @@
               }
             } else {
               // send to all getfield sources
-              for (Iterator<PointerKey> readIter = g.getReadsOfInstanceField(storeBase, field); readIter.hasNext();) {
-                final PointerKey predPk = readIter.next();
-                doTransition(curState, MatchBarLabel.v(), new Function<State, Object>() {
-
-                  @Override
-                  public Object apply(State predPkState) {
-                    PointerKeyAndState predPkAndState = new PointerKeyAndState(predPk, predPkState);
-                    handleTrackedPred(trackedSet, predPkAndState, MatchBarLabel.v());
-                    return null;
-                  }
-
+              for (final PointerKey predPk : Iterator2Iterable.make(g.getReadsOfInstanceField(storeBase, field))) {
+                doTransition(curState, MatchBarLabel.v(), predPkState -> {
+                  PointerKeyAndState predPkAndState = new PointerKeyAndState(predPk, predPkState);
+                  handleTrackedPred(trackedSet, predPkAndState, MatchBarLabel.v());
+                  return null;
                 });
               }
 
@@ -1845,15 +1751,10 @@
           @Override
           public void visitAssign(final AssignLabel label, Object dst) {
             final PointerKey predPk = (PointerKey) dst;
-            doTransition(curState, label.bar(), new Function<State, Object>() {
-
-              @Override
-              public Object apply(State predPkState) {
-                PointerKeyAndState predPkAndState = new PointerKeyAndState(predPk, predPkState);
-                handleTrackedPred(trackedSet, predPkAndState, label.bar());
-                return null;
-              }
-
+            doTransition(curState, label.bar(), predPkState -> {
+              PointerKeyAndState predPkAndState = new PointerKeyAndState(predPk, predPkState);
+              handleTrackedPred(trackedSet, predPkAndState, label.bar());
+              return null;
             });
           }
 
@@ -1864,14 +1765,10 @@
           @Override
           void handle(PointerKeyAndState src, final PointerKey dst, final IFlowLabel label) {
             assert src == curPkAndState;
-            doTransition(curState, label, new Function<State, Object>() {
-              @Override
-              public Object apply(State dstState) {
-                PointerKeyAndState dstAndState = new PointerKeyAndState(dst, dstState);
-                handleTrackedPred(trackedSet, dstAndState, label);
-                return null;
-              }
-
+            doTransition(curState, label, dstState -> {
+              PointerKeyAndState dstAndState = new PointerKeyAndState(dst, dstState);
+              handleTrackedPred(trackedSet, dstAndState, label);
+              return null;
             });
           }
 
@@ -1999,11 +1896,11 @@
     }
   }
 
-  private SSAAbstractInvokeInstruction[] getCallInstrs(CGNode node, CallSiteReference site) {
+  private static SSAAbstractInvokeInstruction[] getCallInstrs(CGNode node, CallSiteReference site) {
     return node.getIR().getCalls(site);
   }
 
-  private boolean hasNullIR(CGNode node) {
+  private static boolean hasNullIR(CGNode node) {
     boolean ret = node.getMethod().isNative();
     assert node.getIR() != null || ret;
     return ret;
@@ -2038,16 +1935,12 @@
 
   /**
    * we are looking for an instance key flowing to pk that violates pred.
-   * 
-   * @param pk
-   * @param pred
-   * @param pa
    */
   @SuppressWarnings("unused")
   private boolean doTopLevelTraversal(PointerKey pk, final Predicate<InstanceKey> pred, final PointsToComputer ptoComputer,
       PointerAnalysis<InstanceKey> pa) {
     final Set<PointerKeyAndState> visited = HashSetFactory.make();
-    final LinkedList<PointerKeyAndState> worklist = new LinkedList<PointerKeyAndState>();
+    final LinkedList<PointerKeyAndState> worklist = new LinkedList<>();
 
     class Helper {
 
@@ -2121,18 +2014,13 @@
                   // }
                   g.addSubgraphForNode(caller);
                   SSAAbstractInvokeInstruction[] callInstrs = getCallInstrs(caller, call);
-                  for (int i = 0; i < callInstrs.length; i++) {
-                    SSAAbstractInvokeInstruction callInstr = callInstrs[i];
+                  for (SSAAbstractInvokeInstruction callInstr : callInstrs) {
                     final PointerKey actualPk = heapModel.getPointerKeyForLocal(caller, callInstr.getUse(paramPos));
                     assert g.containsNode(actualPk);
                     assert g.containsNode(localPk);
-                    doTransition(curState, paramLabel, new Function<State, Object>() {
-                      @Override
-                      public Object apply(State nextState) {
-                        propagate(new PointerKeyAndState(actualPk, nextState));
-                        return null;
-                      }
-
+                    doTransition(curState, paramLabel, nextState -> {
+                      propagate(new PointerKeyAndState(actualPk, nextState));
+                      return null;
                     });
                   }
                 }
@@ -2179,14 +2067,9 @@
                 final PointerKey retVal = isExceptional ? heapModel.getPointerKeyForExceptionalReturnValue(callee) : heapModel
                     .getPointerKeyForReturnValue(callee);
                 assert g.containsNode(retVal);
-                doTransition(curState, ReturnLabel.make(callSiteAndCGNode), new Function<State, Object>() {
-
-                  @Override
-                  public Object apply(State nextState) {
-                    propagate(new PointerKeyAndState(retVal, nextState));
-                    return null;
-                  }
-
+                doTransition(curState, ReturnLabel.make(callSiteAndCGNode), nextState -> {
+                  propagate(new PointerKeyAndState(retVal, nextState));
+                  return null;
                 });
               }
             } else {
@@ -2201,14 +2084,9 @@
                   final PointerKey retVal = isExceptional ? heapModel.getPointerKeyForExceptionalReturnValue(callee) : heapModel
                       .getPointerKeyForReturnValue(callee);
                   assert g.containsNode(retVal);
-                  doTransition(curState, ReturnLabel.make(callSiteAndCGNode), new Function<State, Object>() {
-
-                    @Override
-                    public Object apply(State nextState) {
-                      propagate(new PointerKeyAndState(retVal, nextState));
-                      return null;
-                    }
-
+                  doTransition(curState, ReturnLabel.make(callSiteAndCGNode), nextState -> {
+                    propagate(new PointerKeyAndState(retVal, nextState));
+                    return null;
                   });
                 }
               }
@@ -2304,17 +2182,12 @@
           if (DEBUG_TOPLEVEL) {
             System.err.println("toplevel alloc " + ik + " assigned to " + curPk);
           }
-          doTransition(curState, label, new Function<State, Object>() {
-
-            @Override
-            public Object apply(State newState) {
-              // just check if ik violates the pred
-              if (!pred.test(ik)) {
-                foundBadInstanceKey = true;
-              }
-              return null;
+          doTransition(curState, label, newState -> {
+            // just check if ik violates the pred
+            if (!pred.test(ik)) {
+              foundBadInstanceKey = true;
             }
-
+            return null;
           });
         }
 
@@ -2356,17 +2229,10 @@
               }
             }
           } else { // use match edges
-            for (Iterator<PointerKey> writesToInstanceField = g.getWritesToInstanceField(loadBase, field); writesToInstanceField
-                .hasNext();) {
-              final PointerKey writtenPk = writesToInstanceField.next();
-              doTransition(curState, MatchLabel.v(), new Function<State, Object>() {
-
-                @Override
-                public Object apply(State nextState) {
-                  h.propagate(new PointerKeyAndState(writtenPk, nextState));
-                  return null;
-                }
-
+            for (final PointerKey writtenPk : Iterator2Iterable.make(g.getWritesToInstanceField(loadBase, field))) {
+              doTransition(curState, MatchLabel.v(), nextState -> {
+                h.propagate(new PointerKeyAndState(writtenPk, nextState));
+                return null;
               });
             }
           }
@@ -2414,17 +2280,11 @@
 
         @Override
         public void visitAssignGlobal(AssignGlobalLabel label, Object dst) {
-          for (Iterator<? extends Object> writesToStaticField = g.getWritesToStaticField((StaticFieldKey) dst); writesToStaticField
-              .hasNext();) {
-            final PointerKey writtenPk = (PointerKey) writesToStaticField.next();
-            doTransition(curState, label, new Function<State, Object>() {
-
-              @Override
-              public Object apply(State nextState) {
-                h.propagate(new PointerKeyAndState(writtenPk, nextState));
-                return null;
-              }
-
+          for (Object writeToStaticField : Iterator2Iterable.make(g.getWritesToStaticField((StaticFieldKey) dst))) {
+            final PointerKey writtenPk = (PointerKey) writeToStaticField;
+            doTransition(curState, label, nextState -> {
+              h.propagate(new PointerKeyAndState(writtenPk, nextState));
+              return null;
             });
 
           }
@@ -2433,14 +2293,9 @@
         @Override
         public void visitAssign(AssignLabel label, Object dst) {
           final PointerKey succPk = (PointerKey) dst;
-          doTransition(curState, label, new Function<State, Object>() {
-
-            @Override
-            public Object apply(State nextState) {
-              h.propagate(new PointerKeyAndState(succPk, nextState));
-              return null;
-            }
-
+          doTransition(curState, label, nextState -> {
+            h.propagate(new PointerKeyAndState(succPk, nextState));
+            return null;
           });
         }
 
@@ -2456,7 +2311,7 @@
     return true;
   }
 
-  private boolean predHoldsForPk(PointerKey curPk, Predicate<InstanceKey> pred, PointerAnalysis<InstanceKey> pa) {
+  private static boolean predHoldsForPk(PointerKey curPk, Predicate<InstanceKey> pred, PointerAnalysis<InstanceKey> pa) {
     PointerKey curPkForPAHeapModel = convertToHeapModel(curPk, pa.getHeapModel());
     OrdinalSet<InstanceKey> pointsToSet = pa.getPointsToSet(curPkForPAHeapModel);
     for (InstanceKey ik : pointsToSet) {
@@ -2467,7 +2322,7 @@
     return true;
   }
 
-  private PointerKey convertToHeapModel(PointerKey curPk, HeapModel heapModel) {
+  private static PointerKey convertToHeapModel(PointerKey curPk, HeapModel heapModel) {
     return AbstractFlowGraph.convertPointerKeyToHeapModel(curPk, heapModel);
   }
 
@@ -2493,7 +2348,7 @@
     // here we compute the number of unique *method* targets, as opposed to call graph nodes.
     // if we have a context-sensitive call graph, with many targets representing clones of
     // the same method, we don't want to count the clones twice
-    Set<IMethod> methodTargets = new HashSet<IMethod>();
+    Set<IMethod> methodTargets = new HashSet<>();
     for (CGNode node : possibleTargets) {
       methodTargets.add(node.getMethod());
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/CallGraphRefinePolicy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/CallGraphRefinePolicy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/CallGraphRefinePolicy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/CallGraphRefinePolicy.java	2019-01-29 17:08:39.000000000 +0000
@@ -45,14 +45,13 @@
 public interface CallGraphRefinePolicy {
 
   /**
-   * @param callSiteAndCGNode
-   * @return <code>true</code> if the analysis should attempt to determine targets for the virtual call on-the-fly, and
-   *         <code>false</code> otherwise
+   * @return {@code true} if the analysis should attempt to determine targets for the virtual call on-the-fly, and
+   *         {@code false} otherwise
    */
   public boolean shouldRefine(CallerSiteContext callSiteAndCGNode);
 
   /**
-   * @return <code>true</code> if more refinement can be done, and hence another pass can be attempted; <code>false</code> otherwise
+   * @return {@code true} if more refinement can be done, and hence another pass can be attempted; {@code false} otherwise
    */
   public boolean nextPass();
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/DelegatingFieldRefinePolicy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/DelegatingFieldRefinePolicy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/DelegatingFieldRefinePolicy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/DelegatingFieldRefinePolicy.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,10 +44,10 @@
   }
 
   /**
-   * returns <code>true</code> if
-   * <code>A.shouldRefine(field) || B.shouldRefine(field)</code>. Note that
-   * if <code>A.shouldRefine(field)</code> is <code>true</code>,
-   * <code>B.shouldRefine(field)</code> is <em>not</em> called.
+   * returns {@code true} if
+   * {@code A.shouldRefine(field) || B.shouldRefine(field)}. Note that
+   * if {@code A.shouldRefine(field)} is {@code true},
+   * {@code B.shouldRefine(field)} is <em>not</em> called.
    */
   @Override
   public boolean shouldRefine(IField field, PointerKey basePtr, PointerKey val, IFlowLabel label, StateMachine.State state) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/FieldRefinePolicy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/FieldRefinePolicy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/FieldRefinePolicy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/FieldRefinePolicy.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,20 +51,17 @@
 public interface FieldRefinePolicy {
 
   /**
-   * 
    * @param field the accessed field
    * @param basePtr the base pointer of the access
-   * @param val
-   * @param state
-   * @return <code>true</code> if match edges for the field access should be refined. Otherwise, <code>false</code>
+   * @return {@code true} if match edges for the field access should be refined. Otherwise, {@code false}
    *         is returned, indicating that the field can be handled with match edges.
    */
   public boolean shouldRefine(IField field, PointerKey basePtr, PointerKey val, IFlowLabel label, StateMachine.State state);
 
   /**
    * 
-   * @return <code>true</code> if more refinement can be done, and hence another pass can be attempted;
-   *         <code>false</code> otherwise
+   * @return {@code true} if more refinement can be done, and hence another pass can be attempted;
+   *         {@code false} otherwise
    */
   public boolean nextPass();
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/ManualFieldPolicy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/ManualFieldPolicy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/ManualFieldPolicy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/ManualFieldPolicy.java	2019-01-29 17:08:39.000000000 +0000
@@ -125,7 +125,7 @@
   /**
    * @param refinePattern a pattern for detecting which match edges to refine. If the <em>declaring class</em> of the field related
    *          to the match edge matches the pattern, the match edge will be refined. For example, the pattern
-   *          <code>Pattern.compile("Ljava/util")</code> will cause all fields of classes in the <code>java.util</code> package to
+   *          {@code Pattern.compile("Ljava/util")} will cause all fields of classes in the {@code java.util} package to
    *          be refined.
    */
   public ManualFieldPolicy(IClassHierarchy cha, Pattern refinePattern) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/RefinementPolicy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/RefinementPolicy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/RefinementPolicy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/RefinementPolicy.java	2019-01-29 17:08:39.000000000 +0000
@@ -54,10 +54,8 @@
   public int getNumPasses();
 
   /**
-   * 
-   * @param passNum
    * @return the maximum number of nodes to traverse in pass
-   *         <code>passNum</code>
+   *         {@code passNum}
    */
   public int getBudgetForPass(int passNum);
 
@@ -75,8 +73,8 @@
 
   /**
    * 
-   * @return <code>true</code> if more refinement can be done, and hence
-   *         another pass can be attempted; <code>false</code> otherwise
+   * @return {@code true} if more refinement can be done, and hence
+   *         another pass can be attempted; {@code false} otherwise
    */
   public boolean nextPass();
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/TunedFieldRefinementPolicy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/TunedFieldRefinementPolicy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/TunedFieldRefinementPolicy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/refinepolicy/TunedFieldRefinementPolicy.java	2019-01-29 17:08:39.000000000 +0000
@@ -76,8 +76,6 @@
   }
 
   /**
-   * 
-   * @param klass
    * @return the top-level {@link IClass} where klass is declared, or klass itself if klass is top-level or if top-level
    *         class not loaded
    */
@@ -98,4 +96,4 @@
     this.cha = cha;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/SimpleDemandPointsTo.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/SimpleDemandPointsTo.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/SimpleDemandPointsTo.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/SimpleDemandPointsTo.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,7 +50,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.LocalPointerKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.util.Predicate;
+import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.UnimplementedError;
 import com.ibm.wala.util.graph.traverse.SlowDFSDiscoverTimeIterator;
 
@@ -70,7 +70,6 @@
   }
 
   @Override
-  @SuppressWarnings("unchecked")
   public Collection<InstanceKey> getPointsTo(PointerKey pk) throws IllegalArgumentException, UnimplementedError {
 
     if (pk == null) {
@@ -93,15 +92,16 @@
       System.err.println(g.toString());
     }
 
-    Predicate iKeyFilter = new Predicate() {
-      @Override
-      public boolean test(Object o) {
-        return o instanceof InstanceKey;
+    SlowDFSDiscoverTimeIterator<Object> dfs = new SlowDFSDiscoverTimeIterator<>(g, pk);
+    Collection<InstanceKey> keys = HashSetFactory.make();
+    while (dfs.hasNext()) {
+      Object o = dfs.next();
+      if (o instanceof InstanceKey) {
+        keys.add((InstanceKey) o);
       }
-    };
-
-    SlowDFSDiscoverTimeIterator<Object> dfs = new SlowDFSDiscoverTimeIterator<Object>(g, pk);
-    return Predicate.filter(dfs, iKeyFilter);
+    }
+    
+    return keys;
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/statemachine/DummyStateMachine.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/statemachine/DummyStateMachine.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/statemachine/DummyStateMachine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/statemachine/DummyStateMachine.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,7 +50,7 @@
 
     @Override
     public StateMachine<T> make() {
-      return new DummyStateMachine<T>();
+      return new DummyStateMachine<>();
     }
 
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/statemachine/StateMachine.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/statemachine/StateMachine.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/statemachine/StateMachine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/statemachine/StateMachine.java	2019-01-29 17:08:39.000000000 +0000
@@ -55,10 +55,8 @@
   public State getStartState();
 
   /**
-   * @param prevState
-   * @param label
    * @return the successor state of prevState for the transition labelled label,
-   *         or <code>null</code> if no such transition exists
+   *         or {@code null} if no such transition exists
    * @throws StatesMergedException if merging of states is detected
    * @see StatesMergedException
    */
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/statemachine/StatesMergedException.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/statemachine/StatesMergedException.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/statemachine/StatesMergedException.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/statemachine/StatesMergedException.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,4 +49,6 @@
  */
 public class StatesMergedException extends RuntimeException {
 
+  private static final long serialVersionUID = 7769961571949421524L;
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/ThisFilteringHeapModel.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/ThisFilteringHeapModel.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/ThisFilteringHeapModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/alg/ThisFilteringHeapModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -29,10 +29,10 @@
 import com.ibm.wala.util.debug.Assertions;
 
 /**
- * a {@link HeapModel} that delegates to another except for pointer keys representing <code>this</code> parameters of methods, for
+ * a {@link HeapModel} that delegates to another except for pointer keys representing {@code this} parameters of methods, for
  * which it returns a {@link FilteredPointerKey} for the type of the parameter
  * 
- * @see {@link DemandRefinementPointsTo}
+ * @see DemandRefinementPointsTo
  * @author manu
  * 
  */
@@ -115,7 +115,6 @@
   }
 
   /**
-   * @param method
    * @return the receiver class for this method.
    */
   private IClass getReceiverClass(IMethod method) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/AbstractDemandFlowGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/AbstractDemandFlowGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/AbstractDemandFlowGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/AbstractDemandFlowGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -56,16 +56,15 @@
 import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.CallerSiteContext;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
-import com.ibm.wala.ssa.SSAInvokeInstruction;
 import com.ibm.wala.ssa.SSAPhiInstruction;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.intset.BitVectorIntSet;
 import com.ibm.wala.util.ref.ReferenceCleanser;
 
@@ -125,19 +124,17 @@
       return EmptyIterator.instance();
     }
     int paramPos = pk.getValueNumber() - 1;
-    ArrayList<PointerKeyAndCallSite> paramSuccs = new ArrayList<PointerKeyAndCallSite>();
+    ArrayList<PointerKeyAndCallSite> paramSuccs = new ArrayList<>();
     // iterate over callers
     for (CGNode caller : cg) {
       // TODO optimization: we don't need to add the graph if null is passed
       // as the argument
       addSubgraphForNode(caller);
       IR ir = caller.getIR();
-      for (Iterator<CallSiteReference> iterator = ir.iterateCallSites(); iterator.hasNext();) {
-        CallSiteReference call = iterator.next();
+      for (CallSiteReference call : Iterator2Iterable.make(ir.iterateCallSites())) {
         if (cg.getPossibleTargets(caller, call).contains(cgNode)) {
           SSAAbstractInvokeInstruction[] callInstrs = ir.getCalls(call);
-          for (int i = 0; i < callInstrs.length; i++) {
-            SSAAbstractInvokeInstruction callInstr = callInstrs[i];
+          for (SSAAbstractInvokeInstruction callInstr : callInstrs) {
             PointerKey actualPk = heapModel.getPointerKeyForLocal(caller, callInstr.getUse(paramPos));
             assert containsNode(actualPk);
             assert containsNode(pk);
@@ -158,7 +155,7 @@
     if (instrs == null) {
       return EmptyIterator.instance();
     }
-    ArrayList<PointerKeyAndCallSite> paramPreds = new ArrayList<PointerKeyAndCallSite>();
+    ArrayList<PointerKeyAndCallSite> paramPreds = new ArrayList<>();
     for (SSAAbstractInvokeInstruction callInstr : instrs) {
       for (int i = 0; i < callInstr.getNumberOfUses(); i++) {
         if (pk.getValueNumber() != callInstr.getUse(i))
@@ -188,7 +185,7 @@
     SSAAbstractInvokeInstruction callInstr = callDefs.get(pk);
     if (callInstr == null)
       return EmptyIterator.instance();
-    ArrayList<PointerKeyAndCallSite> returnSuccs = new ArrayList<PointerKeyAndCallSite>();
+    ArrayList<PointerKeyAndCallSite> returnSuccs = new ArrayList<>();
     boolean isExceptional = pk.getValueNumber() == callInstr.getException();
 
     CallSiteReference callSiteRef = callInstr.getCallSite();
@@ -215,19 +212,17 @@
       return EmptyIterator.instance();
     }
     boolean isExceptional = pk == heapModel.getPointerKeyForExceptionalReturnValue(cgNode);
-    ArrayList<PointerKeyAndCallSite> returnPreds = new ArrayList<PointerKeyAndCallSite>();
+    ArrayList<PointerKeyAndCallSite> returnPreds = new ArrayList<>();
     // iterate over callers
     for (CGNode caller : cg) {
       // TODO we don't need to add the graph if null is passed
       // as the argument
       addSubgraphForNode(caller);
       IR ir = caller.getIR();
-      for (Iterator<CallSiteReference> iterator = ir.iterateCallSites(); iterator.hasNext();) {
-        CallSiteReference call = iterator.next();
+      for (CallSiteReference call : Iterator2Iterable.make(ir.iterateCallSites())) {
         if (cg.getPossibleTargets(caller, call).contains(cgNode)) {
           SSAAbstractInvokeInstruction[] callInstrs = ir.getCalls(call);
-          for (int i = 0; i < callInstrs.length; i++) {
-            SSAAbstractInvokeInstruction callInstr = callInstrs[i];
+          for (SSAAbstractInvokeInstruction callInstr : callInstrs) {
             PointerKey returnPk = heapModel.getPointerKeyForLocal(caller, isExceptional ? callInstr.getException() : callInstr
                 .getDef());
             assert containsNode(returnPk);
@@ -262,8 +257,7 @@
       return;
     }
 
-    DefUse du = node.getDU();
-    addNodeInstructionConstraints(node, ir, du);
+    addNodeInstructionConstraints(node, ir);
     addNodePassthruExceptionConstraints(node, ir);
     addNodeConstantConstraints(node, ir);
   }
@@ -271,7 +265,7 @@
   /**
    * Add pointer flow constraints based on instructions in a given node
    */
-  protected void addNodeInstructionConstraints(CGNode node, IR ir, DefUse du) {
+  protected void addNodeInstructionConstraints(CGNode node, IR ir) {
     FlowStatementVisitor v = makeVisitor(node);
     ControlFlowGraph<SSAInstruction, ISSABasicBlock> cfg = ir.getControlFlowGraph();
     for (ISSABasicBlock b : cfg) {
@@ -287,8 +281,7 @@
     v.setBasicBlock(b);
 
     // visit each instruction in the basic block.
-    for (Iterator<SSAInstruction> it = b.iterator(); it.hasNext();) {
-      SSAInstruction s = it.next();
+    for (SSAInstruction s : b) {
       if (s != null) {
         s.visit(v);
       }
@@ -300,8 +293,8 @@
   private void addPhiConstraints(CGNode node, ControlFlowGraph<SSAInstruction, ISSABasicBlock> cfg, ISSABasicBlock b) {
 
     // visit each phi instruction in each successor block
-    for (Iterator<? extends IBasicBlock> iter = cfg.getSuccNodes(b); iter.hasNext();) {
-      ISSABasicBlock sb = (ISSABasicBlock) iter.next();
+    for (IBasicBlock ibb : Iterator2Iterable.make(cfg.getSuccNodes(b))) {
+      ISSABasicBlock sb = (ISSABasicBlock) ibb;
       if (sb.isExitBlock()) {
         // an optimization based on invariant that exit blocks should
         // have no
@@ -310,15 +303,15 @@
       }
       int n = 0;
       // set n to be whichPred(this, sb);
-      for (Iterator<? extends IBasicBlock> back = cfg.getPredNodes(sb); back.hasNext(); n++) {
-        if (back.next() == b) {
+      for (IBasicBlock back : Iterator2Iterable.make(cfg.getPredNodes(sb))) {
+        if (back == b) {
           break;
         }
+        ++n;
       }
       assert n < cfg.getPredNodeCount(sb);
-      for (Iterator<SSAPhiInstruction> phis = sb.iteratePhis(); phis.hasNext();) {
+      for (SSAPhiInstruction phi : Iterator2Iterable.make(sb.iteratePhis())) {
         // Assertions.UNREACHABLE();
-        SSAPhiInstruction phi = phis.next();
         if (phi == null) {
           continue;
         }
@@ -337,7 +330,7 @@
 
   protected abstract FlowStatementVisitor makeVisitor(CGNode node);
 
-  private void debugPrintIR(IR ir) {
+  private static void debugPrintIR(IR ir) {
     if (DEBUG) {
       if (ir == null) {
         System.err.println("\n   No statements\n");
@@ -367,10 +360,8 @@
     Set<CallerSiteContext> ret = callerCache.get(callee);
     if (ret == null) {
       ret = HashSetFactory.make();
-      for (Iterator<? extends CGNode> predNodes = cg.getPredNodes(callee); predNodes.hasNext();) {
-        CGNode caller = predNodes.next();
-        for (Iterator<CallSiteReference> iterator = cg.getPossibleSites(caller, callee); iterator.hasNext();) {
-          CallSiteReference call = iterator.next();
+      for (CGNode caller : Iterator2Iterable.make(cg.getPredNodes(callee))) {
+        for (CallSiteReference call : Iterator2Iterable.make(cg.getPossibleSites(caller, callee))) {
           ret.add(new CallerSiteContext(caller, call));
         }
       }
@@ -392,4 +383,4 @@
     super(mam, heapModel, cha, cg);
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/AbstractFlowGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/AbstractFlowGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/AbstractFlowGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/AbstractFlowGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -75,12 +75,14 @@
 import com.ibm.wala.ssa.SSAArrayStoreInstruction;
 import com.ibm.wala.ssa.SSAGetInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.SSAInvokeInstruction;
 import com.ibm.wala.ssa.SSANewInstruction;
 import com.ibm.wala.ssa.SSAPutInstruction;
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.MapUtil;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.debug.Assertions;
@@ -112,25 +114,26 @@
   };
 
   /**
-   * Map: LocalPointerKey -> SSAInvokeInstruction. If we have (x, foo()), that means that x was def'fed by the return value from the
+   * Map: LocalPointerKey -&gt; SSAInvokeInstruction. If we have (x, foo()), that means that x was def'fed by the return value from the
    * call to foo()
    */
   protected final Map<PointerKey, SSAAbstractInvokeInstruction> callDefs = HashMapFactory.make();
 
   /**
-   * Map: {@link LocalPointerKey} -> Set<{@link SSAInvokeInstruction}>. If we have (x, foo()), that means x was passed as a
-   * parameter to the call to foo(). The parameter position is not represented and must be recovered.
+   * Map: {@link LocalPointerKey} -&gt; {@link Set}&lt;{@link SSAInvokeInstruction}&gt;.
+   * If we have (x, foo()), that means x was passed as a parameter to the call to foo().
+   * The parameter position is not represented and must be recovered.
    */
   protected final Map<PointerKey, Set<SSAAbstractInvokeInstruction>> callParams = HashMapFactory.make();
 
   /**
-   * Map: LocalPointerKey -> CGNode. If we have (x, foo), then x is a parameter of method foo. For now, we have to re-discover the
+   * Map: LocalPointerKey -&gt; CGNode. If we have (x, foo), then x is a parameter of method foo. For now, we have to re-discover the
    * parameter position. TODO this should just be a set; we can get the CGNode from the {@link LocalPointerKey}
    */
   protected final Map<PointerKey, CGNode> params = HashMapFactory.make();
 
   /**
-   * Map: {@link LocalPointerKey} -> {@link CGNode}. If we have (x, foo), then x is a return value of method foo. Must re-discover
+   * Map: {@link LocalPointerKey} -&gt; {@link CGNode}. If we have (x, foo), then x is a return value of method foo. Must re-discover
    * if x is normal or exceptional return value.
    */
   protected final Map<PointerKey, CGNode> returns = HashMapFactory.make();
@@ -157,10 +160,9 @@
    */
   @Override
   public void visitSuccs(Object node, IFlowLabelVisitor v) {
-    for (Iterator<? extends IFlowLabel> succLabelIter = getSuccLabels(node); succLabelIter.hasNext();) {
-      final IFlowLabel label = succLabelIter.next();
-      for (Iterator<? extends Object> succNodeIter = getSuccNodes(node, label); succNodeIter.hasNext();) {
-        label.visit(v, succNodeIter.next());
+    for (final IFlowLabel label : Iterator2Iterable.make(getSuccLabels(node))) {
+      for (Object succNode : Iterator2Iterable.make(getSuccNodes(node, label))) {
+        label.visit(v, succNode);
       }
     }
   }
@@ -171,22 +173,18 @@
    */
   @Override
   public void visitPreds(Object node, IFlowLabelVisitor v) {
-    for (Iterator<? extends IFlowLabel> predLabelIter = getPredLabels(node); predLabelIter.hasNext();) {
-      final IFlowLabel label = predLabelIter.next();
-      for (Iterator<? extends Object> predNodeIter = getPredNodes(node, label); predNodeIter.hasNext();) {
-        label.visit(v, predNodeIter.next());
+    for (final IFlowLabel label : Iterator2Iterable.make(getPredLabels(node))) {
+      for (Object predNode : Iterator2Iterable.make(getPredNodes(node, label))) {
+        label.visit(v, predNode);
       }
     }
   }
 
   /**
    * For each invocation in the method, add nodes for actual parameters and return values
-   * 
-   * @param node
    */
   protected void addNodesForInvocations(CGNode node, IR ir) {
-    for (Iterator<CallSiteReference> iter = ir.iterateCallSites(); iter.hasNext();) {
-      CallSiteReference site = iter.next();
+    for (CallSiteReference site : Iterator2Iterable.make(ir.iterateCallSites())) {
       SSAAbstractInvokeInstruction[] calls = ir.getCalls(site);
       for (SSAAbstractInvokeInstruction invokeInstr : calls) {
         for (int i = 0; i < invokeInstr.getNumberOfUses(); i++) {
@@ -269,7 +267,7 @@
     for (MemoryAccess a : writes) {
       addSubgraphForNode(a.getNode());
     }
-    ArrayList<PointerKey> written = new ArrayList<PointerKey>();
+    ArrayList<PointerKey> written = new ArrayList<>();
     for (MemoryAccess a : writes) {
       IR ir = a.getNode().getIR();
       SSAPutInstruction s = (SSAPutInstruction) ir.getInstructions()[a.getInstructionIndex()];
@@ -330,7 +328,7 @@
     for (MemoryAccess a : reads) {
       addSubgraphForNode(a.getNode());
     }
-    ArrayList<PointerKey> readInto = new ArrayList<PointerKey>();
+    ArrayList<PointerKey> readInto = new ArrayList<>();
     for (MemoryAccess a : reads) {
       IR ir = a.getNode().getIR();
       SSAGetInstruction s = (SSAGetInstruction) ir.getInstructions()[a.getInstructionIndex()];
@@ -353,7 +351,7 @@
     for (MemoryAccess a : arrayWrites) {
       addSubgraphForNode(a.getNode());
     }
-    ArrayList<PointerKey> written = new ArrayList<PointerKey>();
+    ArrayList<PointerKey> written = new ArrayList<>();
     for (MemoryAccess a : arrayWrites) {
       final CGNode node = a.getNode();
       IR ir = node.getIR();
@@ -383,13 +381,11 @@
   protected Iterator<PointerKey> getArrayReads(PointerKey arrayRef) {
     arrayRef = convertPointerKeyToHeapModel(arrayRef, mam.getHeapModel());
     Collection<MemoryAccess> arrayReads = mam.getArrayReads(arrayRef);
-    for (Iterator<MemoryAccess> it = arrayReads.iterator(); it.hasNext();) {
-      MemoryAccess a = it.next();
+    for (MemoryAccess a : arrayReads) {
       addSubgraphForNode(a.getNode());
     }
-    ArrayList<PointerKey> read = new ArrayList<PointerKey>();
-    for (Iterator<MemoryAccess> it = arrayReads.iterator(); it.hasNext();) {
-      MemoryAccess a = it.next();
+    ArrayList<PointerKey> read = new ArrayList<>();
+    for (MemoryAccess a : arrayReads) {
       IR ir = a.getNode().getIR();
       SSAArrayLoadInstruction s = (SSAArrayLoadInstruction) ir.getInstructions()[a.getInstructionIndex()];
       if (s == null) {
@@ -428,8 +424,7 @@
    */
   protected void addExceptionDefConstraints(IR ir, CGNode node, List<ProgramCounter> peis, PointerKey exceptionVar,
       Set<IClass> catchClasses) {
-    for (Iterator<ProgramCounter> it = peis.iterator(); it.hasNext();) {
-      ProgramCounter peiLoc = it.next();
+    for (ProgramCounter peiLoc : peis) {
       SSAInstruction pei = ir.getPEI(peiLoc);
 
       if (pei instanceof SSAAbstractInvokeInstruction) {
@@ -452,8 +447,7 @@
       // the pei, but just instance keys
       Collection<TypeReference> types = pei.getExceptionTypes();
       if (types != null) {
-        for (Iterator<TypeReference> it2 = types.iterator(); it2.hasNext();) {
-          TypeReference type = it2.next();
+        for (TypeReference type : types) {
           if (type != null) {
             InstanceKey ik = heapModel.getInstanceKeyForPEI(node, peiLoc, type);
             if (ik == null) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/DemandPointerFlowGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/DemandPointerFlowGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/DemandPointerFlowGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/DemandPointerFlowGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -38,7 +38,6 @@
 package com.ibm.wala.demandpa.flowgraph;
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -81,6 +80,7 @@
 import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.Pair;
 
 /**
@@ -98,8 +98,7 @@
    */
   @Override
   protected void addNodesForParameters(CGNode node, IR ir) {
-    for (Iterator<Integer> iter = new PointerParamValueNumIterator(node); iter.hasNext();) {
-      int parameter = iter.next();
+    for (int parameter : Iterator2Iterable.make(new PointerParamValueNumIterator(node))) {
       PointerKey paramPk = heapModel.getPointerKeyForLocal(node, parameter);
       addNode(paramPk);
       params.put(paramPk, node);
@@ -224,7 +223,7 @@
         }
       }
       
-      FilteredPointerKey.MultipleClassesFilter filter = new FilteredPointerKey.MultipleClassesFilter(types.toArray(new IClass[ types.size() ]));
+      FilteredPointerKey.MultipleClassesFilter filter = new FilteredPointerKey.MultipleClassesFilter(types.toArray(new IClass[0]));
       PointerKey result = heapModel.getPointerKeyForLocal(node, instruction.getResult());
       PointerKey value = heapModel.getPointerKeyForLocal(node, instruction.getVal());
       g.addNode(result);
@@ -409,8 +408,7 @@
      */
     protected void addExceptionDefConstraints(IR ir, CGNode node, List<ProgramCounter> peis, PointerKey exceptionVar,
         Set<IClass> catchClasses) {
-      for (Iterator<ProgramCounter> it = peis.iterator(); it.hasNext();) {
-        ProgramCounter peiLoc = it.next();
+      for (ProgramCounter peiLoc : peis) {
         SSAInstruction pei = ir.getPEI(peiLoc);
 
         if (pei instanceof SSAAbstractInvokeInstruction) {
@@ -433,8 +431,7 @@
         // the pei, but just instance keys
         Collection<TypeReference> types = pei.getExceptionTypes();
         if (types != null) {
-          for (Iterator<TypeReference> it2 = types.iterator(); it2.hasNext();) {
-            TypeReference type = it2.next();
+          for (TypeReference type : types) {
             if (type != null) {
               InstanceKey ik = heapModel.getInstanceKeyForPEI(node, peiLoc, type);
               if (ik == null) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/DemandValueFlowGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/DemandValueFlowGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/DemandValueFlowGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/DemandValueFlowGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -196,7 +196,7 @@
 
       PointerKey result = heapModel.getFilteredPointerKeyForLocal(node, 
           instruction.getResult(), 
-          new FilteredPointerKey.MultipleClassesFilter(types.toArray(new IClass[ types.size() ])) );
+          new FilteredPointerKey.MultipleClassesFilter(types.toArray(new IClass[0])) );
         
       PointerKey value = heapModel.getPointerKeyForLocal(node, instruction.getVal());
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/GetFieldLabel.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/GetFieldLabel.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/GetFieldLabel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/GetFieldLabel.java	2019-01-29 17:08:39.000000000 +0000
@@ -91,7 +91,7 @@
 
   @Override
   public String toString() {
-    return "getfield[" + field + "]";
+    return "getfield[" + field + ']';
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/IFlowGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/IFlowGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/IFlowGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/IFlowGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,6 +22,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.StaticFieldKey;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.CallerSiteContext;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
+import com.ibm.wala.ssa.SSAInvokeInstruction;
 import com.ibm.wala.util.graph.labeled.LabeledGraph;
 
 public interface IFlowGraph extends LabeledGraph<Object, IFlowLabel> {
@@ -46,13 +47,11 @@
   public abstract boolean hasSubgraphForNode(CGNode node);
 
   /**
-   * @param pk
-   * @return <code>true</code> iff <code>pk</code> is a formal parameter
+   * @return {@code true} iff {@code pk} is a formal parameter
    */
   public abstract boolean isParam(LocalPointerKey pk);
 
   /**
-   * @param pk
    * @return the {@link SSAInvokeInstruction}s passing some pointer as a parameter
    */
   public abstract Iterator<SSAAbstractInvokeInstruction> getInstrsPassingParam(LocalPointerKey pk);
@@ -60,7 +59,7 @@
   /**
    * get the {@link SSAInvokeInstruction} whose return value is assigned to a pointer key.
    * 
-   * @return the instruction, or <code>null</code> if no return value is assigned to pk
+   * @return the instruction, or {@code null} if no return value is assigned to pk
    */
   public abstract SSAAbstractInvokeInstruction getInstrReturningTo(LocalPointerKey pk);
 
@@ -85,7 +84,7 @@
   /**
    * 
    * @param formalPk a {@link PointerKey} representing either a formal parameter or return value
-   * @return the {@link CallerSiteContext}s representing pointer callers of <code>formalPk</code>'s method
+   * @return the {@link CallerSiteContext}s representing pointer callers of {@code formalPk}'s method
    */
   public abstract Set<CallerSiteContext> getPotentialCallers(PointerKey formalPk);
 
@@ -100,4 +99,4 @@
    */
   public abstract Set<CGNode> getPossibleTargets(CGNode caller, CallSiteReference site, LocalPointerKey actualPk);
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ParamBarLabel.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ParamBarLabel.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ParamBarLabel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ParamBarLabel.java	2019-01-29 17:08:39.000000000 +0000
@@ -78,7 +78,7 @@
 
   @Override
   public String toString() {
-    return "paramBar[" + callSite + "]";
+    return "paramBar[" + callSite + ']';
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ParamLabel.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ParamLabel.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ParamLabel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ParamLabel.java	2019-01-29 17:08:39.000000000 +0000
@@ -59,7 +59,7 @@
 
   @Override
   public String toString() {
-    return "param[" + callSite + "]";
+    return "param[" + callSite + ']';
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/PointerKeyAndCallSite.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/PointerKeyAndCallSite.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/PointerKeyAndCallSite.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/PointerKeyAndCallSite.java	2019-01-29 17:08:39.000000000 +0000
@@ -89,4 +89,4 @@
       return false;
     return true;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/PutFieldBarLabel.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/PutFieldBarLabel.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/PutFieldBarLabel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/PutFieldBarLabel.java	2019-01-29 17:08:39.000000000 +0000
@@ -112,7 +112,7 @@
 
   @Override
   public String toString() {
-    return "putfield_bar[" + field + "]";
+    return "putfield_bar[" + field + ']';
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/PutFieldLabel.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/PutFieldLabel.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/PutFieldLabel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/PutFieldLabel.java	2019-01-29 17:08:39.000000000 +0000
@@ -91,7 +91,7 @@
 
   @Override
   public String toString() {
-    return "putfield[" + field + "]";
+    return "putfield[" + field + ']';
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ReturnBarLabel.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ReturnBarLabel.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ReturnBarLabel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ReturnBarLabel.java	2019-01-29 17:08:39.000000000 +0000
@@ -78,7 +78,7 @@
 
   @Override
   public String toString() {
-    return "returnBar[" + callSite + "]";
+    return "returnBar[" + callSite + ']';
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ReturnLabel.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ReturnLabel.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ReturnLabel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/ReturnLabel.java	2019-01-29 17:08:39.000000000 +0000
@@ -59,7 +59,7 @@
 
   @Override
   public String toString() {
-    return "return[" + callSite + "]";
+    return "return[" + callSite + ']';
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/SimpleDemandPointerFlowGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/SimpleDemandPointerFlowGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/SimpleDemandPointerFlowGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/SimpleDemandPointerFlowGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -65,6 +65,7 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
 import com.ibm.wala.util.graph.impl.SlowSparseNumberedGraph;
@@ -80,13 +81,13 @@
  * 
  * The edges represent
  * <ul>
- * <li>flow from local -> local representing assignment (i.e. phi,pi)
- * <li>flow from instancekey -> local for news
- * <li>flow from formal -> actual parameter
- * <li>flow from return value -> local
+ * <li>flow from local -&gt; local representing assignment (i.e. phi,pi)
+ * <li>flow from instancekey -&gt; local for news
+ * <li>flow from formal -&gt; actual parameter
+ * <li>flow from return value -&gt; local
  * <li>match edges
- * <li>local -> local edges representing loads/stores (e.g. x = y.f will have a edge x->y, labelled with f) for a getstatic x = Y.f,
- * we have an edge from x -> Y.f.
+ * <li>local -&gt; local edges representing loads/stores (e.g. x = y.f will have a edge x-&gt;y, labelled with f) for a getstatic x = Y.f,
+ * we have an edge from x -&gt; Y.f.
  * </ul>
  * 
  * N.B: Edges go OPPOSITE the flow of values.
@@ -95,6 +96,8 @@
  */
 public class SimpleDemandPointerFlowGraph extends SlowSparseNumberedGraph<Object> {
 
+  private static final long serialVersionUID = 5208052568163692029L;
+
   private final static boolean DEBUG = false;
 
   /**
@@ -116,20 +119,20 @@
   final BitVectorIntSet cgNodesVisited = new BitVectorIntSet();
 
   /**
-   * Map: LocalPointerKey -> IField. if we have (x,f), that means x was def'fed by a getfield on f.
+   * Map: LocalPointerKey -&gt; IField. if we have (x,f), that means x was def'fed by a getfield on f.
    */
   final Map<PointerKey, IField> getFieldDefs = HashMapFactory.make();
 
   final Collection<PointerKey> arrayDefs = HashSetFactory.make();
 
   /**
-   * Map: LocalPointerKey -> SSAInvokeInstruction. If we have (x, foo()), that means that x was def'fed by the return value from a
+   * Map: LocalPointerKey -&gt; SSAInvokeInstruction. If we have (x, foo()), that means that x was def'fed by the return value from a
    * call to foo()
    */
   final Map<PointerKey, SSAInvokeInstruction> callDefs = HashMapFactory.make();
 
   /**
-   * Map: LocalPointerKey -> CGNode. If we have (x, foo), then x is a parameter of method foo. For now, we have to re-discover the
+   * Map: LocalPointerKey -&gt; CGNode. If we have (x, foo), then x is a parameter of method foo. For now, we have to re-discover the
    * parameter position.
    */
   final Map<PointerKey, CGNode> params = HashMapFactory.make();
@@ -156,8 +159,6 @@
 
   /**
    * add nodes for parameters and return values
-   * 
-   * @param node
    */
   private void addNodesForParameters(CGNode node) {
     // TODO Auto-generated method stub
@@ -299,12 +300,10 @@
       // as the argument
       addSubgraphForNode(caller);
       IR ir = caller.getIR();
-      for (Iterator<CallSiteReference> iterator = ir.iterateCallSites(); iterator.hasNext();) {
-        CallSiteReference call = iterator.next();
+      for (CallSiteReference call : Iterator2Iterable.make(ir.iterateCallSites())) {
         if (cg.getPossibleTargets(caller, call).contains(node)) {
           SSAAbstractInvokeInstruction[] callInstrs = ir.getCalls(call);
-          for (int i = 0; i < callInstrs.length; i++) {
-            SSAAbstractInvokeInstruction callInstr = callInstrs[i];
+          for (SSAAbstractInvokeInstruction callInstr : callInstrs) {
             PointerKey actualPk = heapModel.getPointerKeyForLocal(caller, callInstr.getUse(paramPos));
             assert containsNode(actualPk);
             assert containsNode(pk);
@@ -481,8 +480,7 @@
     v.setBasicBlock(b);
 
     // visit each instruction in the basic block.
-    for (Iterator<SSAInstruction> it = b.iterator(); it.hasNext();) {
-      SSAInstruction s = it.next();
+    for (SSAInstruction s : b) {
       if (s != null) {
         s.visit(v);
       }
@@ -494,8 +492,7 @@
   private void addPhiConstraints(CGNode node, ControlFlowGraph<SSAInstruction, ISSABasicBlock> cfg, ISSABasicBlock b) {
 
     // visit each phi instruction in each successor block
-    for (Iterator<? extends IBasicBlock> sbs = cfg.getSuccNodes(b); sbs.hasNext();) {
-      ISSABasicBlock sb = (ISSABasicBlock) sbs.next();
+    for (ISSABasicBlock sb : Iterator2Iterable.make(cfg.getSuccNodes(b))) {
       if (sb.isExitBlock()) {
         // an optimization based on invariant that exit blocks should have no
         // phis.
@@ -503,14 +500,14 @@
       }
       int n = 0;
       // set n to be whichPred(this, sb);
-      for (Iterator<? extends IBasicBlock> back = cfg.getPredNodes(sb); back.hasNext(); n++) {
-        if (back.next() == b) {
+      for (IBasicBlock back : Iterator2Iterable.make(cfg.getPredNodes(sb))) {
+        if (back == b) {
           break;
         }
+        ++n;
       }
       assert n < cfg.getPredNodeCount(sb);
-      for (Iterator<SSAPhiInstruction> phis = sb.iteratePhis(); phis.hasNext();) {
-        SSAPhiInstruction phi = phis.next();
+      for (SSAPhiInstruction phi : Iterator2Iterable.make(sb.iteratePhis())) {
         if (phi == null) {
           continue;
         }
@@ -531,7 +528,7 @@
     return new StatementVisitor(node, ir, du);
   }
 
-  private void debugPrintIR(IR ir) {
+  private static void debugPrintIR(IR ir) {
     if (DEBUG) {
       if (ir == null) {
         System.err.println("\n   No statements\n");
@@ -746,7 +743,7 @@
 
       PointerKey result = heapModel.getFilteredPointerKeyForLocal(node, 
           instruction.getResult(), 
-          new FilteredPointerKey.MultipleClassesFilter(types.toArray(new IClass[ types.size() ])) );
+          new FilteredPointerKey.MultipleClassesFilter(types.toArray(new IClass[0])) );
         
       PointerKey value = heapModel.getPointerKeyForLocal(node, instruction.getVal());
       // TODO actually use the cast type
@@ -1314,4 +1311,4 @@
   // }
   // }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/ArrayContents.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/ArrayContents.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/ArrayContents.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/ArrayContents.java	2019-01-29 17:08:39.000000000 +0000
@@ -140,4 +140,4 @@
   public Collection<Annotation> getAnnotations() {
     return Collections.emptySet();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/CallGraphMapUtil.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/CallGraphMapUtil.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/CallGraphMapUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/CallGraphMapUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -69,7 +69,7 @@
    * map a call graph node from one call graph to the corresponding node in another. Note that the target call graph must be
    * context-insensitive for the method, i.e., the only context for the method should be Everywhere.EVERYWHERE.
    * 
-   * @return the corresponding node, or <code>null</code> if the method is not in the target call graph
+   * @return the corresponding node, or {@code null} if the method is not in the target call graph
    * @throws IllegalArgumentException if fromCG == null
    */
   public static CGNode mapCGNode(CGNode orig, CallGraph fromCG, CallGraph toCG) throws IllegalArgumentException {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/MemoryAccess.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/MemoryAccess.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/MemoryAccess.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/MemoryAccess.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,7 +44,7 @@
 
   @Override
   public String toString() {
-    return "MemAccess: " + getNode() + ":" + getInstructionIndex();
+    return "MemAccess: " + getNode() + ':' + getInstructionIndex();
   }
 
   /**
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/MemoryAccessMap.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/MemoryAccessMap.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/MemoryAccessMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/MemoryAccessMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,12 +19,12 @@
 public interface MemoryAccessMap {
 
   /**
-   * @return Collection<FieldAccess>
+   * @return {@link Collection}&lt;{@link MemoryAccess}&gt;
    */
   public Collection<MemoryAccess> getFieldReads(PointerKey baseRef, IField field);
 
   /**
-   * @return Collection<FieldAccess>
+   * @return {@link Collection}&lt;{@link MemoryAccess}&gt;
    */
   public Collection<MemoryAccess> getFieldWrites(PointerKey baseRef, IField field);
   
@@ -40,4 +40,4 @@
    * get the heap model used in this memory access map
    */
   public HeapModel getHeapModel();  
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/PABasedMemoryAccessMap.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/PABasedMemoryAccessMap.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/PABasedMemoryAccessMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/PABasedMemoryAccessMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,15 +52,14 @@
   private final Map<PointerKey, Set<Statement>> invRef;
 
   public PABasedMemoryAccessMap(CallGraph cg, PointerAnalysis<InstanceKey> pa) {
-    this(cg, pa, new SDG(cg, pa, DataDependenceOptions.NO_BASE_NO_HEAP_NO_EXCEPTIONS, ControlDependenceOptions.NONE));
+    this(pa, new SDG<>(cg, pa, DataDependenceOptions.NO_BASE_NO_HEAP_NO_EXCEPTIONS, ControlDependenceOptions.NONE));
   }
 
-  public PABasedMemoryAccessMap(CallGraph cg, PointerAnalysis<InstanceKey> pa, SDG sdg) {
-    this(cg, pa, CISlicer.scanForMod(sdg, pa, true, ModRef.make()), CISlicer.scanForRef(sdg, pa));
+  public PABasedMemoryAccessMap(PointerAnalysis<InstanceKey> pa, SDG<InstanceKey> sdg) {
+    this(pa, CISlicer.scanForMod(sdg, pa, true, ModRef.make()), CISlicer.scanForRef(sdg, pa));
   }
   
-  public PABasedMemoryAccessMap(CallGraph cg, PointerAnalysis<InstanceKey> pa, Map<Statement, Set<PointerKey>> mod,
-      Map<Statement, Set<PointerKey>> ref) {
+  public PABasedMemoryAccessMap(PointerAnalysis<InstanceKey> pa, Map<Statement, Set<PointerKey>> mod, Map<Statement, Set<PointerKey>> ref) {
     if (pa == null) {
       throw new IllegalArgumentException("null pa");
     }
@@ -72,7 +71,7 @@
 
   @Override
   public Collection<MemoryAccess> getArrayReads(PointerKey arrayRef) {
-    Collection<MemoryAccess> memAccesses = new ArrayList<MemoryAccess>();
+    Collection<MemoryAccess> memAccesses = new ArrayList<>();
     if (DEBUG) {
       System.err.println(("looking at reads of array ref " + arrayRef));
     }
@@ -85,7 +84,7 @@
 
   @Override
   public Collection<MemoryAccess> getArrayWrites(PointerKey arrayRef) {
-    Collection<MemoryAccess> memAccesses = new ArrayList<MemoryAccess>();
+    Collection<MemoryAccess> memAccesses = new ArrayList<>();
     if (DEBUG) {
       System.err.println(("looking at writes to array ref " + arrayRef));
     }
@@ -101,7 +100,7 @@
 
   @Override
   public Collection<MemoryAccess> getFieldReads(PointerKey baseRef, IField field) {
-    Collection<MemoryAccess> memAccesses = new ArrayList<MemoryAccess>();
+    Collection<MemoryAccess> memAccesses = new ArrayList<>();
     for (InstanceKey ik : pa.getPointsToSet(baseRef)) {
       PointerKey ifk = heapModel.getPointerKeyForInstanceField(ik, field);
       convertStmtsToMemoryAccess(invRef.get(ifk), memAccesses);
@@ -111,7 +110,7 @@
 
   @Override
   public Collection<MemoryAccess> getFieldWrites(PointerKey baseRef, IField field) {
-    Collection<MemoryAccess> memAccesses = new ArrayList<MemoryAccess>();
+    Collection<MemoryAccess> memAccesses = new ArrayList<>();
     for (InstanceKey ik : pa.getPointsToSet(baseRef)) {
       PointerKey ifk = heapModel.getPointerKeyForInstanceField(ik, field);
       convertStmtsToMemoryAccess(invMod.get(ifk), memAccesses);
@@ -121,19 +120,19 @@
 
   @Override
   public Collection<MemoryAccess> getStaticFieldReads(IField field) {
-    Collection<MemoryAccess> result = new ArrayList<MemoryAccess>();
+    Collection<MemoryAccess> result = new ArrayList<>();
     convertStmtsToMemoryAccess(invRef.get(heapModel.getPointerKeyForStaticField(field)), result);
     return result;
   }
 
   @Override
   public Collection<MemoryAccess> getStaticFieldWrites(IField field) {
-    Collection<MemoryAccess> result = new ArrayList<MemoryAccess>();
+    Collection<MemoryAccess> result = new ArrayList<>();
     convertStmtsToMemoryAccess(invMod.get(heapModel.getPointerKeyForStaticField(field)), result);
     return result;
   }
 
-  private void convertStmtsToMemoryAccess(Collection<Statement> stmts, Collection<MemoryAccess> result) {
+  private static void convertStmtsToMemoryAccess(Collection<Statement> stmts, Collection<MemoryAccess> result) {
     if (stmts == null) {
       return;
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/PointerParamValueNumIterator.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/PointerParamValueNumIterator.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/PointerParamValueNumIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/PointerParamValueNumIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -118,4 +118,4 @@
     throw new UnsupportedOperationException();
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/SimpleMemoryAccessMap.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/SimpleMemoryAccessMap.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/SimpleMemoryAccessMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/SimpleMemoryAccessMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,6 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -64,12 +63,12 @@
   private static final boolean ALWAYS_BUILD_IR = true;
 
   /**
-   * Map: IField -> Set<MemoryAccess>
+   * Map: IField -&gt; Set&lt;MemoryAccess&gt;
    */
   final private Map<IField, Set<MemoryAccess>> readMap = HashMapFactory.make();
 
   /**
-   * Map: IField -> Set<MemoryAccess>
+   * Map: IField -&gt; Set&lt;MemoryAccess&gt;
    */
   final private Map<IField, Set<MemoryAccess>> writeMap = HashMapFactory.make();
 
@@ -94,16 +93,16 @@
   }
 
   private void populate(CallGraph cg) {
-    for (Iterator<CGNode> it = cg.iterator(); it.hasNext();) {
-      CGNode n = it.next();
+    for (CGNode n : cg) {
       populate(n);
     }
   }
 
+  @SuppressWarnings("unused")
   private void populate(CGNode n) {
     // we analyze bytecodes to avoid the cost of IR construction, except
     // for synthetic methods, where we must use the synthetic IR
-    if (ALWAYS_BUILD_IR || n.getMethod().isSynthetic()) {
+    if (ALWAYS_BUILD_IR || n.getMethod().isWalaSynthetic()) {
       if (DEBUG) {
         System.err.println("synthetic method");
       }
@@ -238,10 +237,6 @@
       this.node = node;
     }
 
-    protected int getInstructionIndex() {
-      return instructionIndex;
-    }
-
     protected void setInstructionIndex(int instructionIndex) {
       this.instructionIndex = instructionIndex;
     }
@@ -384,27 +379,26 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
 
     Collection<IField> allFields = HashSetFactory.make();
     allFields.addAll(readMap.keySet());
     allFields.addAll(writeMap.keySet());
 
-    for (Iterator<IField> it = allFields.iterator(); it.hasNext();) {
-      IField f = it.next();
+    for (IField f : allFields) {
       result.append("FIELD ").append(f).append(":\n");
       Collection<MemoryAccess> reads = getFieldReads(null, f);
       if (!reads.isEmpty()) {
         result.append("  reads:\n");
-        for (Iterator<MemoryAccess> it2 = reads.iterator(); it2.hasNext();) {
-          result.append("  ").append(it2.next()).append("\n");
+        for (MemoryAccess memoryAccess : reads) {
+          result.append("  ").append(memoryAccess).append('\n');
         }
       }
       Collection<MemoryAccess> writes = getFieldWrites(null, f);
       if (!writes.isEmpty()) {
         result.append("  writes:\n");
-        for (Iterator<MemoryAccess> it2 = writes.iterator(); it2.hasNext();) {
-          result.append("  ").append(it2.next()).append("\n");
+        for (MemoryAccess memoryAccess : writes) {
+          result.append("  ").append(memoryAccess).append('\n');
         }
       }
     }
@@ -413,14 +407,14 @@
     result.append("ARRAY CONTENTS:\n");
     if (!arrayReads.isEmpty()) {
       result.append("  reads:\n");
-      for (Iterator<MemoryAccess> it2 = arrayReads.iterator(); it2.hasNext();) {
-        result.append("  ").append(it2.next()).append("\n");
+      for (MemoryAccess memoryAccess : arrayReads) {
+        result.append("  ").append(memoryAccess).append('\n');
       }
     }
     if (!arrayWrites.isEmpty()) {
       result.append("  writes:\n");
-      for (Iterator<MemoryAccess> it2 = arrayWrites.iterator(); it2.hasNext();) {
-        result.append("  ").append(it2.next()).append("\n");
+      for (MemoryAccess memoryAccess : arrayWrites) {
+        result.append("  ").append(memoryAccess).append('\n');
       }
     }
     return result.toString();
@@ -443,7 +437,7 @@
   }
 
   public void repOk() {
-    for (MemoryAccess m : Iterator2Iterable.make(new CompoundIterator<MemoryAccess>(arrayReads.iterator(), arrayWrites.iterator()))) {
+    for (MemoryAccess m : Iterator2Iterable.make(new CompoundIterator<>(arrayReads.iterator(), arrayWrites.iterator()))) {
       CGNode node = m.getNode();
       IR ir = node.getIR();
       assert ir != null : "null IR for " + node + " but we have a memory access";
@@ -460,4 +454,4 @@
           + " for array access instruction";
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/escape/FILiveObjectAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/escape/FILiveObjectAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/escape/FILiveObjectAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/escape/FILiveObjectAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,6 @@
 package com.ibm.wala.escape;
 
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -29,6 +28,7 @@
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.impl.GraphInverter;
 import com.ibm.wala.util.graph.traverse.DFS;
@@ -48,10 +48,10 @@
   /**
    * Graph view of pointer analysis results
    */
-  private final HeapGraph heapGraph;
+  private final HeapGraph<?> heapGraph;
 
   /**
-   * Cached map from InstanceKey -> Set<CGNode>
+   * Cached map from InstanceKey -&gt; Set&lt;CGNode&gt;
    */
   final private Map<InstanceKey, Set<CGNode>> liveNodes = HashMapFactory.make();
 
@@ -68,7 +68,7 @@
   /**
    * 
    */
-  public FILiveObjectAnalysis(CallGraph callGraph, HeapGraph heapGraph, boolean expensiveIntraproceduralAnalysis) {
+  public FILiveObjectAnalysis(CallGraph callGraph, HeapGraph<?> heapGraph, boolean expensiveIntraproceduralAnalysis) {
     super();
     this.callGraph = callGraph;
     this.heapGraph = heapGraph;
@@ -125,8 +125,7 @@
   }
 
   private boolean mayBeLiveInSomeCaller(InstanceKey ik, CGNode m) {
-    for (Iterator it = callGraph.getPredNodes(m); it.hasNext();) {
-      CGNode n = (CGNode) it.next();
+    for (CGNode n : Iterator2Iterable.make(callGraph.getPredNodes(m))) {
       if (mayBeLive(ik, n, -1)) {
         return true;
       }
@@ -144,8 +143,7 @@
     IR ir = m.getIR();
     DefUse du = m.getDU();
 
-    for (Iterator it = DFS.iterateDiscoverTime(GraphInverter.invert(heapGraph), ik); it.hasNext();) {
-      Object p = it.next();
+    for (Object p : Iterator2Iterable.make(DFS.iterateDiscoverTime(GraphInverter.invert(heapGraph), ik))) {
       if (p instanceof LocalPointerKey) {
         LocalPointerKey lpk = (LocalPointerKey) p;
         if (lpk.getNode().equals(m)) {
@@ -164,8 +162,7 @@
    */
   private Set<CGNode> computeLiveNodes(InstanceKey ik) {
     Set<CGNode> localRootNodes = HashSetFactory.make();
-    for (Iterator it = DFS.iterateDiscoverTime(GraphInverter.invert(heapGraph), ik); it.hasNext();) {
-      Object node = it.next();
+    for (Object node : Iterator2Iterable.make(DFS.iterateDiscoverTime(GraphInverter.invert(heapGraph), ik))) {
       if (node instanceof StaticFieldKey) {
         liveEverywhere.add(ik);
         return Collections.emptySet();
@@ -180,7 +177,7 @@
             AbstractLocalPointerKey local = (AbstractLocalPointerKey) node;
             localRootNodes.add(local.getNode());
           } else {
-            Assertions.UNREACHABLE("unexpected base of TypedPointerKey: " + node.getClass() + " " + node);
+            Assertions.UNREACHABLE("unexpected base of TypedPointerKey: " + node.getClass() + ' ' + node);
           }
         }
       }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/escape/ILiveObjectAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/escape/ILiveObjectAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/escape/ILiveObjectAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/escape/ILiveObjectAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,9 +25,8 @@
    * @param allocPC bytecode index of allocation site
    * @param m method in question
    * @param instructionIndex index of an instruction in SSA IR. in m. if -1, it is interpreted as a wildcard meaning "any statement"
-   * @throws WalaException
-   * @returns true if an object allocated at the allocation site &lt;allocMethod,allocPC> may be live immediately after the
-   *          statement <m,instructionIndex>
+   * @return true if an object allocated at the allocation site &lt;allocMethod,allocPC&gt; may be live immediately after the
+   *          statement &lt;m,instructionIndex&gt;
    */
   public boolean mayBeLive(CGNode allocMethod, int allocPC, CGNode m, int instructionIndex) throws WalaException;
 
@@ -35,9 +34,8 @@
    * @param ik an instance key
    * @param m method in question
    * @param instructionIndex index of an instruction in SSA IR. in m. if -1, it is interpreted as a wildcard meaning "any statement"
-   * @throws WalaException
-   * @returns true if an object allocated at the allocation site &lt;allocMethod,allocPC> may be live immediately after the
-   *          statement <m,instructionIndex>
+   * @return true if an object allocated at the allocation site &lt;allocMethod,allocPC&gt; may be live immediately after the
+   *          statement &lt;m,instructionIndex&gt;
    */
   public boolean mayBeLive(InstanceKey ik, CGNode m, int instructionIndex) throws WalaException;
 
@@ -45,8 +43,8 @@
    * @param ik an instance key
    * @param m method in question
    * @param instructionIndices indices of instructions in SSA IR.
-   * @returns true if an object allocated at the allocation site &lt;allocMethod,allocPC> may be live immediately after the
-   *          statement <m,instructionIndex> for any instructionIndex in the set
+   * @return true if an object allocated at the allocation site &lt;allocMethod,allocPC&gt; may be live immediately after the
+   *          statement &lt;m,instructionIndex&gt; for any instructionIndex in the set
    */
   public boolean mayBeLive(InstanceKey ik, CGNode m, IntSet instructionIndices);
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/escape/IMethodEscapeAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/escape/IMethodEscapeAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/escape/IMethodEscapeAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/escape/IMethodEscapeAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,7 +22,7 @@
    * @param allocMethod a method which holds an allocation site
    * @param allocPC bytecode index of allocation site
    * @param m method in question
-   * @returns true if an object allocated at the allocation site &lt;allocMethod,allocPC> may escape from an activation of method m,
+   * @return true if an object allocated at the allocation site &lt;allocMethod,allocPC&gt; may escape from an activation of method m,
    *          false otherwise
    */
   public boolean mayEscape(MethodReference allocMethod, int allocPC, MethodReference m) throws WalaException;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/escape/INodeEscapeAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/escape/INodeEscapeAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/escape/INodeEscapeAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/escape/INodeEscapeAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,8 +22,7 @@
    * @param allocNode a CGNode which holds an allocation site
    * @param allocPC bytecode index of allocation site
    * @param node method in question
-   * @throws WalaException
-   * @returns true if an object allocated at the allocation site &lt;allocMethod,allocPC> may escape from an activation of node m,
+   * @return true if an object allocated at the allocation site &lt;allocMethod,allocPC&gt; may escape from an activation of node m,
    *          false otherwise
    */
   public boolean mayEscape(CGNode allocNode, int allocPC, CGNode node) throws WalaException;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/escape/LocalLiveRangeAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/escape/LocalLiveRangeAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/escape/LocalLiveRangeAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/escape/LocalLiveRangeAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,6 +13,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.function.Predicate;
 
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
@@ -21,7 +22,6 @@
 import com.ibm.wala.ssa.SSACFG.BasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAReturnInstruction;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
 import com.ibm.wala.util.debug.Assertions;
@@ -45,7 +45,7 @@
     if (du == null) {
       throw new IllegalArgumentException("du is null");
     }
-    if (du.getNumberOfUses(v) == 0) {
+    if (du.isUnused(v)) {
       return false;
     }
     if (instructionIndex < 0) {
@@ -57,11 +57,7 @@
     final Collection<BasicBlock> uses = findBlocks(ir, du.getUses(v));
 
     // a filter which accepts everything but the block which defs v
-    Predicate notDef = new Predicate() {
-      @Override public boolean test(Object o) {
-        return (defBlock == null || !defBlock.equals(o));
-      }
-    };
+    Predicate<Object> notDef = o -> (defBlock == null || !defBlock.equals(o));
 
     if (defBlock != null && defBlock.equals(queryBlock)) {
       // for now, conservatively say it's live. fix this later if necessary.
@@ -94,15 +90,14 @@
   }
 
   /**
-   * @param statements Iterator<SSAInstruction>
+   * @param statements {@code Iterator<SSAInstruction>}
    */
   private static Collection<BasicBlock> findBlocks(IR ir, Iterator<SSAInstruction> statements) {
     Collection<SSAInstruction> s = Iterator2Collection.toSet(statements);
     Collection<BasicBlock> result = HashSetFactory.make();
-    outer: for (Iterator it = ir.getControlFlowGraph().iterator(); it.hasNext();) {
-      SSACFG.BasicBlock b = (SSACFG.BasicBlock) it.next();
-      for (Iterator it2 = b.iterator(); it2.hasNext();) {
-        SSAInstruction x = (SSAInstruction) it2.next();
+    outer: for (ISSABasicBlock issaBasicBlock : ir.getControlFlowGraph()) {
+      SSACFG.BasicBlock b = (SSACFG.BasicBlock) issaBasicBlock;
+      for (SSAInstruction x : b) {
         if (s.contains(x)) {
           result.add(b);
           continue outer;
@@ -124,10 +119,9 @@
     if (s == null) {
       Assertions.UNREACHABLE();
     }
-    for (Iterator it = ir.getControlFlowGraph().iterator(); it.hasNext();) {
-      SSACFG.BasicBlock b = (SSACFG.BasicBlock) it.next();
-      for (Iterator it2 = b.iterator(); it2.hasNext();) {
-        SSAInstruction x = (SSAInstruction) it2.next();
+    for (ISSABasicBlock issaBasicBlock : ir.getControlFlowGraph()) {
+      SSACFG.BasicBlock b = (SSACFG.BasicBlock) issaBasicBlock;
+      for (SSAInstruction x : b) {
         if (s.equals(x)) {
           return b;
         }
@@ -143,8 +137,8 @@
    * @return the basic block which contains the ith instruction
    */
   private static ISSABasicBlock findBlock(IR ir, int i) {
-    for (Iterator it = ir.getControlFlowGraph().iterator(); it.hasNext();) {
-      SSACFG.BasicBlock b = (SSACFG.BasicBlock) it.next();
+    for (ISSABasicBlock issaBasicBlock : ir.getControlFlowGraph()) {
+      SSACFG.BasicBlock b = (SSACFG.BasicBlock) issaBasicBlock;
       if (i >= b.getFirstInstructionIndex() && i <= b.getLastInstructionIndex()) {
         return b;
       }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/escape/TrivialMethodEscape.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/escape/TrivialMethodEscape.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/escape/TrivialMethodEscape.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/escape/TrivialMethodEscape.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,6 @@
 package com.ibm.wala.escape;
 
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.Set;
 
 import com.ibm.wala.analysis.pointers.HeapGraph;
@@ -25,6 +24,7 @@
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 /**
  * Trivial method-level escape analysis.
@@ -40,7 +40,7 @@
   /**
    * Heap graph representation of pointer analysis
    */
-  private final HeapGraph hg;
+  private final HeapGraph<InstanceKey> hg;
 
   /**
    * Governing call graph
@@ -51,7 +51,7 @@
    * @param hg Heap graph representation of pointer analysis
    * @param cg governing call graph
    */
-  public TrivialMethodEscape(CallGraph cg, HeapGraph hg) {
+  public TrivialMethodEscape(CallGraph cg, HeapGraph<InstanceKey> hg) {
     this.hg = hg;
     this.cg = cg;
   }
@@ -69,7 +69,7 @@
     }
 
     // allocN := set of call graph nodes representing method allocMethod
-    Set allocN = cg.getNodes(allocMethod);
+    Set<CGNode> allocN = cg.getNodes(allocMethod);
     if (allocN.size() == 0) {
       throw new WalaException("could not find call graph node for allocation method " + allocMethod);
     }
@@ -82,18 +82,15 @@
   }
 
   /**
-   * @param allocN Set<CGNode> representing the allocation site.
-   * @param allocPC
-   * @param nodes Set<CGNode>, the nodes of interest
+   * @param allocN {@code Set<CGNode>} representing the allocation site.
+   * @param nodes {@code Set<CGNode>}, the nodes of interest
    * @return true iff some instance allocated at a site N \in &lt;allocN, allocPC> might escape from some activation of a node m \in
    *         { nodes }
-   * @throws WalaException
    */
-  private boolean mayEscape(Set allocN, int allocPC, Set nodes) throws WalaException {
+  private boolean mayEscape(Set<CGNode> allocN, int allocPC, Set nodes) throws WalaException {
     Set<InstanceKey> instances = HashSetFactory.make();
     // instances := set of instance key allocated at &lt;allocMethod, allocPC>
-    for (Iterator it = allocN.iterator(); it.hasNext();) {
-      CGNode n = (CGNode) it.next();
+    for (CGNode n : allocN) {
       NewSiteReference site = findAlloc(n, allocPC);
       InstanceKey ik = hg.getHeapModel().getInstanceKeyForAllocation(n, site);
       if (ik == null) {
@@ -102,10 +99,9 @@
       instances.add(ik);
     }
 
-    for (Iterator<InstanceKey> it = instances.iterator(); it.hasNext();) {
-      InstanceKey ik = it.next();
-      for (Iterator it2 = hg.getPredNodes(ik); it2.hasNext();) {
-        PointerKey p = (PointerKey) it2.next();
+    for (InstanceKey ik : instances) {
+      for (Object o : Iterator2Iterable.make(hg.getPredNodes(ik))) {
+        PointerKey p = (PointerKey) o;
         if (!(p instanceof AbstractLocalPointerKey)) {
           // a pointer from the heap. give up.
           return true;
@@ -130,14 +126,12 @@
    * @param n a call graph node
    * @param allocPC a bytecode index corresponding to an allocation
    * @return the NewSiteReference for the allocation
-   * @throws WalaException
    */
   static NewSiteReference findAlloc(CGNode n, int allocPC) throws WalaException {
     if (n == null) {
       throw new IllegalArgumentException("null n");
     }
-    for (Iterator it = n.iterateNewSites(); it.hasNext();) {
-      NewSiteReference site = (NewSiteReference) it.next();
+    for (NewSiteReference site : Iterator2Iterable.make(n.iterateNewSites())) {
       if (site.getProgramCounter() == allocPC) {
         return site;
       }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisCacheImpl.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisCacheImpl.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisCacheImpl.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisCacheImpl.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ipa.callgraph;
+
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.ssa.AuxiliaryCache;
+import com.ibm.wala.ssa.DefaultIRFactory;
+import com.ibm.wala.ssa.IRFactory;
+import com.ibm.wala.ssa.SSACache;
+import com.ibm.wala.ssa.SSAOptions;
+
+public class AnalysisCacheImpl extends AnalysisCache {
+
+  public AnalysisCacheImpl(IRFactory<IMethod> irFactory, SSAOptions ssaOptions) {
+    super(irFactory, ssaOptions, new SSACache(irFactory, new AuxiliaryCache(), new AuxiliaryCache()));
+  }
+  
+  public AnalysisCacheImpl(SSAOptions ssaOptions) {
+    this(new DefaultIRFactory(), ssaOptions);
+  }
+
+  public AnalysisCacheImpl(IRFactory<IMethod> irFactory) {
+    this(irFactory, new AnalysisOptions().getSSAOptions());
+  }
+  
+  public AnalysisCacheImpl() {
+    this(new DefaultIRFactory());
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisCache.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisCache.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisCache.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisCache.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,7 +13,6 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ssa.DefUse;
-import com.ibm.wala.ssa.DefaultIRFactory;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.IRFactory;
 import com.ibm.wala.ssa.SSACache;
@@ -25,22 +24,25 @@
  * 
  * Someday this should maybe go away?
  */
-public class AnalysisCache {
+public class AnalysisCache implements IAnalysisCacheView {
   private final IRFactory<IMethod> irFactory;
 
   private final SSACache ssaCache;
 
-  public AnalysisCache(IRFactory<IMethod> irFactory) {
+  private final SSAOptions ssaOptions;
+  
+  public AnalysisCache(IRFactory<IMethod> irFactory, SSAOptions ssaOptions, SSACache cache) {
     super();
+    this.ssaOptions = ssaOptions;
     this.irFactory = irFactory;
-    this.ssaCache = new SSACache(irFactory);
+    this.ssaCache = cache;
     ReferenceCleanser.registerCache(this);
   }
 
-  public AnalysisCache() {
-    this(new DefaultIRFactory());
-  }
-
+  /* 
+   * @see com.ibm.wala.ipa.callgraph.IAnalysisCacheView#invalidate(com.ibm.wala.classLoader.IMethod, com.ibm.wala.ipa.callgraph.Context)
+   */
+  @Override
   public void invalidate(IMethod method, Context C) {
     ssaCache.invalidate(method, C);
   }
@@ -49,28 +51,47 @@
     return ssaCache;
   }
 
+  public SSAOptions getSSAOptions() {
+    return ssaOptions;
+  }
+
+  /* 
+   * @see com.ibm.wala.ipa.callgraph.IAnalysisCacheView#getIRFactory()
+   */
+  @Override
   public IRFactory<IMethod> getIRFactory() {
     return irFactory;
   }
 
-  /**
-   * Find or create an IR for the method using the {@link Everywhere} context and default {@link SSAOptions}
+  /* 
+   * @see com.ibm.wala.ipa.callgraph.IAnalysisCacheView#getIR(com.ibm.wala.classLoader.IMethod)
    */
-  public IR getIR(IMethod method) {
+  @Override
+  public IR getIR(IMethod method, Context context) {
     if (method == null) {
       throw new IllegalArgumentException("method is null");
     }
-    return ssaCache.findOrCreateIR(method, Everywhere.EVERYWHERE, new AnalysisOptions().getSSAOptions());
+    return ssaCache.findOrCreateIR(method, context, ssaOptions);
   }
 
-
-  /**
-   * Find or create a DefUse for the IR using the {@link Everywhere} context 
+  @Override
+  public IR getIR(IMethod m) {
+    return getIR(m, Everywhere.EVERYWHERE);
+  }
+  
+  /* 
+   * @see com.ibm.wala.ipa.callgraph.IAnalysisCacheView#getDefUse(com.ibm.wala.ssa.IR)
    */
+  @Override
   public DefUse getDefUse(IR ir) {
     if (ir == null) {
       throw new IllegalArgumentException("ir is null");
     }
     return ssaCache.findOrCreateDU(ir, Everywhere.EVERYWHERE);
   }
+
+  @Override
+  public void clear() {
+    ssaCache.wipe();   
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisOptions.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisOptions.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisOptions.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisOptions.java	2019-01-29 17:08:39.000000000 +0000
@@ -71,8 +71,10 @@
     NO_METHOD_INVOKE("no_method_invoke", Integer.MAX_VALUE, true, false, false), 
     NO_FLOW_TO_CASTS_NO_METHOD_INVOKE("no_flow_to_casts_no_method_invoke", 0, true, false, false), 
     ONE_FLOW_TO_CASTS_NO_METHOD_INVOKE("one_flow_to_casts_no_method_invoke", 1, true, false, false), 
-    ONE_FLOW_TO_CASTS_APPLICATION_GET_METHOD("one_flow_to_casts_application_get_method", 1, false, false, true), 
+    ONE_FLOW_TO_CASTS_APPLICATION_GET_METHOD("one_flow_to_casts_application_get_method", 1, false, false, true),
+    MULTI_FLOW_TO_CASTS_APPLICATION_GET_METHOD("multi_flow_to_casts_application_get_method", 100, false, false, true),
     NO_STRING_CONSTANTS("no_string_constants", Integer.MAX_VALUE, false, true, false), 
+    STRING_ONLY("string_constants", 0, true, false, true), 
     NONE("none", 0, true, true, true);
 
     private final String name;
@@ -184,13 +186,18 @@
 
   /**
    * This numerical value indicates the maximum number of nodes that any {@link CallGraph} build with this {@link AnalysisOptions}
-   * object is allowed to have. During {@link CallGraph} construction, once <code>maxNumberOfNodes</code> {@link CGNode} objects
+   * object is allowed to have. During {@link CallGraph} construction, once {@code maxNumberOfNodes} {@link CGNode} objects
    * have been added to the {@link CallGraph}, no more {@link CGNode} objects will be added. By default,
-   * <code>maxNumberOfNodes</code> is set to <code>-1</code>, which indicates that no restrictions are in place. See also
+   * {@code maxNumberOfNodes} is set to {@code -1}, which indicates that no restrictions are in place. See also
    * {@link ExplicitCallGraph}.
    */
   private long maxNumberOfNodes = -1;
-
+  
+  /**
+   * Should call graph construction handle arrays of zero-length differently?
+   */
+  private boolean handleZeroLengthArray = true;
+  
   // SJF: I'm not sure these factories and caches belong here.
   // TODO: figure out how to clean this up.
 
@@ -418,4 +425,18 @@
   public void setHandleStaticInit(boolean handleStaticInit) {
     this.handleStaticInit = handleStaticInit;
   }
+  
+  /**
+   * Should call graph construction handle arrays of zero-length differently?
+   */
+  public boolean getHandleZeroLengthArray() {
+    return handleZeroLengthArray;
+  }
+
+  /**
+   * Should call graph construction handle arrays of zero-length differently?
+   */
+  public void setHandleZeroLengthArray(boolean handleZeroLengthArray) {
+    this.handleZeroLengthArray = handleZeroLengthArray;
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,12 +11,13 @@
 package com.ibm.wala.ipa.callgraph;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.NotSerializableException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -30,6 +31,7 @@
 import com.ibm.wala.classLoader.ClassFileModule;
 import com.ibm.wala.classLoader.IClassLoader;
 import com.ibm.wala.classLoader.JarFileModule;
+import com.ibm.wala.classLoader.JarStreamModule;
 import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.classLoader.Module;
 import com.ibm.wala.classLoader.SourceDirectoryTreeModule;
@@ -40,12 +42,14 @@
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.PlatformUtil;
+import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.MapIterator;
 import com.ibm.wala.util.collections.MapUtil;
 import com.ibm.wala.util.config.SetOfClasses;
 import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.io.RtJar;
 import com.ibm.wala.util.strings.Atom;
 import com.ibm.wala.util.strings.ImmutableByteArray;
 
@@ -54,7 +58,7 @@
  * 
  * The analysis scope is partitioned by class loader. There are three pre-defined class loader scopes:
  * <ul>
- * <li>Primordial (for <code>rt.jar</code>, the core classes)
+ * <li>Primordial (for {@code rt.jar}, the core classes)
  * <li>Extension (for extension libraries in $JRE/lib/ext)
  * <li>Application (for the classes of the application)
  * </ul>
@@ -117,7 +121,7 @@
    */
   private SetOfClasses exclusions;
 
-  final protected LinkedHashMap<Atom, ClassLoaderReference> loadersByName = new LinkedHashMap<Atom, ClassLoaderReference>();
+  public final LinkedHashMap<Atom, ClassLoaderReference> loadersByName = new LinkedHashMap<>();
 
   /**
    * Special class loader for array instances
@@ -130,7 +134,7 @@
 
   protected AnalysisScope(Collection<? extends Language> languages) {
     super();
-    this.languages = new HashMap<Atom, Language>();
+    this.languages = new HashMap<>();
     for (Language l : languages) {
       this.languages.put(l.getName(), l);
     }
@@ -203,7 +207,6 @@
 
   /**
    * Add a class file to the scope for a loader
-   * @throws InvalidClassFileException 
    */
   public void addClassFileToScope(ClassLoaderReference loader, File file) throws IllegalArgumentException, InvalidClassFileException {
     List<Module> s = MapUtil.findOrCreateList(moduleMap, loader);
@@ -211,8 +214,21 @@
   }
 
   /**
+   * Add a jar file to the scope via an {@link InputStream}.  NOTE: The InputStream should *not*
+   * be a {@link java.util.jar.JarInputStream}; it should be a regular {@link InputStream} for
+   * the raw bytes of the jar file.
+   *
+   */
+  public void addInputStreamForJarToScope(ClassLoaderReference loader, InputStream stream) throws
+      IOException {
+    MapUtil.findOrCreateList(moduleMap, loader).add(new JarStreamModule(stream));
+  }
+
+
+  /**
    * Add a jar file to the scope for a loader
    */
+  @SuppressWarnings("unused")
   public void addToScope(ClassLoaderReference loader, JarFile file) {
     List<Module> s = MapUtil.findOrCreateList(moduleMap, loader);
     if (DEBUG_LEVEL > 0) {
@@ -224,6 +240,7 @@
   /**
    * Add a module to the scope for a loader
    */
+  @SuppressWarnings("unused")
   public void addToScope(ClassLoaderReference loader, Module m) {
     if (m == null) {
       throw new IllegalArgumentException("null m");
@@ -252,6 +269,7 @@
   /**
    * Add a module file to the scope for a loader. The classes in the added jar file will override classes added to the scope so far.
    */
+  @SuppressWarnings("unused")
   public void addToScopeHead(ClassLoaderReference loader, Module m) {
     if (m == null) {
       throw new IllegalArgumentException("null m");
@@ -264,7 +282,7 @@
   }
 
   /**
-   * @return the ClassLoaderReference specified by <code>name</code>.
+   * @return the ClassLoaderReference specified by {@code name}.
    * @throws IllegalArgumentException if name is null
    */
   public ClassLoaderReference getLoader(Atom name) throws IllegalArgumentException {
@@ -319,18 +337,18 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     for (ClassLoaderReference loader : loadersByName.values()) {
       result.append(loader.getName());
-      result.append("\n");
+      result.append('\n');
       for (Module m : getModules(loader)) {
-        result.append(" ");
+        result.append(' ');
         result.append(m);
-        result.append("\n");
+        result.append('\n');
       }
     }
     result.append(getExclusionString());
-    result.append("\n");
+    result.append('\n');
     return result.toString();
   }
 
@@ -371,31 +389,16 @@
    * @return the rt.jar (1.4) or core.jar (1.5) file, or null if not found.
    */
   private JarFile getRtJar() {
-    for (Iterator MS = getModules(getPrimordialLoader()).iterator(); MS.hasNext();) {
-      Module M = (Module) MS.next();
-      if (M instanceof JarFileModule) {
-        JarFile JF = ((JarFileModule) M).getJarFile();
-        if (JF.getName().endsWith(File.separator + "rt.jar")) {
-          return JF;
-        }
-        if (JF.getName().endsWith(File.separator + "core.jar")) {
-          return JF;
-        }
-        // hack for Mac
-        if (PlatformUtil.onMacOSX() && JF.getName().endsWith(File.separator + "classes.jar")) {
-          return JF;
-        }
-      }
-    }
-    return null;
+    return RtJar.getRtJar(
+        new MapIterator<Module,JarFile>(
+            new FilterIterator<>(getModules(getPrimordialLoader()).iterator(), JarFileModule.class::isInstance), M -> ((JarFileModule) M).getJarFile()));
   }
 
   public String getJavaLibraryVersion() throws IllegalStateException {
-    JarFile rtJar = getRtJar();
-    if (rtJar == null) {
-      throw new IllegalStateException("cannot find runtime libraries");
-    }
-    try {
+    try (final JarFile rtJar = getRtJar()) {
+      if (rtJar == null) {
+        throw new IllegalStateException("cannot find runtime libraries");
+      }
       Manifest man = rtJar.getManifest();
       assert man != null : "runtime library has no manifest!";
       String result = man.getMainAttributes().getValue("Specification-Version");
@@ -435,7 +438,6 @@
    * Creates a "serializable" version of the analysis scope.
    * 
    * @return a "serializable" version of the analysis scope.
-   * @throws NotSerializableException
    */
   public ShallowAnalysisScope toShallowAnalysisScope() throws NotSerializableException {
 
@@ -445,7 +447,7 @@
     // Note: 'arrayClassLoader' object will be built from scratch in remote process
 
     // represent modules map as a set of strings (corresponding to analysis scope file lines.
-    List<String> moduleLines = new ArrayList<String>();
+    List<String> moduleLines = new ArrayList<>();
     for (Map.Entry<ClassLoaderReference, List<Module>> e : moduleMap.entrySet()) {
       ClassLoaderReference lrReference = e.getKey();
       String moduleLdr = lrReference.getName().toString();
@@ -478,7 +480,7 @@
     }
 
     // represent loaderImplByRef map as set of strings
-    List<String> ldrImplLines = new ArrayList<String>();
+    List<String> ldrImplLines = new ArrayList<>();
     for (Map.Entry<ClassLoaderReference, String> e : loaderImplByRef.entrySet()) {
       ClassLoaderReference lrReference = e.getKey();
       String ldrName = lrReference.getName().toString();
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphBuilderCancelException.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphBuilderCancelException.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphBuilderCancelException.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphBuilderCancelException.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,6 +20,8 @@
  */
 public class CallGraphBuilderCancelException extends CancelException {
 
+  private static final long serialVersionUID = -3071193971009314659L;
+
   private final CallGraph cg;
 
   private final PointerAnalysis<InstanceKey> pointerAnalysis;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphBuilder.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,12 +13,13 @@
 
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
 
 /**
  * Basic interface for an object that can build a call graph.
  */
-public interface CallGraphBuilder {
+public interface CallGraphBuilder<I extends InstanceKey> {
   /**
    * Build a call graph.
    * 
@@ -31,11 +32,13 @@
   /**
    * @return the Pointer Analysis information computed as a side-effect of call graph construction.
    */
-  public PointerAnalysis<InstanceKey> getPointerAnalysis();
+  public PointerAnalysis<I> getPointerAnalysis();
 
   /**
    * @return A cache of various analysis artifacts used during call graph construction.
    */
-  public AnalysisCache getAnalysisCache();
+  public IAnalysisCacheView getAnalysisCache();
 
+  public IClassHierarchy getClassHierarchy();
+  
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphStats.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphStats.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphStats.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphStats.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,6 @@
 
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
 import com.ibm.wala.classLoader.IMethod;
@@ -93,18 +92,11 @@
 
     @Override
     public String toString() {
-      StringBuffer result = new StringBuffer();
-      result.append("Call graph stats:");
-      result.append("\n");
-      result.append("  Nodes: " + nNodes);
-      result.append("\n");
-      result.append("  Edges: " + nEdges);
-      result.append("\n");
-      result.append("  Methods: " + nMethods);
-      result.append("\n");
-      result.append("  Bytecode Bytes: " + bytecodeBytes);
-      result.append("\n");
-      return result.toString();
+      return "Call graph stats:\n  Nodes: " + nNodes
+              + "\n  Edges: " + nEdges
+              + "\n  Methods: " + nMethods
+              + "\n  Bytecode Bytes: " + bytecodeBytes
+              + '\n';
 
     }
   }
@@ -116,8 +108,7 @@
     Set<CGNode> reachableNodes = DFS.getReachableNodes(cg, Collections.singleton(cg.getFakeRootNode()));
     int nNodes = 0;
     int nEdges = 0;
-    for (Iterator<CGNode> it = reachableNodes.iterator(); it.hasNext();) {
-      CGNode n = it.next();
+    for (CGNode n : reachableNodes) {
       nNodes++;
       nEdges += cg.getSuccNodeCount(n);
     }
@@ -132,7 +123,6 @@
   }
 
   /**
-   * @param cg
    * @return the number of bytecode bytes
    * @throws IllegalArgumentException if cg is null
    */
@@ -142,8 +132,7 @@
     }
     int ret = 0;
     HashSet<IMethod> counted = HashSetFactory.make();
-    for (Iterator<? extends CGNode> iter = cg.iterator(); iter.hasNext();) {
-      CGNode node = iter.next();
+    for (CGNode node : cg) {
       IMethod method = node.getMethod();
       if (counted.add(method)) {
         if (method instanceof ShrikeCTMethod) {
@@ -160,7 +149,6 @@
   /**
    * Walk the call graph and return the set of MethodReferences that appear in the graph.
    * 
-   * @param cg
    * @return a set of MethodReferences
    * @throws IllegalArgumentException if cg is null
    */
@@ -169,8 +157,7 @@
       throw new IllegalArgumentException("cg is null");
     }
     HashSet<MethodReference> result = HashSetFactory.make();
-    for (Iterator it = cg.iterator(); it.hasNext();) {
-      CGNode N = (CGNode) it.next();
+    for (CGNode N : cg) {
       result.add(N.getMethod().getReference());
     }
     return result;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphTransitiveClosure.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphTransitiveClosure.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphTransitiveClosure.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CallGraphTransitiveClosure.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,8 +11,8 @@
 package com.ibm.wala.ipa.callgraph;
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Map;
+import java.util.function.Function;
 
 import com.ibm.wala.dataflow.graph.BitVectorSolver;
 import com.ibm.wala.fixpoint.BitVectorVariable;
@@ -20,7 +20,6 @@
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.CancelRuntimeException;
 import com.ibm.wala.util.collections.HashMapFactory;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.graph.impl.GraphInverter;
 import com.ibm.wala.util.intset.OrdinalSet;
 
@@ -42,14 +41,13 @@
   public static <T> Map<CGNode, OrdinalSet<T>> transitiveClosure(CallGraph cg, Map<CGNode, Collection<T>> nodeResults) {
     try {
       // invert the call graph, to compute the bottom-up result
-      GenReach<CGNode, T> gr = new GenReach<CGNode, T>(GraphInverter.invert(cg), nodeResults);
-      BitVectorSolver<CGNode> solver = new BitVectorSolver<CGNode>(gr);
+      GenReach<CGNode, T> gr = new GenReach<>(GraphInverter.invert(cg), nodeResults);
+      BitVectorSolver<CGNode> solver = new BitVectorSolver<>(gr);
       solver.solve(null);
       Map<CGNode, OrdinalSet<T>> result = HashMapFactory.make();
-      for (Iterator<? extends CGNode> it = cg.iterator(); it.hasNext();) {
-        CGNode n = it.next();
+      for (CGNode n : cg) {
         BitVectorVariable bv = solver.getOut(n);
-        result.put(n, new OrdinalSet<T>(bv.getValue(), gr.getLatticeValues()));
+        result.put(n, new OrdinalSet<>(bv.getValue(), gr.getLatticeValues()));
       }
       return result;
     } catch (CancelException e) {
@@ -62,8 +60,7 @@
    */
   public static <T> Map<CGNode, Collection<T>> collectNodeResults(CallGraph cg, Function<CGNode, Collection<T>> nodeResultComputer) {
     Map<CGNode, Collection<T>> result = HashMapFactory.make();
-    for (Iterator<? extends CGNode> it = cg.iterator(); it.hasNext();) {
-      CGNode n = it.next();
+    for (CGNode n : cg) {
       result.put(n, nodeResultComputer.apply(n));
     }
     return result;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CGNode.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CGNode.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CGNode.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/CGNode.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,7 +26,7 @@
 public interface CGNode extends INodeWithNumber, ContextItem, IClassHierarchyDweller {
   /**
    * Return the {@link IMethod method} this CGNode represents.
-   * This value will never be <code>null</code>.
+   * This value will never be {@code null}.
    *
    * @return the target IMethod for this CGNode.
    */
@@ -34,7 +34,7 @@
 
   /**
    * Return the {@link Context context} this CGNode represents.
-   * This value will never be <code>null</code>.
+   * This value will never be {@code null}.
    *
    * @return the Context for this CGNode.
    */
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/cha/CHACallGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/cha/CHACallGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/cha/CHACallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/cha/CHACallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,39 +11,39 @@
 package com.ibm.wala.ipa.callgraph.cha;
 
 import java.lang.ref.SoftReference;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
+import java.util.function.Predicate;
 
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.classLoader.NewSiteReference;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.BasicCallGraph;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
-import com.ibm.wala.ipa.callgraph.impl.FakeRootMethod;
 import com.ibm.wala.ipa.callgraph.impl.FakeWorldClinitMethod;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.util.CancelException;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.ComposedIterator;
-import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.IteratorUtil;
 import com.ibm.wala.util.collections.MapIterator;
-import com.ibm.wala.util.collections.NonNullSingletonIterator;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.graph.NumberedEdgeManager;
 import com.ibm.wala.util.intset.IntSet;
 import com.ibm.wala.util.intset.IntSetUtil;
@@ -52,10 +52,17 @@
 public class CHACallGraph extends BasicCallGraph<CHAContextInterpreter> {
   private final IClassHierarchy cha;
   private final AnalysisOptions options;
-  private final AnalysisCache cache;
-  
+  private final IAnalysisCacheView cache;
+
+  /**
+   * if set to true, do not include call graph edges in classes outside
+   * the application class loader.  This means callbacks from library
+   * to application will be ignored.
+   */
+  private final boolean applicationOnly;
+
   private boolean isInitialized = false;
-  
+
   private class CHANode extends NodeImpl {
 
     protected CHANode(IMethod method, Context C) {
@@ -64,20 +71,17 @@
 
     @Override
     public IR getIR() {
-      assert false;
-      return null;
+      return cache.getIR(method);
     }
 
     @Override
     public DefUse getDU() {
-      assert false;
-      return null;
+      return cache.getDefUse(cache.getIR(method));
     }
 
     @Override
     public Iterator<NewSiteReference> iterateNewSites() {
-      assert false;
-      return null;
+      return getInterpreter(this).iterateNewSites(this);
     }
 
     @Override
@@ -99,16 +103,22 @@
     public boolean addTarget(CallSiteReference reference, CGNode target) {
       return false;
     }
-    
+
   }
-  
+
   public CHACallGraph(IClassHierarchy cha) {
+    this(cha, false);
+  }
+
+  public CHACallGraph(IClassHierarchy cha, boolean applicationOnly) {
     this.cha = cha;
     this.options = new AnalysisOptions();
-    this.cache = new AnalysisCache();
+    this.cache = new AnalysisCacheImpl();
+    this.applicationOnly = applicationOnly;
     setInterpreter(new ContextInsensitiveCHAContextInterpreter());
   }
 
+  @SuppressWarnings("deprecation")
   public void init(Iterable<Entrypoint> entrypoints) throws CancelException {
     super.init();
 
@@ -121,48 +131,48 @@
     closure();
     isInitialized = true;
   }
-  
+
   @Override
   public IClassHierarchy getClassHierarchy() {
     return cha;
   }
 
+  private final Map<CallSiteReference, Set<IMethod>> targetCache = HashMapFactory.make();
+  
   private Iterator<IMethod> getPossibleTargets(CallSiteReference site) {
-    if (site.isDispatch()) {
-      return cha.getPossibleTargets(site.getDeclaredTarget()).iterator();
-    } else {
-      IMethod m = cha.resolveMethod(site.getDeclaredTarget());
-      if (m != null) {
-        return new NonNullSingletonIterator<IMethod>(m);
+    Set<IMethod> result = targetCache.get(site);
+    if (result == null) {
+      if (site.isDispatch()) {
+        result = cha.getPossibleTargets(site.getDeclaredTarget());
       } else {
-        return EmptyIterator.instance();
+        IMethod m = cha.resolveMethod(site.getDeclaredTarget());
+        if (m != null) {
+          result = Collections.singleton(m);
+        } else {
+          result = Collections.emptySet();
+        }
       }
+      targetCache.put(site, result);
     }
+    return result.iterator();
   }
-  
+
   @Override
   public Set<CGNode> getPossibleTargets(CGNode node, CallSiteReference site) {
     return Iterator2Collection.toSet(
       new MapIterator<IMethod,CGNode>(
-          new FilterIterator<IMethod>(
+          new FilterIterator<>(
               getPossibleTargets(site),
-              new Predicate<IMethod>() {
-                @Override public boolean test(IMethod o) {
-                  return !o.isAbstract();
-                }
-              }
+              this::isRelevantMethod
           ),
-        new Function<IMethod,CGNode>() {
-          @Override
-          public CGNode apply(IMethod object) {
-            try {
-              return findOrCreateNode(object, Everywhere.EVERYWHERE);
-            } catch (CancelException e) {
-              assert false : e.toString();
-              return null;
-            }
+        object -> {
+          try {
+            return findOrCreateNode(object, Everywhere.EVERYWHERE);
+          } catch (CancelException e) {
+            assert false : e.toString();
+            return null;
           }
-        }));        
+        }));
   }
 
   @Override
@@ -172,18 +182,14 @@
 
   @Override
   public Iterator<CallSiteReference> getPossibleSites(final CGNode src, final CGNode target) {
-    return 
-      new FilterIterator<CallSiteReference>(getInterpreter(src).iterateCallSites(src),
-        new Predicate<CallSiteReference>() {
-          @Override public boolean test(CallSiteReference o) {
-            return getPossibleTargets(src, o).contains(target);
-          }
-        });
+    return
+      new FilterIterator<>(getInterpreter(src).iterateCallSites(src),
+        o -> getPossibleTargets(src, o).contains(target));
   }
-  
+
   private class CHARootNode extends CHANode {
     private final Set<CallSiteReference> calls = HashSetFactory.make();
-    
+
     protected CHARootNode(IMethod method, Context C) {
       super(method, C);
     }
@@ -198,32 +204,33 @@
       return calls.add(reference);
     }
   }
-  
+
   @Override
   protected CGNode makeFakeRootNode() throws CancelException {
-    return new CHARootNode(new FakeRootMethod(cha, options, cache), Everywhere.EVERYWHERE);
+    return new CHARootNode(Language.JAVA.getFakeRootMethod(cha, options, cache), Everywhere.EVERYWHERE);
   }
 
   @Override
   protected CGNode makeFakeWorldClinitNode() throws CancelException {
-    return new CHARootNode(new FakeWorldClinitMethod(cha, options, cache), Everywhere.EVERYWHERE);
+    return new CHARootNode(new FakeWorldClinitMethod(Language.JAVA.getFakeRootMethod(cha, options, cache).getDeclaringClass(), options, cache), Everywhere.EVERYWHERE);
   }
-  
+
   private int clinitPC = 0;
-  
+
   @Override
+  @SuppressWarnings("deprecation")
   public CGNode findOrCreateNode(IMethod method, Context C) throws CancelException {
     assert C.equals(Everywhere.EVERYWHERE);
     assert !method.isAbstract();
-    
+
     CGNode n = getNode(method, C);
     if (n == null) {
       assert !isInitialized;
       n = makeNewNode(method, C);
-      
+
       IMethod clinit = method.getDeclaringClass().getClassInitializer();
       if (clinit != null && getNode(clinit, Everywhere.EVERYWHERE) == null) {
-        CGNode cln = makeNewNode(clinit, Everywhere.EVERYWHERE);        
+        CGNode cln = makeNewNode(clinit, Everywhere.EVERYWHERE);
         CGNode clinits = getFakeWorldClinitNode();
         clinits.addTarget(CallSiteReference.make(clinitPC++, clinit.getReference(), IInvokeInstruction.Dispatch.STATIC), cln);
       }
@@ -231,16 +238,16 @@
     return n;
   }
 
-  private Stack<CGNode> newNodes = new Stack<CGNode>();
-  
+  private Stack<CGNode> newNodes = new Stack<>();
+
   private void closure() throws CancelException {
     while (! newNodes.isEmpty()) {
       CGNode n = newNodes.pop();
-      for(Iterator<CallSiteReference> sites = n.iterateCallSites(); sites.hasNext(); ) {
-        Iterator<IMethod> methods = getPossibleTargets(sites.next());
+      for(CallSiteReference site : Iterator2Iterable.make(n.iterateCallSites())) {
+        Iterator<IMethod> methods = getPossibleTargets(site);
         while (methods.hasNext()) {
           IMethod target = methods.next();
-          if (!target.isAbstract()) {
+          if (isRelevantMethod(target)) {
             CGNode callee = getNode(target, Everywhere.EVERYWHERE);
             if (callee == null) {
               callee = findOrCreateNode(target, Everywhere.EVERYWHERE);
@@ -254,7 +261,13 @@
     }
   }
 
-  private CGNode makeNewNode(IMethod method, Context C) throws CancelException {
+  private boolean isRelevantMethod(IMethod target) {
+    return !target.isAbstract()
+        && (!applicationOnly 
+            || cha.getScope().isApplicationLoader(target.getDeclaringClass().getClassLoader()));
+  }
+
+  private CGNode makeNewNode(IMethod method, Context C) {
     CGNode n;
     Key k = new Key(method, C);
     n = new CHANode(method, C);
@@ -267,7 +280,7 @@
   protected NumberedEdgeManager<CGNode> getEdgeManager() {
     return new NumberedEdgeManager<CGNode>() {
       private final Map<CGNode, SoftReference<Set<CGNode>>> predecessors = HashMapFactory.make();
-      
+
       private Set<CGNode> getPreds(CGNode n) {
         if (predecessors.containsKey(n) && predecessors.get(n).get() != null) {
           return predecessors.get(n).get();
@@ -278,11 +291,11 @@
               preds.add(node);
             }
           }
-          predecessors.put(n, new SoftReference<Set<CGNode>>(preds));
+          predecessors.put(n, new SoftReference<>(preds));
           return preds;
         }
       }
-      
+
       @Override
       public Iterator<CGNode> getPredNodes(CGNode n) {
         return getPreds(n).iterator();
@@ -295,7 +308,7 @@
 
       @Override
       public Iterator<CGNode> getSuccNodes(final CGNode n) {
-        return new FilterIterator<CGNode>(new ComposedIterator<CallSiteReference, CGNode>(n.iterateCallSites()) {
+        return new FilterIterator<>(new ComposedIterator<CallSiteReference, CGNode>(n.iterateCallSites()) {
           @Override
           public Iterator<? extends CGNode> makeInner(CallSiteReference outer) {
             return getPossibleTargets(n, outer).iterator();
@@ -352,8 +365,8 @@
       @Override
       public IntSet getSuccNodeNumbers(CGNode node) {
         MutableIntSet result = IntSetUtil.make();
-        for(Iterator<CGNode> ss = getSuccNodes(node); ss.hasNext(); ) {
-          result.add(ss.next().getGraphNodeId());
+        for(CGNode s : Iterator2Iterable.make(getSuccNodes(node))) {
+          result.add(s.getGraphNodeId());
         }
         return result;
       }
@@ -361,12 +374,12 @@
       @Override
       public IntSet getPredNodeNumbers(CGNode node) {
         MutableIntSet result = IntSetUtil.make();
-        for(Iterator<CGNode> ss = getPredNodes(node); ss.hasNext(); ) {
-          result.add(ss.next().getGraphNodeId());
+        for(CGNode s : Iterator2Iterable.make(getPredNodes(node))) {
+          result.add(s.getGraphNodeId());
         }
         return result;
       }
-      
+
     };
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/cha/CHAContextInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/cha/CHAContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/cha/CHAContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/cha/CHAContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,6 +13,7 @@
 import java.util.Iterator;
 
 import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.ipa.callgraph.CGNode;
 
 public interface CHAContextInterpreter {
@@ -27,4 +28,5 @@
    */
   public abstract Iterator<CallSiteReference> iterateCallSites(CGNode node);
 
+  Iterator<NewSiteReference> iterateNewSites(CGNode node);
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/cha/ContextInsensitiveCHAContextInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/cha/ContextInsensitiveCHAContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/cha/ContextInsensitiveCHAContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/cha/ContextInsensitiveCHAContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,6 +14,7 @@
 
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.CodeScanner;
+import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.util.debug.Assertions;
@@ -39,4 +40,16 @@
     }
   }
 
+  @Override
+  public Iterator<NewSiteReference> iterateNewSites(CGNode node) {
+    if (node == null) {
+      throw new IllegalArgumentException("node is null");
+    }
+    try {
+      return CodeScanner.getNewSites(node.getMethod()).iterator();
+    } catch (InvalidClassFileException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/ContextItem.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/ContextItem.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/ContextItem.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/ContextItem.java	2019-01-29 17:08:39.000000000 +0000
@@ -28,7 +28,7 @@
     }
 
     public static <T> Value make(T v) {
-      return new Value<T>(v);
+      return new Value<>(v);
     }
 
     @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/Context.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/Context.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/Context.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/Context.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,11 +16,18 @@
  * For example, for CFA-1, there is only one name ("caller"); and the context maps "caller" to an IMethod
  * 
  * As another example, for CPA, there would be name for each parameter slot ("zero","one","two"), and the Context provides a mapping
- * from this name to a set of types. eg. "one" -> {java.lang.String, java.lang.Date}
+ * from this name to a set of types. eg. "one" -&gt; {java.lang.String, java.lang.Date}
  */
-public interface Context {
+public interface Context extends ContextItem {
   /**
    * @return the objects corresponding to a given name
    */
   ContextItem get(ContextKey name);
+  
+  /**
+   * @return whether this context has a specific type
+   */
+  default boolean isA(Class<? extends Context> type) {
+    return type.isInstance(this);
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/ContextKey.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/ContextKey.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/ContextKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/ContextKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,6 +22,18 @@
   };
 
   /**
+   * A property of contexts that might be generally useful: the "target" method.
+   */
+  public final static ContextKey TARGET = new ContextKey() {
+  };
+
+  /**
+   * A property of contexts that might be generally useful: the "name".
+   */
+  public final static ContextKey NAME = new ContextKey() {
+  };
+
+  /**
    * A property of contexts that might be generally useful: the "call site" method ... used for call-string context schemes.
    */
   public final static ContextKey CALLSITE = new ContextKey() {
@@ -40,13 +52,17 @@
    * context key representing some parameter index, useful, e.g. for CPA-style
    * context-sensitivity policies.
    */
-  public static class ParameterKey implements ContextKey {
+  static class ParameterKey implements ContextKey {
     public final int index;
 
-    public ParameterKey(int index) {
-      super();
+    private ParameterKey(int index) {
       this.index = index;
     }
+    
+    @Override
+    public String toString() {
+      return "P" + index;
+    }
   }
   
   /**
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/DelegatingContext.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/DelegatingContext.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/DelegatingContext.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/DelegatingContext.java	2019-01-29 17:08:39.000000000 +0000
@@ -67,9 +67,12 @@
 
   @Override
   public String toString() {
-    return "DelegatingContext [A=" + A + ", B=" + B + "]";
+    return "DelegatingContext [A=" + A + ", B=" + B + ']';
   }
   
-  
+  @Override
+  public boolean isA(Class<? extends Context> type) {
+    return A.isA(type) || B.isA(type);
+  }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/Entrypoint.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/Entrypoint.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/Entrypoint.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/Entrypoint.java	2019-01-29 17:08:39.000000000 +0000
@@ -191,16 +191,16 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer(method.toString());
-    result.append("(");
+    StringBuilder result = new StringBuilder(method.toString());
+    result.append('(');
     for (int i = 0; i < getNumberOfParameters() - 1; i++) {
       result.append(Arrays.toString(getParameterTypes(i)));
-      result.append(",");
+      result.append(',');
     }
     if (getNumberOfParameters() > 0) {
       result.append(Arrays.toString(getParameterTypes(getNumberOfParameters() - 1)));
     }
-    result.append(")");
+    result.append(')');
     return result.toString();
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/IAnalysisCacheView.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/IAnalysisCacheView.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/IAnalysisCacheView.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/IAnalysisCacheView.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ipa.callgraph;
+
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.ipa.callgraph.impl.Everywhere;
+import com.ibm.wala.ssa.DefUse;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRFactory;
+import com.ibm.wala.ssa.SSAOptions;
+
+public interface IAnalysisCacheView {
+
+  void invalidate(IMethod method, Context C);
+
+  IRFactory<IMethod> getIRFactory();
+
+  /**
+   * Find or create an IR for the method using the {@link Everywhere} context and default {@link SSAOptions}
+   */
+  IR getIR(IMethod method);
+
+  /**
+   * Find or create a DefUse for the IR using the {@link Everywhere} context 
+   */
+  DefUse getDefUse(IR ir);
+
+  IR getIR(IMethod method, Context context);
+
+  void clear();
+
+}
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/AbstractRootMethod.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/AbstractRootMethod.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/AbstractRootMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/AbstractRootMethod.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,16 +22,17 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.classLoader.SyntheticMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.rta.RTAContextInterpreter;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.SyntheticIR;
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
 import com.ibm.wala.ssa.ConstantValue;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSAArrayStoreInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAInstructionFactory;
@@ -54,7 +55,7 @@
  */
 public abstract class AbstractRootMethod extends SyntheticMethod {
 
-  final protected ArrayList<SSAInstruction> statements = new ArrayList<SSAInstruction>();
+  public final ArrayList<SSAInstruction> statements = new ArrayList<>();
 
   private Map<ConstantValue, Integer> constant2ValueNumber = HashMapFactory.make();
 
@@ -62,18 +63,18 @@
    * The number of the next local value number available for the fake root method. Note that we reserve value number 1 to represent
    * the value "any exception caught by the root method"
    */
-  protected int nextLocal = 2;
+  public int nextLocal = 2;
 
-  protected final IClassHierarchy cha;
+  public final IClassHierarchy cha;
 
   private final AnalysisOptions options;
 
-  protected final AnalysisCache cache;
+  protected final IAnalysisCacheView cache;
 
   protected final SSAInstructionFactory insts;
 
   public AbstractRootMethod(MethodReference method, IClass declaringClass, final IClassHierarchy cha, AnalysisOptions options,
-      AnalysisCache cache) {
+      IAnalysisCacheView cache) {
     super(method, declaringClass, true, false);
     this.cha = cha;
     this.options = options;
@@ -89,19 +90,20 @@
     }
   }
 
-  public AbstractRootMethod(MethodReference method, final IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-    this(method, new FakeRootClass(cha), cha, options, cache);
+  public AbstractRootMethod(MethodReference method, final IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
+    this(method, new FakeRootClass(method.getDeclaringClass().getClassLoader(), cha), cha, options, cache);
   }
 
   /*
    * @see com.ibm.wala.classLoader.IMethod#getStatements(com.ibm.wala.util.warnings.WarningSet)
    */
+  @SuppressWarnings("deprecation")
   @Override
   public SSAInstruction[] getStatements(SSAOptions options) {
     SSAInstruction[] result = new SSAInstruction[statements.size()];
     int i = 0;
-    for (Iterator<SSAInstruction> it = statements.iterator(); it.hasNext();) {
-      result[i++] = it.next();
+    for (SSAInstruction ssaInstruction : statements) {
+      result[i++] = ssaInstruction;
     }
 
     return result;
@@ -113,9 +115,8 @@
     Map<Integer, ConstantValue> constants = null;
     if (!constant2ValueNumber.isEmpty()) {
       constants = HashMapFactory.make(constant2ValueNumber.size());
-      for (ConstantValue c : constant2ValueNumber.keySet()) {
-        int vn = constant2ValueNumber.get(c);
-        constants.put(vn, c);
+      for (Map.Entry<ConstantValue, Integer> entry : constant2ValueNumber.entrySet()) {
+        constants.put(entry.getValue(), entry.getKey());
       }
     }
     InducedCFG cfg = makeControlFlowGraph(instrs);
@@ -130,12 +131,12 @@
    * @return the invoke instructions added by this operation
    * @throws IllegalArgumentException if site is null
    */
-  public SSAInvokeInstruction addInvocation(int[] params, CallSiteReference site) {
+  public SSAAbstractInvokeInstruction addInvocation(int[] params, CallSiteReference site) {
     if (site == null) {
       throw new IllegalArgumentException("site is null");
     }
     CallSiteReference newSite = CallSiteReference.make(statements.size(), site.getDeclaredTarget(), site.getInvocationCode());
-    SSAInvokeInstruction s = null;
+    SSAAbstractInvokeInstruction s = null;
     if (newSite.getDeclaredTarget().getReturnType().equals(TypeReference.Void)) {
       s = insts.InvokeInstruction(statements.size(), params, nextLocal++, newSite, null);
     } else {
@@ -258,7 +259,7 @@
     return result;
   }
 
-  protected int getValueNumberForIntConstant(int c) {
+  public int getValueNumberForIntConstant(int c) {
     ConstantValue v = new ConstantValue(c);
     Integer result = constant2ValueNumber.get(v);
     if (result == null) {
@@ -268,7 +269,7 @@
     return result;
   }
 
-  protected int getValueNumberForByteConstant(byte c) {
+  public int getValueNumberForByteConstant(byte c) {
     // treat it like an int constant for now.
     ConstantValue v = new ConstantValue(c);
     Integer result = constant2ValueNumber.get(v);
@@ -279,7 +280,7 @@
     return result;
   }
 
-  protected int getValueNumberForCharConstant(char c) {
+  public int getValueNumberForCharConstant(char c) {
     // treat it like an int constant for now.
     ConstantValue v = new ConstantValue(c);
     Integer result = constant2ValueNumber.get(v);
@@ -361,11 +362,11 @@
 
       @Override
       public Iterator<NewSiteReference> iterateNewSites(CGNode node) {
-        ArrayList<NewSiteReference> result = new ArrayList<NewSiteReference>();
+        ArrayList<NewSiteReference> result = new ArrayList<>();
         SSAInstruction[] statements = getStatements(options.getSSAOptions());
-        for (int i = 0; i < statements.length; i++) {
-          if (statements[i] instanceof SSANewInstruction) {
-            SSANewInstruction s = (SSANewInstruction) statements[i];
+        for (SSAInstruction statement : statements) {
+          if (statement instanceof SSANewInstruction) {
+            SSANewInstruction s = (SSANewInstruction) statement;
             result.add(s.getNewSite());
           }
         }
@@ -373,11 +374,11 @@
       }
 
       public Iterator<SSAInstruction> getInvokeStatements() {
-        ArrayList<SSAInstruction> result = new ArrayList<SSAInstruction>();
+        ArrayList<SSAInstruction> result = new ArrayList<>();
         SSAInstruction[] statements = getStatements(options.getSSAOptions());
-        for (int i = 0; i < statements.length; i++) {
-          if (statements[i] instanceof SSAInvokeInstruction) {
-            result.add(statements[i]);
+        for (SSAInstruction statement : statements) {
+          if (statement instanceof SSAInvokeInstruction) {
+            result.add(statement);
           }
         }
         return result.iterator();
@@ -407,7 +408,7 @@
 
       @Override
       public boolean understands(CGNode node) {
-        return node.getMethod().getDeclaringClass().getReference().equals(FakeRootClass.FAKE_ROOT_CLASS);
+        return node.getMethod().getDeclaringClass().equals(AbstractRootMethod.this.getDeclaringClass());
       }
 
       @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/AllApplicationEntrypoints.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/AllApplicationEntrypoints.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/AllApplicationEntrypoints.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/AllApplicationEntrypoints.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,8 +11,6 @@
 package com.ibm.wala.ipa.callgraph.impl;
 
 import java.util.HashSet;
-import java.util.Iterator;
-
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
@@ -24,6 +22,7 @@
  */
 public class AllApplicationEntrypoints extends HashSet<Entrypoint> {
 
+  private static final long serialVersionUID = 6541081454519490199L;
   private final static boolean DEBUG = false;
 
   /**
@@ -39,8 +38,7 @@
     for (IClass klass : cha) {
       if (!klass.isInterface()) {
         if (isApplicationClass(scope, klass)) {
-          for (Iterator methodIt = klass.getDeclaredMethods().iterator(); methodIt.hasNext();) {
-            IMethod method = (IMethod) methodIt.next();
+          for (IMethod method : klass.getDeclaredMethods()) {
             if (!method.isAbstract()) {
               add(new ArgumentTypeEntrypoint(method, cha));
             }
@@ -57,7 +55,7 @@
   /**
    * @return true iff klass is loaded by the application loader.
    */
-  private boolean isApplicationClass(AnalysisScope scope, IClass klass) {
+  private static boolean isApplicationClass(AnalysisScope scope, IClass klass) {
     return scope.getApplicationLoader().equals(klass.getClassLoader().getReference());
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ArgumentTypeEntrypoint.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ArgumentTypeEntrypoint.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ArgumentTypeEntrypoint.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ArgumentTypeEntrypoint.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,6 @@
 package com.ibm.wala.ipa.callgraph.impl;
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Set;
 
 import com.ibm.wala.classLoader.ArrayClass;
@@ -81,9 +80,8 @@
   }
 
   private TypeReference chooseAConcreteSubClass(IClass klass) {
-    Collection subclasses = cha.computeSubClasses(klass.getReference());
-    for (Iterator it = subclasses.iterator(); it.hasNext();) {
-      IClass c = (IClass) it.next();
+    Collection<IClass> subclasses = cha.computeSubClasses(klass.getReference());
+    for (IClass c : subclasses) {
       if (!c.isAbstract()) {
         return c.getReference();
       }
@@ -110,4 +108,4 @@
     return paramTypes.length;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/BasicCallGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/BasicCallGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/BasicCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/BasicCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,11 +17,14 @@
 import java.util.Set;
 
 import com.ibm.wala.analysis.reflection.JavaTypeContext;
+import com.ibm.wala.analysis.typeInference.TypeAbstraction;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.ContextKey;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.ReceiverInstanceContext;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
@@ -29,6 +32,7 @@
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
@@ -45,7 +49,7 @@
 
   private static final boolean DEBUG = false;
 
-  private final DelegatingNumberedNodeManager<CGNode> nodeManager = new DelegatingNumberedNodeManager<CGNode>();
+  private final DelegatingNumberedNodeManager<CGNode> nodeManager = new DelegatingNumberedNodeManager<>();
 
   /**
    * A fake root node for the graph
@@ -136,8 +140,8 @@
     return result;
   }
 
-  protected NodeImpl getNode(Key K) {
-    return (NodeImpl) nodes.get(K);
+  protected CGNode getNode(Key K) {
+    return nodes.get(K);
   }
 
   @Override
@@ -145,6 +149,7 @@
     return fakeRoot;
   }
 
+  @Override
   public CGNode getFakeWorldClinitNode() {
     return fakeWorldClinit;
   }
@@ -182,7 +187,7 @@
     protected NodeImpl(IMethod method, Context C) {
       this.method = method;
       this.context = C;
-      if (method != null && !method.isSynthetic() && method.isAbstract()) {
+      if (method != null && !method.isWalaSynthetic() && method.isAbstract()) {
         assert !method.isAbstract() : "Abstract method " + method;
       }
       assert C != null;
@@ -218,6 +223,7 @@
       return context;
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public abstract boolean addTarget(CallSiteReference reference, CGNode target);
 
@@ -229,21 +235,23 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer("");
-    for (Iterator i = DFS.iterateDiscoverTime(this, new NonNullSingletonIterator<CGNode>(getFakeRootNode())); i.hasNext();) {
-      CGNode n = (CGNode) i.next();
-      result.append(n + "\n");
-      if (n.getMethod() != null) {
-        for (Iterator sites = n.iterateCallSites(); sites.hasNext();) {
-          CallSiteReference site = (CallSiteReference) sites.next();
-          Iterator targets = getPossibleTargets(n, site).iterator();
-          if (targets.hasNext()) {
-            result.append(" - " + site + "\n");
-          }
-          for (; targets.hasNext();) {
-            CGNode target = (CGNode) targets.next();
-            result.append("     -> " + target + "\n");
-          }
+    StringBuilder result = new StringBuilder();
+    for (CGNode n : Iterator2Iterable.make(DFS.iterateDiscoverTime(this, new NonNullSingletonIterator<>(getFakeRootNode())))) {
+      result.append(nodeToString(this, n)).append('\n');
+    }
+    return result.toString();
+  }
+
+  public static String nodeToString(CallGraph CG, CGNode n) {
+    StringBuilder result = new StringBuilder(n.toString() + '\n');
+     if (n.getMethod() != null) {
+      for (CallSiteReference site : Iterator2Iterable.make(n.iterateCallSites())) {
+        Iterator<CGNode> targets = CG.getPossibleTargets(n, site).iterator();
+        if (targets.hasNext()) {
+          result.append(" - ").append(site).append('\n');
+        }
+        for (CGNode target : Iterator2Iterable.make(targets)) {
+          result.append("     -> ").append(target).append('\n');
         }
       }
     }
@@ -290,7 +298,7 @@
 
     @Override
     public String toString() {
-      return "{" + m + "," + C + "}";
+      return "{" + m + ',' + C + '}';
     }
 
   }
@@ -298,12 +306,11 @@
   @Override
   public Set<CGNode> getNodes(MethodReference m) {
     IMethod im = getClassHierarchy().resolveMethod(m);
-    if (im == null) {
-      return Collections.emptySet();
+    if (im != null) {
+      m = im.getReference();
     }
-    Set<CGNode> result = mr2Nodes.get(im.getReference());
-    Set<CGNode> empty = Collections.emptySet();
-    return (result == null) ? empty : result;
+    Set<CGNode> result = mr2Nodes.get(m);
+    return (result == null) ? Collections.emptySet() : result;
   }
 
   /**
@@ -362,15 +369,17 @@
   
   public void summarizeByPackage() {
    Map<String, Integer> packages = HashMapFactory.make();
-   for(CGNode n : this) { 
-     String nm = n.getMethod().getDeclaringClass().getName().toString() + "/" + n.getMethod().getName() + "/" + n.getContext().getClass().toString();
-  
-     if (n.getContext() instanceof ReceiverInstanceContext) {
-       nm = nm + "/" + ((ReceiverInstanceContext)n.getContext()).getReceiver().getConcreteType().getName();
+   for(CGNode n : this) {
+     final StringBuilder nmBuilder = new StringBuilder(n.getMethod().getDeclaringClass().getName().toString())
+             .append('/').append(n.getMethod().getName()).append('/').append(n.getContext().getClass().toString());
+
+     if (n.getContext().isA(ReceiverInstanceContext.class)) {
+       nmBuilder.append('/').append(((InstanceKey)n.getContext().get(ContextKey.RECEIVER)).getConcreteType().getName());
      } else if (n.getContext() instanceof JavaTypeContext) {
-       nm = nm + "/" + ((JavaTypeContext)n.getContext()).getType().getTypeReference().getName();
+       nmBuilder.append('/').append(((TypeAbstraction) n.getContext().get(ContextKey.RECEIVER)).getTypeReference().getName());
      }
-     
+     String nm = nmBuilder.toString();
+
      do {
        if (packages.containsKey(nm)) {
          packages.put(nm, 1 + packages.get(nm));
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ClassHierarchyClassTargetSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ClassHierarchyClassTargetSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ClassHierarchyClassTargetSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ClassHierarchyClassTargetSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,4 +44,4 @@
       return klass;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ClassHierarchyMethodTargetSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ClassHierarchyMethodTargetSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ClassHierarchyMethodTargetSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ClassHierarchyMethodTargetSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,7 +16,6 @@
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
 
 /**
@@ -74,14 +73,7 @@
     return classHierarchy.resolveMethod(klass, call.getDeclaredTarget().getSelector());
   }
 
-  public boolean mightReturnSyntheticMethod(CGNode caller, CallSiteReference site) {
-    return false;
-  }
-
-  /*
-   * @see com.ibm.wala.ipa.callgraph.MethodTargetSelector#mightReturnSyntheticMethod(com.ibm.wala.types.MethodReference)
-   */
-  public boolean mightReturnSyntheticMethod(MethodReference declaredTarget) {
+  public boolean mightReturnSyntheticMethod() {
     return false;
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ComposedEntrypoints.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ComposedEntrypoints.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ComposedEntrypoints.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ComposedEntrypoints.java	2019-01-29 17:08:39.000000000 +0000
@@ -31,11 +31,11 @@
     if (B == null) {
       throw new IllegalArgumentException("B is null");
     }
-    for (Iterator<Entrypoint> it = A.iterator(); it.hasNext(); ) {
-      entrypoints.add(it.next());
+    for (Entrypoint entrypoint : A) {
+      entrypoints.add(entrypoint);
     }
-    for (Iterator<Entrypoint> it = B.iterator(); it.hasNext(); ) {
-      entrypoints.add(it.next());
+    for (Entrypoint entrypoint : B) {
+      entrypoints.add(entrypoint);
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/DefaultContextSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/DefaultContextSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/DefaultContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/DefaultContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,4 +52,4 @@
     return delegate.getRelevantParameters(caller, site);
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/DelegatingContextSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/DelegatingContextSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/DelegatingContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/DelegatingContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,6 +15,7 @@
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.DelegatingContext;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.util.intset.IntSet;
 
@@ -46,7 +47,7 @@
   @Override
   public Context getCalleeTarget(CGNode caller, CallSiteReference site, IMethod callee, InstanceKey[] receiver) {
     if (DEBUG) {
-      System.err.println(("getCalleeTarget " + caller + " " + site + " " + callee));
+      System.err.println(("getCalleeTarget " + caller + ' ' + site + ' ' + callee));
       System.err.println("Trying with A: " +  A.getClass());
       System.err.println("Trying with B: " +  B.getClass());
     }
@@ -54,14 +55,19 @@
       Context C = A.getCalleeTarget(caller, site, callee, receiver);
       if (C != null) {
         if (DEBUG) {
-          System.err.println(("Case A " + A.getClass() + " " + C));
+          System.err.println(("Case A " + A.getClass() + ' ' + C));
+        }
+        Context CB = B.getCalleeTarget(caller, site, callee, receiver);
+        if (CB != null) {
+          return new DelegatingContext(C, CB);
+        } else {
+          return C;
         }
-        return C;
       }
     }
     Context C = B.getCalleeTarget(caller, site, callee, receiver);
     if (DEBUG) {
-      System.err.println(("Case B " + B.getClass() + " " + C));
+      System.err.println(("Case B " + B.getClass() + ' ' + C));
     }
     return C;
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,15 +15,16 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.function.IntFunction;
 
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.NewSiteReference;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeBT.BytecodeConstants;
@@ -33,13 +34,11 @@
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.EmptyIterator;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.IntMapIterator;
 import com.ibm.wala.util.collections.SparseVector;
 import com.ibm.wala.util.debug.Assertions;
-import com.ibm.wala.util.functions.IntFunction;
 import com.ibm.wala.util.graph.NumberedEdgeManager;
 import com.ibm.wala.util.intset.BasicNaturalRelation;
 import com.ibm.wala.util.intset.IBinaryNaturalRelation;
@@ -58,16 +57,17 @@
 
   protected final AnalysisOptions options;
 
-  private final AnalysisCache cache;
+  private final IAnalysisCacheView cache;
 
   private final long maxNumberOfNodes;
 
+  private final IMethod fakeRootMethod;
   /**
    * special object to track call graph edges
    */
   private final ExplicitEdgeManager edgeManager = makeEdgeManger();
 
-  public ExplicitCallGraph(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
+  public ExplicitCallGraph(IMethod fakeRootMethod, AnalysisOptions options, IAnalysisCacheView cache) {
     super();
     if (options == null) {
       throw new IllegalArgumentException("null options");
@@ -75,11 +75,11 @@
     if (cache == null) {
       throw new IllegalArgumentException("null cache");
     }
-    this.cha = cha;
+    this.cha = fakeRootMethod.getClassHierarchy();
     this.options = options;
     this.cache = cache;
     this.maxNumberOfNodes = options.getMaxNumberOfNodes();
-
+    this.fakeRootMethod = fakeRootMethod;
   }
 
   /**
@@ -91,22 +91,18 @@
 
   /**
    * subclasses may wish to override!
-   * 
-   * @throws CancelException
    */
   @Override
   protected CGNode makeFakeRootNode() throws CancelException {
-    return findOrCreateNode(new FakeRootMethod(cha, options, cache), Everywhere.EVERYWHERE);
+    return findOrCreateNode(fakeRootMethod, Everywhere.EVERYWHERE);
   }
 
   /**
    * subclasses may wish to override!
-   * 
-   * @throws CancelException
    */
   @Override
   protected CGNode makeFakeWorldClinitNode() throws CancelException {
-    return findOrCreateNode(new FakeWorldClinitMethod(cha, options, cache), Everywhere.EVERYWHERE);
+    return findOrCreateNode(new FakeWorldClinitMethod(fakeRootMethod.getDeclaringClass(), options, cache), Everywhere.EVERYWHERE);
   }
 
   /**
@@ -120,7 +116,7 @@
       throw new IllegalArgumentException("null context");
     }
     Key k = new Key(method, context);
-    NodeImpl result = getNode(k);
+    CGNode result = getNode(k);
     if (result == null) {
       if (maxNumberOfNodes == -1 || getNumberOfNodes() < maxNumberOfNodes) {
         result = makeNode(method, context);
@@ -135,19 +131,16 @@
   public class ExplicitNode extends NodeImpl {
 
     /**
-     * A Mapping from call site program counter (int) -> Object, where Object is a CGNode if we've discovered exactly one target for
+     * A Mapping from call site program counter (int) -&gt; Object, where Object is a CGNode if we've discovered exactly one target for
      * the site, or an IntSet of node numbers if we've discovered more than one target for the site.
      */
-    protected final SparseVector<Object> targets = new SparseVector<Object>();
+    protected final SparseVector<Object> targets = new SparseVector<>();
 
     private final MutableSharedBitVectorIntSet allTargets = new MutableSharedBitVectorIntSet();
     
-    private WeakReference<IR> ir = new WeakReference<IR>(null);
-    private WeakReference<DefUse> du = new WeakReference<DefUse>(null);
+    private WeakReference<IR> ir = new WeakReference<>(null);
+    private WeakReference<DefUse> du = new WeakReference<>(null);
 
-    /**
-     * @param method
-     */
     protected ExplicitNode(IMethod method, Context C) {
       super(method, C);
     }
@@ -187,11 +180,9 @@
      */
     protected Iterator<CallSiteReference> getPossibleSites(final CGNode to) {
       final int n = getCallGraph().getNumber(to);
-      return new FilterIterator<CallSiteReference>(iterateCallSites(), new Predicate() {
-        @Override public boolean test(Object o) {
-          IntSet s = getPossibleTargetNumbers((CallSiteReference) o);
-          return s == null ? false : s.contains(n);
-        }
+      return new FilterIterator<>(iterateCallSites(), o -> {
+        IntSet s = getPossibleTargetNumbers(o);
+        return s == null ? false : s.contains(n);
       });
     }
 
@@ -299,7 +290,7 @@
 
     @Override
     public IR getIR() {
-      if (getMethod().isSynthetic()) {
+      if (getMethod().isWalaSynthetic()) {
         // disable local cache in this case, as context interpreters
         // do weird things like mutate IRs
         return getCallGraph().getInterpreter(this).getIR(this);
@@ -307,14 +298,14 @@
       IR ir = this.ir.get();
       if (ir == null) {
         ir = getCallGraph().getInterpreter(this).getIR(this);
-        this.ir = new WeakReference<IR>(ir);
+        this.ir = new WeakReference<>(ir);
       }
       return ir;
     }
 
     @Override
     public DefUse getDU() {
-      if (getMethod().isSynthetic()) {
+      if (getMethod().isWalaSynthetic()) {
         // disable local cache in this case, as context interpreters
         // do weird things like mutate IRs
         return getCallGraph().getInterpreter(this).getDU(this);
@@ -322,7 +313,7 @@
       DefUse du = this.du.get();
       if (du == null) {
         du = getCallGraph().getInterpreter(this).getDU(this);
-        this.du = new WeakReference<DefUse>(du);
+        this.du = new WeakReference<>(du);
       }
       return du;
     }
@@ -356,15 +347,12 @@
 
   protected class ExplicitEdgeManager implements NumberedEdgeManager<CGNode> {
 
-    final IntFunction<CGNode> toNode = new IntFunction<CGNode>() {
-      @Override
-      public CGNode apply(int i) {
-        CGNode result = getNode(i);
-        // if (Assertions.verifyAssertions && result == null) {
-        // Assertions.UNREACHABLE("uh oh " + i);
-        // }
-        return result;
-      }
+    final IntFunction<CGNode> toNode = i -> {
+      CGNode result = getNode(i);
+      // if (Assertions.verifyAssertions && result == null) {
+      // Assertions.UNREACHABLE("uh oh " + i);
+      // }
+      return result;
     };
 
     /**
@@ -392,7 +380,7 @@
       if (s == null) {
         return EmptyIterator.instance();
       } else {
-        return new IntMapIterator<CGNode>(s.intIterator(), toNode);
+        return new IntMapIterator<>(s.intIterator(), toNode);
       }
     }
 
@@ -406,7 +394,7 @@
     @Override
     public Iterator<CGNode> getSuccNodes(CGNode N) {
       ExplicitNode n = (ExplicitNode) N;
-      return new IntMapIterator<CGNode>(n.getAllTargetNumbers().intIterator(), toNode);
+      return new IntMapIterator<>(n.getAllTargetNumbers().intIterator(), toNode);
     }
 
     @Override
@@ -515,7 +503,7 @@
     return n.getPossibleTargetNumbers(site);
   }
 
-  public AnalysisCache getAnalysisCache() {
+  public IAnalysisCacheView getAnalysisCache() {
     return cache;
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeRootClass.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeRootClass.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeRootClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeRootClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,6 +17,7 @@
 import java.util.Set;
 
 import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.IClassLoader;
 import com.ibm.wala.classLoader.IField;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.SyntheticClass;
@@ -37,21 +38,27 @@
  * A synthetic class for the fake root method.
  */
 public class FakeRootClass extends SyntheticClass {
-  public static final TypeReference FAKE_ROOT_CLASS = TypeReference.findOrCreate(ClassLoaderReference.Primordial, TypeName
-      .string2TypeName("Lcom/ibm/wala/FakeRootClass"));
-
+  public static final TypeReference fakeRootClass(ClassLoaderReference clr) {
+    return TypeReference.findOrCreate(clr, TypeName.string2TypeName("Lcom/ibm/wala/FakeRootClass"));
+  }
+  
   private Map<Atom, IField> fakeRootStaticFields = null;
 
   private Set<IMethod> methods = HashSetFactory.make();
 
-  public FakeRootClass(IClassHierarchy cha) {
-    this(FAKE_ROOT_CLASS, cha);
+  public FakeRootClass(ClassLoaderReference clr, IClassHierarchy cha) {
+    this(fakeRootClass(clr), cha);
   }
 
   public FakeRootClass(TypeReference typeRef, IClassHierarchy cha) {
     super(typeRef, cha);
   }
 
+  @Override
+  public IClassLoader getClassLoader() {
+    return getClassHierarchy().getLoader(getReference().getClassLoader());
+  }
+
   public void addMethod(IMethod m) {
     methods.add(m);
   }
@@ -94,7 +101,7 @@
 
       @Override
       public FieldReference getReference() {
-        return FieldReference.findOrCreate(FAKE_ROOT_CLASS, name, fieldType);
+        return FieldReference.findOrCreate(FakeRootClass.this.getReference(), name, fieldType);
       }
 
       @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeRootMethod.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeRootMethod.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeRootMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeRootMethod.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,10 +11,10 @@
 package com.ibm.wala.ipa.callgraph.impl;
 
 import com.ibm.wala.cfg.IBasicBlock;
+import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.types.Descriptor;
 import com.ibm.wala.types.MemberReference;
 import com.ibm.wala.types.MethodReference;
@@ -31,21 +31,19 @@
 
   public static final Descriptor descr = Descriptor.findOrCreate(new TypeName[0], TypeReference.VoidName);
 
-  public static final MethodReference rootMethod = MethodReference.findOrCreate(FakeRootClass.FAKE_ROOT_CLASS, name, descr);
-
-  public FakeRootMethod(final IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-    super(rootMethod, cha, options, cache);
+  public FakeRootMethod(final IClass fakeRootClass, AnalysisOptions options, IAnalysisCacheView cache) {
+    super(MethodReference.findOrCreate(fakeRootClass.getReference(), name, descr), fakeRootClass.getClassHierarchy(), options, cache);
   }
 
   /**
    * @return true iff m is the fake root method.
    * @throws IllegalArgumentException if m is null
    */
-  public static boolean isFakeRootMethod(MemberReference m) {
+  public boolean isFakeRootMethod(MemberReference m) {
     if (m == null) {
       throw new IllegalArgumentException("m is null");
     }
-    return m.equals(rootMethod);
+    return m.equals(getReference());
   }
 
   /**
@@ -57,11 +55,6 @@
       throw new IllegalArgumentException("block is null");
     }
     IMethod m = block.getMethod();
-    return FakeRootMethod.isFakeRootMethod(m.getReference());
-  }
-
-  public static MethodReference getRootMethod() {
-    return rootMethod;
+    return m instanceof FakeRootMethod && ((FakeRootMethod)m).isFakeRootMethod(m.getReference());
   }
-
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeWorldClinitMethod.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeWorldClinitMethod.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeWorldClinitMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/FakeWorldClinitMethod.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,9 +10,9 @@
  *******************************************************************************/
 package com.ibm.wala.ipa.callgraph.impl;
 
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.types.Descriptor;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeName;
@@ -26,10 +26,9 @@
 
   private static final Atom name = Atom.findOrCreateAsciiAtom("fakeWorldClinit");
 
-  private static final MethodReference worldClinitMethod = MethodReference.findOrCreate(FakeRootClass.FAKE_ROOT_CLASS, name, Descriptor
-      .findOrCreate(new TypeName[0], TypeReference.VoidName));
+  private static final Descriptor descr = Descriptor.findOrCreate(new TypeName[0], TypeReference.VoidName);
   
-  public FakeWorldClinitMethod(final IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-    super(worldClinitMethod, cha, options, cache);
+  public FakeWorldClinitMethod(final IClass fakeRootClass, AnalysisOptions options, IAnalysisCacheView cache) {
+    super(MethodReference.findOrCreate(fakeRootClass.getReference(), name, descr), fakeRootClass.getClassHierarchy(), options, cache);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/PartialCallGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/PartialCallGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/PartialCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/PartialCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,9 +21,9 @@
 import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.MethodReference;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.GraphSlicer;
 import com.ibm.wala.util.graph.impl.DelegatingGraph;
@@ -53,11 +53,7 @@
    * @param nodes set of nodes that will be included in the new, partial call graph
    */
   public static PartialCallGraph make(final CallGraph cg, final Collection<CGNode> partialRoots, final Collection<CGNode> nodes) {
-    Graph<CGNode> partialGraph = GraphSlicer.prune(cg, new Predicate<CGNode>() {
-      @Override public boolean test(CGNode o) {
-        return nodes.contains(o);
-      }
-    });
+    Graph<CGNode> partialGraph = GraphSlicer.prune(cg, nodes::contains);
 
     return new PartialCallGraph(cg, partialRoots, partialGraph);
   }
@@ -69,11 +65,7 @@
    */
   public static PartialCallGraph make(CallGraph cg, Collection<CGNode> partialRoots) {
     final Set<CGNode> nodes = DFS.getReachableNodes(cg, partialRoots);
-    Graph<CGNode> partialGraph = GraphSlicer.prune(cg, new Predicate<CGNode>() {
-      @Override public boolean test(CGNode o) {
-        return nodes.contains(o);
-      }
-    });
+    Graph<CGNode> partialGraph = GraphSlicer.prune(cg, nodes::contains);
 
     return new PartialCallGraph(cg, partialRoots, partialGraph);
   }
@@ -105,8 +97,7 @@
   @Override
   public Set<CGNode> getNodes(MethodReference m) {
     Set<CGNode> result = HashSetFactory.make();
-    for (Iterator xs = cg.getNodes(m).iterator(); xs.hasNext();) {
-      CGNode x = (CGNode) xs.next();
+    for (CGNode x : cg.getNodes(m)) {
       if (containsNode(x)) {
         result.add(x);
       }
@@ -122,11 +113,7 @@
 
   @Override
   public Iterator<CGNode> iterateNodes(IntSet nodes) {
-    return new FilterIterator<CGNode>(cg.iterateNodes(nodes), new Predicate() {
-      @Override public boolean test(Object o) {
-        return containsNode((CGNode) o);
-      }
-    });
+    return new FilterIterator<>(cg.iterateNodes(nodes), this::containsNode);
   }
 
   @Override
@@ -149,8 +136,7 @@
   public IntSet getSuccNodeNumbers(CGNode node) {
     assert containsNode(node);
     MutableIntSet x = IntSetUtil.make();
-    for (Iterator ns = getSuccNodes(node); ns.hasNext();) {
-      CGNode succ = (CGNode) ns.next();
+    for (CGNode succ : Iterator2Iterable.make(getSuccNodes(node))) {
       if (containsNode(succ)) {
         x.add(getNumber(succ));
       }
@@ -163,8 +149,7 @@
   public IntSet getPredNodeNumbers(CGNode node) {
     assert containsNode(node);
     MutableIntSet x = IntSetUtil.make();
-    for (Iterator ns = getPredNodes(node); ns.hasNext();) {
-      CGNode pred = (CGNode) ns.next();
+    for (CGNode pred : Iterator2Iterable.make(getPredNodes(node))) {
       if (containsNode(pred)) {
         x.add(getNumber(pred));
       }
@@ -189,8 +174,7 @@
       return null;
     }
     Set<CGNode> result = HashSetFactory.make();
-    for (Iterator ns = cg.getPossibleTargets(node, site).iterator(); ns.hasNext();) {
-      CGNode target = (CGNode) ns.next();
+    for (CGNode target : cg.getPossibleTargets(node, site)) {
       if (containsNode(target)) {
         result.add(target);
       }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/SubtypesEntrypoint.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/SubtypesEntrypoint.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/SubtypesEntrypoint.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/SubtypesEntrypoint.java	2019-01-29 17:08:39.000000000 +0000
@@ -60,7 +60,7 @@
           subs.add(cs.getReference());
         }
       }
-      return subs.toArray(new TypeReference[subs.size()]);
+      return subs.toArray(new TypeReference[0]);
     }
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/UnionContextSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/UnionContextSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/UnionContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/UnionContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,8 +15,8 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
-import com.ibm.wala.ipa.callgraph.DelegatingContext;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.DelegatingContext;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.util.intset.IntSet;
 
@@ -31,7 +31,7 @@
  *
  *  @see com.ibm.wala.ipa.callgraph.impl.DelegatingContextSelector
  *
- *  @author  Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author  Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public class UnionContextSelector implements ContextSelector {
     private final ContextSelector A;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/Util.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/Util.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/Util.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/Util.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,6 +13,7 @@
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -20,13 +21,14 @@
 
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.ClassTargetSelector;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
@@ -104,10 +106,13 @@
       throw new IllegalArgumentException("cha cannot be null");
     }
 
-    InputStream s = cl.getResourceAsStream(xmlFile);
-    XMLMethodSummaryReader summary = new XMLMethodSummaryReader(s, scope);
-
-    addBypassLogic(options, scope, cl, summary, cha);
+    try (final InputStream s = cl.getResourceAsStream(xmlFile)) {
+      XMLMethodSummaryReader summary = new XMLMethodSummaryReader(s, scope);
+      addBypassLogic(options, scope, cl, summary, cha);
+    } catch (IOException e) {
+      System.err.println("Could not close XML method summary reader: " + e.getLocalizedMessage());
+      e.printStackTrace();
+    }
   }
 
   public static void addBypassLogic(AnalysisOptions options, AnalysisScope scope, ClassLoader cl, XMLMethodSummaryReader summary,
@@ -135,8 +140,6 @@
   }
   
   /**
-   * @param scope
-   * @param cha
    * @return set of all eligible Main classes in the class hierarchy
    * @throws IllegalArgumentException if scope is null
    */
@@ -163,12 +166,7 @@
         }
       }
     }
-    return new Iterable<Entrypoint>() {
-      @Override
-      public Iterator<Entrypoint> iterator() {
-        return result.iterator();
-      }
-    };
+    return result::iterator;
   }
 
   /**
@@ -189,7 +187,7 @@
   /**
    * @return Entrypoints for a set of J2SE Main classes
    * @throws IllegalArgumentException if classNames == null
-   * @throws IllegalArgumentException if (classNames != null) and (0 < classNames.length) and (classNames[0] == null)
+   * @throws IllegalArgumentException if (classNames != null) and (0 &lt; classNames.length) and (classNames[0] == null)
    * @throws IllegalArgumentException if classNames.length == 0
    */
   public static Iterable<Entrypoint> makeMainEntrypoints(final ClassLoaderReference loaderRef, final IClassHierarchy cha,
@@ -205,41 +203,38 @@
       throw new IllegalArgumentException("(0 < classNames.length) and (classNames[0] == null)");
     }
 
-    for (int i = 0; i < classNames.length; i++) {
-      if (classNames[i].indexOf("L") != 0) {
-        throw new IllegalArgumentException("Expected class name to start with L " + classNames[i]);
+    for (String className : classNames) {
+      if (className.indexOf('L') != 0) {
+        throw new IllegalArgumentException("Expected class name to start with L " + className);
       }
-      if (classNames[i].indexOf(".") > 0) {
-        Assertions.productionAssertion(false, "Expected class name formatted with /, not . " + classNames[i]);
+      if (className.indexOf('.') > 0) {
+        Assertions.productionAssertion(false, "Expected class name formatted with /, not . " + className);
       }
     }
 
-    return new Iterable<Entrypoint>() {
-      @Override
-      public Iterator<Entrypoint> iterator() {
-        final Atom mainMethod = Atom.findOrCreateAsciiAtom("main");
-        return new Iterator<Entrypoint>() {
-          private int index = 0;
-
-          @Override
-          public void remove() {
-            Assertions.UNREACHABLE();
-          }
-
-          @Override
-          public boolean hasNext() {
-            return index < classNames.length;
-          }
-
-          @Override
-          public Entrypoint next() {
-            TypeReference T = TypeReference.findOrCreate(loaderRef, TypeName.string2TypeName(classNames[index++]));
-            MethodReference mainRef = MethodReference.findOrCreate(T, mainMethod, Descriptor
-                .findOrCreateUTF8("([Ljava/lang/String;)V"));
-            return new DefaultEntrypoint(mainRef, cha);
-          }
-        };
-      }
+    return () -> {
+      final Atom mainMethod = Atom.findOrCreateAsciiAtom("main");
+      return new Iterator<Entrypoint>() {
+        private int index = 0;
+
+        @Override
+        public void remove() {
+          Assertions.UNREACHABLE();
+        }
+
+        @Override
+        public boolean hasNext() {
+          return index < classNames.length;
+        }
+
+        @Override
+        public Entrypoint next() {
+          TypeReference T = TypeReference.findOrCreate(loaderRef, TypeName.string2TypeName(classNames[index++]));
+          MethodReference mainRef = MethodReference.findOrCreate(T, mainMethod, Descriptor
+              .findOrCreateUTF8("([Ljava/lang/String;)V"));
+          return new DefaultEntrypoint(mainRef, cha);
+        }
+      };
     };
   }
 
@@ -258,8 +253,6 @@
   }
 
   /**
-   * @param supG
-   * @param subG
    * @throws IllegalArgumentException if subG is null
    * @throws IllegalArgumentException if supG is null
    */
@@ -278,19 +271,17 @@
       System.err.println("subgraph: ");
       System.err.println(subG.toString());
       System.err.println("nodeDiff: ");
-      for (Iterator it = nodeDiff.iterator(); it.hasNext();) {
-        System.err.println(it.next().toString());
+      for (T t : nodeDiff) {
+        System.err.println(t.toString());
       }
       Assertions.productionAssertion(nodeDiff.isEmpty(), "bad superset, see tracefile\n");
     }
 
-    for (Iterator<? extends T> subNodes = subG.iterator(); subNodes.hasNext();) {
-      T m = subNodes.next();
-
+    for (T m : subG) {
       Set<T> succDiff = setify(subG.getSuccNodes(m));
       succDiff.removeAll(setify(supG.getSuccNodes(m)));
       if (!succDiff.isEmpty()) {
-        Assertions.productionAssertion(succDiff.isEmpty(), "bad superset for successors of " + m + ":" + succDiff);
+        Assertions.productionAssertion(succDiff.isEmpty(), "bad superset for successors of " + m + ':' + succDiff);
       }
 
       Set<T> predDiff = setify(subG.getPredNodes(m));
@@ -301,10 +292,10 @@
         System.err.println("subgraph: ");
         System.err.println(subG.toString());
         System.err.println("predDiff: ");
-        for (Iterator it = predDiff.iterator(); it.hasNext();) {
-          System.err.println(it.next().toString());
+        for (T t : predDiff) {
+          System.err.println(t.toString());
         }
-        Assertions.UNREACHABLE("bad superset for predecessors of " + m + ":" + predDiff);
+        Assertions.UNREACHABLE("bad superset for predecessors of " + m + ':' + predDiff);
       }
     }
   }
@@ -316,7 +307,7 @@
    * @param cha governing class hierarchy
    * @param scope representation of the analysis scope
    */
-  public static CallGraphBuilder makeRTABuilder(AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha,
+  public static CallGraphBuilder makeRTABuilder(AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha,
       AnalysisScope scope) {
 
     addDefaultSelectors(options, cha);
@@ -331,9 +322,9 @@
    * @param scope representation of the analysis scope
    * @return a 0-CFA Call Graph Builder.
    */
-  public static SSAPropagationCallGraphBuilder makeZeroCFABuilder(AnalysisOptions options, AnalysisCache cache,
+  public static SSAPropagationCallGraphBuilder makeZeroCFABuilder(Language l, AnalysisOptions options, IAnalysisCacheView cache,
       IClassHierarchy cha, AnalysisScope scope) {
-    return makeZeroCFABuilder(options, cache, cha, scope, null, null);
+    return makeZeroCFABuilder(l, options, cache, cha, scope, null, null);
   }
 
   /**
@@ -345,7 +336,7 @@
    * @return a 0-CFA Call Graph Builder.
    * @throws IllegalArgumentException if options is null
    */
-  public static SSAPropagationCallGraphBuilder makeZeroCFABuilder(AnalysisOptions options, AnalysisCache cache,
+  public static SSAPropagationCallGraphBuilder makeZeroCFABuilder(Language l, AnalysisOptions options, IAnalysisCacheView cache,
       IClassHierarchy cha, AnalysisScope scope, ContextSelector customSelector, SSAContextInterpreter customInterpreter) {
 
     if (options == null) {
@@ -354,7 +345,7 @@
     addDefaultSelectors(options, cha);
     addDefaultBypassLogic(options, scope, Util.class.getClassLoader(), cha);
 
-    return ZeroXCFABuilder.make(cha, options, cache, customSelector, customInterpreter, ZeroXInstanceKeys.NONE);
+    return ZeroXCFABuilder.make(l, cha, options, cache, customSelector, customInterpreter, ZeroXInstanceKeys.NONE);
   }
 
   /**
@@ -364,9 +355,9 @@
    * @param cha governing class hierarchy
    * @param scope representation of the analysis scope
    */
-  public static SSAPropagationCallGraphBuilder makeZeroOneCFABuilder(AnalysisOptions options, AnalysisCache cache,
+  public static SSAPropagationCallGraphBuilder makeZeroOneCFABuilder(Language l, AnalysisOptions options, IAnalysisCacheView cache,
       IClassHierarchy cha, AnalysisScope scope) {
-    return makeZeroOneCFABuilder(options, cache, cha, scope, null, null);
+    return makeZeroOneCFABuilder(l, options, cache, cha, scope, null, null);
   }
 
   /**
@@ -378,7 +369,7 @@
    * @return a 0-1-CFA Call Graph Builder.
    * @throws IllegalArgumentException if options is null
    */
-  public static SSAPropagationCallGraphBuilder makeVanillaZeroOneCFABuilder(AnalysisOptions options, AnalysisCache cache,
+  public static SSAPropagationCallGraphBuilder makeVanillaZeroOneCFABuilder(Language l, AnalysisOptions options, IAnalysisCacheView analysisCache,
       IClassHierarchy cha, AnalysisScope scope, ContextSelector customSelector, SSAContextInterpreter customInterpreter) {
 
     if (options == null) {
@@ -387,7 +378,7 @@
     addDefaultSelectors(options, cha);
     addDefaultBypassLogic(options, scope, Util.class.getClassLoader(), cha);
 
-    return ZeroXCFABuilder.make(cha, options, cache, customSelector, customInterpreter, ZeroXInstanceKeys.ALLOCATIONS | ZeroXInstanceKeys.CONSTANT_SPECIFIC);
+    return ZeroXCFABuilder.make(l, cha, options, analysisCache, customSelector, customInterpreter, ZeroXInstanceKeys.ALLOCATIONS | ZeroXInstanceKeys.CONSTANT_SPECIFIC);
   }
 
   /**
@@ -397,9 +388,9 @@
    * @param cha governing class hierarchy
    * @param scope representation of the analysis scope
    */
-  public static SSAPropagationCallGraphBuilder makeVanillaZeroOneCFABuilder(AnalysisOptions options, AnalysisCache cache,
+  public static SSAPropagationCallGraphBuilder makeVanillaZeroOneCFABuilder(Language l, AnalysisOptions options, IAnalysisCacheView analysisCache,
       IClassHierarchy cha, AnalysisScope scope) {
-    return makeVanillaZeroOneCFABuilder(options, cache, cha, scope, null, null);
+    return makeVanillaZeroOneCFABuilder(l, options, analysisCache, cha, scope, null, null);
   }
 
   /**
@@ -411,7 +402,7 @@
    * @return a 0-1-CFA Call Graph Builder.
    * @throws IllegalArgumentException if options is null
    */
-  public static SSAPropagationCallGraphBuilder makeZeroOneCFABuilder(AnalysisOptions options, AnalysisCache cache,
+  public static SSAPropagationCallGraphBuilder makeZeroOneCFABuilder(Language l, AnalysisOptions options, IAnalysisCacheView cache,
       IClassHierarchy cha, AnalysisScope scope, ContextSelector customSelector, SSAContextInterpreter customInterpreter) {
 
     if (options == null) {
@@ -420,7 +411,7 @@
     addDefaultSelectors(options, cha);
     addDefaultBypassLogic(options, scope, Util.class.getClassLoader(), cha);
 
-    return ZeroXCFABuilder.make(cha, options, cache, customSelector, customInterpreter, ZeroXInstanceKeys.ALLOCATIONS | ZeroXInstanceKeys.SMUSH_MANY | ZeroXInstanceKeys.SMUSH_PRIMITIVE_HOLDERS
+    return ZeroXCFABuilder.make(l, cha, options, cache, customSelector, customInterpreter, ZeroXInstanceKeys.ALLOCATIONS | ZeroXInstanceKeys.SMUSH_MANY | ZeroXInstanceKeys.SMUSH_PRIMITIVE_HOLDERS
         | ZeroXInstanceKeys.SMUSH_STRINGS | ZeroXInstanceKeys.SMUSH_THROWABLES);
   }
 
@@ -431,7 +422,7 @@
    * @return a 0-CFA Call Graph Builder augmented with extra logic for containers
    * @throws IllegalArgumentException if options is null
    */
-  public static SSAPropagationCallGraphBuilder makeZeroContainerCFABuilder(AnalysisOptions options, AnalysisCache cache,
+  public static SSAPropagationCallGraphBuilder makeZeroContainerCFABuilder(AnalysisOptions options, IAnalysisCacheView cache,
       IClassHierarchy cha, AnalysisScope scope) {
 
     if (options == null) {
@@ -452,12 +443,12 @@
    * @return a 0-1-CFA Call Graph Builder augmented with extra logic for containers
    * @throws IllegalArgumentException if options is null
    */
-  public static SSAPropagationCallGraphBuilder makeZeroOneContainerCFABuilder(AnalysisOptions options, AnalysisCache cache,
+  public static SSAPropagationCallGraphBuilder makeZeroOneContainerCFABuilder(AnalysisOptions options, IAnalysisCacheView cache,
       IClassHierarchy cha, AnalysisScope scope) {
     return makeZeroOneContainerCFABuilder(options, cache, cha, scope, null, null);
   }
    
-  public static SSAPropagationCallGraphBuilder makeZeroOneContainerCFABuilder(AnalysisOptions options, AnalysisCache cache,
+  public static SSAPropagationCallGraphBuilder makeZeroOneContainerCFABuilder(AnalysisOptions options, IAnalysisCacheView cache,
       IClassHierarchy cha, AnalysisScope scope, ContextSelector appSelector, SSAContextInterpreter appInterpreter) {
 
     if (options == null) {
@@ -475,7 +466,7 @@
    * with call-string length limited to n, and a context-sensitive
    * allocation-site-based heap abstraction.
    */
-  public static SSAPropagationCallGraphBuilder makeNCFABuilder(int n, AnalysisOptions options, AnalysisCache cache,
+  public static SSAPropagationCallGraphBuilder makeNCFABuilder(int n, AnalysisOptions options, IAnalysisCacheView cache,
       IClassHierarchy cha, AnalysisScope scope) {
     if (options == null) {
       throw new IllegalArgumentException("options is null");
@@ -484,7 +475,7 @@
     addDefaultBypassLogic(options, scope, Util.class.getClassLoader(), cha);
     ContextSelector appSelector = null;
     SSAContextInterpreter appInterpreter = null;
-    SSAPropagationCallGraphBuilder result = new nCFABuilder(n, cha, options, cache, appSelector, appInterpreter);
+    SSAPropagationCallGraphBuilder result = new nCFABuilder(n, Language.JAVA.getFakeRootMethod(cha, options, cache), options, cache, appSelector, appInterpreter);
     // nCFABuilder uses type-based heap abstraction by default, but we want allocation sites
     result.setInstanceKeys(new ZeroXInstanceKeys(options, cha, result.getContextInterpreter(), ZeroXInstanceKeys.ALLOCATIONS
         | ZeroXInstanceKeys.SMUSH_MANY | ZeroXInstanceKeys.SMUSH_PRIMITIVE_HOLDERS | ZeroXInstanceKeys.SMUSH_STRINGS
@@ -498,7 +489,7 @@
    * allocation-site-based heap abstraction. Standard optimizations in the heap
    * abstraction like smushing of strings are disabled.
    */
-  public static SSAPropagationCallGraphBuilder makeVanillaNCFABuilder(int n, AnalysisOptions options, AnalysisCache cache,
+  public static SSAPropagationCallGraphBuilder makeVanillaNCFABuilder(int n, AnalysisOptions options, IAnalysisCacheView cache,
       IClassHierarchy cha, AnalysisScope scope) {
     if (options == null) {
       throw new IllegalArgumentException("options is null");
@@ -507,7 +498,7 @@
     addDefaultBypassLogic(options, scope, Util.class.getClassLoader(), cha);
     ContextSelector appSelector = null;
     SSAContextInterpreter appInterpreter = null;
-    SSAPropagationCallGraphBuilder result = new nCFABuilder(n, cha, options, cache, appSelector, appInterpreter);
+    SSAPropagationCallGraphBuilder result = new nCFABuilder(n, Language.JAVA.getFakeRootMethod(cha, options, cache), options, cache, appSelector, appInterpreter);
     // nCFABuilder uses type-based heap abstraction by default, but we want allocation sites
     result.setInstanceKeys(new ZeroXInstanceKeys(options, cha, result.getContextInterpreter(), ZeroXInstanceKeys.ALLOCATIONS | ZeroXInstanceKeys.CONSTANT_SPECIFIC));
     return result;
@@ -521,7 +512,7 @@
    * @return a 0-1-CFA Call Graph Builder augmented with extra logic for containers
    * @throws IllegalArgumentException if options is null
    */
-  public static SSAPropagationCallGraphBuilder makeVanillaZeroOneContainerCFABuilder(AnalysisOptions options, AnalysisCache cache,
+  public static SSAPropagationCallGraphBuilder makeVanillaZeroOneContainerCFABuilder(AnalysisOptions options, IAnalysisCacheView cache,
       IClassHierarchy cha, AnalysisScope scope) {
 
     if (options == null) {
@@ -543,13 +534,15 @@
       addBypassLogic(options, scope, cl, nativeSpec, cha);
     } else {
       // try to load from filesystem
-      try {
-        BufferedInputStream bIn = new BufferedInputStream(new FileInputStream(nativeSpec));
+      try (final BufferedInputStream bIn = new BufferedInputStream(new FileInputStream(nativeSpec))) {
         XMLMethodSummaryReader reader = new XMLMethodSummaryReader(bIn, scope);
         addBypassLogic(options, scope, cl, reader, cha);
       } catch (FileNotFoundException e) {
         System.err.println("Could not load natives xml file from: " + nativeSpec);
         e.printStackTrace();
+      } catch (IOException e) {
+        System.err.println("Could not close natives xml file " + nativeSpec);
+        e.printStackTrace();
       }
     }
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AbstractPointerAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AbstractPointerAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AbstractPointerAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AbstractPointerAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,14 +27,14 @@
   /**
    * graph representation of pointer-analysis results
    */
-  private HeapGraph heapGraph;
+  private HeapGraph<InstanceKey> heapGraph;
   /**
    * Governing call graph.
    */
   private final CallGraph cg;
 
   /**
-   * bijection from InstanceKey <=>Integer
+   * bijection from InstanceKey &lt;=&gt; Integer
    */
   protected final MutableMapping<InstanceKey> instanceKeys;
   
@@ -44,9 +44,9 @@
   }
 
   @Override
-  public HeapGraph getHeapGraph() {
+  public HeapGraph<InstanceKey> getHeapGraph() {
     if (heapGraph == null) {
-      heapGraph = new BasicHeapGraph(this, cg);
+      heapGraph = new BasicHeapGraph<>(this, cg);
     }
     return heapGraph;
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AllocationSiteInNodeFactory.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AllocationSiteInNodeFactory.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AllocationSiteInNodeFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AllocationSiteInNodeFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,15 +25,20 @@
 import com.ibm.wala.types.TypeReference;
 
 /**
- * A factory which tries by default to create {@link InstanceKey}s which are {@link AllocationSiteInNode}s.
+ * A factory which tries by default to create {@link InstanceKey}s which are
+ * {@link AllocationSiteInNode}s.
  * 
  * Notes:
  * <ul>
- * <li>This class checks to avoid creating recursive contexts when {@link CGNode}s are based on {@link ReceiverInstanceContext}, as
- * in object-sensitivity.
- * <li>Up till recursion, this class will happily create unlimited object sensitivity, so be careful.
- * <li>This class resorts to {@link ClassBasedInstanceKeys} for exceptions from PEIs and class objects.
- * <li>This class consults the {@link AnalysisOptions} to determine whether to disambiguate individual constants.
+ * <li>This class checks to avoid creating recursive contexts when
+ * {@link CGNode}s are based on {@link ReceiverInstanceContext}, as in
+ * object-sensitivity.
+ * <li>Up till recursion, this class will happily create unlimited object
+ * sensitivity, so be careful.
+ * <li>This class resorts to {@link ClassBasedInstanceKeys} for exceptions from
+ * PEIs and class objects.
+ * <li>This class consults the {@link AnalysisOptions} to determine whether to
+ * disambiguate individual constants.
  * </ul>
  */
 public class AllocationSiteInNodeFactory implements InstanceKeyFactory {
@@ -51,7 +56,8 @@
   private final ClassBasedInstanceKeys classBased;
 
   /**
-   * @param options Governing call graph construction options
+   * @param options
+   *          Governing call graph construction options
    */
   public AllocationSiteInNodeFactory(AnalysisOptions options, IClassHierarchy cha) {
     this.options = options;
@@ -67,9 +73,10 @@
     }
 
     CGNode nodeToUse = node;
-    
+
     // disallow recursion in contexts.
-    if (node.getContext() instanceof ReceiverInstanceContext || node.getContext() instanceof CallerContext) {
+    if (node.getContext().isA(ReceiverInstanceContext.class) || 
+        node.getContext().isA(CallerContext.class)) {
       IMethod m = node.getMethod();
       CGNode n = ContainerContextSelector.findNodeRecursiveMatchingContext(m, node.getContext());
       if (n != null) {
@@ -85,11 +92,15 @@
       if (ir.getSymbolTable().isIntegerConstant(lengthVN)) {
         Integer c = (Integer) ir.getSymbolTable().getConstantValue(lengthVN);
         if (c.intValue() == 0) {
-          return new ZeroLengthArrayInNode(nodeToUse, allocation, type);
+          if (options.getHandleZeroLengthArray()) {
+            return new ZeroLengthArrayInNode(nodeToUse, allocation, type);
+          } else {
+            return new NormalAllocationInNode(nodeToUse, allocation, type);
+          }
         }
-      }     
+      }
     }
-    
+
     InstanceKey key = new NormalAllocationInNode(nodeToUse, allocation, type);
 
     return key;
@@ -109,7 +120,7 @@
   @Override
   public <T> InstanceKey getInstanceKeyForConstant(TypeReference type, T S) {
     if (options.getUseConstantSpecificKeys()) {
-      return new ConstantKey<T>(S, cha.lookupClass(type));
+      return new ConstantKey<>(S, cha.lookupClass(type));
     } else {
       return new ConcreteTypeKey(cha.lookupClass(type));
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AllocationSiteInNode.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AllocationSiteInNode.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AllocationSiteInNode.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AllocationSiteInNode.java	2019-01-29 17:08:39.000000000 +0000
@@ -38,7 +38,7 @@
 
   @Override
   public String toString() {
-    return "SITE_IN_NODE{" + getNode().getMethod() + ":" + site + " in " + getNode().getContext() + "}";
+    return "SITE_IN_NODE{" + getNode().getMethod() + ':' + site + " in " + getNode().getContext() + '}';
   }
 
   /**
@@ -50,7 +50,7 @@
 
   @Override
   public Iterator<Pair<CGNode, NewSiteReference>> getCreationSites(CallGraph CG) {
-    return new NonNullSingletonIterator<Pair<CGNode, NewSiteReference>>(Pair.make(getNode(), getSite()));
+    return new NonNullSingletonIterator<>(Pair.make(getNode(), getSite()));
   }
    
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AllocationSite.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AllocationSite.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AllocationSite.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AllocationSite.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,11 +18,9 @@
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.Context;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.MapIterator;
 import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.functions.Function;
 
 /**
  * An {@link InstanceKey} which represents a {@link NewSiteReference} in some {@link IMethod}. Note that this differs from
@@ -44,7 +42,7 @@
 
   @Override
   public String toString() {
-    return "SITE{" + getMethod() + ":" + site + "}";
+    return "SITE{" + getMethod() + ':' + site + '}';
   }
 
   public NewSiteReference getSite() {
@@ -93,20 +91,11 @@
 
   @Override
   public Iterator<Pair<CGNode, NewSiteReference>> getCreationSites(CallGraph CG) {
-    return new MapIterator<CGNode, Pair<CGNode, NewSiteReference>>(
-        new FilterIterator<CGNode>(
+    return new MapIterator<>(
+        new FilterIterator<>(
           CG.getNodes(method.getReference()).iterator(),
-          new Predicate<CGNode>() {
-            @Override public boolean test(CGNode o) {
-              return o.getMethod().equals(method);
-            }
-          }
+          o -> o.getMethod().equals(method)
         ), 
-        new Function<CGNode, Pair<CGNode, NewSiteReference>>() {
-          @Override
-          public Pair<CGNode, NewSiteReference> apply(CGNode object) {
-            return Pair.make(object, site);
-          }
-        });
+        object -> Pair.make(object, site));
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AssignOperator.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AssignOperator.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AssignOperator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/AssignOperator.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,7 +16,7 @@
 /**
  * Corresponds to: "is a superset of". Used for assignment.
  * 
- * Unary op: <lhs>:= Assign( <rhs>)
+ * Unary op: &lt;lhs&gt;:= Assign(&lt;rhs&gt;)
  * 
  * (Technically, it's a binary op, since it includes lhs as an implicit input; this allows it to compose with other ops that define
  * the same lhs, so long as they're all Assign ops)
@@ -32,8 +32,8 @@
   public byte evaluate(PointsToSetVariable lhs, PointsToSetVariable rhs) {
 
     if (PropagationCallGraphBuilder.DEBUG_ASSIGN) {
-      String S = "EVAL Assign " + lhs.getPointerKey() + " " + rhs.getPointerKey();
-      S = S + "\nEVAL " + lhs + " " + rhs;
+      String S = "EVAL Assign " + lhs.getPointerKey() + ' ' + rhs.getPointerKey();
+      S = S + "\nEVAL " + lhs + ' ' + rhs;
       System.err.println(S);
     }
     boolean changed = lhs.addAll(rhs);
@@ -67,4 +67,4 @@
   public boolean isComplex() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerContextPair.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerContextPair.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerContextPair.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerContextPair.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,7 @@
 import com.ibm.wala.ipa.callgraph.ContextKey;
 
 /**
- * This is a {@link Context} which is defined by a pair consisting of <caller node, base context>.
+ * This is a {@link Context} which is defined by a pair consisting of &lt;caller node, base context&gt;.
  * 
  * The base context is typically some special case; e.g., a JavaTypeContext used for reflection.
  */
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContext.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContext.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContext.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContext.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,7 +16,7 @@
 import com.ibm.wala.ipa.callgraph.ContextKey;
 
 /**
- * A context which is a <CGNode, CallSiteReference> pair.
+ * A context which is a &lt;CGNode, CallSiteReference&gt; pair.
  */
 public class CallerSiteContext extends CallerContext {
 
@@ -53,7 +53,7 @@
 
   @Override
   public String toString() {
-    return super.toString() + "@" + callSite.getProgramCounter();
+    return super.toString() + '@' + callSite.getProgramCounter();
   }
 
   public CallSiteReference getCallSite() {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContextPair.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContextPair.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContextPair.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContextPair.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,7 @@
 import com.ibm.wala.ipa.callgraph.ContextKey;
 
 /**
- * This is a context which is defined by a pair consisting of <caller node, base context>.
+ * This is a context which is defined by a pair consisting of &lt;caller node, base context&gt;.
  * 
  * The base context is typically some special case; e.g., a JavaTypeContext used for reflection.
  */
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallStringContext.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallStringContext.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallStringContext.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallStringContext.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,7 +26,9 @@
 
   @Override
   public boolean equals(Object o) {
-    return (o instanceof CallStringContext) && ((CallStringContext) o).cs.equals(cs);
+    return (o instanceof Context) && 
+        ((Context)o).isA(CallStringContext.class) &&
+        ((Context)o).get(CallStringContextSelector.CALL_STRING).equals(cs);
   }
 
   @Override
@@ -47,4 +49,4 @@
       return null;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallStringContextSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallStringContextSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallStringContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallStringContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -30,25 +30,34 @@
     }
   };
 
+  public static final ContextKey BASE = new ContextKey() {
+    @Override
+    public String toString() {
+      return "BASE_KEY";
+    }
+  };
+
   public static class CallStringContextPair implements Context {
     private final CallString cs;
 
     private final Context base;
 
-    private CallStringContextPair(CallString cs, Context base) {
+    public CallStringContextPair(CallString cs, Context base) {
       this.cs = cs;
       this.base = base;
     }
 
     @Override
     public boolean equals(Object o) {
-      return (o instanceof CallStringContextPair) && ((CallStringContextPair) o).cs.equals(cs)
-          && ((CallStringContextPair) o).base.equals(base);
+      return o instanceof Context &&
+          ((Context)o).isA(CallStringContextPair.class) && 
+          ((Context)o).get(CALL_STRING).equals(cs) &&
+          ((Context)o).get(BASE).equals(base);
     }
 
     @Override
     public String toString() {
-      return "CallStringContextPair: " + cs.toString() + ":" + base.toString();
+      return "CallStringContextPair: " + cs.toString() + ':' + base.toString();
     }
 
     @Override
@@ -60,6 +69,8 @@
     public ContextItem get(ContextKey name) {
       if (CALL_STRING.equals(name)) {
         return cs;
+      } else if (BASE.equals(name)) {
+        return base;
       } else {
         return base.get(name);
       }
@@ -72,9 +83,9 @@
     public CallString getCallString() {
       return cs;
     }
-  };
+  }
 
-  private final ContextSelector base;
+  protected final ContextSelector base;
 
   public CallStringContextSelector(ContextSelector base) {
     this.base = base;
@@ -82,7 +93,7 @@
 
   protected abstract int getLength(CGNode caller, CallSiteReference site, IMethod target);
 
-  private CallString getCallString(CGNode caller, CallSiteReference site, IMethod target) {
+  protected CallString getCallString(CGNode caller, CallSiteReference site, IMethod target) {
     int length = getLength(caller, site, target);
     if (length > 0) {
       if (caller.getContext().get(CALL_STRING) != null) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallString.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallString.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallString.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallString.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,7 +27,7 @@
     this.methods = new IMethod[] { method };
   }
 
-  CallString(CallSiteReference site, IMethod method, int length, CallString base) {
+  protected CallString(CallSiteReference site, IMethod method, int length, CallString base) {
     int sitesLength = Math.min(length, base.sites.length + 1);
     int methodsLength = Math.min(length, base.methods.length + 1);
     sites = new CallSiteReference[sitesLength];
@@ -40,9 +40,9 @@
 
   @Override
   public String toString() {
-    StringBuffer str = new StringBuffer("[");
+    StringBuilder str = new StringBuilder("[");
     for (int i = 0; i < sites.length; i++) {
-      str.append(" ").append(methods[i].getSignature()).append("@").append(sites[i].getProgramCounter());
+      str.append(' ').append(methods[i].getSignature()).append('@').append(sites[i].getProgramCounter());
     }
     str.append(" ]");
     return str.toString();
@@ -84,4 +84,4 @@
     return this.methods;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ContainerContextSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ContainerContextSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ContainerContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ContainerContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,6 +15,7 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.ContextKey;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
 import com.ibm.wala.ipa.callgraph.propagation.AllocationSiteInNode;
 import com.ibm.wala.ipa.callgraph.propagation.ContainerUtil;
@@ -36,8 +37,8 @@
  * This context selector returns a context customized for the {@link InstanceKey} of the receiver if
  * <ul>
  * <li>receiver is a container, or</li>
- * was allocated in a node whose context was a {@link ReceiverInstanceContext}, and the type is interesting according to a delegate
- * {@link ZeroXInstanceKeys}
+ * <li>was allocated in a node whose context was a {@link ReceiverInstanceContext}, and the type is interesting according to a delegate
+ * {@link ZeroXInstanceKeys}</li>
  * </ul>
  * 
  * Additionally, we add one level of call string context to a few well-known static factory methods from the standard libraries.
@@ -112,7 +113,7 @@
     if (keys != null && keys.length > 0 && keys[0] != null) {
       receiver = keys[0];
     }
-    if (mayUnderstand(caller, site, callee, receiver)) {
+    if (mayUnderstand(site, callee, receiver)) {
       if (DEBUG) {
         System.err.println("May Understand: " + callee + " recv " + receiver);
       }
@@ -232,21 +233,20 @@
     if (DEBUG) {
       System.err.println("findNodeRecursiveMatchingContext " + m + " in context " + c);
     }
-    if (c instanceof ReceiverInstanceContext) {
-      ReceiverInstanceContext ric = (ReceiverInstanceContext) c;
-      if (!(ric.getReceiver() instanceof AllocationSiteInNode)) {
+    if (c.isA(ReceiverInstanceContext.class)) {
+      InstanceKey receiver = (InstanceKey) c.get(ContextKey.RECEIVER);
+      if (!(receiver instanceof AllocationSiteInNode)) {
         return null;
       }
-      AllocationSiteInNode i = (AllocationSiteInNode) ric.getReceiver();
+      AllocationSiteInNode i = (AllocationSiteInNode) receiver;
       CGNode n = i.getNode();
       if (n.getMethod().equals(m)) {
         return n;
       } else {
         return findNodeRecursiveMatchingContext(m, n.getContext());
       }
-    } else if (c instanceof CallerContext) {
-      CallerContext cc = (CallerContext) c;
-      CGNode n = cc.getCaller();
+    } else if (c.isA(CallerContext.class)) {
+      CGNode n = (CGNode) c.get(ContextKey.CALLER);
       if (n.getMethod().equals(m)) {
         return n;
       } else {
@@ -270,7 +270,7 @@
     return (n == null) ? null : n.getContext();
   }
 
-  public boolean mayUnderstand(CGNode caller, CallSiteReference site, IMethod targetMethod, InstanceKey receiver) {
+  public boolean mayUnderstand(CallSiteReference site, IMethod targetMethod, InstanceKey receiver) {
     if (targetMethod == null) {
       throw new IllegalArgumentException("targetMethod is null");
     }
@@ -320,7 +320,7 @@
       if (receiver instanceof AllocationSiteInNode) {
         AllocationSiteInNode I = (AllocationSiteInNode) receiver;
         CGNode N = I.getNode();
-        if (N.getContext() instanceof ReceiverInstanceContext) {
+        if (N.getContext().isA(ReceiverInstanceContext.class)) {
           return true;
         }
       }
@@ -333,7 +333,7 @@
    */
   protected boolean isContainer(IClass C) {
     if (DEBUG) {
-      System.err.println("isContainer? " + C + " " + ContainerUtil.isContainer(C));
+      System.err.println("isContainer? " + C + ' ' + ContainerUtil.isContainer(C));
     }
     return ContainerUtil.isContainer(C);
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ContextInsensitiveSSAInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ContextInsensitiveSSAInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ContextInsensitiveSSAInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ContextInsensitiveSSAInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,14 +12,15 @@
 
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.classLoader.IClass;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.callgraph.propagation.rta.ContextInsensitiveRTAInterpreter;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
 
@@ -30,7 +31,7 @@
 
   protected final AnalysisOptions options;
 
-  public ContextInsensitiveSSAInterpreter(AnalysisOptions options, AnalysisCache cache) {
+  public ContextInsensitiveSSAInterpreter(AnalysisOptions options, IAnalysisCacheView cache) {
     super(cache);
     this.options = options;
   }
@@ -42,8 +43,14 @@
     }
     // Note: since this is context-insensitive, we cache an IR based on the
     // EVERYWHERE context
-    return getAnalysisCache().getSSACache().findOrCreateIR(node.getMethod(), Everywhere.EVERYWHERE, options.getSSAOptions());
+    return getAnalysisCache().getIR(node.getMethod(), Everywhere.EVERYWHERE);
   }
+  
+  @Override
+  public IRView getIRView(CGNode node) {
+    return getIR(node);
+  }
+
 
   @Override
   public int getNumberOfStatements(CGNode node) {
@@ -73,6 +80,6 @@
     }
     // Note: since this is context-insensitive, we cache an IR based on the
     // EVERYWHERE context
-    return getAnalysisCache().getSSACache().findOrCreateDU(node.getMethod(), Everywhere.EVERYWHERE, options.getSSAOptions());
+    return getAnalysisCache().getDefUse(getAnalysisCache().getIR(node.getMethod(), Everywhere.EVERYWHERE));
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DefaultPointerKeyFactory.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DefaultPointerKeyFactory.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DefaultPointerKeyFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DefaultPointerKeyFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -72,6 +72,13 @@
     if (field == null) {
       throw new IllegalArgumentException("field is null");
     }
+    
+    
+    IField resolveAgain = I.getConcreteType().getField(field.getName(), field.getFieldTypeReference().getName());
+    if (resolveAgain != null) {
+      field = resolveAgain;
+    }
+    
     return new InstanceFieldKey(I, field);
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DefaultSSAInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DefaultSSAInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DefaultSSAInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DefaultSSAInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,13 +17,14 @@
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.NewSiteReference;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.callgraph.propagation.rta.DefaultRTAInterpreter;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
 
@@ -36,7 +37,7 @@
 
   private final ContextInsensitiveSSAInterpreter defaultInterpreter;
 
-  public DefaultSSAInterpreter(AnalysisOptions options, AnalysisCache cache) {
+  public DefaultSSAInterpreter(AnalysisOptions options, IAnalysisCacheView cache) {
     super(options, cache);
     cloneInterpreter = new CloneInterpreter();
     defaultInterpreter = new ContextInsensitiveSSAInterpreter(options, cache);
@@ -56,6 +57,12 @@
     return getCFAInterpreter(node).getIR(node);
   }
 
+  
+  @Override
+  public IRView getIRView(CGNode node) {
+    return getIR(node);
+  }
+
   @Override
   public int getNumberOfStatements(CGNode node) {
     return getCFAInterpreter(node).getNumberOfStatements(node);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DelegatingSSAContextInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DelegatingSSAContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DelegatingSSAContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/DelegatingSSAContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,6 +17,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.rta.DelegatingRTAContextInterpreter;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
 
@@ -56,6 +57,17 @@
   }
 
   @Override
+  public IRView getIRView(CGNode node) {
+    if (A != null) {
+      if (A.understands(node)) {
+        return A.getIRView(node);
+      }
+    }
+    assert B.understands(node);
+    return B.getIRView(node);
+  }
+
+  @Override
   public int getNumberOfStatements(CGNode node) {
     if (A != null) {
       if (A.understands(node)) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ExceptionReturnValueKey.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ExceptionReturnValueKey.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ExceptionReturnValueKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ExceptionReturnValueKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,7 +23,7 @@
 
   @Override
   public String toString() {
-    return "[Exc-Ret-V:" + getNode() + "]";
+    return "[Exc-Ret-V:" + getNode() + ']';
   }
 
   @Override
@@ -38,4 +38,4 @@
   public int hashCode() {
     return 1201 * super.internalHashCode();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/FallbackContextInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/FallbackContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/FallbackContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/FallbackContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -30,6 +30,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.types.FieldReference;
@@ -63,7 +64,7 @@
 		if (node.getMethod() instanceof SyntheticMethod || node.getMethod() instanceof ShrikeCTMethod) {
 			return shrikeCI.iterateNewSites(node);
 		} else {
-			IR ir = getIR(node);
+			IRView ir = getIR(node);
 		    if (ir == null) {
 		      return EmptyIterator.instance();
 		    } else {
@@ -96,7 +97,7 @@
 		if (node.getMethod() instanceof SyntheticMethod || node.getMethod() instanceof ShrikeCTMethod) {
 			return shrikeCI.iterateCallSites(node);
 		} else {
-			IR ir = getIR(node);
+			IRView ir = getIR(node);
 		    if (ir == null) {
 		      return EmptyIterator.instance();
 		    } else {
@@ -129,6 +130,11 @@
 		return shrikeCI.getIR(node);
 	}
 
+  @Override
+  public IRView getIRView(CGNode node) {
+    return getIR(node);
+  }
+
 	/* (non-Javadoc)
 	 * @see com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter#getDU(com.ibm.wala.ipa.callgraph.CGNode)
 	 */
@@ -152,4 +158,4 @@
 	public ControlFlowGraph<SSAInstruction, ISSABasicBlock> getCFG(CGNode n) {
 		return shrikeCI.getCFG(n);
 	}
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/nCFABuilder.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/nCFABuilder.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/nCFABuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/nCFABuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,15 +12,15 @@
 package com.ibm.wala.ipa.callgraph.propagation.cfa;
 
 import com.ibm.wala.analysis.reflection.ReflectionContextInterpreter;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.DefaultContextSelector;
 import com.ibm.wala.ipa.callgraph.impl.DelegatingContextSelector;
 import com.ibm.wala.ipa.callgraph.propagation.ClassBasedInstanceKeys;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
 
 /**
  * nCFA Call graph builder. Note that by default, this builder uses a
@@ -28,10 +28,10 @@
  */
 public class nCFABuilder extends SSAPropagationCallGraphBuilder {
 
-  public nCFABuilder(int n, IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache, ContextSelector appContextSelector,
+  public nCFABuilder(int n, IMethod abstractRootMethod, AnalysisOptions options, IAnalysisCacheView cache, ContextSelector appContextSelector,
       SSAContextInterpreter appContextInterpreter) {
 
-    super(cha, options, cache, new DefaultPointerKeyFactory());
+    super(abstractRootMethod, options, cache, new DefaultPointerKeyFactory());
     if (options == null) {
       throw new IllegalArgumentException("options is null");
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXCFABuilder.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXCFABuilder.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXCFABuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXCFABuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,10 +11,11 @@
 package com.ibm.wala.ipa.callgraph.propagation.cfa;
 
 import com.ibm.wala.analysis.reflection.ReflectionContextInterpreter;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.DefaultContextSelector;
 import com.ibm.wala.ipa.callgraph.impl.DelegatingContextSelector;
 import com.ibm.wala.ipa.callgraph.impl.Util;
@@ -27,10 +28,10 @@
  */
 public class ZeroXCFABuilder extends SSAPropagationCallGraphBuilder {
 
-  public ZeroXCFABuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache, ContextSelector appContextSelector,
+  public ZeroXCFABuilder(Language l, IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache, ContextSelector appContextSelector,
       SSAContextInterpreter appContextInterpreter, int instancePolicy) {
 
-    super(cha, options, cache, new DefaultPointerKeyFactory());
+    super(l.getFakeRootMethod(cha, options, cache), options, cache, new DefaultPointerKeyFactory());
 
     ContextSelector def = new DefaultContextSelector(options, cha);
     ContextSelector contextSelector = appContextSelector == null ? def : new DelegatingContextSelector(appContextSelector, def);
@@ -66,7 +67,7 @@
    * @throws IllegalArgumentException if options is null
    * @throws IllegalArgumentException if xmlFiles == null
    */
-  public static SSAPropagationCallGraphBuilder make(AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha,
+  public static SSAPropagationCallGraphBuilder make(AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha,
       ClassLoader cl, AnalysisScope scope, String[] xmlFiles, byte instancePolicy) throws IllegalArgumentException {
 
     if (xmlFiles == null) {
@@ -76,19 +77,19 @@
       throw new IllegalArgumentException("options is null");
     }
     Util.addDefaultSelectors(options, cha);
-    for (int i = 0; i < xmlFiles.length; i++) {
-      Util.addBypassLogic(options, scope, cl, xmlFiles[i], cha);
+    for (String xmlFile : xmlFiles) {
+      Util.addBypassLogic(options, scope, cl, xmlFile, cha);
     }
 
-    return new ZeroXCFABuilder(cha, options, cache, null, null, instancePolicy);
+    return new ZeroXCFABuilder(Language.JAVA, cha, options, cache, null, null, instancePolicy);
   }
 
-  public static ZeroXCFABuilder make(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache,
+  public static ZeroXCFABuilder make(Language l, IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache,
       ContextSelector appContextSelector, SSAContextInterpreter appContextInterpreter, int instancePolicy) throws IllegalArgumentException {
     if (options == null) {
       throw new IllegalArgumentException("options == null");
     }
-    return new ZeroXCFABuilder(cha, options, cache, appContextSelector, appContextInterpreter, instancePolicy);
+    return new ZeroXCFABuilder(l, cha, options, cache, appContextSelector, appContextInterpreter, instancePolicy);
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXContainerCFABuilder.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXContainerCFABuilder.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXContainerCFABuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXContainerCFABuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,9 +10,10 @@
  *******************************************************************************/
 package com.ibm.wala.ipa.callgraph.propagation.cfa;
 
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.DelegatingContextSelector;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
@@ -29,10 +30,10 @@
    * @param appContextInterpreter application-specific logic to interpret a method in context
    * @throws IllegalArgumentException if options is null
    */
-  public ZeroXContainerCFABuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache,
+  public ZeroXContainerCFABuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache,
       ContextSelector appContextSelector, SSAContextInterpreter appContextInterpreter, int instancePolicy) {
 
-    super(cha, options, cache, appContextSelector, appContextInterpreter, instancePolicy);
+    super(Language.JAVA, cha, options, cache, appContextSelector, appContextInterpreter, instancePolicy);
 
     ContextSelector CCS = makeContainerContextSelector(cha, (ZeroXInstanceKeys) getInstanceKeys());
     DelegatingContextSelector DCS = new DelegatingContextSelector(CCS, contextSelector);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXInstanceKeys.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXInstanceKeys.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXInstanceKeys.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXInstanceKeys.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,6 @@
 
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -35,6 +34,7 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 /**
  * Flexible class to create {@link InstanceKey}s depending on various policies ranging from class-based (i.e. 0-CFA) to
@@ -86,8 +86,8 @@
   public static final int SMUSH_PRIMITIVE_HOLDERS = 8;
 
   /**
-   * This variant counts the N, number of allocation sites of a particular type T in each method. If N > SMUSH_LIMIT, then these N
-   * allocation sites are NOT distinguished ... instead there is a single abstract allocation site for <N,T>
+   * This variant counts the N, number of allocation sites of a particular type T in each method. If N &gt; SMUSH_LIMIT, then these N
+   * allocation sites are NOT distinguished ... instead there is a single abstract allocation site for &lt;N,T&gt;
    * 
    * Probably the best choice in many cases.
    */
@@ -134,7 +134,7 @@
   final private RTAContextInterpreter contextInterpreter;
 
   /**
-   * a Map from CGNode->Set<IClass> that should be smushed.
+   * a Map from CGNode-&gt;Set&lt;IClass&gt; that should be smushed.
    */
   protected final Map<CGNode, Set<IClass>> smushMap = HashMapFactory.make();
 
@@ -214,8 +214,7 @@
     if (s == null) {
       Map<IClass, Integer> count = countAllocsByType(node);
       HashSet<IClass> smushees = HashSetFactory.make(5);
-      for (Iterator<Map.Entry<IClass, Integer>> it = count.entrySet().iterator(); it.hasNext();) {
-        Map.Entry<IClass, Integer> e = it.next();
+      for (Map.Entry<IClass, Integer> e : count.entrySet()) {
         Integer i = e.getValue();
         if (i.intValue() > SMUSH_LIMIT) {
           smushees.add(e.getKey());
@@ -228,19 +227,18 @@
   }
 
   /**
-   * @return Map: IClass -> Integer, the number of allocation sites for each type.
+   * @return Map: IClass -&gt; Integer, the number of allocation sites for each type.
    */
   private Map<IClass, Integer> countAllocsByType(CGNode node) {
     Map<IClass, Integer> count = HashMapFactory.make();
-    for (Iterator it = contextInterpreter.iterateNewSites(node); it.hasNext();) {
-      NewSiteReference n = (NewSiteReference) it.next();
+    for (NewSiteReference n : Iterator2Iterable.make(contextInterpreter.iterateNewSites(node))) {
       IClass alloc = cha.lookupClass(n.getDeclaredType());
       if (alloc != null) {
         Integer old = count.get(alloc);
         if (old == null) {
-          count.put(alloc, new Integer(1));
+          count.put(alloc, Integer.valueOf(1));
         } else {
-          count.put(alloc, new Integer(old.intValue() + 1));
+          count.put(alloc, Integer.valueOf(old.intValue() + 1));
         }
       }
     }
@@ -262,13 +260,13 @@
       throw new IllegalArgumentException("null type");
     }
     if (disambiguateConstants() || isReflectiveType(type)) {
-      return new ConstantKey<T>(S, getClassHierarchy().lookupClass(type));
+      return new ConstantKey<>(S, getClassHierarchy().lookupClass(type));
     } else {
       return classBased.getInstanceKeyForConstant(type, S);
     }
   }
 
-  private boolean isReflectiveType(TypeReference type) {
+  private static boolean isReflectiveType(TypeReference type) {
     return type.equals(TypeReference.JavaLangReflectConstructor) || type.equals(TypeReference.JavaLangReflectMethod);
   }
 
@@ -336,8 +334,7 @@
       if (c.getReference().equals(TypeReference.JavaLangObject)) {
         return true;
       } else {
-        for (Iterator<IField> it = c.getDeclaredInstanceFields().iterator(); it.hasNext();) {
-          IField f = it.next();
+        for (IField f : c.getDeclaredInstanceFields()) {
           if (f.getReference().getFieldType().isReferenceType()) {
             return false;
           }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ClassBasedInstanceKeys.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ClassBasedInstanceKeys.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ClassBasedInstanceKeys.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ClassBasedInstanceKeys.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,6 +49,11 @@
       throw new IllegalArgumentException("allocation is null");
     }
 
+    if (String.valueOf(allocation).contains("java/lang/invoke/DirectMethodHandle$StaticAccessor")) {
+      System.err.println("got " + allocation + " in " + node);
+    }
+    
+
     if (options.getClassTargetSelector() == null) {
       throw new IllegalStateException("options did not specify class target selector");
     }
@@ -63,24 +68,22 @@
   }
 
   /**
-   * @see com.ibm.wala.ipa.callgraph.propagation.InstanceKeyFactory#getInstanceKeyForMultiNewArray(com.ibm.wala.ipa.callgraph.CGNode,
-   *      com.ibm.wala.classLoader.NewSiteReference, int) dim == 0 represents the first dimension, e.g., the [Object; instances in
-   *      [[Object; e.g., the [[Object; instances in [[[Object; dim == 1 represents the second dimension, e.g., the [Object
-   *      instances in [[[Object;
+   * <p>dim == 0 represents the first dimension, e.g., the [Object; instances in [[Object; e.g., the [[Object; instances in
+   * [[[Object;</p>
+   *
+   * <p>dim == 1 represents the second dimension, e.g., the [Object instances in [[[Object;</p>
    */
   @Override
   public InstanceKey getInstanceKeyForMultiNewArray(CGNode node, NewSiteReference allocation, int dim) {
     if (DEBUG) {
-      System.err.println(("getInstanceKeyForMultiNewArray " + allocation + " " + dim));
+      System.err.println(("getInstanceKeyForMultiNewArray " + allocation + ' ' + dim));
     }
     ArrayClass type = (ArrayClass) options.getClassTargetSelector().getAllocatedTarget(node, allocation);
     assert (type != null);
     if (DEBUG) {
       System.err.println(("type: " + type));
     }
-    if (type == null) {
-      assert type != null : "null type for " + allocation;
-    }
+    assert type != null : "null type for " + allocation;
     int i = 0;
     while (i <= dim) {
       i++;
@@ -89,7 +92,7 @@
       }
       type = (ArrayClass) type.getElementClass();
       if (DEBUG) {
-        System.err.println(("intermediate: " + i + " " + type));
+        System.err.println(("intermediate: " + i + ' ' + type));
       }
     }
     if (DEBUG) {
@@ -109,7 +112,7 @@
       return null;
     } else {
       if (options.getUseConstantSpecificKeys()) {
-        return new ConstantKey<T>(S, cha.lookupClass(type));
+        return new ConstantKey<>(S, cha.lookupClass(type));
       } else {
         return new ConcreteTypeKey(cha.lookupClass(type));
       }
@@ -132,23 +135,24 @@
   public InstanceKey getInstanceKeyForMetadataObject(Object obj, TypeReference objType) {
     IClass cls = cha.lookupClass(objType);
     assert cls != null : objType;
+    
     if (obj instanceof TypeReference) {
       IClass klass = cha.lookupClass((TypeReference)obj);
       if (klass == null) {
         return new ConcreteTypeKey(cls);
       } else {
         // return the IClass itself, wrapped as a constant!
-        return new ConstantKey<IClass>(klass, cls);
+        return new ConstantKey<>(klass, cls);
       }
     } else if (obj instanceof MethodReference) {
       IMethod m = cha.resolveMethod((MethodReference)obj);
       if (m == null) {
-        return new ConcreteTypeKey(cls);
+         return new ConcreteTypeKey(cls);
       } else {
-        return new ConstantKey<IMethod>(m, cls);
+        return new ConstantKey<>(m, cls);
       }
     } else if (obj instanceof Descriptor) {
-      return new ConstantKey<Descriptor>((Descriptor)obj, cls);
+      return new ConstantKey<>((Descriptor)obj, cls);
     } else {
       // other cases
       throw new Error();
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ConcreteTypeKey.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ConcreteTypeKey.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ConcreteTypeKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ConcreteTypeKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,16 +18,13 @@
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.ComposedIterator;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.MapIterator;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.debug.Assertions;
-import com.ibm.wala.util.functions.Function;
 
 /**
  * An instance key which represents a unique set for each concrete type.
@@ -62,7 +59,7 @@
 
   @Override
   public String toString() {
-    return "[" + type + "]";
+    return "[" + type + ']';
   }
 
   public IClass getType() {
@@ -83,19 +80,18 @@
    * @return a set of ConcreteTypeKeys that represent the exceptions the PEI may throw.
    * @throws IllegalArgumentException if pei is null
    */
-  public static InstanceKey[] getInstanceKeysForPEI(SSAInstruction pei, IR ir, IClassHierarchy cha) {
+  public static InstanceKey[] getInstanceKeysForPEI(SSAInstruction pei, IClassHierarchy cha) {
     if (pei == null) {
       throw new IllegalArgumentException("pei is null");
     }
-    Collection types = pei.getExceptionTypes();
+    Collection<TypeReference> types = pei.getExceptionTypes();
     // TODO: institute a cache?
     if (types == null) {
       return null;
     }
     InstanceKey[] result = new InstanceKey[types.size()];
     int i = 0;
-    for (Iterator it = types.iterator(); it.hasNext();) {
-      TypeReference type = (TypeReference) it.next();
+    for (TypeReference type : types) {
       assert type != null;
       IClass klass = cha.lookupClass(type);
       result[i++] = new ConcreteTypeKey(klass);
@@ -108,22 +104,13 @@
     return new ComposedIterator<CGNode, Pair<CGNode, NewSiteReference>>(CG.iterator()) {
       @Override
       public Iterator<? extends Pair<CGNode, NewSiteReference>> makeInner(final CGNode outer) {
-        return new MapIterator<NewSiteReference, Pair<CGNode, NewSiteReference>>(
-            new FilterIterator<NewSiteReference>(
+        return new MapIterator<>(
+            new FilterIterator<>(
                 outer.iterateNewSites(),
-                new Predicate<NewSiteReference>() {
-                  @Override public boolean test(NewSiteReference o) {
-                    return o.getDeclaredType().equals(type.getReference());
-                  }
-                }
+                o -> o.getDeclaredType().equals(type.getReference())
             ),
-            new Function<NewSiteReference, Pair<CGNode, NewSiteReference>>() {
-              @Override
-              public Pair<CGNode, NewSiteReference> apply(NewSiteReference object) {
-                return Pair.make(outer, object);
-              }
-            });
+            object -> Pair.make(outer, object));
       }
     };
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ConstantKey.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ConstantKey.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ConstantKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ConstantKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -30,13 +30,14 @@
   public ConstantKey(T value, IClass valueClass) {
     this.value = value;
     this.valueClass = valueClass;
+    assert valueClass != null;
   }
 
   @Override
   public boolean equals(Object obj) {
     if (obj instanceof ConstantKey) {
       ConstantKey other = (ConstantKey) obj;
-      return value == null ? other.value == null : value.equals(other.value);
+      return valueClass.equals(other.valueClass) ? (value == null ? other.value == null : value.equals(other.value)) : false;
     } else {
       return false;
     }
@@ -52,7 +53,7 @@
     if (value == null)
       return "[ConstantKey:null]";
     else
-      return "[ConstantKey:" + value + ":" + value.getClass() + "]";
+      return "[ConstantKey:" + value + ':' + valueClass.getReference() + ']';
   }
 
   /*
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/CPAContextSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/CPAContextSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/CPAContextSelector.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/CPAContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ipa.callgraph.propagation;
+
+import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.util.intset.IntSet;
+import com.ibm.wala.util.intset.IntSetUtil;
+import com.ibm.wala.util.intset.MutableIntSet;
+
+public class CPAContextSelector implements ContextSelector {
+
+  private final ContextSelector base;
+  
+  public CPAContextSelector(ContextSelector base) {
+    this.base = base;
+  }
+
+  public static class CPAContext extends SelectiveCPAContext {
+
+    public CPAContext(Context base, InstanceKey[] x) {
+      super(base, x);
+    }
+    
+  }
+  
+  @Override
+  public Context getCalleeTarget(CGNode caller, CallSiteReference site, IMethod callee, InstanceKey[] actualParameters) {
+     Context target = base.getCalleeTarget(caller, site, callee, actualParameters);
+     if (actualParameters != null && actualParameters.length > 0) {
+    return new CPAContext(target, actualParameters);
+     } else {
+       return target;
+     }
+  }
+
+  private static boolean dispatchIndex(CallSiteReference ref, int i) {
+    if (ref.isStatic()) {
+      return ! ref.getDeclaredTarget().getParameterType(i).isPrimitiveType();
+    } else {
+      return i==0 || ! ref.getDeclaredTarget().getParameterType(i-1).isPrimitiveType();
+    }
+  }
+  
+  @Override
+  public IntSet getRelevantParameters(CGNode caller, CallSiteReference site) {
+    MutableIntSet s = IntSetUtil.make();
+    for(int i = 0; i < caller.getIR().getCalls(site)[0].getNumberOfUses(); i++) {
+      if (!caller.getMethod().getDeclaringClass().getClassLoader().getLanguage().methodsHaveDeclaredParameterTypes() || dispatchIndex(site, i)) {
+        s.add(i);
+      }
+    }
+    return s;
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/FilteredPointerKey.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/FilteredPointerKey.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/FilteredPointerKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/FilteredPointerKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -168,7 +168,7 @@
 
     @Override
     public String toString() {
-      return "SingleInstanceFilter: " + concreteType + " (" + concreteType.getClass() + ")";
+      return "SingleInstanceFilter: " + concreteType + " (" + concreteType.getClass() + ')';
     }
 
     public InstanceKey getInstance() {
@@ -189,10 +189,7 @@
     public boolean addFiltered(PropagationSystem system, PointsToSetVariable L, PointsToSetVariable R) {
       int idx = system.findOrCreateIndexForInstanceKey(concreteType);
       if (R.contains(idx)) {
-        if (!L.contains(idx)) {
-          L.add(idx);
-          return true;
-        }
+        return L.add(idx);
       }
 
       return false;
@@ -262,9 +259,8 @@
         InstanceKey I = system.getInstanceKey(i);
         IClass C = I.getConcreteType();
         if ((C.getMethod(targetMethod.getSelector()) == targetMethod) == sense) {
-          if (!L.contains(i)) {
+          if (L.add(i)) {
             result = true;
-            L.add(i);
           }
         }
       }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceFieldKey.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceFieldKey.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceFieldKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceFieldKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -53,7 +53,7 @@
 
   @Override
   public String toString() {
-    return "[" + instance + "," + field + "]";
+    return "[" + instance + ',' + field + ']';
   }
 
   public IField getField() {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceKeyFactory.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceKeyFactory.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceKeyFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceKeyFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -36,9 +36,6 @@
   public abstract <T> InstanceKey getInstanceKeyForConstant(TypeReference type, T S);
 
   /**
-   * @param node
-   * @param instr
-   * @param type
    * @return the instance key that represents the exception of type _type_
    *         thrown by a particular PEI.
    */
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceKey.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceKey.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,10 +23,10 @@
  * An InstanceKey serves as the representative for an equivalence class of
  * objects in the heap, that can be pointed to.
  * 
- * For example, for 0-CFA, an InstanceKey would embody an <IClass>... we model
+ * For example, for 0-CFA, an InstanceKey would embody an &lt;IClass&gt;... we model
  * all instances of a particular class
  * 
- * For 0-1-CFA, an InstanceKey could be <IMethod,statement #>, representing a
+ * For 0-1-CFA, an InstanceKey could be &lt;IMethod,statement #&gt;, representing a
  * particular allocation statement in a particular method.
  */
 public interface InstanceKey extends ContextItem {
@@ -39,10 +39,10 @@
   IClass getConcreteType();
 
   /**
-   * Get the creation sites of <code>this</code>, i.e., the statements that may
-   * allocate objects represented by <code>this</code>. A creation site is a
+   * Get the creation sites of {@code this}, i.e., the statements that may
+   * allocate objects represented by {@code this}. A creation site is a
    * pair (n,s), where n is the containing {@link CGNode} in the given
-   * {@link CallGraph} <code>CG</code> and s is the allocating
+   * {@link CallGraph} {@code CG} and s is the allocating
    * {@link NewSiteReference}.
    * 
    */
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/IPointerOperator.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/IPointerOperator.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/IPointerOperator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/IPointerOperator.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,4 +20,4 @@
    */
   boolean isComplex();
   
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/LocalPointerKey.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/LocalPointerKey.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/LocalPointerKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/LocalPointerKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,7 +49,7 @@
 
   @Override
   public String toString() {
-    return "[" + node + ", v" + valueNumber + "]";
+    return "[" + node + ", v" + valueNumber + ']';
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/MultiNewArrayInNode.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/MultiNewArrayInNode.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/MultiNewArrayInNode.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/MultiNewArrayInNode.java	2019-01-29 17:08:39.000000000 +0000
@@ -65,7 +65,7 @@
 
   @Override
   public String toString() {
-    return super.toString() + "<dim:" + dim + ">";
+    return super.toString() + "<dim:" + dim + '>';
   }
 
   public int getDim() {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerAnalysisImpl.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerAnalysisImpl.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerAnalysisImpl.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerAnalysisImpl.java	2019-01-29 17:08:39.000000000 +0000
@@ -88,13 +88,12 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer("PointerAnalysis:\n");
-    for (Iterator it = pointsToMap.iterateKeys(); it.hasNext();) {
-      PointerKey p = (PointerKey) it.next();
-      OrdinalSet O = getPointsToSet(p);
+    StringBuilder result = new StringBuilder("PointerAnalysis:\n");
+    for (PointerKey p : Iterator2Iterable.make(pointsToMap.iterateKeys())) {
+      OrdinalSet<InstanceKey> O = getPointsToSet(p);
       result.append("  ").append(p).append(" ->\n");
-      for (Iterator it2 = O.iterator(); it2.hasNext();) {
-        result.append("     ").append(it2.next()).append("\n");
+      for (InstanceKey instanceKey : O) {
+        result.append("     ").append(instanceKey).append('\n');
       }
     }
     return result.toString();
@@ -135,7 +134,7 @@
       return OrdinalSet.empty();
     } else {
       IntSet S = v.getValue();
-      return new OrdinalSet<InstanceKey>(S, instanceKeys);
+      return new OrdinalSet<>(S, instanceKeys);
     }
   }
 
@@ -209,7 +208,7 @@
     public void visitArrayLoad(SSAArrayLoadInstruction instruction) {
       pointsToSet = analysis.computeImplicitPointsToSetAtALoad(node, instruction);
     }
-  };
+  }
 
   protected ImplicitPointsToSetVisitor makeImplicitPointsToVisitor(LocalPointerKey lpk) {
     return new ImplicitPointsToSetVisitor(this, lpk);
@@ -261,7 +260,7 @@
         }
       }
     }
-    return new OrdinalSet<InstanceKey>(S, instanceKeys);
+    return new OrdinalSet<>(S, instanceKeys);
   }
 
   private OrdinalSet<InstanceKey> computeImplicitPointsToSetAtPhi(CGNode node, SSAPhiInstruction instruction) {
@@ -277,15 +276,14 @@
         }
       }
     }
-    return new OrdinalSet<InstanceKey>(S, instanceKeys);
+    return new OrdinalSet<>(S, instanceKeys);
   }
 
   private OrdinalSet<InstanceKey> computeImplicitPointsToSetAtALoad(CGNode node, SSAArrayLoadInstruction instruction) {
     PointerKey arrayRef = pointerKeys.getPointerKeyForLocal(node, instruction.getArrayRef());
     MutableSparseIntSet S = MutableSparseIntSet.makeEmpty();
-    OrdinalSet refs = getPointsToSet(arrayRef);
-    for (Iterator it = refs.iterator(); it.hasNext();) {
-      InstanceKey ik = (InstanceKey) it.next();
+    OrdinalSet<InstanceKey> refs = getPointsToSet(arrayRef);
+    for (InstanceKey ik : refs) {
       PointerKey key = pointerKeys.getPointerKeyForArrayContents(ik);
       OrdinalSet pointees = getPointsToSet(key);
       IntSet set = pointees.getBackingSet();
@@ -293,7 +291,7 @@
         S.addAll(set);
       }
     }
-    return new OrdinalSet<InstanceKey>(S, instanceKeys);
+    return new OrdinalSet<>(S, instanceKeys);
   }
 
   private OrdinalSet<InstanceKey> computeImplicitPointsToSetAtGet(CGNode node, SSAGetInstruction instruction) {
@@ -311,9 +309,8 @@
     } else {
       PointerKey ref = pointerKeys.getPointerKeyForLocal(node, refVn);
       MutableSparseIntSet S = MutableSparseIntSet.makeEmpty();
-      OrdinalSet refs = getPointsToSet(ref);
-      for (Iterator it = refs.iterator(); it.hasNext();) {
-        InstanceKey ik = (InstanceKey) it.next();
+      OrdinalSet<InstanceKey> refs = getPointsToSet(ref);
+      for (InstanceKey ik : refs) {
         PointerKey fkey = pointerKeys.getPointerKeyForInstanceField(ik, f);
         if (fkey != null) {
           OrdinalSet pointees = getPointsToSet(fkey);
@@ -323,7 +320,7 @@
           }
         }
       }
-      return new OrdinalSet<InstanceKey>(S, instanceKeys);
+      return new OrdinalSet<>(S, instanceKeys);
     }
   }
 
@@ -333,8 +330,7 @@
     Set<IClass> caughtTypes = SSAPropagationCallGraphBuilder.getCaughtExceptionTypes(instruction, ir);
     MutableSparseIntSet S = MutableSparseIntSet.makeEmpty();
     // add the instances from each incoming pei ...
-    for (Iterator<ProgramCounter> it = peis.iterator(); it.hasNext();) {
-      ProgramCounter peiLoc = it.next();
+    for (ProgramCounter peiLoc : peis) {
       SSAInstruction pei = ir.getPEI(peiLoc);
       PointerKey e = null;
       // first deal with exception variables from calls and throws.
@@ -346,9 +342,8 @@
         e = pointerKeys.getPointerKeyForLocal(node, s.getException());
       }
       if (e != null) {
-        OrdinalSet ep = getPointsToSet(e);
-        for (Iterator it2 = ep.iterator(); it2.hasNext();) {
-          InstanceKey ik = (InstanceKey) it2.next();
+        OrdinalSet<InstanceKey> ep = getPointsToSet(e);
+        for (InstanceKey ik : ep) {
           if (PropagationCallGraphBuilder.catches(caughtTypes, ik.getConcreteType(), getCallGraph().getClassHierarchy())) {
             S.add(instanceKeys.getMappedIndex(ik));
           }
@@ -358,10 +353,9 @@
       // Account for those exceptions for which we do not actually have a
       // points-to set for
       // the pei, but just instance keys
-      Collection types = pei.getExceptionTypes();
+      Collection<TypeReference> types = pei.getExceptionTypes();
       if (types != null) {
-        for (Iterator it2 = types.iterator(); it2.hasNext();) {
-          TypeReference type = (TypeReference) it2.next();
+        for (TypeReference type : types) {
           if (type != null) {
             InstanceKey ik = SSAPropagationCallGraphBuilder.getInstanceKeyForPEI(node, peiLoc, type, iKeyFactory);
             ConcreteTypeKey ck = (ConcreteTypeKey) ik;
@@ -374,7 +368,7 @@
         }
       }
     }
-    return new OrdinalSet<InstanceKey>(S, instanceKeys);
+    return new OrdinalSet<>(S, instanceKeys);
   }
 
   private OrdinalSet<InstanceKey> computeImplicitPointsToSetAtCheckCast(CGNode node, SSACheckCastInstruction instruction) {
@@ -388,15 +382,13 @@
         return rhsSet;
       } else {
         if (klass.isInterface()) {
-          for (Iterator it = rhsSet.iterator(); it.hasNext();) {
-            InstanceKey ik = (InstanceKey) it.next();
+          for (InstanceKey ik : rhsSet) {
             if (getCallGraph().getClassHierarchy().implementsInterface(ik.getConcreteType(), klass)) {
               S.add(getInstanceKeyMapping().getMappedIndex(ik));
             }
           }
         } else {
-          for (Iterator it = rhsSet.iterator(); it.hasNext();) {
-            InstanceKey ik = (InstanceKey) it.next();
+          for (InstanceKey ik : rhsSet) {
             if (getCallGraph().getClassHierarchy().isSubclassOf(ik.getConcreteType(), klass)) {
               S.add(getInstanceKeyMapping().getMappedIndex(ik));
             }
@@ -404,7 +396,7 @@
         }
       }
     }
-    return new OrdinalSet<InstanceKey>(S, instanceKeys);
+    return new OrdinalSet<>(S, instanceKeys);
   }
 
   private OrdinalSet<InstanceKey> computeImplicitPointsToSetAtCall(LocalPointerKey lpk, CGNode node, SSAInvokeInstruction call) {
@@ -419,15 +411,15 @@
 
   private OrdinalSet<InstanceKey> toOrdinalSet(InstanceKey[] ik) {
     MutableSparseIntSet s = MutableSparseIntSet.makeEmpty();
-    for (int i = 0; i < ik.length; i++) {
-      int index = instanceKeys.getMappedIndex(ik[i]);
+    for (InstanceKey element : ik) {
+      int index = instanceKeys.getMappedIndex(element);
       if (index != -1) {
         s.add(index);
       } else {
-        assert index != -1 : "instance " + ik[i] + " not mapped!";
+        assert index != -1 : "instance " + element + " not mapped!";
       }
     }
-    return new OrdinalSet<InstanceKey>(s, instanceKeys);
+    return new OrdinalSet<>(s, instanceKeys);
   }
 
   /**
@@ -435,15 +427,14 @@
    */
   private OrdinalSet<InstanceKey> computeImplicitExceptionsForCall(CGNode node, SSAInvokeInstruction call) {
     MutableSparseIntSet S = MutableSparseIntSet.makeEmpty();
-    for (Iterator it = getCallGraph().getPossibleTargets(node, call.getCallSite()).iterator(); it.hasNext();) {
-      CGNode target = (CGNode) it.next();
+    for (CGNode target : getCallGraph().getPossibleTargets(node, call.getCallSite())) {
       PointerKey retVal = pointerKeys.getPointerKeyForExceptionalReturnValue(target);
       IntSet set = getPointsToSet(retVal).getBackingSet();
       if (set != null) {
         S.addAll(set);
       }
     }
-    return new OrdinalSet<InstanceKey>(S, instanceKeys);
+    return new OrdinalSet<>(S, instanceKeys);
   }
 
   /*
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -40,7 +40,7 @@
   HeapGraph<T> getHeapGraph();
   
   /**
-   * @return the bijection between InstanceKey <=> Integer that defines the
+   * @return the bijection between InstanceKey &lt;=&gt; Integer that defines the
    * interpretation of points-to-sets.
    */
   OrdinalSetMapping<T> getInstanceKeyMapping();
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKeyComparator.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKeyComparator.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKeyComparator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKeyComparator.java	2019-01-29 17:08:39.000000000 +0000
@@ -70,7 +70,7 @@
     }
   }
     
-  private int compareLocalKey(LocalPointerKey key1, Object key2) {
+  private static int compareLocalKey(LocalPointerKey key1, Object key2) {
     if (key2 instanceof LocalPointerKey) {
       int l1 = key1.getValueNumber();
       int l2 = ((LocalPointerKey)key2).getValueNumber();
@@ -91,7 +91,7 @@
     else return -1;
   }
 
-  private int compareReturnValueKey(ReturnValueKey key1, Object key2) {
+  private static int compareReturnValueKey(ReturnValueKey key1, Object key2) {
     if (key2 instanceof ReturnValueKey) {
       int n1 = key1.getNode().getGraphNodeId();
       int n2 = ((ReturnValueKey)key2).getNode().getGraphNodeId();
@@ -106,7 +106,7 @@
     else return -1;
   }
 
-  private int compareExceptionKey(ExceptionReturnValueKey key1, Object key2) {
+  private static int compareExceptionKey(ExceptionReturnValueKey key1, Object key2) {
     if (key2 instanceof ExceptionReturnValueKey) {
       int n1 = key1.getNode().getGraphNodeId();
       int n2 = ((ExceptionReturnValueKey)key2).getNode().getGraphNodeId();
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKeyFactory.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKeyFactory.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKeyFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKeyFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -32,7 +32,6 @@
   FilteredPointerKey getFilteredPointerKeyForLocal(CGNode node, int valueNumber, FilteredPointerKey.TypeFilter filter);
 
   /**
-   * @param node
    * @return the PointerKey that acts as a representative for the class of pointers that includes the return value for a node
    */
   PointerKey getPointerKeyForReturnValue(CGNode node);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKey.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKey.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,15 +14,15 @@
  * A PointerKey instance serves as the representative for an equivalence class
  * of pointers. (or more generally ...locations, if we allow primitives).
  * 
- * For example, a PointerKey for 0-CFA might be - a <CGNode,int> pair, where the
+ * For example, a PointerKey for 0-CFA might be - a &lt;CGNode,int&gt; pair, where the
  * int represents an SSA value number. This PointerKey would represent all
- * values of the pointer of a particular local variable. - a <FieldReference>,
+ * values of the pointer of a particular local variable. - a &lt;FieldReference&gt;,
  * representing the set of instances of a given field in the heap, or of a
  * particular static field.
  * 
  * A PointerKey for 0-1-CFA, with 1-level of InstanceVar context in the Grove et
- * al. terminology, would instead of FieldReference, use a - <InstanceKey,
- * FieldReference> pair
+ * al. terminology, would instead of FieldReference, use a - &lt;InstanceKey,
+ * FieldReference&gt; pair
  */
 public interface PointerKey {
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointsToMap.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointsToMap.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointsToMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointsToMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,9 +12,9 @@
 
 import java.util.Iterator;
 
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.IVector;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.SimpleVector;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.intset.BitVector;
@@ -42,7 +42,7 @@
    * <li>UNIFIED
    * </ul>
    */
-  private final IVector<Object> pointsToSets = new SimpleVector<Object>();
+  private final IVector<Object> pointsToSets = new SimpleVector<>();
 
   private final IntegerUnionFind uf = new IntegerUnionFind();
 
@@ -188,8 +188,7 @@
    * Wipe out the cached transitive closure information
    */
   public void revertToPreTransitive() {
-    for (Iterator it = iterateKeys(); it.hasNext();) {
-      PointerKey key = (PointerKey) it.next();
+    for (PointerKey key : Iterator2Iterable.make(iterateKeys())) {
       if (!isTransitiveRoot(key) && !isImplicit(key) && !isUnified(key)) {
         PointsToSetVariable v = getPointsToSet(key);
         v.removeAll();
@@ -198,14 +197,10 @@
   }
 
   /**
-   * @return Iterator<PointerKey>
+   * @return {@link Iterator}&lt;{@link PointerKey}&gt;
    */
   public Iterator<PointerKey> getTransitiveRoots() {
-    return new FilterIterator<PointerKey>(iterateKeys(), new Predicate() {
-      @Override public boolean test(Object o) {
-        return isTransitiveRoot((PointerKey) o);
-      }
-    });
+    return new FilterIterator<>(iterateKeys(), this::isTransitiveRoot);
   }
 
   /**
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointsToSetVariable.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointsToSetVariable.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointsToSetVariable.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointsToSetVariable.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,6 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.intset.IntSet;
-import com.ibm.wala.util.intset.IntSetAction;
 import com.ibm.wala.util.intset.MutableMapping;
 import com.ibm.wala.util.intset.MutableSparseIntSet;
 
@@ -76,14 +75,15 @@
   }
   
   @Override
-  public void add(int b) {
+  public boolean add(int b) {
     if (PARANOID) {
       MutableSparseIntSet m = MutableSparseIntSet.createMutableSparseIntSet(1);
       m.add(b);
       checkTypes(m);
     }
-    super.add(b);
+    final boolean result = super.add(b);
     cryIfTooBig();
+    return result;
   }
 
   @Override
@@ -120,21 +120,16 @@
     if (cha.isAssignableFrom(cha.lookupClass(TypeReference.JavaLangThrowable), type)) {
       return;
     }
-    b.foreach(new IntSetAction() {
-
-      @Override
-      public void act(int x) {
-        InstanceKey ik = instanceKeys.getMappedObject(x);
-        IClass concreteType = ik.getConcreteType();
-        if (!cha.isAssignableFrom(type, concreteType)) {
-          System.err.println("BOOM");
-          System.err.println(ir);
-          System.err.println(lpk + " type " + type);
-          System.err.println(ik + " type " + concreteType);
-          Assertions.UNREACHABLE();
-        }
+    b.foreach(x -> {
+      InstanceKey ik = instanceKeys.getMappedObject(x);
+      IClass concreteType = ik.getConcreteType();
+      if (!cha.isAssignableFrom(type, concreteType)) {
+        System.err.println("BOOM");
+        System.err.println(ir);
+        System.err.println(lpk + " type " + type);
+        System.err.println(ik + " type " + concreteType);
+        Assertions.UNREACHABLE();
       }
-
     });
   }
 
@@ -154,7 +149,7 @@
    * 
    * @param pointerKey The pointerKey to set.
    */
-  void setPointerKey(PointerKey pointerKey) {
+  public void setPointerKey(PointerKey pointerKey) {
     // check that we haven't modified the hash code!!! this is crucial
     assert this.pointerKey.hashCode() == pointerKey.hashCode();
     this.pointerKey = pointerKey;
@@ -162,6 +157,6 @@
 
   @Override
   public String toString() {
-    return pointerKey.toString() + ":" + super.toString();
+    return pointerKey.toString() + ':' + super.toString();
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,7 +23,6 @@
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.classLoader.SyntheticClass;
 import com.ibm.wala.fixpoint.UnaryOperator;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
@@ -32,6 +31,7 @@
 import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.AbstractRootMethod;
 import com.ibm.wala.ipa.callgraph.impl.ExplicitCallGraph;
 import com.ibm.wala.ipa.callgraph.propagation.rta.RTAContextInterpreter;
@@ -57,7 +57,7 @@
  * TODO: This implementation currently keeps all points to sets live ... even those for local variables that do not span
  * interprocedural boundaries. This may be too space-inefficient .. we can consider recomputing local sets on demand.
  */
-public abstract class PropagationCallGraphBuilder implements CallGraphBuilder {
+public abstract class PropagationCallGraphBuilder implements CallGraphBuilder<InstanceKey> {
   private final static boolean DEBUG_ALL = false;
 
   final static boolean DEBUG_ASSIGN = DEBUG_ALL | false;
@@ -99,7 +99,7 @@
   /**
    * Cache of IRs and things
    */
-  private final AnalysisCache analysisCache;
+  private final IAnalysisCacheView analysisCache;
 
   /**
    * Set of nodes that have already been traversed for constraints
@@ -138,7 +138,7 @@
   /**
    * Singleton operator for assignments
    */
-  protected final static AssignOperator assignOperator = new AssignOperator();
+  public final static AssignOperator assignOperator = new AssignOperator();
 
   /**
    * singleton operator for filter
@@ -171,26 +171,25 @@
   final private boolean rememberGetPutHistory = true;
 
   /**
-   * @param cha governing class hierarchy
    * @param options governing call graph construction options
    * @param pointerKeyFactory factory which embodies pointer abstraction policy
    */
-  protected PropagationCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache,
+  protected PropagationCallGraphBuilder(IMethod abstractRootMethod, AnalysisOptions options, IAnalysisCacheView cache,
       PointerKeyFactory pointerKeyFactory) {
-    if (cha == null) {
+    if (abstractRootMethod == null) {
       throw new IllegalArgumentException("cha is null");
     }
     if (options == null) {
       throw new IllegalArgumentException("options is null");
     }
     assert cache != null;
-    this.cha = cha;
+    this.cha = abstractRootMethod.getClassHierarchy();
     this.options = options;
     this.analysisCache = cache;
     // we need pointer keys to handle reflection
     assert pointerKeyFactory != null;
     this.pointerKeyFactory = pointerKeyFactory;
-    callGraph = createEmptyCallGraph(cha, options);
+    callGraph = createEmptyCallGraph(abstractRootMethod, options);
     try {
       callGraph.init();
     } catch (CancelException e) {
@@ -202,8 +201,8 @@
     JAVA_LANG_OBJECT = cha.lookupClass(TypeReference.JavaLangObject);
   }
 
-  protected ExplicitCallGraph createEmptyCallGraph(IClassHierarchy cha, AnalysisOptions options) {
-    return new ExplicitCallGraph(cha, options, getAnalysisCache());
+  protected ExplicitCallGraph createEmptyCallGraph(IMethod abstractRootMethod, AnalysisOptions options) {
+    return new ExplicitCallGraph(abstractRootMethod, options, getAnalysisCache());
   }
 
   /**
@@ -244,8 +243,7 @@
     discoveredNodes.add(callGraph.getFakeRootNode());
 
     // Set up the initially reachable methods and classes
-    for (Iterator it = options.getEntrypoints().iterator(); it.hasNext();) {
-      Entrypoint E = (Entrypoint) it.next();
+    for (Entrypoint E : options.getEntrypoints()) {
       if (DEBUG_ENTRYPOINTS) {
         System.err.println("Entrypoint: " + E);
       }
@@ -281,7 +279,7 @@
     return callGraph;
   }
 
-  protected PropagationSystem makeSystem(AnalysisOptions options) {
+  protected PropagationSystem makeSystem(@SuppressWarnings("unused") AnalysisOptions options) {
     return new PropagationSystem(callGraph, pointerKeyFactory, instanceKeyFactory);
   }
 
@@ -314,8 +312,7 @@
 
   /**
    * Add constraints for a node.
-   * @param monitor 
-   * 
+   *
    * @return true iff any new constraints are added.
    */
   protected abstract boolean addConstraintsFromNode(CGNode n, IProgressMonitor monitor) throws CancelException;
@@ -325,7 +322,6 @@
    * iterative.
    * 
    * @return true iff any new constraints are added.
-   * @throws CancelException 
    */
   protected boolean addConstraintsFromNewNodes(IProgressMonitor monitor) throws CancelException {
     boolean result = false;
@@ -540,7 +536,7 @@
 
     @Override
     public String toString() {
-      return "{ " + base + " type: " + type + "}";
+      return "{ " + base + " type: " + type + '}';
     }
 
     public PointerKey getBase() {
@@ -590,7 +586,7 @@
    * LHS U= (RHS n k)
    * 
    * 
-   * Unary op: <lhs>:= Cast_k( <rhs>)
+   * Unary op: &lt;lhs&gt;:= Cast_k( &lt;rhs&gt;)
    * 
    * (Again, technically a binary op -- see note for Assign)
    * 
@@ -611,8 +607,8 @@
       FilteredPointerKey pk = (FilteredPointerKey) lhs.getPointerKey();
 
       if (DEBUG_FILTER) {
-        String S = "EVAL Filter " + lhs.getPointerKey() + " " + rhs.getPointerKey();
-        S += "\nEVAL      " + lhs + " " + rhs;
+        String S = "EVAL Filter " + lhs.getPointerKey() + ' ' + rhs.getPointerKey();
+        S += "\nEVAL      " + lhs + ' ' + rhs;
         System.err.println(S);
       }
       if (rhs.size() == 0) {
@@ -656,6 +652,7 @@
 
   }
 
+  @Override
   public IClassHierarchy getClassHierarchy() {
     return cha;
   }
@@ -712,7 +709,6 @@
    * @return the CGNode to which this particular call should dispatch.
    */
   protected CGNode getTargetForCall(CGNode caller, CallSiteReference site, IClass recv, InstanceKey iKey[]) {
-
     IMethod targetMethod = options.getMethodTargetSelector().getCalleeTarget(caller, site, recv);
 
     // this most likely indicates an exclusion at work; the target selector
@@ -722,7 +718,7 @@
     }
     Context targetContext = contextSelector.getCalleeTarget(caller, site, targetMethod, iKey);
     
-    if (targetContext instanceof IllegalArgumentExceptionContext) {
+    if (targetContext.isA(IllegalArgumentExceptionContext.class)) {
       return null;
     }
     try {
@@ -803,7 +799,7 @@
   }
 
   /**
-   * Binary op: <dummy>:= ArrayLoad( &lt;arrayref>) Side effect: Creates new equations.
+   * Binary op: &lt;dummy&gt;:= ArrayLoad( &lt;arrayref&gt;) Side effect: Creates new equations.
    */
   public final class ArrayLoadOperator extends UnarySideEffect implements IPointerOperator {
     protected final MutableIntSet priorInstances = rememberGetPutHistory ? IntSetUtil.make() : null;
@@ -822,44 +818,40 @@
     public byte evaluate(PointsToSetVariable rhs) {
       if (DEBUG_ARRAY_LOAD) {
         PointsToSetVariable def = getFixedSet();
-        String S = "EVAL ArrayLoad " + rhs.getPointerKey() + " " + def.getPointerKey();
+        String S = "EVAL ArrayLoad " + rhs.getPointerKey() + ' ' + def.getPointerKey();
         System.err.println(S);
-        System.err.println("EVAL ArrayLoad " + def + " " + rhs);
+        System.err.println("EVAL ArrayLoad " + def + ' ' + rhs);
         if (priorInstances != null) {
-          System.err.println("prior instances: " + priorInstances + " " + priorInstances.getClass());
+          System.err.println("prior instances: " + priorInstances + ' ' + priorInstances.getClass());
         }
       }
 
       if (rhs.size() == 0) {
         return NOT_CHANGED;
       }
-      final PointerKey object = rhs.getPointerKey();
 
       PointsToSetVariable def = getFixedSet();
       final PointerKey dVal = def.getPointerKey();
 
       final MutableBoolean sideEffect = new MutableBoolean();
-      IntSetAction action = new IntSetAction() {
-        @Override
-        public void act(int i) {
-          InstanceKey I = system.getInstanceKey(i);
-          if (!I.getConcreteType().isArrayClass()) {
-            return;
-          }
-          TypeReference C = I.getConcreteType().getReference().getArrayElementType();
-          if (C.isPrimitiveType()) {
-            return;
-          }
-          PointerKey p = getPointerKeyForArrayContents(I);
-          if (p == null) {
-            return;
-          }
+      IntSetAction action = i -> {
+        InstanceKey I = system.getInstanceKey(i);
+        if (!I.getConcreteType().isArrayClass()) {
+          return;
+        }
+        TypeReference C = I.getConcreteType().getReference().getArrayElementType();
+        if (C.isPrimitiveType()) {
+          return;
+        }
+        PointerKey p = getPointerKeyForArrayContents(I);
+        if (p == null) {
+          return;
+        }
 
-          if (DEBUG_ARRAY_LOAD) {
-            System.err.println("ArrayLoad add assign: " + dVal + " " + p);
-          }
-          sideEffect.b |= system.newFieldRead(dVal, assignOperator, p, object);
+        if (DEBUG_ARRAY_LOAD) {
+          System.err.println("ArrayLoad add assign: " + dVal + ' ' + p);
         }
+        sideEffect.b |= system.newFieldRead(dVal, assignOperator, p);
       };
       if (priorInstances != null) {
         rhs.getValue().foreachExcluding(priorInstances, action);
@@ -896,7 +888,7 @@
   }
 
   /**
-   * Binary op: <dummy>:= ArrayStore( &lt;arrayref>) Side effect: Creates new equations.
+   * Binary op: &lt;dummy&gt;:= ArrayStore( &lt;arrayref&gt;) Side effect: Creates new equations.
    */
   public final class ArrayStoreOperator extends UnarySideEffect implements IPointerOperator {
     @Override
@@ -913,23 +905,21 @@
     public byte evaluate(PointsToSetVariable rhs) {
       if (DEBUG_ARRAY_STORE) {
         PointsToSetVariable val = getFixedSet();
-        String S = "EVAL ArrayStore " + rhs.getPointerKey() + " " + val.getPointerKey();
+        String S = "EVAL ArrayStore " + rhs.getPointerKey() + ' ' + val.getPointerKey();
         System.err.println(S);
-        System.err.println("EVAL ArrayStore " + rhs + " " + getFixedSet());
+        System.err.println("EVAL ArrayStore " + rhs + ' ' + getFixedSet());
       }
 
       if (rhs.size() == 0) {
         return NOT_CHANGED;
       }
-      PointerKey object = rhs.getPointerKey();
 
       PointsToSetVariable val = getFixedSet();
       PointerKey pVal = val.getPointerKey();
 
       List<InstanceKey> instances = system.getInstances(rhs.getValue());
       boolean sideEffect = false;
-      for (Iterator<InstanceKey> it = instances.iterator(); it.hasNext();) {
-        InstanceKey I = it.next();
+      for (InstanceKey I : instances) {
         if (!I.getConcreteType().isArrayClass()) {
           continue;
         }
@@ -942,18 +932,18 @@
         }
         IClass contents = getClassHierarchy().lookupClass(C);
         if (contents == null) {
-          assert false : "null type for " + C + " " + I.getConcreteType();
+          assert false : "null type for " + C + ' ' + I.getConcreteType();
         }
         PointerKey p = getPointerKeyForArrayContents(I);
         if (DEBUG_ARRAY_STORE) {
-          System.err.println("ArrayStore add filtered-assign: " + p + " " + pVal);
+          System.err.println("ArrayStore add filtered-assign: " + p + ' ' + pVal);
         }
 
         // note that the following is idempotent
         if (isJavaLangObject(contents)) {
-          sideEffect |= system.newFieldWrite(p, assignOperator, pVal, object);
+          sideEffect |= system.newFieldWrite(p, assignOperator, pVal);
         } else {
-          sideEffect |= system.newFieldWrite(p, filterOperator, pVal, object);
+          sideEffect |= system.newFieldWrite(p, filterOperator, pVal);
         }
       }
       byte sideEffectMask = sideEffect ? (byte) SIDE_EFFECT_MASK : 0;
@@ -982,7 +972,7 @@
   }
 
   /**
-   * Binary op: <dummy>:= GetField( <ref>) Side effect: Creates new equations.
+   * Binary op: &lt;dummy&gt;:= GetField( &lt;ref&gt;) Side effect: Creates new equations.
    */
   public class GetFieldOperator extends UnarySideEffect implements IPointerOperator {
     private final IField field;
@@ -997,14 +987,14 @@
 
     @Override
     public String toString() {
-      return "GetField " + getField() + "," + getFixedSet().getPointerKey();
+      return "GetField " + getField() + ',' + getFixedSet().getPointerKey();
     }
 
     @Override
     public byte evaluate(PointsToSetVariable rhs) {
       if (DEBUG_GET) {
-        String S = "EVAL GetField " + getField() + " " + getFixedSet().getPointerKey() + " " + rhs.getPointerKey() + getFixedSet()
-            + " " + rhs;
+        String S = "EVAL GetField " + getField() + ' ' + getFixedSet().getPointerKey() + ' ' + rhs.getPointerKey() + getFixedSet()
+            + ' ' + rhs;
         System.err.println(S);
       }
 
@@ -1012,32 +1002,28 @@
       if (ref.size() == 0) {
         return NOT_CHANGED;
       }
-      final PointerKey object = ref.getPointerKey();
       PointsToSetVariable def = getFixedSet();
       final PointerKey dVal = def.getPointerKey();
 
       IntSet value = filterInstances(ref.getValue());
       if (DEBUG_GET) {
-        System.err.println("filtered value: " + value + " " + value.getClass());
+        System.err.println("filtered value: " + value + ' ' + value.getClass());
         if (priorInstances != null) {
-          System.err.println("prior instances: " + priorInstances + " " + priorInstances.getClass());
+          System.err.println("prior instances: " + priorInstances + ' ' + priorInstances.getClass());
         }
       }
       final MutableBoolean sideEffect = new MutableBoolean();
-      IntSetAction action = new IntSetAction() {
-        @Override
-        public void act(int i) {
-          InstanceKey I = system.getInstanceKey(i);
-          if (!representsNullType(I)) {
-            PointerKey p = getPointerKeyForInstanceField(I, getField());
-
-            if (p != null) {
-              if (DEBUG_GET) {
-                String S = "Getfield add constraint " + dVal + " " + p;
-                System.err.println(S);
-              }
-              sideEffect.b |= system.newFieldRead(dVal, assignOperator, p, object);
+      IntSetAction action = i -> {
+        InstanceKey I = system.getInstanceKey(i);
+        if (!representsNullType(I)) {
+          PointerKey p = getPointerKeyForInstanceField(I, getField());
+
+          if (p != null) {
+            if (DEBUG_GET) {
+              String S = "Getfield add constraint " + dVal + ' ' + p;
+              System.err.println(S);
             }
+            sideEffect.b |= system.newFieldRead(dVal, assignOperator, p);
           }
         }
       };
@@ -1121,15 +1107,14 @@
     @Override
     public byte evaluate(PointsToSetVariable rhs) {
       if (DEBUG_PUT) {
-        String S = "EVAL PutField " + getField() + " " + (getFixedSet()).getPointerKey() + " " + rhs.getPointerKey()
-            + getFixedSet() + " " + rhs;
+        String S = "EVAL PutField " + getField() + ' ' + (getFixedSet()).getPointerKey() + ' ' + rhs.getPointerKey()
+            + getFixedSet() + ' ' + rhs;
         System.err.println(S);
       }
 
       if (rhs.size() == 0) {
         return NOT_CHANGED;
       }
-      final PointerKey object = rhs.getPointerKey();
 
       PointsToSetVariable val = getFixedSet();
       final PointerKey pVal = val.getPointerKey();
@@ -1140,23 +1125,20 @@
         Assertions.UNREACHABLE();
       }
       final MutableBoolean sideEffect = new MutableBoolean();
-      IntSetAction action = new IntSetAction() {
-        @Override
-        public void act(int i) {
-          InstanceKey I = system.getInstanceKey(i);
-          if (!representsNullType(I)) {
+      IntSetAction action = i -> {
+        InstanceKey I = system.getInstanceKey(i);
+        if (!representsNullType(I)) {
+          if (DEBUG_PUT) {
+            String S1 = "Putfield consider instance " + I;
+            System.err.println(S1);
+          }
+          PointerKey p = getPointerKeyForInstanceField(I, getField());
+          if (p != null) {
             if (DEBUG_PUT) {
-              String S = "Putfield consider instance " + I;
-              System.err.println(S);
-            }
-            PointerKey p = getPointerKeyForInstanceField(I, getField());
-            if (p != null) {
-              if (DEBUG_PUT) {
-                String S = "Putfield add constraint " + p + " " + pVal;
-                System.err.println(S);
-              }
-              sideEffect.b |= system.newFieldWrite(p, assign, pVal, object);
+              String S2 = "Putfield add constraint " + p + ' ' + pVal;
+              System.err.println(S2);
             }
+            sideEffect.b |= system.newFieldWrite(p, assign, pVal);
           }
         }
       };
@@ -1243,15 +1225,12 @@
       }
       IntSet value = ref.getValue();
       final MutableBoolean sideEffect = new MutableBoolean();
-      IntSetAction action = new IntSetAction() {
-        @Override
-        public void act(int i) {
-          InstanceKey I = system.getInstanceKey(i);
-          if (!representsNullType(I)) {
-            PointerKey p = getPointerKeyForInstanceField(I, field);
-            if (p != null) {
-              sideEffect.b |= system.newConstraint(p, instance);
-            }
+      IntSetAction action = i -> {
+        InstanceKey I = system.getInstanceKey(i);
+        if (!representsNullType(I)) {
+          PointerKey p = getPointerKeyForInstanceField(I, field);
+          if (p != null) {
+            sideEffect.b |= system.newConstraint(p, instance);
           }
         }
       };
@@ -1317,33 +1296,30 @@
       }
       IntSet value = arrayref.getValue();
       final MutableBoolean sideEffect = new MutableBoolean();
-      IntSetAction action = new IntSetAction() {
-        @Override
-        public void act(int i) {
-          InstanceKey I = system.getInstanceKey(i);
-          if (!I.getConcreteType().isArrayClass()) {
-            return;
-          }
-          if (I instanceof ZeroLengthArrayInNode) {
-            return;
-          }
-          TypeReference C = I.getConcreteType().getReference().getArrayElementType();
-          if (C.isPrimitiveType()) {
-            return;
-          }
-          IClass contents = getClassHierarchy().lookupClass(C);
-          if (contents == null) {
-            assert false : "null type for " + C + " " + I.getConcreteType();
+      IntSetAction action = i -> {
+        InstanceKey I = system.getInstanceKey(i);
+        if (!I.getConcreteType().isArrayClass()) {
+          return;
+        }
+        if (I instanceof ZeroLengthArrayInNode) {
+          return;
+        }
+        TypeReference C = I.getConcreteType().getReference().getArrayElementType();
+        if (C.isPrimitiveType()) {
+          return;
+        }
+        IClass contents = getClassHierarchy().lookupClass(C);
+        if (contents == null) {
+          assert false : "null type for " + C + ' ' + I.getConcreteType();
+        }
+        PointerKey p = getPointerKeyForArrayContents(I);
+        if (contents.isInterface()) {
+          if (getClassHierarchy().implementsInterface(instance.getConcreteType(), contents)) {
+            sideEffect.b |= system.newConstraint(p, instance);
           }
-          PointerKey p = getPointerKeyForArrayContents(I);
-          if (contents.isInterface()) {
-            if (getClassHierarchy().implementsInterface(instance.getConcreteType(), contents)) {
-              sideEffect.b |= system.newConstraint(p, instance);
-            }
-          } else {
-            if (getClassHierarchy().isSubclassOf(instance.getConcreteType(), contents)) {
-              sideEffect.b |= system.newConstraint(p, instance);
-            }
+        } else {
+          if (getClassHierarchy().isSubclassOf(instance.getConcreteType(), contents)) {
+            sideEffect.b |= system.newConstraint(p, instance);
           }
         }
       };
@@ -1393,6 +1369,7 @@
    * @param klass a class
    * @return an int set which represents the subset of S that correspond to subtypes of klass
    */
+  @SuppressWarnings("unused")
   protected IntSet filterForClass(IntSet S, IClass klass) {
     MutableIntSet filter = null;
     if (klass.getReference().equals(TypeReference.JavaLangObject)) {
@@ -1446,8 +1423,8 @@
 
       boolean debug = false;
       if (DEBUG_FILTER) {
-        String S = "EVAL InverseFilter/" + filter + " " + lhs.getPointerKey() + " " + rhs.getPointerKey();
-        S += "\nEVAL      " + lhs + " " + rhs;
+        String S = "EVAL InverseFilter/" + filter + ' ' + lhs.getPointerKey() + ' ' + rhs.getPointerKey();
+        S += "\nEVAL      " + lhs + ' ' + rhs;
         System.err.println(S);
       }
       if (rhs.size() == 0) {
@@ -1471,8 +1448,6 @@
 
   /**
    * Add constraints when the interpretation of a node changes (e.g. reflection)
-   * @param monitor 
-   * @throws CancelException 
    */
   public void addConstraintsFromChangedNode(CGNode node, IProgressMonitor monitor) throws CancelException {
     unconditionallyAddConstraintsFromNode(node, monitor);
@@ -1486,8 +1461,8 @@
   }
 
   @Override
-  public AnalysisCache getAnalysisCache() {
+  public IAnalysisCacheView getAnalysisCache() {
     return analysisCache;
-  };
+  }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,12 +25,7 @@
 import com.ibm.wala.fixpoint.IVariable;
 import com.ibm.wala.fixpoint.UnaryOperator;
 import com.ibm.wala.fixpoint.UnaryStatement;
-import com.ibm.wala.util.collections.CompoundIterator;
-import com.ibm.wala.util.collections.EmptyIterator;
-import com.ibm.wala.util.Predicate;
-import com.ibm.wala.util.collections.FilterIterator;
-import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.collections.SmallMap;
+import com.ibm.wala.util.collections.*;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
 import com.ibm.wala.util.graph.AbstractNumberedGraph;
@@ -61,12 +56,12 @@
   /**
    * Track nodes (PointsToSet Variables and AbstractEquations)
    */
-  private final NumberedNodeManager<INodeWithNumber> nodeManager = new DelegatingNumberedNodeManager<INodeWithNumber>();
+  private final NumberedNodeManager<INodeWithNumber> nodeManager = new DelegatingNumberedNodeManager<>();
 
   /**
    * Track edges (equations) that are not represented implicitly
    */
-  private final NumberedEdgeManager<INodeWithNumber> edgeManager = new SparseNumberedEdgeManager<INodeWithNumber>(nodeManager, 2,
+  private final NumberedEdgeManager<INodeWithNumber> edgeManager = new SparseNumberedEdgeManager<>(nodeManager, 2,
       BasicNaturalRelation.SIMPLE);
 
   private final DelegateGraph delegateGraph = new DelegateGraph();
@@ -80,14 +75,14 @@
    * for UnaryOperator op, let R be implicitMap.get(op) then (i,j) \in R implies i op j is an equation in the graph
    * 
    */
-  private final SmallMap<UnaryOperator<PointsToSetVariable>, IBinaryNaturalRelation> implicitUnaryMap = new SmallMap<UnaryOperator<PointsToSetVariable>, IBinaryNaturalRelation>();
+  private final SmallMap<UnaryOperator<PointsToSetVariable>, IBinaryNaturalRelation> implicitUnaryMap = new SmallMap<>();
 
   /**
    * The inverse of relations in the implicit map
    * 
    * for UnaryOperator op, let R be invImplicitMap.get(op) then (i,j) \in R implies j op i is an equation in the graph
    */
-  private final SmallMap<UnaryOperator<PointsToSetVariable>, IBinaryNaturalRelation> invImplicitUnaryMap = new SmallMap<UnaryOperator<PointsToSetVariable>, IBinaryNaturalRelation>();
+  private final SmallMap<UnaryOperator<PointsToSetVariable>, IBinaryNaturalRelation> invImplicitUnaryMap = new SmallMap<>();
 
   /**
    * Number of implicit unary equations registered
@@ -97,7 +92,7 @@
   /**
    * @return a relation in map m corresponding to a key
    */
-  private IBinaryNaturalRelation findOrCreateRelation(Map<UnaryOperator<PointsToSetVariable>, IBinaryNaturalRelation> m,
+  private static IBinaryNaturalRelation findOrCreateRelation(Map<UnaryOperator<PointsToSetVariable>, IBinaryNaturalRelation> m,
       UnaryOperator<PointsToSetVariable> key) {
     IBinaryNaturalRelation result = m.get(key);
     if (result == null) {
@@ -110,7 +105,7 @@
   /**
    * @return a Relation object to track implicit equations using the operator
    */
-  private IBinaryNaturalRelation makeRelation(AbstractOperator op) {
+  private static IBinaryNaturalRelation makeRelation(AbstractOperator op) {
     byte[] implementation = null;
     if (op instanceof AssignOperator) {
       // lots of assignments.
@@ -225,7 +220,7 @@
   /**
    * @return true iff this equation should be represented implicitly in this data structure
    */
-  private boolean useImplicitRepresentation(IFixedPointStatement s) {
+  private static boolean useImplicitRepresentation(IFixedPointStatement s) {
     AbstractStatement eq = (AbstractStatement) s;
     AbstractOperator op = eq.getOperator();
     return (op instanceof AssignOperator || op instanceof PropagationCallGraphBuilder.FilterOperator);
@@ -246,7 +241,7 @@
     int lhs = eq.getLHS().getGraphNodeId();
     int rhs = eq.getRightHandSide().getGraphNodeId();
     if (DEBUG) {
-      System.err.println(("lhs rhs " + lhs + " " + rhs));
+      System.err.println(("lhs rhs " + lhs + ' ' + rhs));
     }
     IBinaryNaturalRelation R = findOrCreateRelation(implicitUnaryMap, eq.getOperator());
     boolean b = R.add(lhs, rhs);
@@ -264,7 +259,7 @@
     int lhs = eq.getLHS().getGraphNodeId();
     int rhs = eq.getRightHandSide().getGraphNodeId();
     if (DEBUG) {
-      System.err.println(("lhs rhs " + lhs + " " + rhs));
+      System.err.println(("lhs rhs " + lhs + ' ' + rhs));
     }
     IBinaryNaturalRelation R = findOrCreateRelation(implicitUnaryMap, eq.getOperator());
     R.remove(lhs, rhs);
@@ -274,14 +269,9 @@
   }
 
   @Override
-  @SuppressWarnings("unchecked")
   public Iterator<AbstractStatement> getStatements() {
-    Iterator<AbstractStatement> it = new FilterIterator(delegateGraph.iterator(), new Predicate() {
-      @Override public boolean test(Object x) {
-        return x instanceof AbstractStatement;
-      }
-    });
-    return new CompoundIterator<AbstractStatement>(it, new GlobalImplicitIterator());
+    Iterator<AbstractStatement> it = IteratorUtil.filter(delegateGraph.iterator(), AbstractStatement.class);
+    return new CompoundIterator<>(it, new GlobalImplicitIterator());
   }
 
   /**
@@ -313,7 +303,7 @@
       UnaryStatement temp = op.makeEquation(lhs, use);
       if (DEBUG) {
         System.err.print(("XX Return temp: " + temp));
-        System.err.println(("lhs rhs " + l + " " + use.getGraphNodeId()));
+        System.err.println(("lhs rhs " + l + ' ' + use.getGraphNodeId()));
       }
       return temp;
     }
@@ -372,7 +362,7 @@
 
     private final Iterator<UnaryOperator<PointsToSetVariable>> outerKeyDelegate = implicitUnaryMap.keySet().iterator();
 
-    private Iterator innerDelegate;
+    private Iterator<IntPair> innerDelegate;
 
     private UnaryOperator<PointsToSetVariable> currentOperator;
 
@@ -388,7 +378,7 @@
       while (outerKeyDelegate.hasNext()) {
         currentOperator = outerKeyDelegate.next();
         IBinaryNaturalRelation R = implicitUnaryMap.get(currentOperator);
-        Iterator it = R.iterator();
+        Iterator<IntPair> it = R.iterator();
         if (it.hasNext()) {
           innerDelegate = it;
           return;
@@ -403,7 +393,7 @@
 
     @Override
     public AbstractStatement next() {
-      IntPair p = (IntPair) innerDelegate.next();
+      IntPair p = innerDelegate.next();
       int lhs = p.getX();
       int rhs = p.getY();
       UnaryStatement result = currentOperator.makeEquation((PointsToSetVariable) delegateGraph.getNode(lhs),
@@ -439,7 +429,7 @@
   public void reorder() {
     VariableGraphView graph = new VariableGraphView();
 
-    Iterator<PointsToSetVariable> order = Topological.makeTopologicalIter(graph);
+    Iterator<PointsToSetVariable> order = Topological.makeTopologicalIter(graph).iterator();
 
     int number = 0;
     while (order.hasNext()) {
@@ -452,7 +442,7 @@
   }
 
   /**
-   * A graph of just the variables in the system. v1 -> v2 iff there exists equation e s.t. e uses v1 and e defs v2.
+   * A graph of just the variables in the system. v1 -&gt; v2 iff there exists equation e s.t. e uses v1 and e defs v2.
    * 
    * Note that this graph trickily and fragilely reuses the nodeManager from the delegateGraph, above. This will work ok as long as
    * every variable is inserted in the delegateGraph.
@@ -488,8 +478,7 @@
      */
     @Override
     public void addNode(PointsToSetVariable n) {
-      Assertions.UNREACHABLE();
-
+      assert containsNode(n);
     }
 
     /*
@@ -506,8 +495,7 @@
      */
     @Override
     public boolean containsNode(PointsToSetVariable N) {
-      Assertions.UNREACHABLE();
-      return false;
+      return delegateGraph.containsNode(N);
     }
 
     /*
@@ -515,7 +503,7 @@
      */
     @Override
     public Iterator<PointsToSetVariable> getPredNodes(PointsToSetVariable v) {
-      final Iterator eqs = getStatementsThatDef(v);
+      final Iterator<AbstractStatement> eqs = getStatementsThatDef(v);
       return new Iterator<PointsToSetVariable>() {
         Iterator<INodeWithNumber> inner;
 
@@ -533,7 +521,7 @@
             }
             return result;
           } else {
-            AbstractStatement eq = (AbstractStatement) eqs.next();
+            AbstractStatement eq = eqs.next();
             if (useImplicitRepresentation(eq)) {
               return (PointsToSetVariable) ((UnaryStatement) eq).getRightHandSide();
             } else {
@@ -554,16 +542,14 @@
     /*
      * @see com.ibm.wala.util.graph.EdgeManager#getPredNodeCount(java.lang.Object)
      */
-    @SuppressWarnings("unused")
-    public int getPredNodeCount(INodeWithNumber N) {
-      PointsToSetVariable v = (PointsToSetVariable) N;
+    @Override
+    public int getPredNodeCount(PointsToSetVariable v) {
       int result = 0;
-      for (Iterator eqs = getStatementsThatDef(v); eqs.hasNext();) {
-        AbstractStatement eq = (AbstractStatement) eqs.next();
+      for (AbstractStatement eq : Iterator2Iterable.make(getStatementsThatDef(v))) {
         if (useImplicitRepresentation(eq)) {
           result++;
         } else {
-          result += delegateGraph.getPredNodeCount(N);
+          result += delegateGraph.getPredNodeCount(v);
         }
       }
       return result;
@@ -574,7 +560,7 @@
      */
     @Override
     public Iterator<PointsToSetVariable> getSuccNodes(PointsToSetVariable v) {
-      final Iterator eqs = getStatementsThatUse(v);
+      final Iterator<AbstractStatement> eqs = getStatementsThatUse(v);
       return new Iterator<PointsToSetVariable>() {
         PointsToSetVariable nextResult;
         {
@@ -596,7 +582,7 @@
         private void advance() {
           nextResult = null;
           while (eqs.hasNext() && nextResult == null) {
-            AbstractStatement eq = (AbstractStatement) eqs.next();
+            AbstractStatement eq = eqs.next();
             nextResult = (PointsToSetVariable) eq.getLHS();
           }
         }
@@ -615,8 +601,7 @@
     @Override
     public int getSuccNodeCount(PointsToSetVariable v) {
       int result = 0;
-      for (Iterator eqs = getStatementsThatUse(v); eqs.hasNext();) {
-        AbstractStatement eq = (AbstractStatement) eqs.next();
+      for (AbstractStatement eq : Iterator2Iterable.make(getStatementsThatUse(v))) {
         IVariable lhs = eq.getLHS();
         if (lhs != null) {
           result++;
@@ -656,9 +641,7 @@
     @Override
     @SuppressWarnings("unchecked")
     protected NumberedEdgeManager getEdgeManager() {
-      // TODO Auto-generated method stub
-      Assertions.UNREACHABLE();
-      return null;
+      return this;
     }
 
   }
@@ -676,13 +659,13 @@
     Iterator<INodeWithNumber> result = delegateGraph.getSuccNodes(v);
     for (int i = 0; i < invImplicitUnaryMap.size(); i++) {
       UnaryOperator op = invImplicitUnaryMap.getKey(i);
-      IBinaryNaturalRelation R = (IBinaryNaturalRelation) invImplicitUnaryMap.getValue(i);
+      IBinaryNaturalRelation R = invImplicitUnaryMap.getValue(i);
       IntSet s = R.getRelated(number);
       if (s != null) {
-        result = new CompoundIterator<INodeWithNumber>(new ImplicitUseIterator(op, v, s), result);
+        result = new CompoundIterator<>(new ImplicitUseIterator(op, v, s), result);
       }
     }
-    List<AbstractStatement> list = new ArrayList<AbstractStatement>();
+    List<AbstractStatement> list = new ArrayList<>();
     while (result.hasNext()) {
       list.add((AbstractStatement) result.next());
     }
@@ -702,14 +685,14 @@
     Iterator<INodeWithNumber> result = delegateGraph.getPredNodes(v);
     for (int i = 0; i < implicitUnaryMap.size(); i++) {
       UnaryOperator op = implicitUnaryMap.getKey(i);
-      IBinaryNaturalRelation R = (IBinaryNaturalRelation) implicitUnaryMap.getValue(i);
+      IBinaryNaturalRelation R = implicitUnaryMap.getValue(i);
       IntSet s = R.getRelated(number);
       if (s != null) {
-        result = new CompoundIterator<INodeWithNumber>(new ImplicitDefIterator(op, s, v), result);
+        result = new CompoundIterator<>(new ImplicitDefIterator(op, s, v), result);
       }
     }
 
-    List<AbstractStatement> list = new ArrayList<AbstractStatement>();
+    List<AbstractStatement> list = new ArrayList<>();
     while (result.hasNext()) {
       list.add((AbstractStatement) result.next());
     }
@@ -733,9 +716,7 @@
       return 0;
     }
     int result = delegateGraph.getSuccNodeCount(v);
-    for (Iterator it = invImplicitUnaryMap.keySet().iterator(); it.hasNext();) {
-      UnaryOperator op = (UnaryOperator) it.next();
-      IBinaryNaturalRelation R = invImplicitUnaryMap.get(op);
+    for (IBinaryNaturalRelation R : invImplicitUnaryMap.values()) {
       IntSet s = R.getRelated(number);
       if (s != null) {
         result += s.size();
@@ -754,9 +735,7 @@
       return 0;
     }
     int result = delegateGraph.getPredNodeCount(v);
-    for (Iterator it = implicitUnaryMap.keySet().iterator(); it.hasNext();) {
-      UnaryOperator op = (UnaryOperator) it.next();
-      IBinaryNaturalRelation R = implicitUnaryMap.get(op);
+    for (IBinaryNaturalRelation R : implicitUnaryMap.values()) {
       IntSet s = R.getRelated(number);
       if (s != null) {
         result += s.size();
@@ -766,14 +745,8 @@
   }
 
   @Override
-  @SuppressWarnings("unchecked")
   public Iterator<PointsToSetVariable> getVariables() {
-    Iterator<PointsToSetVariable> it = new FilterIterator(delegateGraph.iterator(), new Predicate() {
-      @Override public boolean test(Object x) {
-        return x instanceof IVariable;
-      }
-    });
-    return it;
+    return IteratorUtil.filter(delegateGraph.iterator(), PointsToSetVariable.class);
   }
 
   /*
@@ -788,10 +761,10 @@
       System.err.println("implicit map:");
       int count = 0;
       int totalBytes = 0;
-      for (Iterator it = implicitUnaryMap.entrySet().iterator(); it.hasNext();) {
-        count++;
-        Map.Entry e = (Map.Entry) it.next();
-        IBinaryNaturalRelation R = (IBinaryNaturalRelation) e.getValue();
+      for (Map.Entry<UnaryOperator<PointsToSetVariable>, IBinaryNaturalRelation> entry : implicitUnaryMap.entrySet()) {
+		  count++;
+        Map.Entry<?, IBinaryNaturalRelation> e = entry;
+        IBinaryNaturalRelation R = e.getValue();
         System.err.println(("entry " + count));
         R.performVerboseAction();
         HeapTracer.Result result = HeapTracer.traceHeap(Collections.singleton(R), false);
@@ -855,7 +828,7 @@
   }
 
   /**
-   * A graph of just the variables in the system. v1 -> v2 iff there exists an assignment equation e s.t. e uses v1 and e defs v2.
+   * A graph of just the variables in the system. v1 -&gt; v2 iff there exists an assignment equation e s.t. e uses v1 and e defs v2.
    * 
    */
   public NumberedGraph<PointsToSetVariable> getAssignmentGraph() {
@@ -869,7 +842,7 @@
   }
 
   /**
-   * A graph of just the variables in the system. v1 -> v2 iff there exists an Assingnment or Filter equation e s.t. e uses v1 and e
+   * A graph of just the variables in the system. v1 -&gt; v2 iff there exists an Assingnment or Filter equation e s.t. e uses v1 and e
    * defs v2.
    * 
    */
@@ -892,7 +865,7 @@
   }
 
   /**
-   * A graph of just the variables in the system. v1 -> v2 that are related by def-use with "interesting" operators
+   * A graph of just the variables in the system. v1 -&gt; v2 that are related by def-use with "interesting" operators
    * 
    */
   private abstract class FilteredConstraintGraphView extends AbstractNumberedGraph<PointsToSetVariable> {
@@ -955,7 +928,7 @@
      */
     @Override
     public Iterator<PointsToSetVariable> getPredNodes(PointsToSetVariable v) {
-      final Iterator eqs = getStatementsThatDef(v);
+      final Iterator<AbstractStatement> eqs = getStatementsThatDef(v);
       return new Iterator<PointsToSetVariable>() {
         PointsToSetVariable nextResult;
         {
@@ -977,7 +950,7 @@
         private void advance() {
           nextResult = null;
           while (eqs.hasNext() && nextResult == null) {
-            AbstractStatement eq = (AbstractStatement) eqs.next();
+            AbstractStatement eq = eqs.next();
             if (isInteresting(eq)) {
               nextResult = (PointsToSetVariable) ((UnaryStatement) eq).getRightHandSide();
             }
@@ -997,8 +970,7 @@
     @Override
     public int getPredNodeCount(PointsToSetVariable v) {
       int result = 0;
-      for (Iterator eqs = getStatementsThatDef(v); eqs.hasNext();) {
-        AbstractStatement eq = (AbstractStatement) eqs.next();
+      for (AbstractStatement eq : Iterator2Iterable.make(getStatementsThatDef(v))) {
         if (isInteresting(eq)) {
           result++;
         }
@@ -1011,7 +983,7 @@
      */
     @Override
     public Iterator<PointsToSetVariable> getSuccNodes(PointsToSetVariable v) {
-      final Iterator eqs = getStatementsThatUse(v);
+      final Iterator<AbstractStatement> eqs = getStatementsThatUse(v);
       return new Iterator<PointsToSetVariable>() {
         PointsToSetVariable nextResult;
         {
@@ -1033,7 +1005,7 @@
         private void advance() {
           nextResult = null;
           while (eqs.hasNext() && nextResult == null) {
-            AbstractStatement eq = (AbstractStatement) eqs.next();
+            AbstractStatement eq = eqs.next();
             if (isInteresting(eq)) {
               nextResult = (PointsToSetVariable) ((UnaryStatement) eq).getLHS();
             }
@@ -1054,8 +1026,7 @@
     @Override
     public int getSuccNodeCount(PointsToSetVariable v) {
       int result = 0;
-      for (Iterator eqs = getStatementsThatUse(v); eqs.hasNext();) {
-        AbstractStatement eq = (AbstractStatement) eqs.next();
+      for (AbstractStatement eq : Iterator2Iterable.make(getStatementsThatUse(v))) {
         if (isInteresting(eq)) {
           result++;
         }
@@ -1099,22 +1070,15 @@
   }
 
   public String spaceReport() {
-    StringBuffer result = new StringBuffer("PropagationGraph\n");
-    result.append("ImplicitEdges:" + countImplicitEdges() + "\n");
     // for (Iterator it = implicitUnaryMap.values().iterator(); it.hasNext(); )
     // {
     // result.append(it.next() + "\n");
     // }
-    return result.toString();
+    return "PropagationGraph\nImplicitEdges:" + countImplicitEdges() + '\n';
   }
 
   private int countImplicitEdges() {
-    int result = 0;
-    for (Iterator it = new GlobalImplicitIterator(); it.hasNext();) {
-      it.next();
-      result++;
-    }
-    return result;
+    return IteratorUtil.count(new GlobalImplicitIterator());
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationSystem.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationSystem.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationSystem.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationSystem.java	2019-01-29 17:08:39.000000000 +0000
@@ -32,8 +32,6 @@
 import com.ibm.wala.fixpoint.UnaryStatement;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder.FilterOperator;
-import com.ibm.wala.ipa.cha.ClassHierarchyException;
-import com.ibm.wala.ipa.cha.ClassHierarchyWarning;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
@@ -46,12 +44,10 @@
 import com.ibm.wala.util.heapTrace.HeapTracer;
 import com.ibm.wala.util.intset.IntIterator;
 import com.ibm.wala.util.intset.IntSet;
-import com.ibm.wala.util.intset.IntSetAction;
 import com.ibm.wala.util.intset.IntSetUtil;
 import com.ibm.wala.util.intset.MutableIntSet;
 import com.ibm.wala.util.intset.MutableMapping;
 import com.ibm.wala.util.ref.ReferenceCleanser;
-import com.ibm.wala.util.warnings.Warnings;
 
 /**
  * System of constraints that define propagation for call graph construction
@@ -77,12 +73,12 @@
   private final PropagationGraph flowGraph = new PropagationGraph();
 
   /**
-   * bijection from InstanceKey <=>Integer
+   * bijection from InstanceKey &lt;=&gt; Integer
    */
   protected final MutableMapping<InstanceKey> instanceKeys = MutableMapping.make();
 
   /**
-   * A mapping from IClass -> MutableSharedBitVectorIntSet The range represents the instance keys that correspond to a given class.
+   * A mapping from IClass -&gt; MutableSharedBitVectorIntSet The range represents the instance keys that correspond to a given class.
    * This mapping is used to filter sets based on declared types; e.g., in cast constraints
    */
   final private Map<IClass, MutableIntSet> class2InstanceKey = HashMapFactory.make();
@@ -105,7 +101,7 @@
   /**
    * When doing unification, we must also updated the fixed sets in unary side effects.
    * 
-   * This maintains a map from PointsToSetVariable -> Set<UnarySideEffect>
+   * This maintains a map from PointsToSetVariable -&gt; Set&lt;UnarySideEffect&gt;
    */
   final private Map<PointsToSetVariable, Set<UnarySideEffect>> fixedSetMap = HashMapFactory.make();
 
@@ -147,8 +143,7 @@
   protected void updateSideEffects(PointsToSetVariable p, PointsToSetVariable rep) {
     Set<UnarySideEffect> set = fixedSetMap.get(p);
     if (set != null) {
-      for (Iterator it = set.iterator(); it.hasNext();) {
-        UnarySideEffect s = (UnarySideEffect) it.next();
+      for (UnarySideEffect s : set) {
         s.replaceFixedSet(rep);
       }
       Set<UnarySideEffect> s2 = MapUtil.findOrCreateSet(fixedSetMap, rep);
@@ -214,7 +209,7 @@
    * @return an List of instance keys corresponding to the integers in a set
    */
   List<InstanceKey> getInstances(IntSet set) {
-    LinkedList<InstanceKey> result = new LinkedList<InstanceKey>();
+    LinkedList<InstanceKey> result = new LinkedList<>();
     for (IntIterator it = set.intIterator(); it.hasNext();) {
       int j = it.next();
       result.add(getInstanceKey(j));
@@ -252,7 +247,6 @@
   /**
    * If key is unified, returns the representative
    * 
-   * @param key
    * @return the dataflow variable that tracks the points-to set for key
    */
   public PointsToSetVariable findOrCreatePointsToSet(PointerKey key) {
@@ -283,12 +277,8 @@
           pk = key;
         }
         FilteredPointerKey fpk = (FilteredPointerKey) pk;
-        if (fpk == null) {
-          Assertions.UNREACHABLE("fpk is null");
-        }
-        if (key == null) {
-          Assertions.UNREACHABLE("key is null");
-        }
+        assert fpk != null;
+        assert key != null;
         if (fpk.getTypeFilter() == null) {
           Assertions.UNREACHABLE("fpk.getTypeFilter() is null");
         }
@@ -307,7 +297,7 @@
       result = instanceKeys.add(key);
     }
     if (DEBUG) {
-      System.err.println("getIndexForInstanceKey " + key + " " + result);
+      System.err.println("getIndexForInstanceKey " + key + ' ' + result);
     }
     return result;
   }
@@ -329,7 +319,7 @@
       throw new IllegalArgumentException("rhs null");
     }
     if (DEBUG) {
-      System.err.println("Add constraint A: " + lhs + " " + op + " " + rhs);
+      System.err.println("Add constraint A: " + lhs + ' ' + op + ' ' + rhs);
     }
     PointsToSetVariable L = findOrCreatePointsToSet(lhs);
     PointsToSetVariable R = findOrCreatePointsToSet(rhs);
@@ -339,7 +329,7 @@
       // solver if the value of L changes.
       pointsToMap.recordTransitiveRoot(L.getPointerKey());
       if (!(L.getPointerKey() instanceof FilteredPointerKey)) {
-        Assertions.UNREACHABLE("expected filtered lhs " + L.getPointerKey() + " " + L.getPointerKey().getClass() + " " + lhs + " "
+        Assertions.UNREACHABLE("expected filtered lhs " + L.getPointerKey() + ' ' + L.getPointerKey().getClass() + ' ' + lhs + ' '
             + lhs.getClass());
       }
     }
@@ -357,7 +347,7 @@
       throw new IllegalArgumentException("rhs null");
     }
     if (DEBUG) {
-      System.err.println("Add constraint A: " + lhs + " " + op + " " + rhs);
+      System.err.println("Add constraint A: " + lhs + ' ' + op + ' ' + rhs);
     }
     assert !pointsToMap.isUnified(lhs);
     assert !pointsToMap.isUnified(rhs);
@@ -380,7 +370,7 @@
       throw new IllegalArgumentException("null rhs2");
     }
     if (DEBUG) {
-      System.err.println("Add constraint A: " + lhs + " " + op + " " + rhs1 + ", " + rhs2);
+      System.err.println("Add constraint A: " + lhs + ' ' + op + ' ' + rhs1 + ", " + rhs2);
     }
     assert !pointsToMap.isUnified(lhs);
     assert !pointsToMap.isUnified(rhs1);
@@ -394,14 +384,14 @@
   /**
    * @return true iff the system changes
    */
-  public boolean newFieldWrite(PointerKey lhs, UnaryOperator<PointsToSetVariable> op, PointerKey rhs, PointerKey container) {
+  public boolean newFieldWrite(PointerKey lhs, UnaryOperator<PointsToSetVariable> op, PointerKey rhs) {
     return newConstraint(lhs, op, rhs);
   }
 
   /**
    * @return true iff the system changes
    */
-  public boolean newFieldRead(PointerKey lhs, UnaryOperator<PointsToSetVariable> op, PointerKey rhs, PointerKey container) {
+  public boolean newFieldRead(PointerKey lhs, UnaryOperator<PointsToSetVariable> op, PointerKey rhs) {
     return newConstraint(lhs, op, rhs);
   }
 
@@ -419,11 +409,10 @@
     // This works since the solver is monotonic with TOP = {}
     PointsToSetVariable L = findOrCreatePointsToSet(lhs);
     int index = findOrCreateIndexForInstanceKey(value);
-    if (L.contains(index)) {
+    if (!L.add(index)) {
       // a no-op
       return false;
     } else {
-      L.add(index);
 
       // also register that we have an instanceKey for the klass
       assert value.getConcreteType() != null;
@@ -449,29 +438,25 @@
   private void registerInstanceOfClass(IClass klass, int index) {
 
     if (DEBUG) {
-      System.err.println("registerInstanceOfClass " + klass + " " + index);
+      System.err.println("registerInstanceOfClass " + klass + ' ' + index);
     }
 
     assert !klass.getReference().equals(TypeReference.JavaLangObject);
 
-    try {
-      IClass T = klass;
-      registerInstanceWithAllSuperclasses(index, T);
-      registerInstanceWithAllInterfaces(klass, index);
-
-      if (klass.isArrayClass()) {
-        ArrayClass aClass = (ArrayClass) klass;
-        int dim = aClass.getDimensionality();
-        registerMultiDimArraysForArrayOfObjectTypes(dim, index, aClass);
-
-        IClass elementClass = aClass.getInnermostElementClass();
-        if (elementClass != null) {
-          registerArrayInstanceWithAllSuperclassesOfElement(index, elementClass, dim);
-          registerArrayInstanceWithAllInterfacesOfElement(index, elementClass, dim);
-        }
+    IClass T = klass;
+    registerInstanceWithAllSuperclasses(index, T);
+    registerInstanceWithAllInterfaces(klass, index);
+
+    if (klass.isArrayClass()) {
+      ArrayClass aClass = (ArrayClass) klass;
+      int dim = aClass.getDimensionality();
+      registerMultiDimArraysForArrayOfObjectTypes(dim, index, aClass);
+
+      IClass elementClass = aClass.getInnermostElementClass();
+      if (elementClass != null) {
+        registerArrayInstanceWithAllSuperclassesOfElement(index, elementClass, dim);
+        registerArrayInstanceWithAllInterfacesOfElement(index, elementClass, dim);
       }
-    } catch (ClassHierarchyException e) {
-      Warnings.add(ClassHierarchyWarning.create(e.getMessage()));
     }
   }
 
@@ -488,22 +473,21 @@
   }
 
   private void registerArrayInstanceWithAllInterfacesOfElement(int index, IClass elementClass, int dim) {
-    Collection ifaces = null;
+    Collection<IClass> ifaces = null;
     ifaces = elementClass.getAllImplementedInterfaces();
-    for (Iterator it = ifaces.iterator(); it.hasNext();) {
-      IClass I = (IClass) it.next();
+    for (IClass I : ifaces) {
       TypeReference iArrayRef = makeArray(I.getReference(), dim);
       IClass iArrayClass = null;
       iArrayClass = I.getClassLoader().lookupClass(iArrayRef.getName());
       MutableIntSet set = findOrCreateSparseSetForClass(iArrayClass);
       set.add(index);
       if (DEBUG) {
-        System.err.println("dense filter for interface " + iArrayClass + " " + set);
+        System.err.println("dense filter for interface " + iArrayClass + ' ' + set);
       }
     }
   }
 
-  private TypeReference makeArray(TypeReference element, int dim) {
+  private static TypeReference makeArray(TypeReference element, int dim) {
     TypeReference iArrayRef = element;
     for (int i = 0; i < dim; i++) {
       iArrayRef = TypeReference.findOrCreateArrayOf(iArrayRef);
@@ -511,8 +495,7 @@
     return iArrayRef;
   }
 
-  private void registerArrayInstanceWithAllSuperclassesOfElement(int index, IClass elementClass, int dim)
-      throws ClassHierarchyException {
+  private void registerArrayInstanceWithAllSuperclassesOfElement(int index, IClass elementClass, int dim) {
     IClass T;
     // register the array with each supertype of the element class
     T = elementClass.getSuperclass();
@@ -523,40 +506,29 @@
       MutableIntSet set = findOrCreateSparseSetForClass(tArrayClass);
       set.add(index);
       if (DEBUG) {
-        System.err.println("dense filter for class " + tArrayClass + " " + set);
+        System.err.println("dense filter for class " + tArrayClass + ' ' + set);
       }
       T = T.getSuperclass();
     }
   }
 
-  /**
-   * @param klass
-   * @param index
-   * @throws ClassHierarchyException
-   */
-  private void registerInstanceWithAllInterfaces(IClass klass, int index) throws ClassHierarchyException {
-    Collection ifaces = klass.getAllImplementedInterfaces();
-    for (Iterator it = ifaces.iterator(); it.hasNext();) {
-      IClass I = (IClass) it.next();
+  private void registerInstanceWithAllInterfaces(IClass klass, int index) {
+    Collection<IClass> ifaces = klass.getAllImplementedInterfaces();
+    for (IClass I : ifaces) {
       MutableIntSet set = findOrCreateSparseSetForClass(I);
       set.add(index);
       if (DEBUG) {
-        System.err.println("dense filter for interface " + I + " " + set);
+        System.err.println("dense filter for interface " + I + ' ' + set);
       }
     }
   }
 
-  /**
-   * @param index
-   * @param T
-   * @throws ClassHierarchyException
-   */
-  private void registerInstanceWithAllSuperclasses(int index, IClass T) throws ClassHierarchyException {
+  private void registerInstanceWithAllSuperclasses(int index, IClass T) {
     while (T != null && !T.getReference().equals(TypeReference.JavaLangObject)) {
       MutableIntSet set = findOrCreateSparseSetForClass(T);
       set.add(index);
       if (DEBUG) {
-        System.err.println("dense filter for class " + T + " " + set);
+        System.err.println("dense filter for class " + T + ' ' + set);
       }
       T = T.getSuperclass();
     }
@@ -567,7 +539,7 @@
       throw new IllegalArgumentException("null arg0");
     }
     if (DEBUG) {
-      System.err.println("add constraint D: " + op + " " + arg0);
+      System.err.println("add constraint D: " + op + ' ' + arg0);
     }
     assert !pointsToMap.isUnified(arg0);
     PointsToSetVariable v1 = findOrCreatePointsToSet(arg0);
@@ -579,7 +551,7 @@
       throw new IllegalArgumentException("null arg0");
     }
     if (DEBUG) {
-      System.err.println("add constraint D: " + op + " " + Arrays.toString(arg0));
+      System.err.println("add constraint D: " + op + ' ' + Arrays.toString(arg0));
     }
     PointsToSetVariable[] vs = new PointsToSetVariable[ arg0.length ];
     for(int i = 0; i < arg0.length; i++) {
@@ -591,7 +563,7 @@
 
   public void newSideEffect(AbstractOperator<PointsToSetVariable> op, PointerKey arg0, PointerKey arg1) {
     if (DEBUG) {
-      System.err.println("add constraint D: " + op + " " + arg0);
+      System.err.println("add constraint D: " + op + ' ' + arg0);
     }
     assert !pointsToMap.isUnified(arg0);
     assert !pointsToMap.isUnified(arg1);
@@ -649,21 +621,16 @@
       PointsToSetVariable rhs = (PointsToSetVariable) u.getRightHandSide();
       IntSet value = rhs.getValue();
       final int[] topFive = new int[5];
-      value.foreach(new IntSetAction() {
-        @Override
-        public void act(int x) {
-          for (int i = 0; i < 4; i++) {
-            topFive[i] = topFive[i + 1];
-          }
-          topFive[4] = x;
-        }
+      value.foreach(x -> {
+        System.arraycopy(topFive, 1, topFive, 0, 4);
+        topFive[4] = x;
       });
-      StringBuffer result = new StringBuffer();
+      StringBuilder result = new StringBuilder();
       for (int i = 0; i < 5; i++) {
         int p = topFive[i];
         if (p != 0) {
           InstanceKey ik = getInstanceKey(p);
-          result.append(p).append("  ").append(ik).append("\n");
+          result.append(p).append("  ").append(ik).append('\n');
         }
       }
       return result.toString();
@@ -729,7 +696,7 @@
     pointsToMap.revertToPreTransitive();
   }
 
-  public Iterator getTransitiveRoots() {
+  public Iterator<PointerKey> getTransitiveRoots() {
     return pointsToMap.getTransitiveRoots();
   }
 
@@ -760,9 +727,6 @@
     return periodicMaintainInterval;
   }
 
-  /**
-   * @param periodicMaintainInteval
-   */
   public void setPeriodicMaintainInterval(int periodicMaintainInteval) {
     this.periodicMaintainInterval = periodicMaintainInteval;
   }
@@ -803,8 +767,7 @@
    */
   private void updateSideEffectsForUnification(HashSet<PointsToSetVariable> s, int rep) {
     PointsToSetVariable pRef = pointsToMap.getPointsToSet(rep);
-    for (Iterator<PointsToSetVariable> it = s.iterator(); it.hasNext();) {
-      PointsToSetVariable p = it.next();
+    for (PointsToSetVariable p : s) {
       updateSideEffects(p, pRef);
     }
   }
@@ -818,15 +781,11 @@
   @SuppressWarnings("unchecked")
   private void updateEquationsForUnification(HashSet<PointsToSetVariable> s, int rep) {
     PointsToSetVariable pRef = pointsToMap.getPointsToSet(rep);
-    for (Iterator<PointsToSetVariable> it = s.iterator(); it.hasNext();) {
-      PointsToSetVariable p = it.next();
-
+    for (PointsToSetVariable p : s) {
       if (p != pRef) {
         // pRef is the representative for p.
         // be careful: cache the defs before mucking with the underlying system
-        for (Iterator d = Iterator2Collection.toSet(getStatementsThatDef(p)).iterator(); d.hasNext();) {
-          AbstractStatement as = (AbstractStatement) d.next();
-
+        for (AbstractStatement as : Iterator2Collection.toSet(getStatementsThatDef(p))) {
           if (as instanceof AssignEquation) {
             AssignEquation assign = (AssignEquation) as;
             PointsToSetVariable rhs = assign.getRightHandSide();
@@ -841,8 +800,7 @@
           }
         }
         // be careful: cache the defs before mucking with the underlying system
-        for (Iterator u = Iterator2Collection.toSet(getStatementsThatUse(p)).iterator(); u.hasNext();) {
-          AbstractStatement as = (AbstractStatement) u.next();
+        for (AbstractStatement as : Iterator2Collection.toSet(getStatementsThatUse(p))) {
           if (as instanceof AssignEquation) {
             AssignEquation assign = (AssignEquation) as;
             PointsToSetVariable lhs = assign.getLHS();
@@ -909,6 +867,10 @@
     return pointsToMap.isUnified(result);
   }
 
+  public boolean isImplicit(PointerKey result) {
+    return pointsToMap.isImplicit(result);
+  }
+
   public int getNumber(PointerKey p) {
     return pointsToMap.getIndex(p);
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ReceiverInstanceContext.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ReceiverInstanceContext.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ReceiverInstanceContext.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ReceiverInstanceContext.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,7 +44,7 @@
 
   @Override
   public String toString() {
-    return "ReceiverInstanceContext<" + ik + ">";
+    return "ReceiverInstanceContext<" + ik + '>';
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ReflectionHandler.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ReflectionHandler.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ReflectionHandler.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ReflectionHandler.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,8 +12,8 @@
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
+import java.util.function.Predicate;
 
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.SyntheticMethod;
@@ -31,8 +31,9 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
-import com.ibm.wala.util.Predicate;
+import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Collection;
 
 /**
  * A helper class which can modify a {@link PropagationCallGraphBuilder} to deal with reflective factory methods.
@@ -48,11 +49,8 @@
 
   /**
    * update the pointer analysis solver based on flow of reflective factory results to checkcasts
-   * @param monitor 
-   * 
+   *
    * @return true if anything has changed
-   * @throws CancelException
-   * @throws IllegalArgumentException
    */
   protected boolean updateForReflection(IProgressMonitor monitor) throws IllegalArgumentException, CancelException {
 
@@ -62,28 +60,24 @@
       if (VERBOSE) {
         System.err.println("Slice " + st);
       }
-      Collection<Statement> slice = Slicer.computeForwardSlice(st, builder.callGraph, null, DataDependenceOptions.REFLECTION,
-          ControlDependenceOptions.NONE);
+      Collection<Statement> slice = Slicer.computeForwardSlice(st, builder.callGraph, null, DataDependenceOptions.REFLECTION, ControlDependenceOptions.NONE);
       if (VERBOSE) {
         for (Statement x : slice) {
           System.err.println(" " + x);
         }
       }
-      Predicate<Statement> f = new Predicate<Statement>() {
-        @Override
-        public boolean test(Statement s) {
-          if (s.getKind() == Kind.NORMAL) {
-            return ((NormalStatement) s).getInstruction() instanceof SSACheckCastInstruction;
-          } else {
-            return false;
-          }
+      Predicate<Statement> f = s -> {
+        if (s.getKind() == Kind.NORMAL) {
+          return ((NormalStatement) s).getInstruction() instanceof SSACheckCastInstruction;
+        } else {
+          return false;
         }
       };
-      Collection<Statement> casts = Predicate.filter(slice.iterator(), f);
+      Collection<Statement> casts = Iterator2Collection.toSet(new FilterIterator<>(slice.iterator(), f));
       changedNodes.addAll(modifyFactoryInterpreter(st, casts, builder.getContextInterpreter(), builder.getClassHierarchy()));
     }
-    for (Iterator<CGNode> it = changedNodes.iterator(); it.hasNext();) {
-      builder.addConstraintsFromChangedNode(it.next(), monitor);
+    for (CGNode cgNode : changedNodes) {
+      builder.addConstraintsFromChangedNode(cgNode, monitor);
     }
     return changedNodes.size() > 0;
 
@@ -92,8 +86,7 @@
   private Collection<Statement> computeFactoryReturnStatements() {
     // todo: clean up logic with inheritance, delegation.
     HashSet<Statement> result = HashSetFactory.make();
-    for (Iterator it = builder.getCallGraph().iterator(); it.hasNext();) {
-      CGNode n = (CGNode) it.next();
+    for (CGNode n : builder.getCallGraph()) {
       if (n.getMethod() instanceof SyntheticMethod) {
         SyntheticMethod m = (SyntheticMethod) n.getMethod();
         if (m.isFactoryMethod()) {
@@ -109,7 +102,7 @@
    * 
    * @return set of nodes whose interpretation has changed.
    */
-  private Set<CGNode> modifyFactoryInterpreter(Statement returnStatement, Collection<Statement> casts,
+  private static Set<CGNode> modifyFactoryInterpreter(Statement returnStatement, Collection<Statement> casts,
       RTAContextInterpreter contextInterpreter, IClassHierarchy cha) {
     HashSet<CGNode> result = HashSetFactory.make();
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ReturnValueKey.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ReturnValueKey.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ReturnValueKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/ReturnValueKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,7 +22,7 @@
 
   @Override
   public String toString() {
-    return "[Ret-V:" + getNode() + "]";
+    return "[Ret-V:" + getNode() + ']';
   }
 
   @Override
@@ -34,4 +34,4 @@
   public int hashCode() {
     return 1283 * super.internalHashCode();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/AbstractRTABuilder.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/AbstractRTABuilder.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/AbstractRTABuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/AbstractRTABuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,19 +11,19 @@
 package com.ibm.wala.ipa.callgraph.propagation.rta;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
 import com.ibm.wala.analysis.reflection.ReflectionContextInterpreter;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.fixpoint.UnaryOperator;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.DefaultContextSelector;
 import com.ibm.wala.ipa.callgraph.impl.DelegatingContextSelector;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
@@ -45,7 +45,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.cfa.DelegatingSSAContextInterpreter;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
-import com.ibm.wala.ssa.SSAInvokeInstruction;
+import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSANewInstruction;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.FieldReference;
@@ -54,6 +54,7 @@
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 /**
  * Abstract superclass of various RTA flavors
@@ -97,9 +98,9 @@
       TypeReference.findOrCreate(ClassLoaderReference.Primordial, "Ljava/lang/ExceptionInInitializerError"),
       TypeReference.findOrCreate(ClassLoaderReference.Primordial, "Ljava/lang/NullPointerException") };
 
-  protected AbstractRTABuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache,
+  protected AbstractRTABuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache,
       ContextSelector appContextSelector, SSAContextInterpreter appContextInterpreter) {
-    super(cha, options, cache, new DefaultPointerKeyFactory());
+    super(Language.JAVA.getFakeRootMethod(cha, options, cache), options, cache, new DefaultPointerKeyFactory());
     setInstanceKeys(new ClassBasedInstanceKeys(options, cha));
     setContextSelector(makeContextSelector(appContextSelector));
     setContextInterpreter(makeContextInterpreter(appContextInterpreter));
@@ -136,8 +137,7 @@
    * Add a constraint for each allocate
    */
   private void addNewConstraints(CGNode node) {
-    for (Iterator it = getRTAContextInterpreter().iterateNewSites(node); it.hasNext();) {
-      NewSiteReference n = (NewSiteReference) it.next();
+    for (NewSiteReference n : Iterator2Iterable.make(getRTAContextInterpreter().iterateNewSites(node))) {
       visitNew(node, n);
     }
   }
@@ -146,8 +146,7 @@
    * Add a constraint for each invoke
    */
   private void addCallConstraints(CGNode node) {
-    for (Iterator it = getRTAContextInterpreter().iterateCallSites(node); it.hasNext();) {
-      CallSiteReference c = (CallSiteReference) it.next();
+    for (CallSiteReference c : Iterator2Iterable.make(getRTAContextInterpreter().iterateCallSites(node))) {
       visitInvoke(node, c);
     }
   }
@@ -156,20 +155,18 @@
    * Handle accesses to static fields
    */
   private void addFieldConstraints(CGNode node) {
-    for (Iterator it = getRTAContextInterpreter().iterateFieldsRead(node); it.hasNext();) {
-      FieldReference f = (FieldReference) it.next();
-      processFieldAccess(node, f);
+    for (FieldReference f : Iterator2Iterable.make(getRTAContextInterpreter().iterateFieldsRead(node))) {
+      processFieldAccess(f);
     }
-    for (Iterator it = getRTAContextInterpreter().iterateFieldsWritten(node); it.hasNext();) {
-      FieldReference f = (FieldReference) it.next();
-      processFieldAccess(node, f);
+    for (FieldReference f : Iterator2Iterable.make(getRTAContextInterpreter().iterateFieldsWritten(node))) {
+      processFieldAccess(f);
     }
   }
 
   /**
-   * Is s is a getstatic or putstatic, then potentially add the relevant <clinit>to the newMethod set.
+   * Is s is a getstatic or putstatic, then potentially add the relevant &lt;clinit&gt; to the newMethod set.
    */
-  private void processFieldAccess(CGNode node, FieldReference f) {
+  private void processFieldAccess(FieldReference f) {
     if (DEBUG) {
       System.err.println(("processFieldAccess: " + f));
     }
@@ -183,10 +180,9 @@
 
   protected void processClassInitializer(IClass klass) {
 
-    if (clinitProcessed.contains(klass)) {
+    if (!clinitProcessed.add(klass)) {
       return;
     }
-    clinitProcessed.add(klass);
 
     if (klass.getClassInitializer() != null) {
       if (DEBUG) {
@@ -201,7 +197,7 @@
       if (targetMethod != null) {
         CGNode target = callGraph.getNode(targetMethod, Everywhere.EVERYWHERE);
         if (target == null) {
-          SSAInvokeInstruction s = fakeWorldClinitMethod.addInvocation(null, site);
+          SSAAbstractInvokeInstruction s = fakeWorldClinitMethod.addInvocation(null, site);
           try {
             target = callGraph.findOrCreateNode(targetMethod, Everywhere.EVERYWHERE);
             processResolvedCall(callGraph.getFakeWorldClinitNode(), s.getCallSite(), target);
@@ -285,7 +281,7 @@
     }
     caller.addTarget(site, target);
 
-    if (FakeRootMethod.isFakeRootMethod(caller.getMethod().getReference())) {
+    if (caller.equals(callGraph.getFakeRootNode())) {
       if (entrypointCallSites.contains(site)) {
         callGraph.registerEntrypoint(target);
       }
@@ -317,16 +313,15 @@
     IClass klass = iKey.getConcreteType();
 
     if (DEBUG) {
-      System.err.println(("iKey: " + iKey + " " + system.findOrCreateIndexForInstanceKey(iKey)));
+      System.err.println(("iKey: " + iKey + ' ' + system.findOrCreateIndexForInstanceKey(iKey)));
     }
 
     if (klass == null) {
       return;
     }
-    if (allocatedClasses.contains(klass)) {
+    if (!allocatedClasses.add(klass)) {
       return;
     }
-    allocatedClasses.add(klass);
     updateSetsForNewClass(klass, iKey, node, newSite);
 
     // side effect of new: may call class initializer
@@ -335,8 +330,6 @@
 
   /**
    * Perform needed bookkeeping when a new class is discovered.
-   * 
-   * @param klass
    */
   protected abstract void updateSetsForNewClass(IClass klass, InstanceKey iKey, CGNode node, NewSiteReference ns);
 
@@ -349,8 +342,8 @@
 
     FakeRootMethod m = (FakeRootMethod) getCallGraph().getFakeRootNode().getMethod();
 
-    for (int i = 0; i < PRE_ALLOC.length; i++) {
-      SSANewInstruction n = m.addAllocation(PRE_ALLOC[i]);
+    for (TypeReference element : PRE_ALLOC) {
+      SSANewInstruction n = m.addAllocation(element);
       // visit now to ensure java.lang.Object is visited first
       visitNew(getCallGraph().getFakeRootNode(), n.getNewSite());
     }
@@ -399,8 +392,8 @@
   }
 
   @Override
-  protected ExplicitCallGraph createEmptyCallGraph(IClassHierarchy cha, AnalysisOptions options) {
-    return new DelegatingExplicitCallGraph(cha, options, getAnalysisCache());
+  protected ExplicitCallGraph createEmptyCallGraph(IMethod fakeRootClass, AnalysisOptions options) {
+    return new DelegatingExplicitCallGraph(fakeRootClass, options, getAnalysisCache());
   }
 
   /*
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/BasicRTABuilder.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/BasicRTABuilder.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/BasicRTABuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/BasicRTABuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.ipa.callgraph.propagation.rta;
 
-import java.util.Iterator;
-
 import com.ibm.wala.analysis.reflection.CloneInterpreter;
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
@@ -19,10 +17,10 @@
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.fixpoint.IntSetVariable;
 import com.ibm.wala.fixpoint.UnaryOperator;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.ExplicitCallGraph;
 import com.ibm.wala.ipa.callgraph.impl.ExplicitCallGraph.ExplicitNode;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
@@ -41,7 +39,7 @@
  */
 public class BasicRTABuilder extends AbstractRTABuilder {
 
-  public BasicRTABuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache, ContextSelector contextSelector,
+  public BasicRTABuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache, ContextSelector contextSelector,
       SSAContextInterpreter contextInterpreter) {
     super(cha, options, cache, contextSelector, contextInterpreter);
   }
@@ -55,8 +53,7 @@
     // set up the selector map to record each method that class implements
     registerImplementedMethods(klass, iKey);
 
-    for (Iterator ifaces = klass.getAllImplementedInterfaces().iterator(); ifaces.hasNext();) {
-      IClass c = (IClass) ifaces.next();
+    for (IClass c : klass.getAllImplementedInterfaces()) {
       registerImplementedMethods(c, iKey);
     }
     klass = klass.getSuperclass();
@@ -71,10 +68,9 @@
    */
   private void registerImplementedMethods(IClass declarer, InstanceKey iKey) {
     if (DEBUG) {
-      System.err.println(("registerImplementedMethods: " + declarer + " " + iKey));
+      System.err.println(("registerImplementedMethods: " + declarer + ' ' + iKey));
     }
-    for (Iterator it = declarer.getDeclaredMethods().iterator(); it.hasNext();) {
-      IMethod M = (IMethod) it.next();
+    for (IMethod M : declarer.getDeclaredMethods()) {
       Selector selector = M.getReference().getSelector();
       PointerKey sKey = getKeyForSelector(selector);
       if (DEBUG) {
@@ -116,6 +112,7 @@
      */
     final private MutableIntSet previousReceivers = IntSetUtil.getDefaultIntSetFactory().make();
 
+    @SuppressWarnings("unused")
     @Override
     public byte evaluate(PointsToSetVariable lhs, PointsToSetVariable rhs) {
       IntSetVariable receivers = rhs;
@@ -133,7 +130,7 @@
         return NOT_CHANGED;
       }
       if (DEBUG) {
-        String S = "EVAL dispatch to " + caller + ":" + site;
+        String S = "EVAL dispatch to " + caller + ':' + site;
         System.err.println(S);
         if (DEBUG_LEVEL >= 2) {
           System.err.println(("receivers: " + value));
@@ -148,46 +145,43 @@
       if (DEBUG_LEVEL >= 2) {
         System.err.println(("filtered value: " + value));
       }
-      IntSetAction action = new IntSetAction() {
-        @Override
-        public void act(int ptr) {
+      IntSetAction action = ptr -> {
+        if (DEBUG) {
+          System.err.println(("    dispatch to ptr " + ptr));
+        }
+        InstanceKey iKey = system.getInstanceKey(ptr);
+
+        CGNode target = getTargetForCall(caller, site, iKey.getConcreteType(), new InstanceKey[]{iKey});
+        if (target == null) {
+          // This indicates an error; I sure hope getTargetForCall
+          // raised a warning about this!
           if (DEBUG) {
-            System.err.println(("    dispatch to ptr " + ptr));
+            System.err.println(("Warning: null target for call " + site + ' ' + iKey));
           }
-          InstanceKey iKey = system.getInstanceKey(ptr);
-
-          CGNode target = getTargetForCall(caller, site, iKey.getConcreteType(), new InstanceKey[]{iKey});
-          if (target == null) {
-            // This indicates an error; I sure hope getTargetForCall
-            // raised a warning about this!
-            if (DEBUG) {
-              System.err.println(("Warning: null target for call " + site + " " + iKey));
-            }
+          return;
+        }
+        if (clone2Assign) {
+          if (target.getMethod().getReference().equals(CloneInterpreter.CLONE)) {
+            // (mostly) ignore a call to clone: it won't affect the
+            // solution, but we should probably at least have a call
+            // edge
+            caller.addTarget(site, target);
             return;
           }
-          if (clone2Assign) {
-            if (target.getMethod().getReference().equals(CloneInterpreter.CLONE)) {
-              // (mostly) ignore a call to clone: it won't affect the
-              // solution, but we should probably at least have a call
-              // edge
-              caller.addTarget(site, target);
-              return;
-            }
-          }
+        }
 
-          IntSet targets = getCallGraph().getPossibleTargetNumbers(caller, site);
-          if (targets != null && targets.contains(target.getGraphNodeId())) {
-            // do nothing; we've previously discovered and handled this
-            // receiver for this call site.
-            return;
-          }
+        IntSet targets = getCallGraph().getPossibleTargetNumbers(caller, site);
+        if (targets != null && targets.contains(target.getGraphNodeId())) {
+          // do nothing; we've previously discovered and handled this
+          // receiver for this call site.
+          return;
+        }
 
-          // process the newly discovered target for this call
-          processResolvedCall(caller, site, target);
+        // process the newly discovered target for this call
+        processResolvedCall(caller, site, target);
 
-          if (!haveAlreadyVisited(target)) {
-            markDiscovered(target);
-          }
+        if (!haveAlreadyVisited(target)) {
+          markDiscovered(target);
         }
       };
 
@@ -230,4 +224,4 @@
     return new DispatchOperator(site, (ExplicitNode) node);
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/CallSite.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/CallSite.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/CallSite.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/CallSite.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,6 +20,8 @@
  */
 public final class CallSite extends Pair<CallSiteReference, CGNode> {
 
+  private static final long serialVersionUID = -5277592800329960642L;
+
   public CallSite(CallSiteReference site, CGNode node) {
     super(site, node);
     if (site == null) {
@@ -45,4 +47,4 @@
     return getSite().getDeclaredTarget().getSelector();
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/ContextInsensitiveRTAInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/ContextInsensitiveRTAInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/ContextInsensitiveRTAInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/ContextInsensitiveRTAInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,8 +16,8 @@
 import com.ibm.wala.classLoader.CodeScanner;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.NewSiteReference;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.cha.ContextInsensitiveCHAContextInterpreter;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
@@ -29,13 +29,13 @@
  */
 public abstract class ContextInsensitiveRTAInterpreter extends ContextInsensitiveCHAContextInterpreter implements RTAContextInterpreter, SSAContextInterpreter {
 
-  private final AnalysisCache analysisCache;
+  private final IAnalysisCacheView analysisCache;
 
-  public ContextInsensitiveRTAInterpreter(AnalysisCache cache) {
+  public ContextInsensitiveRTAInterpreter(IAnalysisCacheView cache) {
     this.analysisCache = cache;
   }
 
-  public AnalysisCache getAnalysisCache() {
+  public IAnalysisCacheView getAnalysisCache() {
     return analysisCache;
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DefaultRTAInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DefaultRTAInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DefaultRTAInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DefaultRTAInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,9 +16,9 @@
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.NewSiteReference;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.FakeRootMethod;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.ContextInsensitiveSSAInterpreter;
 import com.ibm.wala.types.FieldReference;
@@ -35,7 +35,7 @@
   /**
    * @param options governing analysis options
    */
-  public DefaultRTAInterpreter(AnalysisOptions options, AnalysisCache cache) {
+  public DefaultRTAInterpreter(AnalysisOptions options, IAnalysisCacheView cache) {
     defaultInterpreter = new ContextInsensitiveSSAInterpreter(options, cache);
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DelegatingExplicitCallGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DelegatingExplicitCallGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DelegatingExplicitCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DelegatingExplicitCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,17 +10,15 @@
  *******************************************************************************/
 package com.ibm.wala.ipa.callgraph.propagation.rta;
 
-import java.util.Iterator;
 import java.util.Set;
 
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.ExplicitCallGraph;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.intset.BasicNaturalRelation;
 import com.ibm.wala.util.intset.BitVectorIntSet;
@@ -42,19 +40,14 @@
    */
   private final IBinaryNaturalRelation delegateR = new BasicNaturalRelation();
 
-  /**
-   * @param cha
-   * @param options
-   */
-  public DelegatingExplicitCallGraph(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-    super(cha, options, cache);
+  public DelegatingExplicitCallGraph(IMethod fakeRootClass, AnalysisOptions options, IAnalysisCacheView cache) {
+    super(fakeRootClass, options, cache);
   }
 
   /**
-   * In this implementation, super.targets is a mapping from call site ->
+   * In this implementation, super.targets is a mapping from call site -&gt;
    * Object, where Object is a
    * <ul>
-   * A Mapping from call site -> Object, where Object is a
    * <li>CGNode if we've discovered exactly one target for the site
    * <li> or an IntSet of node numbers if we've discovered more than one target
    * for the site.
@@ -73,8 +66,7 @@
     @Override
     public MutableSharedBitVectorIntSet getAllTargetNumbers() {
       MutableSharedBitVectorIntSet result = new MutableSharedBitVectorIntSet(super.getAllTargetNumbers());
-      for (Iterator it = targets.iterator(); it.hasNext();) {
-        Object n = it.next();
+      for (Object n : targets) {
         if (n instanceof CallSite) {
           ExplicitNode delegate = (ExplicitNode) ((CallSite) n).getNode();
           IntSet s = DelegatingExplicitCallGraph.this.getPossibleTargetNumbers(delegate, ((CallSite) n).getSite());
@@ -119,8 +111,7 @@
       if (super.getAllTargetNumbers().contains(y)) {
         return true;
       } else {
-        for (Iterator it = targets.iterator(); it.hasNext();) {
-          Object n = it.next();
+        for (Object n : targets) {
           if (n instanceof CallSite) {
             ExplicitNode delegate = (ExplicitNode) ((CallSite) n).getNode();
             IntSet s = DelegatingExplicitCallGraph.this.getPossibleTargetNumbers(delegate,((CallSite) n).getSite());
@@ -264,6 +255,6 @@
   @Override
   protected ExplicitEdgeManager makeEdgeManger() {
     return new DelegatingEdgeManager();
-  };
+  }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/RTAContextInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/RTAContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/RTAContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/RTAContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,6 +26,7 @@
   /**
    * @return an Iterator of the types that may be allocated by a given method in a given context.
    */
+  @Override
   public abstract Iterator<NewSiteReference> iterateNewSites(CGNode node);
 
   /**
@@ -43,9 +44,7 @@
    * 
    * TODO: this is a little ugly, is there a better place to move this?
    * 
-   * @param node
-   * @param klass
    * @return true iff a NEW type was recorded, false if the type was previously recorded.
    */
   public boolean recordFactoryType(CGNode node, IClass klass);
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedHeapModel.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedHeapModel.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedHeapModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedHeapModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -36,9 +36,7 @@
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Predicate;
-import com.ibm.wala.util.collections.HashMapFactory;
-import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.*;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
 
@@ -65,14 +63,14 @@
   private final Collection<CGNode> nodesHandled = HashSetFactory.make();
 
   /**
-   * Map: <PointerKey> -> thing, where thing is a FilteredPointerKey or an InstanceKey representing a constant.
+   * Map: &lt;PointerKey&gt; -&gt; thing, where thing is a FilteredPointerKey or an InstanceKey representing a constant.
    * 
    * computed lazily
    */
   private Map<PointerKey, Object> pKeys;
 
   /**
-   * @param klasses Collection<IClass>
+   * @param klasses Collection&lt;IClass&gt;
    * @throws IllegalArgumentException if cg is null
    */
   public TypeBasedHeapModel(AnalysisOptions options, Collection<IClass> klasses, CallGraph cg) {
@@ -88,12 +86,10 @@
     if (pKeys == null) {
       pKeys = HashMapFactory.make();
     }
-    for (Iterator<IClass> it = klasses.iterator(); it.hasNext();) {
-      IClass klass = it.next();
+    for (IClass klass : klasses) {
       pKeys.putAll(computePointerKeys(klass));
     }
-    for (Iterator it = cg.iterator(); it.hasNext();) {
-      CGNode node = (CGNode) it.next();
+    for (CGNode node : cg) {
       initPKeysForNode(node);
     }
   }
@@ -158,8 +154,7 @@
         result.put(p, p);
       }
     } else {
-      for (Iterator<IField> it = klass.getAllFields().iterator(); it.hasNext();) {
-        IField f = it.next();
+      for (IField f : klass.getAllFields()) {
         if (!f.getFieldTypeReference().isPrimitiveType()) {
           if (f.isStatic()) {
             PointerKey p = pointerKeys.getPointerKeyForStaticField(f);
@@ -175,15 +170,9 @@
   }
 
   @Override
-  @SuppressWarnings("unchecked")
   public Iterator<PointerKey> iteratePointerKeys() {
     initAllPKeys();
-    return Predicate.filter(pKeys.values().iterator(), new Predicate() {
-      @Override
-      public boolean test(Object o) {
-        return o instanceof PointerKey;
-      }
-    }).iterator();
+    return IteratorUtil.filter(pKeys.values().iterator(), PointerKey.class);
   }
 
   @Override
@@ -206,7 +195,7 @@
     return iKeyFactory.getInstanceKeyForConstant(type, S);
   }
 
-  public String getStringConstantForInstanceKey(InstanceKey I) throws UnimplementedError {
+  public String getStringConstantForInstanceKey() throws UnimplementedError {
     Assertions.UNREACHABLE();
     return null;
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedPointerAnalysis.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedPointerAnalysis.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedPointerAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedPointerAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,6 @@
 package com.ibm.wala.ipa.callgraph.propagation.rta;
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Map;
 
 import com.ibm.wala.classLoader.IClass;
@@ -49,12 +48,12 @@
   private final TypeBasedHeapModel heapModel;
 
   /**
-   * Map: IClass -> OrdinalSet
+   * Map: IClass -&gt; OrdinalSet
    */
   private final Map<IClass, OrdinalSet<InstanceKey>> pointsTo = HashMapFactory.make();
 
   /**
-   * @param klasses Collection<IClass>
+   * @param klasses {@code Collection<IClass>}
    * @throws AssertionError if klasses is null
    */
   private TypeBasedPointerAnalysis(AnalysisOptions options, Collection<IClass> klasses, CallGraph cg) throws AssertionError {
@@ -64,15 +63,14 @@
   }
 
   /**
-   * @param c Collection<IClass>
+   * @param c {@code Collection<IClass>}
    */
   private static MutableMapping<InstanceKey> makeInstanceKeys(Collection<IClass> c) {
     if (c == null) {
       throw new IllegalArgumentException("null c");
     }
     MutableMapping<InstanceKey> result = MutableMapping.make();
-    for (Iterator<IClass> it = c.iterator(); it.hasNext();) {
-      IClass klass = it.next();
+    for (IClass klass : c) {
       if (!klass.isAbstract() && !klass.isInterface()) {
         result.add(new ConcreteTypeKey(klass));
       }
@@ -139,14 +137,13 @@
     return result;
   }
 
-  private OrdinalSet<InstanceKey> toOrdinalInstanceKeySet(Collection c) {
+  private OrdinalSet<InstanceKey> toOrdinalInstanceKeySet(Collection<IClass> c) {
     BimodalMutableIntSet s = new BimodalMutableIntSet();
-    for (Iterator it = c.iterator(); it.hasNext();) {
-      IClass klass = (IClass) it.next();
+    for (IClass klass : c) {
       int index = getInstanceKeyMapping().add(new ConcreteTypeKey(klass));
       s.add(index);
     }
-    return new OrdinalSet<InstanceKey>(s, getInstanceKeyMapping());
+    return new OrdinalSet<>(s, getInstanceKeyMapping());
   }
 
   private IClass inferType(PointerKey key) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SelectiveCPAContext.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SelectiveCPAContext.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SelectiveCPAContext.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SelectiveCPAContext.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,12 +11,12 @@
 
 package com.ibm.wala.ipa.callgraph.propagation;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ipa.callgraph.ContextItem;
 import com.ibm.wala.ipa.callgraph.ContextKey;
+import com.ibm.wala.util.collections.HashMapFactory;
 
 /**
  * A selective Cartesian product context that enforces object sensitivity on some set
@@ -34,12 +34,13 @@
 
   // helper method for constructing the parameterObjs map
   private static Map<ContextKey, InstanceKey> makeMap(InstanceKey[] x) {
-    Map<ContextKey, InstanceKey> result = new HashMap<ContextKey, InstanceKey>();
+    Map<ContextKey, InstanceKey> result = HashMapFactory.make();
     for(int i = 0; i < x.length; i++) {
       if (x[i] != null) {
         result.put(ContextKey.PARAMETERS[i], x[i]);
       }
     }
+    
     return result;
   }
 
@@ -54,6 +55,11 @@
   }
 
   @Override
+  public String toString() {
+     return "cpa:" + parameterObjs;
+  }
+
+  @Override
   public ContextItem get(ContextKey name) {
     if (parameterObjs.containsKey(name)) {
       return new FilteredPointerKey.SingleInstanceFilter(parameterObjs.get(name));
@@ -78,5 +84,4 @@
         parameterObjs.equals(((SelectiveCPAContext)other).parameterObjs);
   }     
 
-
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SmushedAllocationSiteInNode.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SmushedAllocationSiteInNode.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SmushedAllocationSiteInNode.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SmushedAllocationSiteInNode.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,11 +16,9 @@
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.MapIterator;
 import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.functions.Function;
 
 /**
  * An {@link InstanceKey} which represents the set of all allocation sites
@@ -56,19 +54,10 @@
 
   @Override
   public Iterator<Pair<CGNode, NewSiteReference>> getCreationSites(CallGraph CG) {
-    return new MapIterator<NewSiteReference,Pair<CGNode, NewSiteReference>>(
-        new FilterIterator<NewSiteReference>(
+    return new MapIterator<>(
+        new FilterIterator<>(
           getNode().iterateNewSites(),
-          new Predicate<NewSiteReference>() {
-            @Override public boolean test(NewSiteReference o) {
-              return o.getDeclaredType().equals(getConcreteType().getReference());
-            }
-        }),
-        new Function<NewSiteReference,Pair<CGNode, NewSiteReference>>() {
-          @Override
-          public Pair<CGNode, NewSiteReference> apply(NewSiteReference object) {
-            return Pair.make(getNode(), object);
-          }
-        });
+          o -> o.getDeclaredType().equals(getConcreteType().getReference())),
+        object -> Pair.make(getNode(), object));
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SmushedAllocationSiteInstanceKeys.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SmushedAllocationSiteInstanceKeys.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SmushedAllocationSiteInstanceKeys.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SmushedAllocationSiteInstanceKeys.java	2019-01-29 17:08:39.000000000 +0000
@@ -56,7 +56,7 @@
     }
 
     // disallow recursion in contexts.
-    if (node.getContext() instanceof ReceiverInstanceContext) {
+    if (node.getContext().isA(ReceiverInstanceContext.class)) {
       IMethod m = node.getMethod();
       CGNode n = ContainerContextSelector.findNodeRecursiveMatchingContext(m, node.getContext());
       if (n != null) {
@@ -83,7 +83,7 @@
   @Override
   public <T> InstanceKey getInstanceKeyForConstant(TypeReference type, T S) {
     if (options.getUseConstantSpecificKeys())
-      return new ConstantKey<T>(S, cha.lookupClass(type));
+      return new ConstantKey<>(S, cha.lookupClass(type));
     else
       return new ConcreteTypeKey(cha.lookupClass(type));
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAContextInterpreter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,6 +15,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.rta.RTAContextInterpreter;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
 
@@ -28,6 +29,8 @@
    */
   public IR getIR(CGNode node);
 
+  public IRView getIRView(CGNode node);
+
   /**
    * @return DefUse for the IR that models the method context, or null if it's an unmodelled native method
    */
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/SSAPropagationCallGraphBuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,6 +18,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import com.ibm.wala.analysis.reflection.CloneInterpreter;
 import com.ibm.wala.cfg.ControlFlowGraph;
@@ -30,21 +31,20 @@
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.classLoader.ProgramCounter;
 import com.ibm.wala.fixpoint.AbstractOperator;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.ContextKey;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.AbstractRootMethod;
 import com.ibm.wala.ipa.callgraph.impl.DefaultEntrypoint;
 import com.ibm.wala.ipa.callgraph.impl.ExplicitCallGraph;
-import com.ibm.wala.ipa.callgraph.impl.FakeRootMethod;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeBT.ConditionalBranchInstruction;
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
 import com.ibm.wala.ssa.DefUse;
-import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSAAbstractThrowInstruction;
@@ -73,12 +73,12 @@
 import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.CancelException;
-import com.ibm.wala.util.CancelRuntimeException;
 import com.ibm.wala.util.MonitorUtil;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
-import com.ibm.wala.util.functions.VoidFunction;
+import com.ibm.wala.util.debug.UnimplementedError;
 import com.ibm.wala.util.intset.IntIterator;
 import com.ibm.wala.util.intset.IntSet;
 import com.ibm.wala.util.intset.IntSetAction;
@@ -137,7 +137,7 @@
    * 
    * Doesn't play well with pre-transitive solver; turning off for now.
    */
-  protected final static boolean SHORT_CIRCUIT_SINGLE_USES = true;
+  protected final static boolean SHORT_CIRCUIT_SINGLE_USES = false;
 
   /**
    * Should we change calls to clone() to assignments?
@@ -158,9 +158,9 @@
 
   public IProgressMonitor monitor;
 
-  protected SSAPropagationCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache,
+  protected SSAPropagationCallGraphBuilder(IMethod abstractRootMethod, AnalysisOptions options, IAnalysisCacheView cache,
       PointerKeyFactory pointerKeyFactory) {
-    super(cha, options, cache, pointerKeyFactory);
+    super(abstractRootMethod, options, cache, pointerKeyFactory);
     // this.usePreTransitiveSolver = options.usePreTransitiveSolver();
   }
 
@@ -169,9 +169,6 @@
   }
 
   /**
-   * @param node
-   * @param x
-   * @param type
    * @return the instance key that represents the exception of type _type_ thrown by a particular PEI.
    * @throws IllegalArgumentException if ikFactory is null
    */
@@ -184,9 +181,6 @@
 
   /**
    * Visit all instructions in a node, and add dataflow constraints induced by each statement in the SSA form.
-   * @throws CancelException 
-   * 
-   * @see com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder#addConstraintsFromNode(com.ibm.wala.ipa.callgraph.CGNode)
    */
   @Override
   protected boolean addConstraintsFromNode(CGNode node, IProgressMonitor monitor) throws CancelException {
@@ -213,7 +207,7 @@
     if (DEBUG) {
       System.err.println("\n\nAdd constraints from node " + node);
     }
-    IR ir = getCFAContextInterpreter().getIR(node);
+    IRView ir = getCFAContextInterpreter().getIRView(node);
     if (DEBUG) {
       if (ir == null) {
         System.err.println("\n   No statements\n");
@@ -232,6 +226,8 @@
 
     addNodeInstructionConstraints(node, monitor);
 
+    addNodeValueConstraints(node, monitor);
+    
     DefUse du = getCFAContextInterpreter().getDU(node);
     addNodePassthruExceptionConstraints(node, ir, du);
     // conservatively assume something changed
@@ -247,17 +243,15 @@
 
   /**
    * Add pointer flow constraints based on instructions in a given node
-   * @throws CancelException 
    */
   protected void addNodeInstructionConstraints(CGNode node, IProgressMonitor monitor) throws CancelException {
     this.monitor = monitor;
     ConstraintVisitor v = makeVisitor(node);
 
-    IR ir = v.ir;
-    ControlFlowGraph<SSAInstruction, ISSABasicBlock> cfg = ir.getControlFlowGraph();
-    for (Iterator<ISSABasicBlock> x = cfg.iterator(); x.hasNext();) {
-      BasicBlock b = (BasicBlock) x.next();
-      addBlockInstructionConstraints(node, cfg, b, v, monitor);
+    IRView ir = v.ir;
+    for (ISSABasicBlock sbb : Iterator2Iterable.make(ir.getBlocks())) {
+      BasicBlock b = (BasicBlock) sbb;
+      addBlockInstructionConstraints(node, ir, b, v, monitor);
       if (wasChanged(node)) {
         return;
       }
@@ -265,18 +259,24 @@
   }
 
   /**
+   * Hook for aubclasses to add pointer flow constraints based on values in a given node
+   */
+  @SuppressWarnings("unused")
+  protected void addNodeValueConstraints(CGNode node, IProgressMonitor monitor) throws CancelException {
+ 
+  }
+  
+  /**
    * Add constraints for a particular basic block.
-   * @throws CancelException 
    */
-  protected void addBlockInstructionConstraints(CGNode node, ControlFlowGraph<SSAInstruction, ISSABasicBlock> cfg, BasicBlock b,
+  protected void addBlockInstructionConstraints(CGNode node, IRView ir, BasicBlock b,
       ConstraintVisitor v, IProgressMonitor monitor) throws CancelException {
     this.monitor = monitor;
     v.setBasicBlock(b);
 
     // visit each instruction in the basic block.
-    for (Iterator<SSAInstruction> it = b.iterator(); it.hasNext();) {
+    for (SSAInstruction s : b) {
       MonitorUtil.throwExceptionIfCanceled(monitor);      
-      SSAInstruction s = it.next();
       if (s != null) {
         s.visit(v);
         if (wasChanged(node)) {
@@ -285,26 +285,27 @@
       }
     }
 
-    addPhiConstraints(node, cfg, b, v);
+    addPhiConstraints(node, ir.getControlFlowGraph(), b, v);
   }
 
-  private void addPhiConstraints(CGNode node, ControlFlowGraph<SSAInstruction, ISSABasicBlock> cfg, BasicBlock b,
+  private void addPhiConstraints(CGNode node, ControlFlowGraph<SSAInstruction, ISSABasicBlock> controlFlowGraph, BasicBlock b,
       ConstraintVisitor v) {
     // visit each phi instruction in each successor block
-    for (Iterator sbs = cfg.getSuccNodes(b); sbs.hasNext();) {
-      BasicBlock sb = (BasicBlock) sbs.next();
+    for (ISSABasicBlock isb : Iterator2Iterable.make(controlFlowGraph.getSuccNodes(b))) {
+      BasicBlock sb = (BasicBlock) isb;
       if (!sb.hasPhi()) {
         continue;
       }
       int n = 0;
-      for (Iterator<? extends IBasicBlock> back = cfg.getPredNodes(sb); back.hasNext(); n++) {
-        if (back.next() == b) {
+      for (IBasicBlock back : Iterator2Iterable.make(controlFlowGraph.getPredNodes(sb))) {
+        if (back == b) {
           break;
         }
+        ++n;
       }
-      assert n < cfg.getPredNodeCount(sb);
-      for (Iterator<? extends SSAInstruction> phis = sb.iteratePhis(); phis.hasNext();) {
-        SSAPhiInstruction phi = (SSAPhiInstruction) phis.next();
+      assert n < controlFlowGraph.getPredNodeCount(sb);
+      for (SSAInstruction inst : Iterator2Iterable.make(sb.iteratePhis())) {
+        SSAPhiInstruction phi = (SSAPhiInstruction) inst;
         if (phi == null) {
           continue;
         }
@@ -319,8 +320,8 @@
             if (contentsAreInvariant(v.symbolTable, v.du, phi.getUse(n))) {
               system.recordImplicitPointsToSet(use);
               InstanceKey[] ik = getInvariantContents(v.symbolTable, v.du, node, phi.getUse(n), this);
-              for (int i = 0; i < ik.length; i++) {
-                system.newConstraint(def, ik[i]);
+              for (InstanceKey element : ik) {
+                system.newConstraint(def, element);
               }
             } else {
               system.newConstraint(def, assignOperator, use);
@@ -333,11 +334,8 @@
 
   /**
    * Add constraints to represent the flow of exceptions to the exceptional return value for this node
-   * 
-   * @param node
-   * @param ir
    */
-  protected void addNodePassthruExceptionConstraints(CGNode node, IR ir, DefUse du) {
+  protected void addNodePassthruExceptionConstraints(CGNode node, IRView ir, DefUse du) {
     // add constraints relating to thrown exceptions that reach the exit block.
     List<ProgramCounter> peis = getIncomingPEIs(ir, ir.getExitBlock());
     PointerKey exception = getPointerKeyForExceptionalReturnValue(node);
@@ -355,13 +353,13 @@
    * @param exceptionVar PointerKey representing a pointer to an exception value
    * @param catchClasses the types "caught" by the exceptionVar
    */
-  private void addExceptionDefConstraints(IR ir, DefUse du, CGNode node, List<ProgramCounter> peis, PointerKey exceptionVar,
+  @SuppressWarnings("unused")
+  private void addExceptionDefConstraints(IRView ir, DefUse du, CGNode node, List<ProgramCounter> peis, PointerKey exceptionVar,
       Set<IClass> catchClasses) {
     if (DEBUG) {
       System.err.println("Add exception def constraints for node " + node);
     }
-    for (Iterator<ProgramCounter> it = peis.iterator(); it.hasNext();) {
-      ProgramCounter peiLoc = it.next();
+    for (ProgramCounter peiLoc : peis) {
       if (DEBUG) {
         System.err.println("peiLoc: " + peiLoc);
       }
@@ -387,9 +385,9 @@
 
         if (contentsAreInvariant(ir.getSymbolTable(), du, s.getException())) {
           InstanceKey[] ik = getInvariantContents(ir.getSymbolTable(), du, node, s.getException(), this);
-          for (int i = 0; i < ik.length; i++) {
-            system.findOrCreateIndexForInstanceKey(ik[i]);
-            assignInstanceToCatch(exceptionVar, catchClasses, ik[i]);
+          for (InstanceKey element : ik) {
+            system.findOrCreateIndexForInstanceKey(element);
+            assignInstanceToCatch(exceptionVar, catchClasses, element);
           }
         } else {
           addAssignmentsForCatchPointerKey(exceptionVar, catchClasses, e);
@@ -401,8 +399,7 @@
       // the pei, but just instance keys
       Collection<TypeReference> types = pei.getExceptionTypes();
       if (types != null) {
-        for (Iterator<TypeReference> it2 = types.iterator(); it2.hasNext();) {
-          TypeReference type = it2.next();
+        for (TypeReference type : types) {
           if (type != null) {
             InstanceKey ik = getInstanceKeyForPEI(node, peiLoc, type, instanceKeyFactory);
             if (ik == null) {
@@ -423,7 +420,7 @@
   /**
    * @return true iff there's a unique catch block which catches all exceptions thrown by a certain call site.
    */
-  protected static boolean hasUniqueCatchBlock(SSAAbstractInvokeInstruction call, IR ir) {
+  protected static boolean hasUniqueCatchBlock(SSAAbstractInvokeInstruction call, IRView ir) {
     ISSABasicBlock[] bb = ir.getBasicBlocksForCall(call.getCallSite());
     if (bb.length == 1) {
       Iterator<ISSABasicBlock> it = ir.getControlFlowGraph().getExceptionalSuccessors(bb[0]).iterator();
@@ -443,7 +440,7 @@
    * @throws IllegalArgumentException if ir == null
    * @throws IllegalArgumentException if call == null
    */
-  public PointerKey getUniqueCatchKey(SSAAbstractInvokeInstruction call, IR ir, CGNode node) throws IllegalArgumentException,
+  public PointerKey getUniqueCatchKey(SSAAbstractInvokeInstruction call, IRView ir, CGNode node) throws IllegalArgumentException,
       IllegalArgumentException {
     if (call == null) {
       throw new IllegalArgumentException("call == null");
@@ -467,7 +464,7 @@
    * @return a List of Instructions that may transfer control to bb via an exceptional edge
    * @throws IllegalArgumentException if ir is null
    */
-  public static List<ProgramCounter> getIncomingPEIs(IR ir, ISSABasicBlock bb) {
+  public static List<ProgramCounter> getIncomingPEIs(IRView ir, ISSABasicBlock bb) {
     if (ir == null) {
       throw new IllegalArgumentException("ir is null");
     }
@@ -475,9 +472,9 @@
       System.err.println("getIncomingPEIs " + bb);
     }
     ControlFlowGraph<SSAInstruction, ISSABasicBlock> g = ir.getControlFlowGraph();
-    List<ProgramCounter> result = new ArrayList<ProgramCounter>(g.getPredNodeCount(bb));
-    for (Iterator it = g.getPredNodes(bb); it.hasNext();) {
-      BasicBlock pred = (BasicBlock) it.next();
+    List<ProgramCounter> result = new ArrayList<>(g.getPredNodeCount(bb));
+    for (ISSABasicBlock sbb : Iterator2Iterable.make(g.getPredNodes(bb))) {
+      BasicBlock pred = (BasicBlock) sbb;
       if (DEBUG) {
         System.err.println("pred: " + pred);
       }
@@ -497,6 +494,70 @@
     return result;
   }
 
+  private class CrossProductRec {
+    private final InstanceKey[][] invariants;
+    private final Consumer<InstanceKey[]> f;
+    private final SSAAbstractInvokeInstruction call;
+    private final CGNode caller;
+    private final int[] params;
+    private final CallSiteReference site;
+    private final InstanceKey[] keys;
+
+    private CrossProductRec(InstanceKey[][] invariants, SSAAbstractInvokeInstruction call, CGNode caller,
+        Consumer<InstanceKey[]> f) {
+      this.invariants = invariants;
+      this.f = f;
+      this.call = call;
+      this.caller = caller;
+      this.site = call.getCallSite();
+      this.params = IntSetUtil.toArray(getRelevantParameters(caller, site));
+      this.keys  = new InstanceKey[ params.length ];
+    }
+
+    protected void rec(final int pi, final int rhsi) {
+      if (pi == params.length) {
+        f.accept(keys);
+      } else {
+        final int p = params[pi];
+        InstanceKey[] ik = invariants != null ? invariants[p] : null;
+        if (ik != null) {
+          if (ik.length > 0) {
+            for (InstanceKey element : ik) {
+              system.findOrCreateIndexForInstanceKey(element);
+              keys[pi] = element;
+              rec(pi + 1, rhsi);
+            }
+          } /* else {
+            if (!site.isDispatch() || p != 0) {
+              keys[pi] = null;
+              rec(pi + 1, rhsi);
+            } 
+          } */
+        } else {
+          IntSet s = getParamObjects(pi, rhsi);
+          if (s != null && !s.isEmpty()) {
+            s.foreach(x -> {
+              keys[pi] = system.getInstanceKey(x);
+              rec(pi + 1, rhsi + 1);
+            });
+          } /*else {
+            if (!site.isDispatch() || p != 0) {
+              keys[pi] = null;
+              rec(pi + 1, rhsi + 1);
+            }
+          } */
+        }
+      }
+    }
+
+    protected IntSet getParamObjects(int paramIndex, @SuppressWarnings("unused") int rhsi) {
+      int paramVn = call.getUse(paramIndex);
+      PointerKey var = getPointerKeyForLocal(caller, paramVn);
+      IntSet s = system.findOrCreatePointsToSet(var).getValue();
+      return s;
+    }
+  }
+  
   /**
    * A visitor that generates constraints based on statements in SSA form.
    */
@@ -521,7 +582,7 @@
     /**
      * The governing IR
      */
-    protected final IR ir;
+    protected final IRView ir;
 
     /**
      * The governing propagation system, into which constraints are added
@@ -551,10 +612,11 @@
 
       this.system = builder.getPropagationSystem();
 
-      this.ir = builder.getCFAContextInterpreter().getIR(node);
+      SSAContextInterpreter interp = builder.getCFAContextInterpreter();
+      this.ir = interp.getIRView(node);
       this.symbolTable = this.ir.getSymbolTable();
 
-      this.du = builder.getCFAContextInterpreter().getDU(node);
+      this.du = interp.getDU(node);
 
       assert symbolTable != null;
     }
@@ -567,7 +629,7 @@
       return builder.options;
     }
 
-    protected AnalysisCache getAnalysisCache() {
+    protected IAnalysisCacheView getAnalysisCache() {
       return builder.getAnalysisCache();
     }
 
@@ -649,7 +711,7 @@
     }
 
     protected boolean isRootType(IClass klass) {
-      return getBuilder().isRootType(klass);
+      return SSAPropagationCallGraphBuilder.isRootType(klass);
     }
 
     /*
@@ -715,11 +777,11 @@
               if (contentsAreInvariant(symbolTable, du, value)) {
                 system.recordImplicitPointsToSet(valuePtrKey);
                 InstanceKey[] vk = getInvariantContents(value);
-                for (int j = 0; j < vk.length; j++) {
-                  system.findOrCreateIndexForInstanceKey(vk[j]);
-                  if (vk[j].getConcreteType() != null) {
-                    if (getClassHierarchy().isAssignableFrom(contents, vk[j].getConcreteType())) {
-                      system.newConstraint(p, vk[j]);
+                for (InstanceKey element : vk) {
+                  system.findOrCreateIndexForInstanceKey(element);
+                  if (element.getConcreteType() != null) {
+                    if (getClassHierarchy().isAssignableFrom(contents, element.getConcreteType())) {
+                      system.newConstraint(p, element);
                     }
                   }
                 }
@@ -737,10 +799,10 @@
         if (contentsAreInvariant(symbolTable, du, value)) {
           system.recordImplicitPointsToSet(valuePtrKey);
           InstanceKey[] ik = getInvariantContents(value);
-          for (int i = 0; i < ik.length; i++) {
-            system.findOrCreateIndexForInstanceKey(ik[i]);
+          for (InstanceKey element : ik) {
+            system.findOrCreateIndexForInstanceKey(element);
             assert !system.isUnified(arrayRefPtrKey);
-            system.newSideEffect(getBuilder().new InstanceArrayStoreOperator(ik[i]), arrayRefPtrKey);
+            system.newSideEffect(getBuilder().new InstanceArrayStoreOperator(element), arrayRefPtrKey);
           }
         } else {
           system.newSideEffect(getBuilder().new ArrayStoreOperator(system.findOrCreatePointsToSet(valuePtrKey)), arrayRefPtrKey);
@@ -779,7 +841,7 @@
         }
       }
       
-      PointerKey result = getFilteredPointerKeyForLocal(instruction.getResult(), new FilteredPointerKey.MultipleClassesFilter(types.toArray(new IClass[ types.size() ])));
+      PointerKey result = getFilteredPointerKeyForLocal(instruction.getResult(), new FilteredPointerKey.MultipleClassesFilter(types.toArray(new IClass[0])));
       PointerKey value = getPointerKeyForLocal(instruction.getVal());
 
       if (hasNoInterestingUses(instruction.getDef())) {
@@ -792,17 +854,17 @@
             IClass cls = getClassHierarchy().lookupClass(t);
 
             if (cls.isInterface()) {
-              for (int i = 0; i < ik.length; i++) {
-                system.findOrCreateIndexForInstanceKey(ik[i]);
-                if (getClassHierarchy().implementsInterface(ik[i].getConcreteType(), cls)) {
-                  system.newConstraint(result, ik[i]);
+              for (InstanceKey element : ik) {
+                system.findOrCreateIndexForInstanceKey(element);
+                if (getClassHierarchy().implementsInterface(element.getConcreteType(), cls)) {
+                  system.newConstraint(result, element);
                 }
               }
             } else {
-              for (int i = 0; i < ik.length; i++) {
-                system.findOrCreateIndexForInstanceKey(ik[i]);
-                if (getClassHierarchy().isSubclassOf(ik[i].getConcreteType(), cls)) {
-                  system.newConstraint(result, ik[i]);
+              for (InstanceKey element : ik) {
+                system.findOrCreateIndexForInstanceKey(element);
+                if (getClassHierarchy().isSubclassOf(element.getConcreteType(), cls)) {
+                  system.newConstraint(result, element);
                 }
               }
             }
@@ -836,11 +898,11 @@
       if (contentsAreInvariant(symbolTable, du, instruction.getResult())) {
         system.recordImplicitPointsToSet(result);
         InstanceKey[] ik = getInvariantContents(instruction.getResult());
-        for (int i = 0; i < ik.length; i++) {
+        for (InstanceKey element : ik) {
           if (DEBUG) {
-            System.err.println("invariant contents: " + returnValue + " " + ik[i]);
+            System.err.println("invariant contents: " + returnValue + ' ' + element);
           }
-          system.newConstraint(returnValue, ik[i]);
+          system.newConstraint(returnValue, element);
         }
       } else {
         system.newConstraint(returnValue, assignOperator, result);
@@ -968,15 +1030,15 @@
             if (!representsNullType(refk[j])) {
               system.findOrCreateIndexForInstanceKey(refk[j]);
               PointerKey p = getPointerKeyForInstanceField(refk[j], f);
-              for (int i = 0; i < ik.length; i++) {
-                system.newConstraint(p, ik[i]);
+              for (InstanceKey element : ik) {
+                system.newConstraint(p, element);
               }
             }
           }
         } else {
-          for (int i = 0; i < ik.length; i++) {
-            system.findOrCreateIndexForInstanceKey(ik[i]);
-            system.newSideEffect(getBuilder().new InstancePutFieldOperator(f, ik[i]), refKey);
+          for (InstanceKey element : ik) {
+            system.findOrCreateIndexForInstanceKey(element);
+            system.newSideEffect(getBuilder().new InstancePutFieldOperator(f, element), refKey);
           }
         }
       } else {
@@ -1008,14 +1070,14 @@
       if (contentsAreInvariant(symbolTable, du, rval)) {
         system.recordImplicitPointsToSet(rvalKey);
         InstanceKey[] ik = getInvariantContents(rval);
-        for (int i = 0; i < ik.length; i++) {
-          system.newConstraint(fKey, ik[i]);
+        for (InstanceKey element : ik) {
+          system.newConstraint(fKey, element);
         }
       } else {
         system.newConstraint(fKey, assignOperator, rvalKey);
       }
       if (DEBUG) {
-        System.err.println("visitPut class init " + field.getDeclaringClass() + " " + field);
+        System.err.println("visitPut class init " + field.getDeclaringClass() + ' ' + field);
       }
       // side effect of putstatic: may call class initializer
       IClass klass = getClassHierarchy().lookupClass(field.getDeclaringClass());
@@ -1038,14 +1100,29 @@
       if (DEBUG) {
         System.err.println("visitInvoke: " + instruction);
       }
-
+      
       PointerKey uniqueCatch = null;
       if (hasUniqueCatchBlock(instruction, ir)) {
         uniqueCatch = getBuilder().getUniqueCatchKey(instruction, ir, node);
       }
 
       InstanceKey[][] invariantParameters = invs.computeInvariantParameters(instruction);
-      if (instruction.getCallSite().isStatic()) {
+      
+      IntSet params = getBuilder().getContextSelector().getRelevantParameters(node, instruction.getCallSite());
+      if (!instruction.getCallSite().isStatic() && !params.contains(0) && (invariantParameters == null || invariantParameters[0] == null)) {
+        params = IntSetUtil.makeMutableCopy(params);
+        ((MutableIntSet)params).add(0);
+      }
+
+      if (invariantParameters != null) {
+      for(int i = 0; i < invariantParameters.length; i++) {
+        if (invariantParameters[i] != null) {
+          params = IntSetUtil.makeMutableCopy(params);
+          ((MutableIntSet)params).remove(i);
+        }
+      }
+      }
+      if (params.isEmpty()) {
         for (CGNode n : getBuilder().getTargetsForCall(node, instruction, invariantParameters)) {
           getBuilder().processResolvedCall(node, instruction, n, invariantParameters, uniqueCatch);
           if (DEBUG) {
@@ -1059,11 +1136,6 @@
         // Add a side effect that will fire when we determine a value
         // for a dispatch parameter. This side effect will create a new node
         // and new constraints based on the new callee context.
-        IntSet params = getBuilder().getContextSelector().getRelevantParameters(node, instruction.getCallSite());
-        if (! params.contains(0)) {
-          params = IntSetUtil.makeMutableCopy(params);
-          ((MutableIntSet)params).add(0);
-        }
         final int vns[] = new int[ params.size() ];
         params.foreach(new IntSetAction() {
           private int i = 0;
@@ -1084,19 +1156,16 @@
             System.err.println("Add side effect, dispatch to " + instruction + " for " + params);
           }
  
-          final List<PointerKey> pks = new ArrayList<PointerKey>(params.size());
-          params.foreach(new IntSetAction() {
-            @Override
-            public void act(int x) {
-              if (!contentsAreInvariant(symbolTable, du, instruction.getUse(x))) {
-                pks.add(getBuilder().getPointerKeyForLocal(node, instruction.getUse(x)));                   
-              }
+          final List<PointerKey> pks = new ArrayList<>(params.size());
+          params.foreach(x -> {
+            if (!contentsAreInvariant(symbolTable, du, instruction.getUse(x))) {
+              pks.add(getBuilder().getPointerKeyForLocal(node, instruction.getUse(x)));                   
             }
           });
    
           DispatchOperator dispatchOperator = getBuilder().new DispatchOperator(instruction, node,
               invariantParameters, uniqueCatch, params);
-          system.newSideEffect(dispatchOperator, pks.toArray(new PointerKey[pks.size()]));
+          system.newSideEffect(dispatchOperator, pks.toArray(new PointerKey[0]));
         }
       }
     }
@@ -1116,7 +1185,7 @@
       IClass klass = iKey.getConcreteType();
 
       if (DEBUG) {
-        System.err.println("visitNew: " + instruction + " i:" + iKey + " " + system.findOrCreateIndexForInstanceKey(iKey));
+        System.err.println("visitNew: " + instruction + " i:" + iKey + ' ' + system.findOrCreateIndexForInstanceKey(iKey));
       }
 
       if (klass == null) {
@@ -1248,8 +1317,8 @@
             if (contentsAreInvariant(symbolTable, du, instruction.getUse(i))) {
               system.recordImplicitPointsToSet(use);
               InstanceKey[] ik = getInvariantContents(instruction.getUse(i));
-              for (int j = 0; j < ik.length; j++) {
-                system.newConstraint(dst, ik[j]);
+              for (InstanceKey element : ik) {
+                system.newConstraint(dst, element);
               }
             } else {
               system.newConstraint(dst, assignOperator, use);
@@ -1296,10 +1365,10 @@
                 if (contentsAreInvariant(symbolTable, du, val)) {
                   system.recordImplicitPointsToSet(src);
                   InstanceKey[] ik = getInvariantContents(val);
-                  for (int j = 0; j < ik.length; j++) {
-                    boolean assignable = getClassHierarchy().isAssignableFrom(cls, ik[j].getConcreteType());
+                  for (InstanceKey element : ik) {
+                    boolean assignable = getClassHierarchy().isAssignableFrom(cls, element.getConcreteType());
                     if ((assignable && useFilter) || (!assignable && !useFilter)) {
-                      system.newConstraint(dst, ik[j]);
+                      system.newConstraint(dst, element);
                     }
                   }
                 } else {
@@ -1333,8 +1402,8 @@
       if (contentsAreInvariant(symbolTable, du, src)) {
         system.recordImplicitPointsToSet(srcKey);
         InstanceKey[] ik = getInvariantContents(src);
-        for (int j = 0; j < ik.length; j++) {
-          system.newConstraint(dst, ik[j]);
+        for (InstanceKey element : ik) {
+          system.newConstraint(dst, element);
         }
       } else {
         system.newConstraint(dst, assignOperator, srcKey);
@@ -1411,8 +1480,7 @@
 
     
     private void processFinalizeMethod(final IClass klass) {
-      if (! getBuilder().finalizeVisited.contains(klass)) {
-        getBuilder().finalizeVisited.add(klass);
+      if (getBuilder().finalizeVisited.add(klass)) {
         IMethod finalizer = klass.getMethod(MethodReference.finalizeSelector);
         if (finalizer != null && ! finalizer.getDeclaringClass().getReference().equals(TypeReference.JavaLangObject)) {
           Entrypoint ef = new DefaultEntrypoint(finalizer, getClassHierarchy()) {
@@ -1481,7 +1549,6 @@
    * 
    * Side effect: add edge to the call graph.
    * 
-   * @param instruction
    * @param constParams if non-null, then constParams[i] holds the set of instance keys that are passed as param i, or null if param
    *          i is not invariant
    * @param uniqueCatchKey if non-null, then this is the unique PointerKey that catches all exceptions from this call site.
@@ -1499,7 +1566,7 @@
     }
     caller.addTarget(instruction.getCallSite(), target);
 
-    if (FakeRootMethod.isFakeRootMethod(caller.getMethod().getReference())) {
+    if (callGraph.getFakeRootNode().equals(caller)) {
       if (entrypointCallSites.contains(instruction.getCallSite())) {
         callGraph.registerEntrypoint(target);
       }
@@ -1512,6 +1579,7 @@
     processCallingConstraints(caller, instruction, target, constParams, uniqueCatchKey);
   }
   
+  @SuppressWarnings("unused")
   protected void processCallingConstraints(CGNode caller, SSAAbstractInvokeInstruction instruction, CGNode target,
       InstanceKey[][] constParams, PointerKey uniqueCatchKey) {
     // TODO: i'd like to enable this optimization, but it's a little tricky
@@ -1535,7 +1603,7 @@
     // }
     // } else {
     // generate contraints from parameter passing
-    int nUses = instruction.getNumberOfParameters();
+    int nUses = instruction.getNumberOfPositionalParameters();
     int nExpected = target.getMethod().getNumberOfParameters();
 
     /*
@@ -1553,13 +1621,13 @@
     // TODO: we need much more precise filters than cones in order to handle
     // the various types of dispatch logic. We need a filter that expresses
     // "the set of types s.t. x.foo resolves to y.foo."
-    for (int i = 0; i < instruction.getNumberOfParameters(); i++) {
+    for (int i = 0; i < instruction.getNumberOfPositionalParameters(); i++) {
       if (target.getMethod().getParameterType(i).isReferenceType()) {
         PointerKey formal = getTargetPointerKey(target, i);
         if (constParams != null && constParams[i] != null) {
           InstanceKey[] ik = constParams[i];
-          for (int j = 0; j < ik.length; j++) {
-              system.newConstraint(formal, ik[j]);
+          for (InstanceKey element : ik) {
+              system.newConstraint(formal, element);
           }
         } else {
           if (instruction.getUse(i) < 0) {
@@ -1622,8 +1690,6 @@
     final private MutableIntSet[] previousPtrs;
     
     /**
-     * @param call
-     * @param node
      * @param constParams if non-null, then constParams[i] holds the String constant that is passed as param i, or null if param i
      *          is not a String constant
      */
@@ -1635,15 +1701,59 @@
       this.uniqueCatch = uniqueCatch;
       this.dispatchIndices = IntSetUtil.toArray(dispatchIndices);
       // we better always be interested in the receiver
-      assert this.dispatchIndices[0] == 0;
+      // assert this.dispatchIndices[0] == 0;
       previousPtrs = new MutableIntSet[dispatchIndices.size()];
       for(int i = 0; i < previousPtrs.length; i++) {
         previousPtrs[i] = IntSetUtil.getDefaultIntSetFactory().make();
       }
     }
+    
+    private byte cpa(final PointsToSetVariable[] rhs) {
+     final MutableBoolean changed = new MutableBoolean();
+      for(int rhsIndex = 0; rhsIndex < rhs.length; rhsIndex++) { 
+        final int y = rhsIndex;
+        IntSet currentObjs = rhs[rhsIndex].getValue();
+        if (currentObjs != null) {
+          final IntSet oldObjs = previousPtrs[rhsIndex];
+ 
+         currentObjs.foreachExcluding(oldObjs, x -> new CrossProductRec(constParams, call, node,
+              v -> {
+                IClass recv = null;
+                if (call.getCallSite().isDispatch()) {
+                  recv = v[0].getConcreteType();
+                }
 
+                CGNode target = getTargetForCall(node, call.getCallSite(), recv, v);
+                if (target != null) {                        
+                  changed.b = true;
+                  processResolvedCall(node, call, target, constParams, uniqueCatch);
+                  if (!haveAlreadyVisited(target)) {
+                    markDiscovered(target);
+                  }
+                }  
+              }) {
+            
+            {
+              rec(0, 0);
+            }
+            
+            @Override 
+            protected IntSet getParamObjects(int paramVn, int rhsi) {
+              if (rhsi == y) {
+                return IntSetUtil.make(new int[]{ x });
+              } else {
+                return previousPtrs[rhsi];
+              }
+            }  
+          });
+          previousPtrs[rhsIndex].addAll(currentObjs);
+        }
+      }
 
-
+      byte sideEffectMask = changed.b ? (byte) SIDE_EFFECT_MASK : 0;
+      return (byte) (NOT_CHANGED | sideEffectMask);
+    }
+ 
     /*
      * @see com.ibm.wala.dataflow.fixpoint.UnaryOperator#evaluate(com.ibm.wala.dataflow.fixpoint.IVariable,
      * com.ibm.wala.dataflow.fixpoint.IVariable)
@@ -1651,6 +1761,10 @@
     @Override
     public byte evaluate(PointsToSetVariable lhs, final PointsToSetVariable[] rhs) {
       assert dispatchIndices.length >= rhs.length : "bad operator at " + call;
+      
+      return cpa(rhs);
+      
+      /*
       // did evaluating the dispatch operation add a new possible target
       // to the call site?  
       final MutableBoolean addedNewTarget = new MutableBoolean();
@@ -1744,8 +1858,10 @@
 
       byte sideEffectMask = addedNewTarget.b ? (byte) SIDE_EFFECT_MASK : 0;
       return (byte) (NOT_CHANGED | sideEffectMask);
+      */
     }
 
+    @SuppressWarnings("unused")
     private void handleAllReceivers(MutableIntSet receiverVals, InstanceKey[] keys, MutableBoolean sideEffect) {
       assert keys[0] == null;
       IntIterator receiverIter = receiverVals.intIterator();
@@ -1862,53 +1978,9 @@
     }
   }
 
-  protected void iterateCrossProduct(final CGNode caller, final SSAAbstractInvokeInstruction call, IntSet parameters,
-      final InstanceKey[][] invariants, final VoidFunction<InstanceKey[]> f) {
-    final int params[] = IntSetUtil.toArray(parameters);
-    final InstanceKey[] keys = new InstanceKey[call.getNumberOfParameters()];
-    final CallSiteReference site = call.getCallSite();
-    new Object() {
-      private void rec(final int pi) {
-        if (pi == params.length) {
-          f.apply(keys);
-        } else {
-          final int p = params[pi];
-          int vn = call.getUse(p);
-          PointerKey var = getPointerKeyForLocal(caller, vn);
-          InstanceKey[] ik = invariants != null ? invariants[p] : null;
-          if (ik != null) {
-            if (ik.length > 0) {
-              for (int i = 0; i < ik.length; i++) {
-                system.findOrCreateIndexForInstanceKey(ik[i]);
-                keys[p] = ik[i];
-                rec(pi + 1);
-              }
-            } else {
-              if (!site.isDispatch() || p != 0) {
-                keys[p] = null;
-                rec(pi + 1);
-              }
-            }
-          } else {
-            IntSet s = system.findOrCreatePointsToSet(var).getValue();
-            if (s != null && !s.isEmpty()) {
-              s.foreach(new IntSetAction() {
-                @Override
-                public void act(int x) {
-                  keys[p] = system.getInstanceKey(x);
-                  rec(pi + 1);
-                }
-              });
-            } else {
-              if (!site.isDispatch() || p != 0) {
-                keys[p] = null;
-                rec(pi + 1);
-              }
-            }
-          }
-        }
-      }
-    }.rec(0);
+  protected void iterateCrossProduct(final CGNode caller, final SSAAbstractInvokeInstruction call, final InstanceKey[][] invariants,
+      final Consumer<InstanceKey[]> f) {
+    new CrossProductRec(invariants, call, caller, f).rec(0, 0);
   }
   
   protected Set<CGNode> getTargetsForCall(final CGNode caller, final SSAAbstractInvokeInstruction instruction, InstanceKey[][] invs) {
@@ -1919,27 +1991,28 @@
     // to take the invoke instruction as a parameter instead, since invs is
     // associated with the instruction
     final CallSiteReference site = instruction.getCallSite();
+    final Set<CGNode> targets = HashSetFactory.make();
+    Consumer<InstanceKey[]> f = v -> {
+      IClass recv = null;
+      if (site.isDispatch()) {
+        recv = v[0].getConcreteType();
+      }
+      CGNode target = getTargetForCall(caller, site, recv, v);
+      if (target != null) {
+        targets.add(target);
+      }
+    };
+    iterateCrossProduct(caller, instruction, invs, f);
+     return targets;
+  }
+
+  private IntSet getRelevantParameters(final CGNode caller, final CallSiteReference site) throws UnimplementedError {
     IntSet params = contextSelector.getRelevantParameters(caller, site);
     if (!site.isStatic() && !params.contains(0)) {
       params = IntSetUtil.makeMutableCopy(params);
       ((MutableIntSet)params).add(0);
     }
-    final Set<CGNode> targets = HashSetFactory.make();
-    VoidFunction<InstanceKey[]> f = new VoidFunction<InstanceKey[]>() {
-      @Override
-      public void apply(InstanceKey[] v) {
-        IClass recv = null;
-        if (site.isDispatch()) {
-          recv = v[0].getConcreteType();
-        }
-        CGNode target = getTargetForCall(caller, site, recv, v);
-        if (target != null) {
-          targets.add(target);
-        }
-      }
-    };
-    iterateCrossProduct(caller, instruction, params, invs, f);
-     return targets;
+    return params;
   }
 
   public boolean hasNoInterestingUses(CGNode node, int vn, DefUse du) {
@@ -1953,8 +2026,7 @@
     // todo: enhance this by solving a dead-code elimination
     // problem.
     InterestingVisitor v = makeInterestingVisitor(node, vn);
-    for (Iterator it = du.getUses(v.vn); it.hasNext();) {
-      SSAInstruction s = (SSAInstruction) it.next();
+    for (SSAInstruction s : Iterator2Iterable.make(du.getUses(v.vn))) {
       s.visit(v);
       if (v.bingo) {
         return false;
@@ -1963,7 +2035,7 @@
     return true;
   }
 
-  protected InterestingVisitor makeInterestingVisitor(CGNode node, int vn) {
+  protected InterestingVisitor makeInterestingVisitor(@SuppressWarnings("unused") CGNode node, int vn) {
     return new InterestingVisitor(vn);
   }
 
@@ -2048,7 +2120,6 @@
   /**
    * TODO: enhance this logic using type inference
    * 
-   * @param instruction
    * @return true if we need to filter the receiver type to account for virtual dispatch
    */
   @SuppressWarnings("unused")
@@ -2078,12 +2149,12 @@
     return true;
   }
 
-  private boolean isRootType(IClass klass) {
+  private static boolean isRootType(IClass klass) {
     return klass.getClassHierarchy().isRootClass(klass);
   }
 
   @SuppressWarnings("unused")
-  private boolean isRootType(FilteredPointerKey.TypeFilter filter) {
+  private static boolean isRootType(FilteredPointerKey.TypeFilter filter) {
     if (filter instanceof FilteredPointerKey.SingleClassFilter) {
       return isRootType(((FilteredPointerKey.SingleClassFilter) filter).getConcreteType());
     } else {
@@ -2095,7 +2166,6 @@
    * TODO: enhance this logic using type inference TODO!!!: enhance filtering to consider concrete types, not just cones.
    * precondition: needs Filter
    * 
-   * @param target
    * @return an IClass which represents
    */
   public PointerKey getTargetPointerKey(CGNode target, int index) {
@@ -2130,7 +2200,6 @@
   }
 
   /**
-   * @param method
    * @return the receiver class for this method.
    */
   private IClass getReceiverClass(IMethod method) {
@@ -2148,7 +2217,6 @@
   /**
    * A value is "invariant" if we can figure out the instances it can ever point to locally, without resorting to propagation.
    * 
-   * @param valueNumber
    * @return true iff the contents of the local with this value number can be deduced locally, without propagation
    */
   protected boolean contentsAreInvariant(SymbolTable symbolTable, DefUse du, int valueNumber) {
@@ -2178,7 +2246,6 @@
   /**
    * precondition:contentsAreInvariant(valueNumber)
    * 
-   * @param valueNumber
    * @return the complete set of instances that the local with vn=valueNumber may point to.
    */
   public InstanceKey[] getInvariantContents(SymbolTable symbolTable, DefUse du, CGNode node, int valueNumber, HeapModel hm) {
@@ -2225,8 +2292,8 @@
     }
 
     if (ensureIndexes) {
-      for (int i = 0; i < result.length; i++) {
-        system.findOrCreateIndexForInstanceKey(result[i]);
+      for (InstanceKey element : result) {
+        system.findOrCreateIndexForInstanceKey(element);
       }
     }
 
@@ -2301,7 +2368,7 @@
     return system.iteratePointerKeys();
   }
 
-  public static Set<IClass> getCaughtExceptionTypes(SSAGetCaughtExceptionInstruction instruction, IR ir) {
+  public static Set<IClass> getCaughtExceptionTypes(SSAGetCaughtExceptionInstruction instruction, IRView ir) {
     if (ir == null) {
       throw new IllegalArgumentException("ir is null");
     }
@@ -2311,8 +2378,8 @@
     Iterator<TypeReference> exceptionTypes = ((ExceptionHandlerBasicBlock) ir.getControlFlowGraph().getNode(
         instruction.getBasicBlockNumber())).getCaughtExceptionTypes();
     HashSet<IClass> types = HashSetFactory.make(10);
-    for (; exceptionTypes.hasNext();) {
-      IClass c = ir.getMethod().getClassHierarchy().lookupClass(exceptionTypes.next());
+    for (TypeReference tr : Iterator2Iterable.make(exceptionTypes)) {
+      IClass c = ir.getMethod().getClassHierarchy().lookupClass(tr);
       if (c != null) {
         types.add(c);
       }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/StaticFieldKey.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/StaticFieldKey.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/StaticFieldKey.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/StaticFieldKey.java	2019-01-29 17:08:39.000000000 +0000
@@ -41,7 +41,7 @@
   }
   @Override
   public String toString() {
-    return "[" + field + "]";
+    return "[" + field + ']';
   }
   public IField getField() {
     return field;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/TargetMethodContextSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/TargetMethodContextSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/TargetMethodContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/TargetMethodContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,6 @@
 import com.ibm.wala.ipa.callgraph.ContextItem;
 import com.ibm.wala.ipa.callgraph.ContextKey;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.Selector;
 import com.ibm.wala.util.intset.IntSet;
 import com.ibm.wala.util.intset.IntSetUtil;
@@ -30,7 +29,7 @@
 
   private final Selector selector;
 
-  public TargetMethodContextSelector(Selector selector, IClassHierarchy cha) {
+  public TargetMethodContextSelector(Selector selector) {
     this.selector = selector;
   }
 
@@ -44,14 +43,12 @@
 
     class MethodDispatchContext implements Context {
 
-      private IMethod getTargetMethod() {
-        return M;
-      }
-
       @Override
       public ContextItem get(ContextKey name) {
         if (name.equals(ContextKey.PARAMETERS[0])) {
           return new FilteredPointerKey.TargetMethodFilter(M);
+        } else if (name.equals(ContextKey.TARGET)) {
+          return M;
         } else {
           return null;
         }
@@ -69,10 +66,11 @@
 
       @Override
       public boolean equals(Object o) {
-        return (o instanceof MethodDispatchContext) && ((MethodDispatchContext) o).getTargetMethod().equals(M);
+        return (o instanceof Context) && 
+            ((Context)o).isA(MethodDispatchContext.class) && 
+            ((Context)o).get(ContextKey.TARGET).equals(M);
       }
     }
-    ;
 
     return new MethodDispatchContext();
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/pruned/ApplicationLoaderPolicy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/pruned/ApplicationLoaderPolicy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/pruned/ApplicationLoaderPolicy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/pruned/ApplicationLoaderPolicy.java	2019-01-29 17:08:39.000000000 +0000
@@ -31,4 +31,4 @@
     return n.getMethod().getDeclaringClass().getClassLoader().getName().equals(AnalysisScope.APPLICATION);
   }
   
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/pruned/CallGraphPruning.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/pruned/CallGraphPruning.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/pruned/CallGraphPruning.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/pruned/CallGraphPruning.java	2019-01-29 17:08:39.000000000 +0000
@@ -70,9 +70,9 @@
       System.out.println("Running optimization with depth: " + depth);
    }
    
-   this.marked = new LinkedList<CGNode>();
-   this.keep = new HashSet<CGNode>();
-   this.visited = new LinkedList<CGNode>();
+   this.marked = new LinkedList<>();
+   this.keep = new HashSet<>();
+   this.visited = new LinkedList<>();
    this.depth = depth;
    this.pruningPolicy = policy;
    
@@ -107,8 +107,8 @@
 	
 	private void addDepth(CGNode node) {
 		
-		LinkedList<CGNode> A = new LinkedList<CGNode>();
-		LinkedList<CGNode> B = new LinkedList<CGNode>();
+		LinkedList<CGNode> A = new LinkedList<>();
+		LinkedList<CGNode> B = new LinkedList<>();
 		int i = depth;
 		A.add(node);
 		while (i > 0) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/pruned/PrunedCallGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/pruned/PrunedCallGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/pruned/PrunedCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/pruned/PrunedCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,9 +12,11 @@
 package com.ibm.wala.ipa.callgraph.pruned;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.Map;
 import java.util.Set;
 
 import com.ibm.wala.classLoader.CallSiteReference;
@@ -31,20 +33,29 @@
 	
 	private CallGraph cg;
 	private Set<CGNode> keep;
+	private Map<CGNode,Set<CGNode>> remove = Collections.emptyMap();
 	
 	public PrunedCallGraph(CallGraph cg, Set<CGNode> keep) {
 		this.cg = cg;
 		this.keep = keep;
 	}
 
+  public PrunedCallGraph(CallGraph cg, Set<CGNode> keep, Map<CGNode,Set<CGNode>> remove) {
+    this(cg, keep);
+    this.remove = remove;
+  }
+  
+	@Override
 	public void removeNodeAndEdges(CGNode n) throws UnsupportedOperationException {
 		cg.removeNodeAndEdges(n);
 		keep.remove(n);
+		remove.remove(n);
 	}
 
+	@Override
 	public Iterator<CGNode> iterator() {
 		Iterator<CGNode> tmp = cg.iterator();
-		Collection<CGNode> col = new LinkedList<CGNode>();
+		Collection<CGNode> col = new LinkedList<>();
 		while (tmp.hasNext()) {
 			CGNode n = tmp.next();
 			if (keep.contains(n)) {
@@ -55,30 +66,40 @@
 		return col.iterator();
 	}
 
+	@Override
 	public int getNumberOfNodes() {
 		return keep.size();
 	}
 
+	@Override
 	public void addNode(CGNode n) {
 		cg.addNode(n);
 		keep.add(n);
 	}
 
+	@Override
 	public void removeNode(CGNode n) throws UnsupportedOperationException {
 		cg.removeNode(n);
 		keep.remove(n);
+    remove.remove(n);
 	}
 
+	@Override
 	public boolean containsNode(CGNode n) {
 		return cg.containsNode(n) && keep.contains(n);
 	}
 
+	private boolean removedEdge(CGNode src, CGNode target) {
+	  return remove.containsKey(src) && remove.get(src).contains(target);
+	}
+	
+	@Override
 	public Iterator<CGNode> getPredNodes(CGNode n) {
 		Iterator<CGNode> tmp = cg.getPredNodes(n);
-		Collection<CGNode> col = new LinkedList<CGNode>();
+		Collection<CGNode> col = new LinkedList<>();
 		while (tmp.hasNext()) {
 			CGNode no = tmp.next();
-			if (keep.contains(no)) {
+			if (keep.contains(no) && !removedEdge(no, n)) {
 				col.add(no);
 			}
 		}
@@ -86,12 +107,13 @@
 		return col.iterator();
 	}
 
+	@Override
 	public int getPredNodeCount(CGNode n) {
 		Iterator<CGNode> tmp = cg.getPredNodes(n);
 		int cnt = 0;
 		while (tmp.hasNext()) {
 			CGNode no = tmp.next();
-			if (keep.contains(no)) {
+			if (keep.contains(no) && !removedEdge(no, n)) {
 				cnt++;
 			}
 		}
@@ -99,12 +121,13 @@
 	}
 
 
+	@Override
 	public Iterator<CGNode> getSuccNodes(CGNode n) {
 		Iterator<CGNode> tmp = cg.getSuccNodes(n);
-		Collection<CGNode> col = new LinkedList<CGNode>();
+		Collection<CGNode> col = new LinkedList<>();
 		while (tmp.hasNext()) {
 			CGNode no = tmp.next();
-			if (keep.contains(no)) {
+			if (keep.contains(no) && !removedEdge(n, no)) {
 				col.add(no);
 			}
 		}
@@ -113,12 +136,13 @@
 	}
 
 
+	@Override
 	public int getSuccNodeCount(CGNode n) {
 		Iterator<CGNode> tmp = cg.getSuccNodes(n);
 		int cnt = 0;
 		while (tmp.hasNext()) {
 			CGNode no = tmp.next();
-			if (keep.contains(no)) {
+			if (keep.contains(no) && !removedEdge(n, no)) {
 				cnt++;
 			}
 		}
@@ -126,6 +150,7 @@
 	}
 
 
+	@Override
 	public void addEdge(CGNode src, CGNode dst) {
 		if (keep.contains(src) && keep.contains(dst)){
 			cg.addEdge(src, dst);
@@ -133,31 +158,37 @@
 	}
 
 
+	@Override
 	public void removeEdge(CGNode src, CGNode dst) throws UnsupportedOperationException {
 		cg.removeEdge(src, dst);
 	}
 
 
+	@Override
 	public void removeAllIncidentEdges(CGNode node) throws UnsupportedOperationException {
 		cg.removeAllIncidentEdges(node);
 	}
 
 
+	@Override
 	public void removeIncomingEdges(CGNode node) throws UnsupportedOperationException {
 		cg.removeIncomingEdges(node);
 	}
 
 
+	@Override
 	public void removeOutgoingEdges(CGNode node) throws UnsupportedOperationException {
 		cg.removeOutgoingEdges(node);
 	}
 
 
+	@Override
 	public boolean hasEdge(CGNode src, CGNode dst) {
-		return cg.hasEdge(src, dst) && keep.contains(src) &&  keep.contains(dst);
+		return cg.hasEdge(src, dst) && keep.contains(src) &&  keep.contains(dst) && !removedEdge(src, dst);
 	}
 
 
+	@Override
 	public int getNumber(CGNode N) {
 		if (keep.contains(N)) {
 			return cg.getNumber(N);
@@ -168,6 +199,7 @@
 	}
 
 
+	@Override
 	public CGNode getNode(int number) {
 		if(keep.contains(cg.getNode(number))) {
 			return cg.getNode(number);
@@ -177,14 +209,16 @@
 	}
 
 
+	@Override
 	public int getMaxNumber() {
 		return cg.getMaxNumber();
 	}
 
 
+	@Override
 	public Iterator<CGNode> iterateNodes(IntSet s) {
 		Iterator<CGNode> tmp = cg.iterateNodes(s);
-		Collection<CGNode> col = new LinkedList<CGNode>();
+		Collection<CGNode> col = new LinkedList<>();
 		while (tmp.hasNext()) {
 			CGNode n = tmp.next();
 			if (keep.contains(n)) {
@@ -196,6 +230,7 @@
 	}
 
 
+	@Override
 	public IntSet getSuccNodeNumbers(CGNode node) {
 		if (!keep.contains(node)){
 			return null;
@@ -203,28 +238,31 @@
 		IntSet tmp = cg.getSuccNodeNumbers(node);
 		BitVectorIntSet kp = new BitVectorIntSet();
 		for (CGNode n : keep) {
-			kp.add(getNumber(n));
+		  if (!removedEdge(node, n)) {
+		    kp.add(getNumber(n));
+		  }
 		}
 		return tmp.intersection(kp);
 	}
 
 
+	@Override
 	public IntSet getPredNodeNumbers(CGNode node) {
 		if (!keep.contains(node)){
 			return null;
 		}
-		if (!keep.contains(node)){
-			return null;
-		}
 		IntSet tmp = cg.getPredNodeNumbers(node);
 		BitVectorIntSet kp = new BitVectorIntSet();
 		for (CGNode n : keep) {
-			kp.add(getNumber(n));
+      if (!removedEdge(n, node)) {
+        kp.add(getNumber(n));
+      }
 		}
 		return tmp.intersection(kp);
 	}
 
 
+	@Override
 	public CGNode getFakeRootNode() {
 		if (keep.contains(cg.getFakeRootNode())) {
 			return cg.getFakeRootNode();
@@ -233,6 +271,7 @@
 		}
 	}
 
+	@Override
 	 public CGNode getFakeWorldClinitNode() {
 	    if (keep.contains(cg.getFakeWorldClinitNode())) {
 	      return cg.getFakeRootNode();
@@ -242,9 +281,10 @@
 	  }
 
 
+	@Override
 	public Collection<CGNode> getEntrypointNodes() {
 		Collection<CGNode> tmp = cg.getEntrypointNodes();
-		Set<CGNode> ret = new HashSet<CGNode>();
+		Set<CGNode> ret = new HashSet<>();
 		for (CGNode n : tmp) {
 			if (keep.contains(n)) {
 				ret.add(n);
@@ -254,6 +294,7 @@
 	}
 
 
+	@Override
 	public CGNode getNode(IMethod method, Context C) {
 		if(keep.contains(cg.getNode(method, C))) {
 			return cg.getNode(method, C);
@@ -263,9 +304,10 @@
 	}
 
 
+	@Override
 	public Set<CGNode> getNodes(MethodReference m) {
 		Set<CGNode> tmp = cg.getNodes(m);
-		Set<CGNode> ret = new HashSet<CGNode>();
+		Set<CGNode> ret = new HashSet<>();
 		for (CGNode n : tmp) {
 			if (keep.contains(n)) {
 				ret.add(n);
@@ -275,19 +317,21 @@
 	}
 
 
+	@Override
 	public IClassHierarchy getClassHierarchy() {
 		return cg.getClassHierarchy();
 	}
 
 
+	@Override
 	public Set<CGNode> getPossibleTargets(CGNode node, CallSiteReference site) {
 		if (!keep.contains(node)){
 			return null;
 		}
 		Set<CGNode> tmp = cg.getPossibleTargets(node, site);
-		Set<CGNode> ret = new HashSet<CGNode>();
+		Set<CGNode> ret = new HashSet<>();
 		for (CGNode n : tmp) {
-			if (keep.contains(n)) {
+			if (keep.contains(n) && !removedEdge(node, n)) {
 				ret.add(n);
 			}
 		}
@@ -295,6 +339,7 @@
 	}
 
 
+	@Override
 	public int getNumberOfTargets(CGNode node, CallSiteReference site) {
 		if (!keep.contains(node)){
 			return -1;
@@ -303,8 +348,9 @@
 	}
 
 
+	@Override
 	public Iterator<CallSiteReference> getPossibleSites(CGNode src,	CGNode target) {
-		if (!(keep.contains(src) && keep.contains(target))){
+		if (!(keep.contains(src) && keep.contains(target)) || removedEdge(src, target)){
 			return null;
 		}
 		return cg.getPossibleSites(src, target);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/ShallowAnalysisScope.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/ShallowAnalysisScope.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/ShallowAnalysisScope.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/ShallowAnalysisScope.java	2019-01-29 17:08:39.000000000 +0000
@@ -67,7 +67,7 @@
     StringBuilder result = new StringBuilder();
     for (String moduleLine : moduleLinesList) {
       result.append(moduleLine);
-      result.append("\n");
+      result.append('\n');
     }
     return result.toString();
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/AbstractInterproceduralCFG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/AbstractInterproceduralCFG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/AbstractInterproceduralCFG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/AbstractInterproceduralCFG.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,6 +12,8 @@
 
 import java.util.Iterator;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Predicate;
 
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.cfg.IBasicBlock;
@@ -21,13 +23,12 @@
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.IndiscriminateFilter;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.MapIterator;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.graph.NumberedGraph;
 import com.ibm.wala.util.graph.impl.SlowSparseNumberedGraph;
 import com.ibm.wala.util.intset.BitVector;
@@ -47,15 +48,16 @@
   private static final boolean FAIL_ON_EAGER_CONSTRUCTION = false;
 
   /**
-   * Should the graph include call-to-return edges? When set to <code>false</code>, the graphs output by {@link IFDSExplorer} look
-   * incorrect
+   * Should the graph include call-to-return edges? When set to {@code false}, the graphs output by
+   * {@link com.ibm.wala.ide.ui.IFDSExplorer} look incorrect
    */
+  @SuppressWarnings({ "JavadocReference", "javadoc" })
   private final static boolean CALL_TO_RETURN_EDGES = true;
 
   /**
    * Graph implementation we delegate to.
    */
-  final private NumberedGraph<BasicBlockInContext<T>> g = new SlowSparseNumberedGraph<BasicBlockInContext<T>>(2);
+  final private NumberedGraph<BasicBlockInContext<T>> g = new SlowSparseNumberedGraph<>(2);
 
   /**
    * Governing call graph
@@ -142,9 +144,8 @@
 
   /**
    * If n is relevant and its cfg has not already been added, add nodes and edges for n
-   * 
-   * @param n
    */
+  @SuppressWarnings("unused")
   private void addIntraproceduralNodesAndEdgesForCGNodeIfNeeded(CGNode n) {
     if (!cgNodesVisited.contains(cg.getNumber(n)) && relevant.test(n)) {
       if (DEBUG_LEVEL > 0) {
@@ -158,8 +159,7 @@
         addNodeForEachBasicBlock(cfg, n);
         SSAInstruction[] instrs = cfg.getInstructions();
         // create edges for node n.
-        for (Iterator<T> bbs = cfg.iterator(); bbs.hasNext();) {
-          T bb = bbs.next();
+        for (T bb : cfg) {
           if (bb != cfg.entry())
             addEdgesToNonEntryBlock(n, cfg, instrs, bb);
         }
@@ -175,22 +175,22 @@
    * @param instrs the instructions for node n
    * @param bb a basic block in the CFG
    */
+  @SuppressWarnings("unused")
   protected void addEdgesToNonEntryBlock(CGNode n, ControlFlowGraph<?, T> cfg, SSAInstruction[] instrs, T bb) {
     if (DEBUG_LEVEL > 1) {
       System.err.println("addEdgesToNonEntryBlock: " + bb);
       System.err.println("nPred: " + cfg.getPredNodeCount(bb));
     }
 
-    for (Iterator<? extends T> ps = cfg.getPredNodes(bb); ps.hasNext();) {
-      T pb = ps.next();
+    for (T pb : Iterator2Iterable.make(cfg.getPredNodes(bb))) {
       if (DEBUG_LEVEL > 1) {
         System.err.println("Consider previous block: " + pb);
       }
 
       if (pb.equals(cfg.entry())) {
         // entry block has no instructions
-        BasicBlockInContext<T> p = new BasicBlockInContext<T>(n, pb);
-        BasicBlockInContext<T> b = new BasicBlockInContext<T>(n, bb);
+        BasicBlockInContext<T> p = new BasicBlockInContext<>(n, pb);
+        BasicBlockInContext<T> b = new BasicBlockInContext<>(n, bb);
         g.addEdge(p, b);
         continue;
       }
@@ -203,14 +203,14 @@
       if (inst instanceof SSAAbstractInvokeInstruction) {
         if (CALL_TO_RETURN_EDGES) {
           // Add a "normal" edge from the predecessor block to this block.
-          BasicBlockInContext<T> p = new BasicBlockInContext<T>(n, pb);
-          BasicBlockInContext<T> b = new BasicBlockInContext<T>(n, bb);
+          BasicBlockInContext<T> p = new BasicBlockInContext<>(n, pb);
+          BasicBlockInContext<T> b = new BasicBlockInContext<>(n, bb);
           g.addEdge(p, b);
         }
       } else {
         // previous instruction is not a call instruction.
-        BasicBlockInContext<T> p = new BasicBlockInContext<T>(n, pb);
-        BasicBlockInContext<T> b = new BasicBlockInContext<T>(n, bb);
+        BasicBlockInContext<T> p = new BasicBlockInContext<>(n, pb);
+        BasicBlockInContext<T> b = new BasicBlockInContext<>(n, bb);
         if (!g.containsNode(p) || !g.containsNode(b)) {
           assert g.containsNode(p) : "IPCFG does not contain " + p;
           assert g.containsNode(b) : "IPCFG does not contain " + b;
@@ -233,12 +233,13 @@
    * @param returnBlock the return site for a call
    * @param targetCFG the called method
    */
+  @SuppressWarnings("unused")
   private void addEdgesFromExitToReturn(CGNode caller, T returnBlock, CGNode target,
       ControlFlowGraph<SSAInstruction, ? extends T> targetCFG) {
     T texit = targetCFG.exit();
-    BasicBlockInContext<T> exit = new BasicBlockInContext<T>(target, texit);
+    BasicBlockInContext<T> exit = new BasicBlockInContext<>(target, texit);
     addNodeForBasicBlockIfNeeded(exit);
-    BasicBlockInContext<T> ret = new BasicBlockInContext<T>(caller, returnBlock);
+    BasicBlockInContext<T> ret = new BasicBlockInContext<>(caller, returnBlock);
     if (!g.containsNode(exit) || !g.containsNode(ret)) {
       assert g.containsNode(exit) : "IPCFG does not contain " + exit;
       assert g.containsNode(ret) : "IPCFG does not contain " + ret;
@@ -255,18 +256,19 @@
    * @param callBlock the return site for a call
    * @param targetCFG the called method
    */
+  @SuppressWarnings("unused")
   private void addEdgesFromCallToEntry(CGNode caller, T callBlock, CGNode target,
       ControlFlowGraph<SSAInstruction, ? extends T> targetCFG) {
     T tentry = targetCFG.entry();
-    BasicBlockInContext<T> entry = new BasicBlockInContext<T>(target, tentry);
+    BasicBlockInContext<T> entry = new BasicBlockInContext<>(target, tentry);
     addNodeForBasicBlockIfNeeded(entry);
-    BasicBlockInContext<T> call = new BasicBlockInContext<T>(caller, callBlock);
+    BasicBlockInContext<T> call = new BasicBlockInContext<>(caller, callBlock);
     if (!g.containsNode(entry) || !g.containsNode(call)) {
       assert g.containsNode(entry) : "IPCFG does not contain " + entry;
       assert g.containsNode(call) : "IPCFG does not contain " + call;
     }
     if (DEBUG_LEVEL > 1) {
-      System.err.println("addEdgeFromCallToEntry " + call + " " + entry);
+      System.err.println("addEdgeFromCallToEntry " + call + ' ' + entry);
     }
     g.addEdge(call, entry);
   }
@@ -275,8 +277,8 @@
    * Add the incoming edges to the entry() block and the outgoing edges from the exit() block for a call graph node.
    * 
    * @param n a node in the call graph
-   * @param bb the entry() block for n
    */
+  @SuppressWarnings("unused")
   private void addInterproceduralEdgesForEntryAndExitBlocks(CGNode n, ControlFlowGraph<SSAInstruction, ? extends T> cfg) {
 
     T entryBlock = cfg.entry();
@@ -285,8 +287,7 @@
       System.err.println("addInterproceduralEdgesForEntryAndExitBlocks " + n);
     }
 
-    for (Iterator callers = cg.getPredNodes(n); callers.hasNext();) {
-      CGNode caller = (CGNode) callers.next();
+    for (CGNode caller : Iterator2Iterable.make(cg.getPredNodes(n))) {
       if (DEBUG_LEVEL > 1) {
         System.err.println("got caller " + caller);
       }
@@ -296,6 +297,7 @@
     }
   }
 
+  @SuppressWarnings("unused")
   private void addEntryAndExitEdgesToCaller(CGNode n, T entryBlock, T exitBlock, CGNode caller) {
     if (DEBUG_LEVEL > 0) {
       System.err.println("caller " + caller + "is relevant");
@@ -320,16 +322,15 @@
               System.err.println("Adding edge " + ccfg.getBlockForInstruction(i) + " to " + entryBlock);
             }
             T callerBB = ccfg.getBlockForInstruction(i);
-            BasicBlockInContext<T> b1 = new BasicBlockInContext<T>(caller, callerBB);
+            BasicBlockInContext<T> b1 = new BasicBlockInContext<>(caller, callerBB);
             // need to add a node for caller basic block, in case we haven't processed caller yet
             addNodeForBasicBlockIfNeeded(b1);
-            BasicBlockInContext<T> b2 = new BasicBlockInContext<T>(n, entryBlock);
+            BasicBlockInContext<T> b2 = new BasicBlockInContext<>(n, entryBlock);
             g.addEdge(b1, b2);
             // also add edges from exit node to all return nodes (successor of call bb)
-            for (Iterator<? extends T> succIter = ccfg.getSuccNodes(callerBB); succIter.hasNext();) {
-              T returnBB = succIter.next();
-              BasicBlockInContext<T> b3 = new BasicBlockInContext<T>(n, exitBlock);
-              BasicBlockInContext<T> b4 = new BasicBlockInContext<T>(caller, returnBB);
+            for (T returnBB : Iterator2Iterable.make(ccfg.getSuccNodes(callerBB))) {
+              BasicBlockInContext<T> b3 = new BasicBlockInContext<>(n, exitBlock);
+              BasicBlockInContext<T> b4 = new BasicBlockInContext<>(caller, returnBB);
               addNodeForBasicBlockIfNeeded(b4);
               g.addEdge(b3, b4);
             }
@@ -344,13 +345,13 @@
    * 
    * @param cfg a control-flow graph
    */
+  @SuppressWarnings("unused")
   private void addNodeForEachBasicBlock(ControlFlowGraph<? extends SSAInstruction, ? extends T> cfg, CGNode N) {
-    for (Iterator<? extends T> bbs = cfg.iterator(); bbs.hasNext();) {
-      T bb = bbs.next();
+    for (T bb : cfg) {
       if (DEBUG_LEVEL > 1) {
         System.err.println("IPCFG Add basic block " + bb);
       }
-      BasicBlockInContext<T> b = new BasicBlockInContext<T>(N, bb);
+      BasicBlockInContext<T> b = new BasicBlockInContext<>(N, bb);
       addNodeForBasicBlockIfNeeded(b);
     }
   }
@@ -443,15 +444,12 @@
 
   /**
    * add interprocedural edges to nodes in callees of n
-   * 
-   * @param n
    */
   private void addEdgesToCallees(CGNode n) {
     ControlFlowGraph<SSAInstruction, T> cfg = getCFG(n);
     if (cfg != null) {
-      for (Iterator<T> bbs = cfg.iterator(); bbs.hasNext();) {
-        T bb = bbs.next();
-        BasicBlockInContext<T> block = new BasicBlockInContext<T>(n, bb);
+      for (T bb : cfg) {
+        BasicBlockInContext<T> block = new BasicBlockInContext<>(n, bb);
         if (hasCall(block)) {
           addCalleeEdgesForCall(n, block);
         }
@@ -470,7 +468,7 @@
       ControlFlowGraph<SSAInstruction, T> cfg = getCFG(returnBlock);
       for (Iterator<? extends T> it = cfg.getPredNodes(returnBlock.getDelegate()); it.hasNext();) {
         T b = it.next();
-        final BasicBlockInContext<T> block = new BasicBlockInContext<T>(node, b);
+        final BasicBlockInContext<T> block = new BasicBlockInContext<>(node, b);
         if (hasCall(block)) {
           addCalleeEdgesForCall(node, block);
         }
@@ -481,6 +479,7 @@
   /**
    * add edges to callee entry for call block, and edges from callee exit to corresponding return blocks
    */
+  @SuppressWarnings("unused")
   private void addCalleeEdgesForCall(CGNode n, BasicBlockInContext<T> callBlock) {
     int num = g.getNumber(callBlock);
     if (!handledCalls.contains(num)) {
@@ -491,8 +490,7 @@
         System.err.println("got Site: " + site);
       }
       boolean irrelevantTargets = false;
-      for (Iterator ts = cg.getPossibleTargets(n, site).iterator(); ts.hasNext();) {
-        CGNode tn = (CGNode) ts.next();
+      for (CGNode tn : cg.getPossibleTargets(n, site)) {
         if (!relevant.test(tn)) {
           if (DEBUG_LEVEL > 1) {
             System.err.println("Irrelevant target: " + tn);
@@ -515,7 +513,7 @@
             addEdgesFromExitToReturn(n, retBlock, tn, tcfg);
             if (irrelevantTargets) {
               // Add a "normal" edge from the call block to the return block.
-              g.addEdge(callBlock, new BasicBlockInContext<T>(n, retBlock));
+              g.addEdge(callBlock, new BasicBlockInContext<>(n, retBlock));
             }
           }
         }
@@ -525,8 +523,6 @@
 
   /**
    * add edges to nodes in callers of n
-   * 
-   * @param n
    */
   private void addCallerEdges(CGNode n) {
     final int num = cg.getNumber(n);
@@ -660,7 +656,6 @@
   }
 
   /**
-   * @param B
    * @return true iff basic block B ends in a call instuction
    */
   public boolean hasCall(BasicBlockInContext<T> B) {
@@ -690,7 +685,6 @@
   }
 
   /**
-   * @param B
    * @return the set of CGNodes that B may call, according to the governing call graph.
    * @throws IllegalArgumentException if B is null
    */
@@ -809,7 +803,7 @@
     ControlFlowGraph<SSAInstruction, ? extends T> cfg = getCFG(n);
     if (cfg != null) {
       T entry = cfg.entry();
-      return new BasicBlockInContext<T>(n, entry);
+      return new BasicBlockInContext<>(n, entry);
     } else {
       return null;
     }
@@ -818,7 +812,7 @@
   public BasicBlockInContext<T> getExit(CGNode n) {
     ControlFlowGraph<SSAInstruction, ? extends T> cfg = getCFG(n);
     T entry = cfg.exit();
-    return new BasicBlockInContext<T>(n, entry);
+    return new BasicBlockInContext<>(n, entry);
   }
 
   /**
@@ -834,13 +828,8 @@
 
     // a successor node is a return site if it is in the same
     // procedure, and is not the entry() node.
-    Predicate isReturn = new Predicate() {
-      @Override public boolean test(Object o) {
-        BasicBlockInContext other = (BasicBlockInContext) o;
-        return !other.isEntryBlock() && node.equals(other.getNode());
-      }
-    };
-    return new FilterIterator<BasicBlockInContext<T>>(getSuccNodes(callBlock), isReturn);
+    Predicate<BasicBlockInContext> isReturn = other -> !other.isEntryBlock() && node.equals(other.getNode());
+    return new FilterIterator<>(getSuccNodes(callBlock), isReturn);
   }
 
   /**
@@ -855,46 +844,36 @@
     Iterator<? extends T> it = cfg.getPredNodes(returnBlock.getDelegate());
     final CGNode node = returnBlock.getNode();
 
-    Predicate<? extends T> dispatchFilter = new Predicate<T>() {
-      @Override public boolean test(T callBlock) {
-        BasicBlockInContext<T> bb = new BasicBlockInContext<T>(node, callBlock);
-        if (!hasCall(bb, cfg)) {
-          return false;
-        }
-        if (callee != null) {
-          return getCallTargets(bb).contains(callee);
-        } else {
-          return getCallTargets(bb).isEmpty();
-        }
+    Predicate<T> dispatchFilter = callBlock -> {
+      BasicBlockInContext<T> bb = new BasicBlockInContext<>(node, callBlock);
+      if (!hasCall(bb, cfg)) {
+        return false;
+      }
+      if (callee != null) {
+        return getCallTargets(bb).contains(callee);
+      } else {
+        return getCallTargets(bb).isEmpty();
       }
     };
     it = new FilterIterator<T>(it, dispatchFilter);
 
-    Function<T, BasicBlockInContext<T>> toContext = new Function<T, BasicBlockInContext<T>>() {
-      @Override
-      public BasicBlockInContext<T> apply(T object) {
-        T b = object;
-        return new BasicBlockInContext<T>(node, b);
-      }
+    Function<T, BasicBlockInContext<T>> toContext = object -> {
+      T b = object;
+      return new BasicBlockInContext<>(node, b);
     };
-    MapIterator<T, BasicBlockInContext<T>> m = new MapIterator<T, BasicBlockInContext<T>>(it, toContext);
-    return new FilterIterator<BasicBlockInContext<T>>(m, isCall);
+    MapIterator<T, BasicBlockInContext<T>> m = new MapIterator<>(it, toContext);
+    return new FilterIterator<>(m, isCall);
   }
 
-  private final Predicate<BasicBlockInContext<T>> isCall = new Predicate<BasicBlockInContext<T>>() {
-    @Override public boolean test(BasicBlockInContext<T> o) {
-      return hasCall(o);
-    }
-  };
+  private final Predicate<BasicBlockInContext<T>> isCall = this::hasCall;
 
   public boolean isReturn(BasicBlockInContext<T> bb) throws IllegalArgumentException {
     if (bb == null) {
       throw new IllegalArgumentException("bb == null");
     }
     ControlFlowGraph<SSAInstruction, T> cfg = getCFG(bb);
-    for (Iterator<? extends T> it = cfg.getPredNodes(bb.getDelegate()); it.hasNext();) {
-      T b = it.next();
-      if (hasCall(new BasicBlockInContext<T>(bb.getNode(), b))) {
+    for (T b : Iterator2Iterable.make(cfg.getPredNodes(bb.getDelegate()))) {
+      if (hasCall(new BasicBlockInContext<>(bb.getNode(), b))) {
         return true;
       }
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/EdgeFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/EdgeFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/EdgeFilter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/EdgeFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -30,4 +30,4 @@
    */
   boolean hasExceptionalEdge(T src, T dst);
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/ExceptionPrunedCFG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/ExceptionPrunedCFG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/ExceptionPrunedCFG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/ExceptionPrunedCFG.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,10 +34,10 @@
     public boolean hasExceptionalEdge(T src, T dst) {
       return false;
     }
-  };
+  }
 
   public static <I, T extends IBasicBlock<I>> PrunedCFG<I, T> make(ControlFlowGraph<I, T> cfg) {
-    return PrunedCFG.make(cfg, new ExceptionEdgePruner<I, T>(cfg));
+    return PrunedCFG.make(cfg, new ExceptionEdgePruner<>(cfg));
   }
 }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/ExceptionFilter2EdgeFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/ExceptionFilter2EdgeFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/ExceptionFilter2EdgeFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/ExceptionFilter2EdgeFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,82 @@
+package com.ibm.wala.ipa.cfg.exceptionpruning;
+
+import java.util.Collection;
+
+import com.ibm.wala.cfg.ControlFlowGraph;
+import com.ibm.wala.ipa.cfg.EdgeFilter;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ssa.ISSABasicBlock;
+import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
+import com.ibm.wala.ssa.SSAAbstractThrowInstruction;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.types.TypeReference;
+
+/**
+ * This class converts an exception filter to an edge filter.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ */
+public class ExceptionFilter2EdgeFilter<Block extends ISSABasicBlock>
+implements EdgeFilter<Block> {
+
+	private final ExceptionFilter<SSAInstruction> filter;
+	private final ClassHierarchy cha;
+	private final ControlFlowGraph<SSAInstruction, Block> cfg;
+
+	public ExceptionFilter2EdgeFilter(ExceptionFilter<SSAInstruction> filter,
+			ClassHierarchy cha, ControlFlowGraph<SSAInstruction, Block> cfg) {
+		this.cfg = cfg;
+		this.filter = filter;
+		this.cha = cha;
+	}
+
+	@Override
+	public boolean hasExceptionalEdge(Block src, Block dst) {
+		boolean hasExceptionalEdge = this.cfg.getExceptionalSuccessors(src)
+				.contains(dst);
+		final SSAInstruction relevantInstruction = src.getLastInstruction();
+		if (hasExceptionalEdge && relevantInstruction != null) {
+			if (weKnowAllExceptions(relevantInstruction)) {
+
+				final Collection<TypeReference> thrownExceptions = relevantInstruction
+						.getExceptionTypes();
+				final Collection<FilteredException> filteredExceptions = this.filter
+						.filteredExceptions(relevantInstruction);
+
+				final boolean isFiltered = ExceptionMatcher.isFiltered(
+						thrownExceptions, filteredExceptions, this.cha);
+				hasExceptionalEdge = !isFiltered;
+			}
+		}
+
+		return hasExceptionalEdge;
+	}
+
+	@Override
+	public boolean hasNormalEdge(Block src, Block dst) {
+		boolean result = true;
+
+		if (src.getLastInstructionIndex() >= 0) {
+  		final SSAInstruction relevantInstruction = src.getLastInstruction();
+  		if (relevantInstruction != null
+  				&& this.filter.alwaysThrowsException(relevantInstruction)) {
+  			result = false;
+  		}
+		} 
+
+		return result && this.cfg.getNormalSuccessors(src).contains(dst);
+	}
+
+	/**
+	 * SSAInstruction::getExceptionTypes() does not return exceptions thrown by
+	 * throw or invoke instructions, so we may not remove edges from those
+	 * instructions, even if all exceptions returned by
+	 * instruction.getExceptionTypes() are to be filtered.
+	 *
+	 * @return if we know all exceptions, that can occur at this address from
+	 *         getExceptionTypes()
+	 */
+	private static boolean weKnowAllExceptions(SSAInstruction instruction) {
+		return !((instruction instanceof SSAAbstractInvokeInstruction) || (instruction instanceof SSAAbstractThrowInstruction));
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/ExceptionFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/ExceptionFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/ExceptionFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/ExceptionFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,24 @@
+package com.ibm.wala.ipa.cfg.exceptionpruning;
+
+import java.util.Collection;
+
+/**
+ * To filter exceptions you can implement this interface and use it in
+ * combination with {@link ExceptionFilter2EdgeFilter}. For more Details see
+ * package-info.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ */
+public interface ExceptionFilter<Instruction> {
+	/**
+	 * @return if the instruction does always throw an exception
+	 */
+	public boolean alwaysThrowsException(Instruction instruction);
+
+	/**
+	 * @return a list of exceptions, which have to be filtered for the given
+	 *         instruction
+	 */
+	public Collection<FilteredException> filteredExceptions(
+			Instruction instruction);
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/ExceptionMatcher.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/ExceptionMatcher.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/ExceptionMatcher.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/ExceptionMatcher.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,120 @@
+package com.ibm.wala.ipa.cfg.exceptionpruning;
+
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.types.TypeReference;
+
+/**
+ * Helper class to check if an exception is part of a set of filtered
+ * exceptions.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class ExceptionMatcher {
+	/**
+	 * @return true, iff thrownExceptions is part of filteredExceptions
+	 */
+	public static boolean isFiltered(
+			Collection<TypeReference> thrownExceptions,
+			Collection<FilteredException> filteredExceptions, ClassHierarchy cha) {
+		final ExceptionMatcher matcher = new ExceptionMatcher(thrownExceptions,
+				filteredExceptions, cha);
+		return matcher.areAllExceptionsIgnored();
+	}
+	
+	/**
+	 * Returns all exceptions of thrownExceptions which are not filtered by filteredExceptions
+	 * @return all exceptions of thrownExceptions which are not filtered by filteredExceptions
+	 */
+	public static Set<TypeReference> retainedExceptions(Collection<TypeReference> thrownExceptions,
+      Collection<FilteredException> filteredExceptions, ClassHierarchy cha){
+	   final ExceptionMatcher matcher = new ExceptionMatcher(thrownExceptions,
+	        filteredExceptions, cha);
+	    return matcher.getRetainedExceptions();
+	}
+
+	private Set<TypeReference> ignoreExact;
+	private Set<TypeReference> ignoreSubclass;
+	private final Set<TypeReference> retainedExceptions;
+	private ClassHierarchy cha;
+
+	private final boolean areAllExceptionsIgnored;
+
+	private ExceptionMatcher(Collection<TypeReference> thrownExceptions,
+			Collection<FilteredException> filteredExceptions, ClassHierarchy cha) {
+		this.ignoreExact = new LinkedHashSet<>();
+		this.ignoreSubclass = new LinkedHashSet<>();
+		this.cha = cha;
+		this.retainedExceptions = new LinkedHashSet<>();
+
+		this.fillIgnore(filteredExceptions);
+
+		this.computeRetainedExceptions(thrownExceptions);
+		this.areAllExceptionsIgnored = this.retainedExceptions.isEmpty();
+
+		this.free();
+	}
+
+	private void computeRetainedExceptions(Collection<TypeReference> thrownExceptions){
+	   for (final TypeReference exception : thrownExceptions) {
+	     if (!this.isFiltered(exception)) {
+	       this.retainedExceptions.add(exception);
+	     }	     
+	   }
+	}
+
+	private boolean areAllExceptionsIgnored() {
+		return this.areAllExceptionsIgnored;
+	}
+
+	private void fillIgnore(Collection<FilteredException> filteredExceptions) {
+		for (final FilteredException filteredException : filteredExceptions) {
+			final TypeReference exception = filteredException.getException();
+
+			this.ignoreExact.add(exception);
+			if (filteredException.isSubclassFiltered()) {
+				this.ignoreSubclass.add(exception);
+			}
+		}
+	}
+
+	private void free() {
+		this.ignoreExact = null;
+		this.ignoreSubclass = null;
+		this.cha = null;
+	}
+
+	/**
+	 * Check if the exception itself is filtered or if it is derived from a
+	 * filtered exception.
+	 *
+	 * @return if the exception is filtered
+	 */
+	private boolean isFiltered(TypeReference exception) {
+		boolean isFiltered = false;
+		if (this.ignoreExact.contains(exception)) {
+			isFiltered = true;
+		} else {
+			for (final TypeReference ignoreException : this.ignoreSubclass) {
+				final IClass exceptionClass = this.cha.lookupClass(exception);
+				final IClass ignoreClass = this.cha
+						.lookupClass(ignoreException);
+				if (this.cha.isAssignableFrom(ignoreClass, exceptionClass)) {
+					isFiltered = true;
+					break;
+				}
+			}
+		}
+
+		return isFiltered;
+	}
+
+  public Set<TypeReference> getRetainedExceptions() {
+    return retainedExceptions;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/ArrayOutOfBoundFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/ArrayOutOfBoundFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/ArrayOutOfBoundFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/ArrayOutOfBoundFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,50 @@
+package com.ibm.wala.ipa.cfg.exceptionpruning.filter;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+
+import com.ibm.wala.analysis.arraybounds.ArrayOutOfBoundsAnalysis;
+import com.ibm.wala.analysis.arraybounds.ArrayOutOfBoundsAnalysis.UnnecessaryCheck;
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.FilteredException;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.types.TypeReference;
+
+/**
+ * Adapter for using {@link ArrayOutOfBoundsAnalysis}. This filter is filtering
+ * ArrayOutOfBoundException, which can not occur.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class ArrayOutOfBoundFilter implements ExceptionFilter<SSAInstruction> {
+	private final ArrayOutOfBoundsAnalysis analysis;
+
+	public ArrayOutOfBoundFilter(ArrayOutOfBoundsAnalysis analysis) {
+		this.analysis = analysis;
+	}
+
+	@Override
+	public boolean alwaysThrowsException(SSAInstruction instruction) {
+		return false;
+	}
+
+	@Override
+	public Collection<FilteredException> filteredExceptions(
+			SSAInstruction instruction) {
+		final UnnecessaryCheck unnecessary = this.analysis
+				.getBoundsCheckNecessary().get(instruction);
+		if (unnecessary == UnnecessaryCheck.BOTH) {
+
+			final LinkedList<FilteredException> result = new LinkedList<>();
+			result.add(new FilteredException(
+					TypeReference.JavaLangArrayIndexOutOfBoundsException));
+
+			return result;
+		} else {
+
+			return Collections.emptyList();
+		}
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/CombinedExceptionFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/CombinedExceptionFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/CombinedExceptionFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/CombinedExceptionFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,55 @@
+package com.ibm.wala.ipa.cfg.exceptionpruning.filter;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.FilteredException;
+
+/**
+ * Use this class to combine multiple {@link ExceptionFilter}
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ */
+public class CombinedExceptionFilter<Instruction> implements ExceptionFilter<Instruction> {
+	private final Collection<ExceptionFilter<Instruction>> exceptionFilter;
+
+	public CombinedExceptionFilter() {
+		this.exceptionFilter = new LinkedList<>();
+	}
+
+	public CombinedExceptionFilter(
+			Collection<ExceptionFilter<Instruction>> exceptionFilter) {
+		this.exceptionFilter = exceptionFilter;
+	}
+
+	public boolean add(ExceptionFilter<Instruction> e) {
+		return this.exceptionFilter.add(e);
+	}
+
+	public boolean addAll(
+			Collection<? extends ExceptionFilter<Instruction>> c) {
+		return this.exceptionFilter.addAll(c);
+	}
+
+	@Override
+	public boolean alwaysThrowsException(Instruction instruction) {
+		boolean result = false;
+
+		for (final ExceptionFilter<Instruction> filter : this.exceptionFilter) {
+			result |= filter.alwaysThrowsException(instruction);
+		}
+
+		return result;
+	}
+
+	@Override
+	public Collection<FilteredException> filteredExceptions(
+			Instruction instruction) {
+		final LinkedList<FilteredException> result = new LinkedList<>();
+		for (final ExceptionFilter<Instruction> filter : this.exceptionFilter) {
+			result.addAll(filter.filteredExceptions(instruction));
+		}
+		return result;
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/DummyFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/DummyFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/DummyFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/DummyFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ipa.cfg.exceptionpruning.filter;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.FilteredException;
+
+public class DummyFilter<Instruction> implements ExceptionFilter<Instruction>{
+  @Override
+  public boolean alwaysThrowsException(Instruction instruction) {
+    return false;
+  }
+
+  @Override
+  public Collection<FilteredException> filteredExceptions(Instruction instruction) {
+    return Collections.emptyList();
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/IgnoreExceptionsFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/IgnoreExceptionsFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/IgnoreExceptionsFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/IgnoreExceptionsFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,58 @@
+package com.ibm.wala.ipa.cfg.exceptionpruning.filter;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.FilteredException;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.types.TypeReference;
+
+/**
+ * For filtering specific exceptions.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class IgnoreExceptionsFilter implements ExceptionFilter<SSAInstruction> {
+	private final Collection<FilteredException> toBeIgnored;
+
+	/**
+	 * All given exceptions and subclasses will be ignored.
+	 */
+	public IgnoreExceptionsFilter(Collection<TypeReference> toBeIgnored) {
+		this.toBeIgnored = new LinkedList<>();
+
+		this.addAll(toBeIgnored);
+	}
+
+	/**
+	 * The given exception and subclasses will be ignored.
+	 */
+	public IgnoreExceptionsFilter(TypeReference toBeIgnored) {
+		this.toBeIgnored = new LinkedList<>();
+
+		final LinkedList<TypeReference> list = new LinkedList<>();
+		list.add(toBeIgnored);
+
+		this.addAll(list);
+	}
+
+	private void addAll(Collection<TypeReference> toBeIgnored) {
+		for (final TypeReference ignored : toBeIgnored) {
+			this.toBeIgnored.add(new FilteredException(ignored,
+					FilteredException.FILTER_SUBCLASSES));
+		}
+	}
+
+	@Override
+	public boolean alwaysThrowsException(SSAInstruction instruction) {
+		return false;
+	}
+
+	@Override
+	public Collection<FilteredException> filteredExceptions(
+			SSAInstruction instruction) {
+		return this.toBeIgnored;
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/NullPointerExceptionFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/NullPointerExceptionFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/NullPointerExceptionFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/NullPointerExceptionFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,46 @@
+package com.ibm.wala.ipa.cfg.exceptionpruning.filter;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+
+import com.ibm.wala.analysis.nullpointer.IntraproceduralNullPointerAnalysis;
+import com.ibm.wala.cfg.exc.intra.NullPointerState.State;
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.FilteredException;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.types.TypeReference;
+
+/**
+ * Adapter for {@link IntraproceduralNullPointerAnalysis}. This filter is filtering
+ * NullPointerException, which can not occur.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class NullPointerExceptionFilter implements
+ExceptionFilter<SSAInstruction> {
+	private final IntraproceduralNullPointerAnalysis analysis;
+
+	public NullPointerExceptionFilter(IntraproceduralNullPointerAnalysis analysis) {
+		this.analysis = analysis;
+	}
+
+	@Override
+	public boolean alwaysThrowsException(SSAInstruction instruction) {
+		return this.analysis.nullPointerExceptionThrowState(instruction) == State.NULL;
+	}
+
+	@Override
+	public Collection<FilteredException> filteredExceptions(
+			SSAInstruction instruction) {
+		if (this.analysis.nullPointerExceptionThrowState(instruction) == State.NOT_NULL) {
+			final LinkedList<FilteredException> result = new LinkedList<>();
+			result.add(new FilteredException(
+					TypeReference.JavaLangNullPointerException));
+			return result;
+		} else {
+			return Collections.emptyList();
+		}
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/package-info.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/package-info.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/filter/package-info.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,7 @@
+/**
+ * All available filters should be contained in this package.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+package com.ibm.wala.ipa.cfg.exceptionpruning.filter;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/FilteredException.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/FilteredException.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/FilteredException.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/FilteredException.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,35 @@
+package com.ibm.wala.ipa.cfg.exceptionpruning;
+
+import com.ibm.wala.types.TypeReference;
+
+/**
+ * FilteredException represents either a single exception or an exception and
+ * all its subclasses.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class FilteredException {
+	public static final boolean FILTER_SUBCLASSES = true;
+	private final TypeReference exception;
+
+	private final boolean isSubclassFiltered;
+
+	public FilteredException(TypeReference exception) {
+		this(exception, false);
+	}
+
+	public FilteredException(TypeReference exception, boolean isSubclassFiltered) {
+		super();
+		this.exception = exception;
+		this.isSubclassFiltered = isSubclassFiltered;
+	}
+
+	public TypeReference getException() {
+		return this.exception;
+	}
+
+	public boolean isSubclassFiltered() {
+		return this.isSubclassFiltered;
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/ArrayOutOfBoundInterFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/ArrayOutOfBoundInterFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/ArrayOutOfBoundInterFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/ArrayOutOfBoundInterFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural;
+
+import com.ibm.wala.analysis.arraybounds.ArrayOutOfBoundsAnalysis;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.filter.ArrayOutOfBoundFilter;
+import com.ibm.wala.ssa.SSAInstruction;
+
+public class ArrayOutOfBoundInterFilter extends StoringExceptionFilter<SSAInstruction>{
+
+  @Override
+  protected ExceptionFilter<SSAInstruction> computeFilter(CGNode node) {
+    ArrayOutOfBoundsAnalysis analysis = new ArrayOutOfBoundsAnalysis(node.getIR());
+    return new ArrayOutOfBoundFilter(analysis);
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/CombinedInterproceduralExceptionFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/CombinedInterproceduralExceptionFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/CombinedInterproceduralExceptionFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/CombinedInterproceduralExceptionFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.filter.CombinedExceptionFilter;
+
+public class CombinedInterproceduralExceptionFilter<Instruction> implements InterproceduralExceptionFilter<Instruction> {
+  private final Collection<InterproceduralExceptionFilter<Instruction>> filter;
+
+  public CombinedInterproceduralExceptionFilter() {
+    this.filter = new LinkedList<>();
+  }
+
+  public CombinedInterproceduralExceptionFilter(
+      Collection<InterproceduralExceptionFilter<Instruction>> filter) {
+    this.filter = filter;
+  }
+
+  public boolean add(InterproceduralExceptionFilter<Instruction> e) {
+    return this.filter.add(e);
+  }
+
+  public boolean addAll(
+      Collection<? extends InterproceduralExceptionFilter<Instruction>> c) {
+    return this.filter.addAll(c);
+  }  
+  
+  @Override
+  public ExceptionFilter<Instruction> getFilter(CGNode node) {
+    CombinedExceptionFilter<Instruction> result = new CombinedExceptionFilter<>();
+    for (InterproceduralExceptionFilter<Instruction> exceptionFilter:filter) {
+      result.add(exceptionFilter.getFilter(node));
+    }    
+    
+    return result;
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/IgnoreExceptionsInterFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/IgnoreExceptionsInterFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/IgnoreExceptionsInterFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/IgnoreExceptionsInterFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural;
+
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter;
+
+public class IgnoreExceptionsInterFilter<Instruction> implements InterproceduralExceptionFilter<Instruction>{
+  private ExceptionFilter<Instruction> filter;
+  
+  public IgnoreExceptionsInterFilter(ExceptionFilter<Instruction> filter){
+    this.filter = filter;
+  }
+  
+  @Override
+  public ExceptionFilter<Instruction> getFilter(CGNode node) {
+    return filter;
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/InterproceduralExceptionFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/InterproceduralExceptionFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/InterproceduralExceptionFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/InterproceduralExceptionFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural;
+
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter;
+
+public interface InterproceduralExceptionFilter<Instruction> {
+  public ExceptionFilter<Instruction> getFilter(CGNode node);
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/NullPointerExceptionInterFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/NullPointerExceptionInterFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/NullPointerExceptionInterFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/NullPointerExceptionInterFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural;
+
+import com.ibm.wala.analysis.nullpointer.IntraproceduralNullPointerAnalysis;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.filter.NullPointerExceptionFilter;
+import com.ibm.wala.ssa.SSAInstruction;
+
+public class NullPointerExceptionInterFilter extends StoringExceptionFilter<SSAInstruction>{
+
+  @Override
+  protected ExceptionFilter<SSAInstruction> computeFilter(CGNode node) {
+    IntraproceduralNullPointerAnalysis analysis = new IntraproceduralNullPointerAnalysis(node.getIR());
+    return new NullPointerExceptionFilter(analysis);
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/package-info.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/package-info.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/package-info.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,8 @@
+/**
+ * 
+ */
+/**
+ * @author stephan
+ *
+ */
+package com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/StoringExceptionFilter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/StoringExceptionFilter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/StoringExceptionFilter.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/interprocedural/StoringExceptionFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter;
+
+public abstract class StoringExceptionFilter<Instruction> implements InterproceduralExceptionFilter<Instruction>{
+  private Map<CGNode, ExceptionFilter<Instruction>> store;
+  
+  public StoringExceptionFilter(){
+    this.store = new LinkedHashMap<>();
+  }
+  
+  abstract protected ExceptionFilter<Instruction> computeFilter(CGNode node);
+  
+  @Override
+  public ExceptionFilter<Instruction> getFilter(CGNode node) {
+    if (store.containsKey(node)) {
+      return store.get(node);
+    } else {
+      ExceptionFilter<Instruction> filter = computeFilter(node);
+      store.put(node, filter);
+      return filter;
+    }
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/package-info.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/package-info.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/package-info.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/exceptionpruning/package-info.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,15 @@
+/**
+ * If we want to filter edges of a control flow graph we already have
+ * {@link com.ibm.wala.ipa.cfg.EdgeFilter}, but if we want to remove
+ * exceptions in particular we may want to combine different analysis.
+ * Therefore we need a possibility to collect a set of removed exceptions,
+ * so that an exceptional edge may be removed as soon as all exceptions,
+ * which can occur along these edge are filtered.
+ *
+ * This package contains classes for this job and also adapter for some
+ * analysis.
+ *
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+package com.ibm.wala.ipa.cfg.exceptionpruning;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/ExplodedInterproceduralCFG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/ExplodedInterproceduralCFG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/ExplodedInterproceduralCFG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/ExplodedInterproceduralCFG.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.ipa.cfg;
 
 import java.util.Map;
+import java.util.function.Predicate;
 
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -19,7 +20,6 @@
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.analysis.ExplodedControlFlowGraph;
 import com.ibm.wala.ssa.analysis.IExplodedBasicBlock;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.HashMapFactory;
 
 /**
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/PrunedCFG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/PrunedCFG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/PrunedCFG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cfg/PrunedCFG.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,9 +21,9 @@
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.cfg.IBasicBlock;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.graph.AbstractNumberedGraph;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.NumberedEdgeManager;
@@ -52,7 +52,7 @@
     if (cfg == null) {
       throw new IllegalArgumentException("cfg is null");
     }
-    return new PrunedCFG<I, T>(cfg, filter);
+    return new PrunedCFG<>(cfg, filter);
   }
 
   private static class FilteredCFGEdges<I, T extends IBasicBlock<I>> implements NumberedEdgeManager<T> {
@@ -69,44 +69,24 @@
     }
 
     public Iterator<T> getExceptionalSuccessors(final T N) {
-      return new FilterIterator<T>(cfg.getExceptionalSuccessors(N).iterator(), new Predicate<T>() {
-        @Override public boolean test(T o) {
-          return currentCFGNodes.containsNode(o) && filter.hasExceptionalEdge(N, o);
-        }
-      });
+      return new FilterIterator<>(cfg.getExceptionalSuccessors(N).iterator(), o -> currentCFGNodes.containsNode(o) && filter.hasExceptionalEdge(N, o));
     }
 
     public Iterator<T> getNormalSuccessors(final T N) {
-      return new FilterIterator<T>(cfg.getNormalSuccessors(N).iterator(), new Predicate<T>() {
-        @Override public boolean test(T o) {
-          return currentCFGNodes.containsNode(o) && filter.hasNormalEdge(N, o);
-        }
-      });
+      return new FilterIterator<>(cfg.getNormalSuccessors(N).iterator(), o -> currentCFGNodes.containsNode(o) && filter.hasNormalEdge(N, o));
     }
 
     public Iterator<T> getExceptionalPredecessors(final T N) {
-      return new FilterIterator<T>(cfg.getExceptionalPredecessors(N).iterator(), new Predicate<T>() {
-        @Override public boolean test(T o) {
-          return currentCFGNodes.containsNode(o) && filter.hasExceptionalEdge(o, N);
-        }
-      });
+      return new FilterIterator<>(cfg.getExceptionalPredecessors(N).iterator(), o -> currentCFGNodes.containsNode(o) && filter.hasExceptionalEdge(o, N));
     }
 
     public Iterator<T> getNormalPredecessors(final T N) {
-      return new FilterIterator<T>(cfg.getNormalPredecessors(N).iterator(), new Predicate<T>() {
-        @Override public boolean test(T o) {
-          return currentCFGNodes.containsNode(o) && filter.hasNormalEdge(o, N);
-        }
-      });
+      return new FilterIterator<>(cfg.getNormalPredecessors(N).iterator(), o -> currentCFGNodes.containsNode(o) && filter.hasNormalEdge(o, N));
     }
 
     @Override
     public Iterator<T> getSuccNodes(final T N) {
-      return new FilterIterator<T>(cfg.getSuccNodes(N), new Predicate<T>() {
-        @Override public boolean test(T o) {
-          return currentCFGNodes.containsNode(o) && (filter.hasNormalEdge(N, o) || filter.hasExceptionalEdge(N, o));
-        }
-      });
+      return new FilterIterator<>(cfg.getSuccNodes(N), o -> currentCFGNodes.containsNode(o) && (filter.hasNormalEdge(N, o) || filter.hasExceptionalEdge(N, o)));
     }
 
     @Override
@@ -117,8 +97,8 @@
     @Override
     public IntSet getSuccNodeNumbers(T N) {
       MutableIntSet bits = IntSetUtil.make();
-      for (Iterator<T> EE = getSuccNodes(N); EE.hasNext();) {
-        bits.add(EE.next().getNumber());
+      for (T EE : Iterator2Iterable.make(getSuccNodes(N))) {
+        bits.add(EE.getNumber());
       }
 
       return bits;
@@ -126,11 +106,7 @@
 
     @Override
     public Iterator<T> getPredNodes(final T N) {
-      return new FilterIterator<T>(cfg.getPredNodes(N), new Predicate<T>() {
-        @Override public boolean test(T o) {
-          return currentCFGNodes.containsNode(o) && (filter.hasNormalEdge(o, N) || filter.hasExceptionalEdge(o, N));
-        }
-      });
+      return new FilterIterator<>(cfg.getPredNodes(N), o -> currentCFGNodes.containsNode(o) && (filter.hasNormalEdge(o, N) || filter.hasExceptionalEdge(o, N)));
     }
 
     @Override
@@ -141,8 +117,8 @@
     @Override
     public IntSet getPredNodeNumbers(T N) {
       MutableIntSet bits = IntSetUtil.make();
-      for (Iterator<T> EE = getPredNodes(N); EE.hasNext();) {
-        bits.add(EE.next().getNumber());
+      for (T EE : Iterator2Iterable.make(getPredNodes(N))) {
+        bits.add(EE.getNumber());
       }
 
       return bits;
@@ -150,8 +126,8 @@
 
     @Override
     public boolean hasEdge(T src, T dst) {
-      for (Iterator EE = getSuccNodes(src); EE.hasNext();) {
-        if (EE.next().equals(dst)) {
+      for (T EE : Iterator2Iterable.make(getSuccNodes(src))) {
+        if (EE.equals(dst)) {
           return true;
         }
       }
@@ -215,8 +191,7 @@
     @Override
     public int getMaxNumber() {
       int max = -1;
-      for (Iterator<? extends T> NS = nodes.iterator(); NS.hasNext();) {
-        T N = NS.next();
+      for (T N : nodes) {
         if (subset.contains(N) && getNumber(N) > max) {
           max = getNumber(N);
         }
@@ -225,12 +200,8 @@
       return max;
     }
 
-    private Iterator<T> filterNodes(Iterator nodeIterator) {
-      return new FilterIterator<T>(nodeIterator, new Predicate() {
-        @Override public boolean test(Object o) {
-          return subset.contains(o);
-        }
-      });
+    private Iterator<T> filterNodes(Iterator<T> nodeIterator) {
+      return new FilterIterator<>(nodeIterator, subset::contains);
     }
 
     @Override
@@ -273,7 +244,7 @@
   private PrunedCFG(final ControlFlowGraph<I, T> cfg, final EdgeFilter<T> filter) {
     this.cfg = cfg;
     Graph<T> temp = new AbstractNumberedGraph<T>() {
-      private final NumberedEdgeManager<T> edges = new FilteredCFGEdges<I, T>(cfg, cfg, filter);
+      private final NumberedEdgeManager<T> edges = new FilteredCFGEdges<>(cfg, cfg, filter);
 
       @Override
       protected NumberedNodeManager<T> getNodeManager() {
@@ -292,8 +263,8 @@
     reachable.add(cfg.entry());
     reachable.add(cfg.exit());
         
-    this.nodes = new FilteredNodes<T>(cfg, reachable);
-    this.edges = new FilteredCFGEdges<I, T>(cfg, nodes, filter);
+    this.nodes = new FilteredNodes<>(cfg, reachable);
+    this.edges = new FilteredCFGEdges<>(cfg, nodes, filter);
   }
 
   @Override
@@ -308,9 +279,9 @@
 
   @Override
   public List<T> getExceptionalSuccessors(final T N) {
-    ArrayList<T> result = new ArrayList<T>();
-    for (Iterator<T> it = edges.getExceptionalSuccessors(N); it.hasNext();) {
-      result.add(it.next());
+    ArrayList<T> result = new ArrayList<>();
+    for (T s : Iterator2Iterable.make(edges.getExceptionalSuccessors(N))) {
+      result.add(s);
     }
     return result;
   }
@@ -380,10 +351,11 @@
 
     int i = 0;
     MutableIntSet valid = IntSetUtil.make();
-    for (Iterator<? extends T> pbs = cfg.getPredNodes(bb); pbs.hasNext(); i++) {
-      if (nodes.containsNode(pbs.next())) {
+    for (T pb : Iterator2Iterable.make(cfg.getPredNodes(bb))) {
+      if (nodes.containsNode(pb)) {
         valid.add(i);
       }
+      ++i;
     }
 
     return valid;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchyFactory.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchyFactory.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchyFactory.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchyFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ipa.cha;
+
+import com.ibm.wala.classLoader.ClassLoaderFactory;
+import com.ibm.wala.classLoader.ClassLoaderFactoryImpl;
+import com.ibm.wala.classLoader.Language;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
+
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class ClassHierarchyFactory {
+
+  /**
+   * @return a ClassHierarchy object representing the analysis scope
+   */
+  public static ClassHierarchy make(AnalysisScope scope) throws ClassHierarchyException {
+    if (scope == null) {
+      throw new IllegalArgumentException("null scope");
+    }
+    return make(scope, new ClassLoaderFactoryImpl(scope.getExclusions()));
+  }
+
+  /**
+   * @return a ClassHierarchy object representing the analysis scope, where phantom classes are
+   * created when superclasses are missing
+   */
+  public static ClassHierarchy makeWithPhantom(AnalysisScope scope) throws ClassHierarchyException {
+    if (scope == null) {
+      throw new IllegalArgumentException("null scope");
+    }
+    return makeWithPhantom(scope, new ClassLoaderFactoryImpl(scope.getExclusions()));
+  }
+
+  /**
+   * @return a ClassHierarchy object representing the analysis scope, missing superclasses are
+   * replaced by the ClassHierarchy root, i.e. java.lang.Object
+   */
+  public static ClassHierarchy makeWithRoot(AnalysisScope scope) throws ClassHierarchyException {
+    if (scope == null) {
+      throw new IllegalArgumentException("null scope");
+    }
+    return makeWithRoot(scope, new ClassLoaderFactoryImpl(scope.getExclusions()));
+  }
+
+  /**
+   * temporarily marking this internal to avoid infinite sleep with randomly chosen IProgressMonitor.
+   */
+  public static ClassHierarchy make(AnalysisScope scope, IProgressMonitor monitor) throws ClassHierarchyException {
+    if (scope == null) {
+      throw new IllegalArgumentException("null scope");
+    }
+    return make(scope, new ClassLoaderFactoryImpl(scope.getExclusions()), monitor);
+  }
+
+  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory) throws ClassHierarchyException {
+    return make(scope, factory, ClassHierarchy.MissingSuperClassHandling.NONE);
+  }
+
+  private static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory, ClassHierarchy.MissingSuperClassHandling
+      superClassHandling) throws ClassHierarchyException {
+    if (scope == null) {
+      throw new IllegalArgumentException("null scope");
+    }
+    if (factory == null) {
+      throw new IllegalArgumentException("null factory");
+    }
+    return new ClassHierarchy(scope, factory, null, new ConcurrentHashMap<>(),
+        superClassHandling);
+  }
+
+  public static ClassHierarchy makeWithPhantom(AnalysisScope scope, ClassLoaderFactory factory)
+      throws ClassHierarchyException {
+    return make(scope, factory, ClassHierarchy.MissingSuperClassHandling.PHANTOM);
+  }
+
+  public static ClassHierarchy makeWithRoot(AnalysisScope scope, ClassLoaderFactory factory)
+          throws ClassHierarchyException {
+    return make(scope, factory, ClassHierarchy.MissingSuperClassHandling.ROOT);
+  }
+
+  /**
+   * temporarily marking this internal to avoid infinite sleep with randomly chosen IProgressMonitor.
+   */
+  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory, IProgressMonitor monitor)
+      throws ClassHierarchyException {
+    return new ClassHierarchy(scope, factory, monitor, new ConcurrentHashMap<>(), ClassHierarchy.MissingSuperClassHandling.NONE);
+  }
+
+  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory, Set<Language> languages)
+      throws ClassHierarchyException {
+    return new ClassHierarchy(scope, factory, languages, null, new ConcurrentHashMap<>(), ClassHierarchy.MissingSuperClassHandling.NONE);
+  }
+
+  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory, Language language)
+      throws ClassHierarchyException {
+    return new ClassHierarchy(scope, factory, language, null, new ConcurrentHashMap<>(), ClassHierarchy.MissingSuperClassHandling.NONE);
+  }
+
+  /**
+   * temporarily marking this internal to avoid infinite sleep with randomly chosen IProgressMonitor. TODO: nanny for testgen
+   */
+  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory, Language language, IProgressMonitor monitor)
+      throws ClassHierarchyException {
+    if (factory == null) {
+      throw new IllegalArgumentException("null factory");
+    }
+    return new ClassHierarchy(scope, factory, language, monitor, new ConcurrentHashMap<>(), ClassHierarchy.MissingSuperClassHandling.NONE);
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchy.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,47 +10,51 @@
  *******************************************************************************/
 package com.ibm.wala.ipa.cha;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
 import com.ibm.wala.classLoader.ArrayClass;
+import com.ibm.wala.classLoader.BytecodeClass;
 import com.ibm.wala.classLoader.ClassLoaderFactory;
-import com.ibm.wala.classLoader.ClassLoaderFactoryImpl;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IClassLoader;
 import com.ibm.wala.classLoader.IField;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.Language;
+import com.ibm.wala.classLoader.NoSuperclassFoundException;
+import com.ibm.wala.classLoader.PhantomClass;
 import com.ibm.wala.classLoader.ShrikeClass;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.Selector;
+import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.MapIterator;
 import com.ibm.wala.util.collections.MapUtil;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.ref.CacheReference;
 import com.ibm.wala.util.ref.ReferenceCleanser;
 import com.ibm.wala.util.strings.Atom;
 import com.ibm.wala.util.warnings.Warning;
 import com.ibm.wala.util.warnings.Warnings;
 
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.ConcurrentModificationException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+
 /**
  * Simple implementation of a class hierarchy.
  * 
@@ -61,6 +65,9 @@
 
   private static final boolean DEBUG = false;
 
+  public enum MissingSuperClassHandling { NONE, ROOT, PHANTOM }
+
+
   /**
    * Languages that contribute classes to the set represented in this hierarchy. The languages may for example be related by
    * inheritance (e.g. X10 derives from Java, and shares a common type hierarchy rooted at java.lang.Object).
@@ -76,8 +83,7 @@
    * {@link ConcurrentModificationException}. But with a {@link ConcurrentHashMap}, at least the code merrily chugs along,
    * tolerating the race.
    */
-  final private Map<TypeReference, Node> map = new ConcurrentHashMap<TypeReference, Node>();
-
+  final private Map<TypeReference, Node> map; 
   /**
    * {@link TypeReference} for the root type
    */
@@ -99,7 +105,7 @@
   final private IClassLoader[] loaders;
 
   /**
-   * A mapping from IClass -> Selector -> Set of IMethod
+   * A mapping from IClass -&gt; Selector -&gt; Set of IMethod
    */
   final private HashMap<IClass, Object> targetCache = HashMapFactory.make();
 
@@ -109,7 +115,7 @@
   private final AnalysisScope scope;
 
   /**
-   * A mapping from IClass (representing an interface) -> Set of IClass that implement that interface
+   * A mapping from IClass (representing an interface) -&gt; Set of IClass that implement that interface
    */
   private final Map<IClass, Set<IClass>> implementors = HashMapFactory.make();
 
@@ -134,6 +140,16 @@
   private Collection<TypeReference> runtimeExceptionTypeRefs;
 
   /**
+   * How should we handle missing superclasses?
+   * DEFAULT: no special handling, class will be excluded from class hierarchy
+   *    ROOT: replace the missing superclass with the hierarchy root
+   * PHANTOM: create a phantom superclass and add the subclass to the hierarchy.
+   *          Note that we can only create phantom superclass when the class is a
+   *          {@link com.ibm.wala.classLoader.BytecodeClass}
+   */
+  private final MissingSuperClassHandling superClassHandling;
+
+  /**
    * Return a set of {@link IClass} that holds all superclasses of klass
    * 
    * @param klass class in question
@@ -146,43 +162,63 @@
 
     Set<IClass> result = HashSetFactory.make(3);
 
-    klass = klass.getSuperclass();
+    try {
+      klass = klass.getSuperclass();
 
-    while (klass != null) {
-      if (DEBUG) {
-        System.err.println("got superclass " + klass);
-      }
-      boolean added = result.add(klass);
-      if (!added) {
-        // oops.  we have A is a sub-class of B and B is a sub-class of A.  blow up.
-        throw new IllegalStateException("cycle in the extends relation for class " + klass);
+      while (klass != null) {
+        if (DEBUG) {
+          System.err.println("got superclass " + klass);
+        }
+        boolean added = result.add(klass);
+        if (!added) {
+          // oops.  we have A is a sub-class of B and B is a sub-class of A.  blow up.
+          throw new IllegalStateException("cycle in the extends relation for class " + klass);
+        }
+        klass = klass.getSuperclass();
+        if (klass != null && klass.getReference().getName().equals(rootTypeRef.getName())) {
+          if (!klass.getReference().getClassLoader().equals(rootTypeRef.getClassLoader())) {
+            throw new IllegalStateException("class " + klass + " is invalid, unexpected classloader");
+          }
+        }
       }
-      klass = klass.getSuperclass();
-      if (klass != null && klass.getReference().getName().equals(rootTypeRef.getName())) {
-        if (!klass.getReference().getClassLoader().equals(rootTypeRef.getClassLoader())) {
-          throw new IllegalStateException("class " + klass + " is invalid, unexpected classloader");
+    } catch (NoSuperclassFoundException e) {
+      if (!superClassHandling.equals(MissingSuperClassHandling.NONE) && klass instanceof BytecodeClass) {
+        if (superClassHandling.equals(MissingSuperClassHandling.PHANTOM)) {
+          // create a phantom superclass.  add it and the root class to the result
+          IClass phantom = getPhantomSuperclass((BytecodeClass) klass);
+          result.add(phantom);
         }
+        result.add(getRootClass());
+      } else {
+        throw e;
       }
     }
     return result;
   }
 
-  private ClassHierarchy(AnalysisScope scope, ClassLoaderFactory factory, Language language, IProgressMonitor progressMonitor)
+  ClassHierarchy(AnalysisScope scope, ClassLoaderFactory factory, Language language,
+      IProgressMonitor progressMonitor, Map<TypeReference, Node> map, MissingSuperClassHandling superClassHandling)
       throws ClassHierarchyException, IllegalArgumentException {
-    this(scope, factory, Collections.singleton(language), progressMonitor);
+    this(scope, factory, Collections.singleton(language), progressMonitor, map,
+        superClassHandling);
   }
 
-  private ClassHierarchy(AnalysisScope scope, ClassLoaderFactory factory, IProgressMonitor progressMonitor)
+  ClassHierarchy(AnalysisScope scope, ClassLoaderFactory factory, IProgressMonitor
+      progressMonitor, Map<TypeReference, Node> map, MissingSuperClassHandling superClassHandling)
       throws ClassHierarchyException, IllegalArgumentException {
-    this(scope, factory, scope.getLanguages(), progressMonitor);
+    this(scope, factory, scope.getLanguages(), progressMonitor, map, superClassHandling);
   }
 
-  private ClassHierarchy(AnalysisScope scope, ClassLoaderFactory factory, Collection<Language> languages,
-      IProgressMonitor progressMonitor) throws ClassHierarchyException, IllegalArgumentException {
+  ClassHierarchy(AnalysisScope scope, ClassLoaderFactory factory, Collection<Language> languages,
+      IProgressMonitor progressMonitor, Map<TypeReference, Node> map, MissingSuperClassHandling superClassHandling) throws
+      ClassHierarchyException, IllegalArgumentException {
     // now is a good time to clear the warnings globally.
     // TODO: think of a better way to guard against warning leaks.
     Warnings.clear();
 
+    this.map = map;
+    this.superClassHandling = superClassHandling;
+    
     if (factory == null) {
       throw new IllegalArgumentException();
     }
@@ -273,13 +309,12 @@
       System.err.println(("Add all classes from loader " + loader));
     }
     Collection<IClass> toRemove = HashSetFactory.make();
-    for (Iterator<IClass> it = loader.iterateAllClasses(); it.hasNext();) {
+    for (IClass klass : Iterator2Iterable.make(loader.iterateAllClasses())) {
       if (progressMonitor != null) {
         if (progressMonitor.isCanceled()) {
           throw new CancelCHAConstructionException();
         }
       }
-      IClass klass = it.next();
       boolean added = addClass(klass);
       if (!added) {
         toRemove.add(klass);
@@ -295,6 +330,7 @@
    */
   @Override
   public boolean addClass(IClass klass) {
+   
     if (klass == null) {
       throw new IllegalArgumentException("klass is null");
     }
@@ -306,34 +342,49 @@
     if (DEBUG) {
       System.err.println(("Attempt to add class " + klass));
     }
-    Set<IClass> loadedSuperclasses;
-    Collection loadedSuperInterfaces;
+    Set<IClass> loadedSuperclasses = null;
+    Collection<IClass> loadedSuperInterfaces;
     try {
       loadedSuperclasses = computeSuperclasses(klass);
       loadedSuperInterfaces = klass.getAllImplementedInterfaces();
     } catch (Exception e) {
-      // a little cleanup
-      if (klass instanceof ShrikeClass) {
-        if (DEBUG) {
-          System.err.println(("Exception.  Clearing " + klass));
+      if (!superClassHandling.equals(MissingSuperClassHandling.NONE) && e instanceof NoSuperclassFoundException) {
+        // this must have been thrown by the getAllImplementedInterfaces() call.
+        // for now, just pretend it implements no interfaces
+        loadedSuperInterfaces = Collections.emptySet();
+      } else {
+        // a little cleanup
+        if (klass instanceof ShrikeClass) {
+          if (DEBUG) {
+            System.err.println(("Exception.  Clearing " + klass));
+          }
         }
+        Warnings.add(ClassExclusion.create(klass.getReference(), e.getMessage()));
+        return false;
       }
-      Warnings.add(ClassExclusion.create(klass.getReference(), e.getMessage()));
-      return false;
     }
     Node node = findOrCreateNode(klass);
 
     if (klass.getReference().equals(this.rootTypeRef)) {
       // there is only one root
-      assert root == null;
+      assert root == null || root == node;
       root = node;
     }
 
     Set workingSuperclasses = HashSetFactory.make(loadedSuperclasses);
     while (node != null) {
       IClass c = node.getJavaClass();
-      IClass superclass = null;
-      superclass = c.getSuperclass();
+      IClass superclass;
+      try {
+        superclass = c.getSuperclass();
+      } catch (NoSuperclassFoundException e) {
+        assert !superClassHandling.equals(MissingSuperClassHandling.NONE);
+
+        if (superClassHandling.equals(MissingSuperClassHandling.ROOT))
+          superclass = getRootClass();
+        else
+          superclass = getPhantomSuperclass((BytecodeClass) c);
+      }
       if (superclass != null) {
         workingSuperclasses.remove(superclass);
         Node supernode = findOrCreateNode(superclass);
@@ -342,6 +393,10 @@
         }
         supernode.addChild(node);
         if (supernode.getJavaClass().getReference().equals(rootTypeRef)) {
+          
+          assert root == null || root == supernode;
+          root = supernode;
+
           node = null;
         } else {
           node = supernode;
@@ -352,8 +407,7 @@
     }
 
     if (loadedSuperInterfaces != null) {
-      for (Iterator it3 = loadedSuperInterfaces.iterator(); it3.hasNext();) {
-        final IClass iface = (IClass) it3.next();
+      for (IClass iface : loadedSuperInterfaces) {
         try {
           // make sure we'll be able to load the interface!
           computeSuperclasses(iface);
@@ -377,6 +431,18 @@
     return true;
   }
 
+  private IClass getPhantomSuperclass(BytecodeClass klass) {
+    ClassLoaderReference loader = klass.getReference().getClassLoader();
+    TypeName superName = klass.getSuperName();
+    TypeReference superRef = TypeReference.findOrCreate(loader, superName);
+    IClass superClass = lookupClass(superRef);
+    if (superClass == null) {
+      superClass = new PhantomClass(superRef, this);
+      addClass(superClass);
+    }
+    return superClass;
+  }
+
   /**
    * Record that a klass implements a particular interface
    */
@@ -454,13 +520,12 @@
     }
     if (declaredClass.isInterface()) {
       HashSet<IMethod> result = HashSetFactory.make(3);
-      Set impls = implementors.get(declaredClass);
+      Set<IClass> impls = implementors.get(declaredClass);
       if (impls == null) {
         // give up and return no receivers
         return Collections.emptySet();
       }
-      for (Iterator it = impls.iterator(); it.hasNext();) {
-        IClass klass = (IClass) it.next();
+      for (IClass klass : impls) {
         if (!klass.isInterface() && !klass.isAbstract()) {
           result.addAll(computeTargetsNotInterface(ref, klass));
         }
@@ -506,7 +571,6 @@
   /**
    * Return the unique receiver of an invocation of method on an object of type m.getDeclaredClass
    * 
-   * @param m
    * @return IMethod, or null if no appropriate receiver is found.
    * @throws IllegalArgumentException if m is null
    */
@@ -581,7 +645,7 @@
         return null;
       } else {
         if (DEBUG) {
-          System.err.println(("Attempt to resolve for " + receiverClass + " in superclass: " + superclass + " " + selector));
+          System.err.println(("Attempt to resolve for " + receiverClass + " in superclass: " + superclass + ' ' + selector));
         }
         return resolveMethod(superclass, selector);
       }
@@ -595,7 +659,7 @@
    * @param selector method selector
    * @return the method if found, else null
    */
-  private IMethod findMethod(IClass clazz, Selector selector) {
+  private static IMethod findMethod(IClass clazz, Selector selector) {
     return clazz.getMethod(selector);
   }
 
@@ -608,9 +672,7 @@
    */
   private Set<IMethod> computeOverriders(Node node, Selector selector) {
     HashSet<IMethod> result = HashSetFactory.make(3);
-    for (Iterator<Node> it = node.getChildren(); it.hasNext();) {
-
-      Node child = it.next();
+    for (Node child : Iterator2Iterable.make(node.getChildren())) {
       IMethod m = findMethod(child.getJavaClass(), selector);
       if (m != null) {
         result.add(m);
@@ -635,22 +697,21 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer(100);
+    StringBuilder result = new StringBuilder(100);
     recursiveStringify(root, result);
     return result.toString();
   }
 
-  private void recursiveStringify(Node n, StringBuffer buffer) {
-    buffer.append(n.toString()).append("\n");
-    for (Iterator<Node> it = n.getChildren(); it.hasNext();) {
-      Node child = it.next();
+  private void recursiveStringify(Node n, StringBuilder buffer) {
+    buffer.append(n.toString()).append('\n');
+    for (Node child : Iterator2Iterable.make(n.getChildren())) {
       recursiveStringify(child, buffer);
     }
   }
 
   /**
    * Number the class hierarchy tree to support efficient subclass tests. After numbering the tree, n1 is a child of n2 iff n2.left
-   * <= n1.left ^ n1.left <= n2.right. Described as "relative numbering" by Vitek, Horspool, and Krall, OOPSLA 97
+   * &lt;= n1.left ^ n1.left &lt;= n2.right. Described as "relative numbering" by Vitek, Horspool, and Krall, OOPSLA 97
    * 
    * TODO: this implementation is recursive; un-recursify if needed
    */
@@ -663,8 +724,7 @@
 
   private void visitForNumbering(Node N) {
     N.left = nextNumber++;
-    for (Iterator<Node> it = N.children.iterator(); it.hasNext();) {
-      Node C = it.next();
+    for (Node C : N.children) {
       visitForNumbering(C);
     }
     N.right = nextNumber++;
@@ -673,7 +733,7 @@
   /**
    * internal representation of a node in the class hiearachy, representing one java class.
    */
-  private static final class Node {
+  static final class Node {
 
     private final IClass klass;
 
@@ -710,13 +770,13 @@
 
     @Override
     public String toString() {
-      StringBuffer result = new StringBuffer(100);
-      result.append(klass.toString()).append(":");
+      StringBuilder result = new StringBuilder(100);
+      result.append(klass.toString()).append(':');
       for (Iterator<Node> i = children.iterator(); i.hasNext();) {
         Node n = i.next();
         result.append(n.klass.toString());
         if (i.hasNext())
-          result.append(",");
+          result.append(',');
       }
       return result.toString();
     }
@@ -756,17 +816,9 @@
       return b;
     } else {
       Node n = map.get(b.getReference());
-      if (n == null) {
-        assert n != null : "null n for " + b;
-      }
+      assert n != null : "null n for " + b;
       Set<IClass> superB;
-      try {
-        superB = getSuperclasses(b);
-      } catch (ClassHierarchyException e1) {
-        e1.printStackTrace();
-        Assertions.UNREACHABLE();
-        superB = null;
-      }
+      superB = getSuperclasses(b);
       IClass aa = a;
       while (aa != null) {
         if (b.equals(aa) || superB.contains(aa)) {
@@ -775,19 +827,13 @@
         aa = aa.getSuperclass();
       }
       Set<IClass> superA;
-      try {
-        superA = getSuperclasses(a);
-      } catch (ClassHierarchyException e1) {
-        e1.printStackTrace();
-        Assertions.UNREACHABLE();
-        superA = null;
-      }
-      Assertions.UNREACHABLE("getLeastCommonSuperclass " + tempA + " " + b + ": " + superA + ", " + superB);
+      superA = getSuperclasses(a);
+      Assertions.UNREACHABLE("getLeastCommonSuperclass " + tempA + ' ' + b + ": " + superA + ", " + superB);
       return null;
     }
   }
 
-  private Set<IClass> getSuperclasses(IClass c) throws ClassHierarchyException {
+  private static Set<IClass> getSuperclasses(IClass c) {
     HashSet<IClass> result = HashSetFactory.make(3);
     while (c.getSuperclass() != null) {
       result.add(c.getSuperclass());
@@ -1019,7 +1065,7 @@
   }
 
   /**
-   * Solely for optimization; return a Collection<TypeReference> representing the subclasses of Error
+   * Solely for optimization; return a Collection&lt;TypeReference&gt; representing the subclasses of Error
    * 
    * kind of ugly. a better scheme?
    */
@@ -1028,8 +1074,7 @@
     if (subTypeRefsOfError == null) {
       computeSubClasses(TypeReference.JavaLangError);
       subTypeRefsOfError = HashSetFactory.make(subclassesOfError.size());
-      for (Iterator it = subclassesOfError.iterator(); it.hasNext();) {
-        IClass klass = (IClass) it.next();
+      for (IClass klass : subclassesOfError) {
         subTypeRefsOfError.add(klass.getReference());
       }
     }
@@ -1037,7 +1082,7 @@
   }
 
   /**
-   * Solely for optimization; return a Collection<TypeReference> representing the subclasses of RuntimeException
+   * Solely for optimization; return a Collection&lt;TypeReference&gt; representing the subclasses of RuntimeException
    * 
    * kind of ugly. a better scheme?
    */
@@ -1046,8 +1091,7 @@
     if (runtimeExceptionTypeRefs == null) {
       computeSubClasses(TypeReference.JavaLangRuntimeException);
       runtimeExceptionTypeRefs = HashSetFactory.make(runtimeExceptionClasses.size());
-      for (Iterator it = runtimeExceptionClasses.iterator(); it.hasNext();) {
-        IClass klass = (IClass) it.next();
+      for (IClass klass : runtimeExceptionClasses) {
         runtimeExceptionTypeRefs.add(klass.getReference());
       }
     }
@@ -1067,8 +1111,7 @@
     assert node != null : "null node for class " + T;
     HashSet<IClass> result = HashSetFactory.make(3);
     result.add(T);
-    for (Iterator<Node> it = node.getChildren(); it.hasNext();) {
-      Node child = it.next();
+    for (Node child : Iterator2Iterable.make(node.getChildren())) {
       result.addAll(computeSubClasses(child.klass.getReference()));
     }
     return result;
@@ -1099,13 +1142,8 @@
 
   @Override
   public Iterator<IClass> iterator() {
-    Function<Node, IClass> toClass = new Function<Node, IClass>() {
-      @Override
-      public IClass apply(Node n) {
-        return n.klass;
-      }
-    };
-    return new MapIterator<Node, IClass>(map.values().iterator(), toClass);
+    Function<Node, IClass> toClass = n -> n.klass;
+    return new MapIterator<>(map.values().iterator(), toClass);
   }
 
   /**
@@ -1123,9 +1161,9 @@
 
   @Override
   public IClassLoader getLoader(ClassLoaderReference loaderRef) {
-    for (int i = 0; i < loaders.length; i++) {
-      if (loaders[i].getReference().equals(loaderRef)) {
-        return loaders[i];
+    for (IClassLoader loader : loaders) {
+      if (loader.getReference().equals(loaderRef)) {
+        return loader;
       }
     }
     Assertions.UNREACHABLE();
@@ -1152,7 +1190,6 @@
   }
 
   /**
-   * @param klass
    * @return the classes that immediately extend klass. if klass is an array class A[][]...[], we return array classes B[][]...[]
    *         (same dimensionality) where B is an immediate subclass of A. If A is primitive, we return the empty set.
    */
@@ -1161,13 +1198,8 @@
     if (klass.isArrayClass()) {
       return getImmediateArraySubclasses((ArrayClass)klass);
     }
-    Function<Node, IClass> node2Class = new Function<Node, IClass>() {
-      @Override
-      public IClass apply(Node n) {
-        return n.klass;
-      }
-    };
-    return Iterator2Collection.toSet(new MapIterator<Node, IClass>(findNode(klass).children.iterator(), node2Class));
+    Function<Node, IClass> node2Class = n -> n.klass;
+    return Iterator2Collection.toSet(new MapIterator<>(findNode(klass).children.iterator(), node2Class));
   }
 
   private Collection<IClass> getImmediateArraySubclasses(ArrayClass klass) {
@@ -1199,66 +1231,6 @@
     return result.isPrimitiveType() ? null : lookupClass(result);
   }
 
-  /**
-   * @return a ClassHierarchy object representing the analysis scope
-   * @throws ClassHierarchyException
-   */
-  public static ClassHierarchy make(AnalysisScope scope) throws ClassHierarchyException {
-    if (scope == null) {
-      throw new IllegalArgumentException("null scope");
-    }
-    return make(scope, new ClassLoaderFactoryImpl(scope.getExclusions()));
-  }
-
-  /**
-   * temporarily marking this internal to avoid infinite sleep with randomly chosen IProgressMonitor.
-   */
-  public static ClassHierarchy make(AnalysisScope scope, IProgressMonitor monitor) throws ClassHierarchyException {
-    if (scope == null) {
-      throw new IllegalArgumentException("null scope");
-    }
-    return make(scope, new ClassLoaderFactoryImpl(scope.getExclusions()), monitor);
-  }
-
-  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory) throws ClassHierarchyException {
-    if (scope == null) {
-      throw new IllegalArgumentException("null scope");
-    }
-    if (factory == null) {
-      throw new IllegalArgumentException("null factory");
-    }
-    return new ClassHierarchy(scope, factory, null);
-  }
-
-  /**
-   * temporarily marking this internal to avoid infinite sleep with randomly chosen IProgressMonitor.
-   */
-  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory, IProgressMonitor monitor)
-      throws ClassHierarchyException {
-    return new ClassHierarchy(scope, factory, monitor);
-  }
-
-  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory, Set<Language> languages)
-      throws ClassHierarchyException {
-    return new ClassHierarchy(scope, factory, languages, null);
-  }
-
-  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory, Language language)
-      throws ClassHierarchyException {
-    return new ClassHierarchy(scope, factory, language, null);
-  }
-
-  /**
-   * temporarily marking this internal to avoid infinite sleep with randomly chosen IProgressMonitor. TODO: nanny for testgen
-   */
-  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory, Language language, IProgressMonitor monitor)
-      throws ClassHierarchyException {
-    if (factory == null) {
-      throw new IllegalArgumentException("null factory");
-    }
-    return new ClassHierarchy(scope, factory, language, monitor);
-  }
-
   @Override
   public IClass getRootClass() {
     return root.getJavaClass();
@@ -1294,7 +1266,7 @@
 
     @Override
     public String getMsg() {
-      return getClass().toString() + " : " + klass + " " + message;
+      return getClass().toString() + " : " + klass + ' ' + message;
     }
 
     public static ClassExclusion create(TypeReference klass, String message) {
@@ -1338,4 +1310,8 @@
   }
 
 /** END Custom change: remember unresolved classes */
+
+  public MissingSuperClassHandling getSuperClassHandling() {
+    return superClassHandling;
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchyStats.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchyStats.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchyStats.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchyStats.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,10 +25,10 @@
       throw new IllegalArgumentException("cha cannot be null");
     }
     IClassLoader[] loaders = cha.getLoaders();
-    for (int i = 0; i < loaders.length; i++) {
-      System.out.println("loader: " + loaders[i]);
-      System.out.println("  classes: " + loaders[i].getNumberOfClasses());
-      System.out.println("  methods: " + loaders[i].getNumberOfMethods());
+    for (IClassLoader loader : loaders) {
+      System.out.println("loader: " + loader);
+      System.out.println("  classes: " + loader.getNumberOfClasses());
+      System.out.println("  methods: " + loader.getNumberOfMethods());
     }
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchyWarning.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchyWarning.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchyWarning.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchyWarning.java	2019-01-29 17:08:39.000000000 +0000
@@ -32,4 +32,4 @@
   public static ClassHierarchyWarning create(String message) {
     return new ClassHierarchyWarning(message);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/IClassHierarchy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/IClassHierarchy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/IClassHierarchy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/IClassHierarchy.java	2019-01-29 17:08:39.000000000 +0000
@@ -144,14 +144,14 @@
   public Collection<IClass> computeSubClasses(TypeReference type);
 
   /**
-   * Solely for optimization; return a Collection<TypeReference> representing the subclasses of Error
+   * Solely for optimization; return a Collection&lt;TypeReference&gt; representing the subclasses of Error
    * 
    * kind of ugly. a better scheme?
    */
   public Collection<TypeReference> getJavaLangErrorTypes();
 
   /**
-   * Solely for optimization; return a Collection<TypeReference> representing the subclasses of {@link RuntimeException}
+   * Solely for optimization; return a Collection&lt;TypeReference&gt; representing the subclasses of {@link RuntimeException}
    * 
    * kind of ugly. a better scheme?
    */
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/SeqClassHierarchyFactory.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/SeqClassHierarchyFactory.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/SeqClassHierarchyFactory.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/SeqClassHierarchyFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ipa.cha;
+
+import com.ibm.wala.classLoader.ClassLoaderFactory;
+import com.ibm.wala.classLoader.ClassLoaderFactoryImpl;
+import com.ibm.wala.classLoader.Language;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
+import com.ibm.wala.util.collections.HashMapFactory;
+
+import java.util.Set;
+
+public class SeqClassHierarchyFactory {
+
+  /**
+   * @return a ClassHierarchy object representing the analysis scope
+   */
+  public static ClassHierarchy make(AnalysisScope scope) throws ClassHierarchyException {
+    if (scope == null) {
+      throw new IllegalArgumentException("null scope");
+    }
+    return make(scope, new ClassLoaderFactoryImpl(scope.getExclusions()));
+  }
+
+  /**
+   * temporarily marking this internal to avoid infinite sleep with randomly chosen IProgressMonitor.
+   */
+  public static ClassHierarchy make(AnalysisScope scope, IProgressMonitor monitor) throws ClassHierarchyException {
+    if (scope == null) {
+      throw new IllegalArgumentException("null scope");
+    }
+    return make(scope, new ClassLoaderFactoryImpl(scope.getExclusions()), monitor);
+  }
+
+  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory) throws ClassHierarchyException {
+    if (scope == null) {
+      throw new IllegalArgumentException("null scope");
+    }
+    if (factory == null) {
+      throw new IllegalArgumentException("null factory");
+    }
+    return new ClassHierarchy(scope, factory, null, HashMapFactory.make(),
+        ClassHierarchy.MissingSuperClassHandling.NONE);
+  }
+
+  /**
+   * temporarily marking this internal to avoid infinite sleep with randomly chosen IProgressMonitor.
+   */
+  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory, IProgressMonitor monitor)
+      throws ClassHierarchyException {
+    return new ClassHierarchy(scope, factory, monitor, HashMapFactory.make(), ClassHierarchy.MissingSuperClassHandling.NONE);
+  }
+
+  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory, Set<Language> languages)
+      throws ClassHierarchyException {
+    return new ClassHierarchy(scope, factory, languages, null, HashMapFactory.make(), ClassHierarchy.MissingSuperClassHandling.NONE);
+  }
+
+  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory, Language language)
+      throws ClassHierarchyException {
+    return new ClassHierarchy(scope, factory, language, null, HashMapFactory.make(), ClassHierarchy.MissingSuperClassHandling.NONE);
+  }
+
+  /**
+   * temporarily marking this internal to avoid infinite sleep with randomly chosen IProgressMonitor. TODO: nanny for testgen
+   */
+  public static ClassHierarchy make(AnalysisScope scope, ClassLoaderFactory factory, Language language, IProgressMonitor monitor)
+      throws ClassHierarchyException {
+    if (factory == null) {
+      throw new IllegalArgumentException("null factory");
+    }
+    return new ClassHierarchy(scope, factory, language, monitor, HashMapFactory.make(), ClassHierarchy.MissingSuperClassHandling.NONE);
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/GenReach.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/GenReach.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/GenReach.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/GenReach.java	2019-01-29 17:08:39.000000000 +0000
@@ -33,7 +33,7 @@
 
   @SuppressWarnings("unchecked")
   public GenReach(Graph<T> flowGraph, Map<T, Collection<L>> gen) {
-    super(flowGraph, new GenFunctions<T, L>(gen), makeDomain(gen));
+    super(flowGraph, new GenFunctions<>(gen), makeDomain(gen));
     // ugly but necessary, in order to avoid computing the domain twice.
     GenReach.GenFunctions<T, L> g = (GenReach.GenFunctions<T, L>) getTransferFunctionProvider();
     g.domain = getLatticeValues();
@@ -102,4 +102,4 @@
     }
 
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRefFieldAccess.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRefFieldAccess.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRefFieldAccess.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRefFieldAccess.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,7 +13,6 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -28,12 +27,13 @@
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAPutInstruction;
 import com.ibm.wala.types.FieldReference;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 /**
  * Computes interprocedural field accesses for a given method.
  * 
  * @author Martin Seidel
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  *
  */
 public final class ModRefFieldAccess {
@@ -46,10 +46,10 @@
 			this.mods = mods;
 			this.refs = refs;
 			if (mods == null) {
-				this.mods = new HashMap<IClass, Set<IField>>();
+				this.mods = new HashMap<>();
 			}
 			if (refs == null) {
-				this.refs = new HashMap<IClass, Set<IField>>();
+				this.refs = new HashMap<>();
 			}
 		}
 		
@@ -73,11 +73,11 @@
 
 	private ModRefFieldAccess(CallGraph cg) {
 		this.cg = cg;
-		this.refs = new HashMap<CGNode, Map<IClass, Set<IField>>>();
-		this.mods = new HashMap<CGNode, Map<IClass, Set<IField>>>();
-		this.trefs = new HashMap<CGNode, Map<IClass, Set<IField>>>();
-		this.tmods = new HashMap<CGNode, Map<IClass, Set<IField>>>();
-		this.done = new LinkedList<CGNode>();
+		this.refs = new HashMap<>();
+		this.mods = new HashMap<>();
+		this.trefs = new HashMap<>();
+		this.tmods = new HashMap<>();
+		this.done = new LinkedList<>();
 	}
 	
 	public static ModRefFieldAccess compute(CallGraph cg) {
@@ -119,8 +119,7 @@
 				continue;
 			}
 			
-			for (Iterator<SSAInstruction> it = ir.iterateNormalInstructions(); it.hasNext();) {
-				SSAInstruction instr = it.next();
+			for (SSAInstruction instr : Iterator2Iterable.make(ir.iterateNormalInstructions())) {
 				if (instr instanceof SSAGetInstruction) {
 					SSAGetInstruction get = (SSAGetInstruction) instr;
 					FieldReference fref = get.getDeclaredField();
@@ -165,8 +164,7 @@
 		
 		final IR ir = node.getIR();
 		if (ir != null) {
-			for (Iterator<SSAInstruction> it = ir.iterateNormalInstructions(); it.hasNext();) {
-				SSAInstruction instr = it.next();
+			for (SSAInstruction instr : Iterator2Iterable.make(ir.iterateNormalInstructions())) {
 				if (instr instanceof SSAGetInstruction) {
 					SSAGetInstruction get = (SSAGetInstruction) instr;
 					FieldReference fref = get.getDeclaredField();
@@ -197,8 +195,7 @@
 			}
 		}
 		
-		for (Iterator<CGNode> it = cg.getSuccNodes(node); it.hasNext();) {
-			CGNode n = it.next();
+		for (CGNode n : Iterator2Iterable.make(cg.getSuccNodes(node))) {
 			if (!done.contains(n)) {
 				done.add(n);
 				TwoMaps t = recAdd(n);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRef.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRef.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRef.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRef.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,6 @@
 package com.ibm.wala.ipa.modref;
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -20,6 +19,7 @@
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.CallGraphTransitiveClosure;
+import com.ibm.wala.ipa.callgraph.propagation.HeapModel;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
@@ -33,7 +33,7 @@
 import com.ibm.wala.ssa.SSANewInstruction;
 import com.ibm.wala.ssa.SSAPutInstruction;
 import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.functions.Function;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.intset.OrdinalSet;
 
 /**
@@ -44,11 +44,11 @@
  */
 public class ModRef<T extends InstanceKey> {
 
-  public static ModRef make() {
-    return new ModRef();
+  public static <U extends InstanceKey> ModRef<U> make() {
+    return new ModRef<>();
   }
 
-  protected ModRef() {
+  public ModRef() {
   }
 
   /**
@@ -96,46 +96,34 @@
   }
 
   /**
-   * For each call graph node, what heap locations (as determined by a heap model) may it write, <bf> NOT </bf> including its
+   * For each call graph node, what heap locations (as determined by a heap model) may it write, <b> NOT </b> including its
    * callees transitively
-   * 
-   * @param heapExclude
    */
   private Map<CGNode, Collection<PointerKey>> scanForMod(CallGraph cg, final PointerAnalysis<T> pa, final HeapExclusions heapExclude) {
 
-    return CallGraphTransitiveClosure.collectNodeResults(cg, new Function<CGNode, Collection<PointerKey>>() {
-
-      @Override
-      public Collection<PointerKey> apply(CGNode n) {
-        return scanNodeForMod(n, pa, heapExclude);
-      }
-    });
+    return CallGraphTransitiveClosure.collectNodeResults(cg, n -> scanNodeForMod(n, pa, heapExclude));
   }
 
   /**
-   * For each call graph node, what heap locations (as determined by a heap model) may it read, <bf> NOT </bf> including its callees
+   * For each call graph node, what heap locations (as determined by a heap model) may it read, <b> NOT </b> including its callees
    * transitively
-   * 
-   * @param heapExclude
    */
   private Map<CGNode, Collection<PointerKey>> scanForRef(CallGraph cg, final PointerAnalysis<T> pa, final HeapExclusions heapExclude) {
-    return CallGraphTransitiveClosure.collectNodeResults(cg, new Function<CGNode, Collection<PointerKey>>() {
-
-      @Override
-      public Collection<PointerKey> apply(CGNode n) {
-        return scanNodeForRef(n, pa, heapExclude);
-      }
-    });
+    return CallGraphTransitiveClosure.collectNodeResults(cg, n -> scanNodeForRef(n, pa, heapExclude));
   }
 
   public ExtendedHeapModel makeHeapModel(PointerAnalysis<T> pa) {
-    return new DelegatingExtendedHeapModel(pa.getHeapModel());
+    HeapModel heapModel = pa.getHeapModel();
+    if (heapModel instanceof ExtendedHeapModel) {
+      return (ExtendedHeapModel) heapModel;
+    } else {
+      return new DelegatingExtendedHeapModel(heapModel);
+    }
   }
+  
   /**
-   * For a call graph node, what heap locations (as determined by a heap model) may it write, <bf> NOT </bf> including it's callees
+   * For a call graph node, what heap locations (as determined by a heap model) may it write, <b> NOT </b> including it's callees
    * transitively
-   * 
-   * @param heapExclude
    */
   private Collection<PointerKey> scanNodeForMod(final CGNode n, final PointerAnalysis<T> pa, HeapExclusions heapExclude) {
     Collection<PointerKey> result = HashSetFactory.make();
@@ -143,8 +131,8 @@
     SSAInstruction.Visitor v = makeModVisitor(n, result, pa, h);
     IR ir = n.getIR();
     if (ir != null) {
-      for (Iterator<SSAInstruction> it = ir.iterateNormalInstructions(); it.hasNext();) {
-        it.next().visit(v);
+      for (SSAInstruction inst : Iterator2Iterable.make(ir.iterateNormalInstructions())) {
+        inst.visit(v);
         assert ! result.contains(null);
       }
     }
@@ -155,7 +143,7 @@
   }
 
   /**
-   * For a call graph node, what heap locations (as determined by a heap model) may it read, <bf> NOT </bf> including it's callees
+   * For a call graph node, what heap locations (as determined by a heap model) may it read, <b> NOT </b> including it's callees
    * transitively
    */
   private Collection<PointerKey> scanNodeForRef(final CGNode n, final PointerAnalysis<T> pa, HeapExclusions heapExclude) {
@@ -164,8 +152,7 @@
     SSAInstruction.Visitor v = makeRefVisitor(n, result, pa, h);
     IR ir = n.getIR();
     if (ir != null) {
-      for (Iterator<SSAInstruction> it = ir.iterateNormalInstructions(); it.hasNext();) {
-        SSAInstruction x = it.next();
+      for (SSAInstruction x : Iterator2Iterable.make(ir.iterateNormalInstructions())) {
         x.visit(v);
         assert ! result.contains(null) : x;
      }
@@ -176,7 +163,7 @@
     return result;
   }
 
-  protected static class RefVisitor<T extends InstanceKey, H extends ExtendedHeapModel> extends SSAInstruction.Visitor {
+  public static class RefVisitor<T extends InstanceKey, H extends ExtendedHeapModel> extends SSAInstruction.Visitor {
     protected final CGNode n;
 
     protected final Collection<PointerKey> result;
@@ -185,7 +172,7 @@
 
     protected final H h;
 
-    protected RefVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa2, H h) {
+    public RefVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa2, H h) {
       this.n = n;
       this.result = result;
       this.pa = pa2;
@@ -227,7 +214,7 @@
     }
   }
 
-  protected static class ModVisitor<T extends InstanceKey, H extends ExtendedHeapModel> extends SSAInstruction.Visitor {
+  public static class ModVisitor<T extends InstanceKey, H extends ExtendedHeapModel> extends SSAInstruction.Visitor {
     protected final CGNode n;
 
     protected final Collection<PointerKey> result;
@@ -238,7 +225,7 @@
 
     private final boolean ignoreAllocHeapDefs;
 
-    protected ModVisitor(CGNode n, Collection<PointerKey> result, H h, PointerAnalysis<T> pa,
+    public ModVisitor(CGNode n, Collection<PointerKey> result, H h, PointerAnalysis<T> pa,
         boolean ignoreAllocHeapDefs) {
       this.n = n;
       this.result = result;
@@ -342,9 +329,10 @@
     return makeModVisitor(n, result, pa, h, false);
   }
 
-  protected ModVisitor makeModVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h,
+  protected ModVisitor<T, ? extends ExtendedHeapModel> makeModVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h,
       boolean ignoreAllocHeapDefs) {
-    return new ModVisitor(n, result, h, pa, ignoreAllocHeapDefs);
+    return n.getMethod().getDeclaringClass().getClassLoader().getLanguage().makeModVisitor(n, result, pa, h, ignoreAllocHeapDefs);
+    //return new ModVisitor<>(n, result, h, pa, ignoreAllocHeapDefs);
   }
 
   /**
@@ -368,8 +356,8 @@
     return hexcl == null ? result : hexcl.filter(result);
   }
 
-  protected RefVisitor makeRefVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h) {
-    return new RefVisitor<T, ExtendedHeapModel>(n, result, pa, h);
+  protected RefVisitor<T, ? extends ExtendedHeapModel> makeRefVisitor(CGNode n, Collection<PointerKey> result, PointerAnalysis<T> pa, ExtendedHeapModel h) {
+    return n.getMethod().getDeclaringClass().getClassLoader().getLanguage().makeRefVisitor(n, result, pa, h);
   }
 
   /**
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ExceptionalReturnCallee.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ExceptionalReturnCallee.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ExceptionalReturnCallee.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ExceptionalReturnCallee.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,4 +26,4 @@
   public Kind getKind() {
     return Kind.EXC_RET_CALLEE;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ExceptionalReturnCaller.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ExceptionalReturnCaller.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ExceptionalReturnCaller.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ExceptionalReturnCaller.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,4 +37,4 @@
   public Kind getKind() {
     return Kind.EXC_RET_CALLER;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/HeapReachingDefs.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/HeapReachingDefs.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/HeapReachingDefs.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/HeapReachingDefs.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Predicate;
 
 import com.ibm.wala.dataflow.graph.AbstractMeetOperator;
 import com.ibm.wala.dataflow.graph.BitVectorFramework;
@@ -32,7 +33,6 @@
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.callgraph.propagation.StaticFieldKey;
-import com.ibm.wala.ipa.modref.DelegatingExtendedHeapModel;
 import com.ibm.wala.ipa.modref.ExtendedHeapModel;
 import com.ibm.wala.ipa.modref.ModRef;
 import com.ibm.wala.ipa.slicer.HeapStatement.HeapReturnCaller;
@@ -45,7 +45,6 @@
 import com.ibm.wala.ssa.analysis.IExplodedBasicBlock;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.CancelRuntimeException;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
@@ -72,11 +71,11 @@
 
   private static final boolean VERBOSE = false;
 
-  private final ModRef modRef;
+  private final ModRef<T> modRef;
 
   private final ExtendedHeapModel heapModel;
   
-  public HeapReachingDefs(ModRef modRef, ExtendedHeapModel heapModel) {
+  public HeapReachingDefs(ModRef<T> modRef, ExtendedHeapModel heapModel) {
     this.modRef = modRef;
     this.heapModel = heapModel;
   }
@@ -125,12 +124,12 @@
     Map<Integer, NormalStatement> ssaInstructionIndex2Statement = mapInstructionsToStatements(domain);
 
     // solve reaching definitions as a dataflow problem
-    BitVectorFramework<IExplodedBasicBlock, Statement> rd = new BitVectorFramework<IExplodedBasicBlock, Statement>(cfg, new RD(node,
+    BitVectorFramework<IExplodedBasicBlock, Statement> rd = new BitVectorFramework<>(cfg, new RD(node,
         cfg, pa, domain, ssaInstructionIndex2Statement, exclusions), domain);
     if (VERBOSE) {
       System.err.println("Solve ");
     }
-    BitVectorSolver<? extends ISSABasicBlock> solver = new BitVectorSolver<IExplodedBasicBlock>(rd);
+    BitVectorSolver<? extends ISSABasicBlock> solver = new BitVectorSolver<>(rd);
     try {
       solver.solve(null);
     } catch (CancelException e) {
@@ -181,7 +180,7 @@
      * For each pointerKey, which statements may def it
      */
     private Map<PointerKey, MutableIntSet> initPointerKeyMod(OrdinalSetMapping<Statement> domain, CGNode node, ExtendedHeapModel h,
-        PointerAnalysis<? extends InstanceKey> pa) {
+        PointerAnalysis<T> pa) {
       Map<PointerKey, MutableIntSet> pointerKeyMod = HashMapFactory.make();
       for (Statement s : domain) {
         switch (s.getKind()) {
@@ -239,7 +238,6 @@
 
     @Override
     public Set<Entry<Statement, OrdinalSet<Statement>>> entrySet() {
-      Assertions.UNREACHABLE();
       return delegate.entrySet();
     }
 
@@ -323,7 +321,7 @@
               }
             }
           }
-          return new OrdinalSet<Statement>(defs, domain);
+          return new OrdinalSet<>(defs, domain);
         } else {
           return OrdinalSet.empty();
         }
@@ -332,12 +330,12 @@
         PointerKey p = r.getLocation();
         BitVectorVariable v = solver.getIn(cfg.exit());
         if (DEBUG) {
-          System.err.println("computeResult " + cfg.exit() + " " + s + " " + pointerKeyMod.get(p) + " " + v);
+          System.err.println("computeResult " + cfg.exit() + ' ' + s + ' ' + pointerKeyMod.get(p) + ' ' + v);
         }
         if (pointerKeyMod.get(p) == null) {
           return OrdinalSet.empty();
         }
-        return new OrdinalSet<Statement>(pointerKeyMod.get(p).intersection(v.getValue()), domain);
+        return new OrdinalSet<>(pointerKeyMod.get(p).intersection(v.getValue()), domain);
       }
       case HEAP_RET_CALLER: {
         HeapStatement.HeapReturnCaller r = (HeapStatement.HeapReturnCaller) s;
@@ -349,7 +347,7 @@
         } else {
           // the defs that flow to the call may flow to this return, since
           // the callees may have no relevant effect.
-          return new OrdinalSet<Statement>(pointerKeyMod.get(r.getLocation()).intersection(v.getValue()), domain);
+          return new OrdinalSet<>(pointerKeyMod.get(r.getLocation()).intersection(v.getValue()), domain);
         }
       }
       case HEAP_PARAM_CALLER: {
@@ -360,14 +358,14 @@
           int x = domain.getMappedIndex(new HeapStatement.HeapParamCallee(node, r.getLocation()));
           assert x >= 0;
           IntSet xset = SparseIntSet.singleton(x);
-          return new OrdinalSet<Statement>(xset, domain);
+          return new OrdinalSet<>(xset, domain);
         }
         BitVectorVariable v = solver.getIn(callBlock);
         if (pointerKeyMod.get(r.getLocation()) == null || v.getValue() == null) {
           // do nothing ... force flow into and out of the callees
           return OrdinalSet.empty();
         } else {
-          return new OrdinalSet<Statement>(pointerKeyMod.get(r.getLocation()).intersection(v.getValue()), domain);
+          return new OrdinalSet<>(pointerKeyMod.get(r.getLocation()).intersection(v.getValue()), domain);
         }
       }
       case NORMAL_RET_CALLEE:
@@ -420,7 +418,7 @@
     return true;
   }
 
-  private Collection<PointerKey> getMod(Statement s, CGNode n, ExtendedHeapModel h, PointerAnalysis<? extends InstanceKey> pa, HeapExclusions exclusions) {
+  private Collection<PointerKey> getMod(Statement s, CGNode n, ExtendedHeapModel h, PointerAnalysis<T> pa, HeapExclusions exclusions) {
     switch (s.getKind()) {
     case NORMAL:
       NormalStatement ns = (NormalStatement) s;
@@ -466,7 +464,7 @@
 
   private static OrdinalSetMapping<Statement> createStatementDomain(Collection<Statement> statements) {
     Statement[] arr = new Statement[statements.size()];
-    OrdinalSetMapping<Statement> domain = new ObjectArrayMapping<Statement>(statements.toArray(arr));
+    OrdinalSetMapping<Statement> domain = new ObjectArrayMapping<>(statements.toArray(arr));
     return domain;
   }
 
@@ -481,7 +479,7 @@
 
     private final OrdinalSetMapping<Statement> domain;
 
-    private final PointerAnalysis<? extends InstanceKey> pa;
+    private final PointerAnalysis<T> pa;
 
     private final Map<Integer, NormalStatement> ssaInstructionIndex2Statement;
 
@@ -493,7 +491,7 @@
      */
     private final IBinaryNaturalRelation heapReturnCaller = new BasicNaturalRelation();
 
-    public RD(CGNode node, ExplodedControlFlowGraph cfg, PointerAnalysis<? extends InstanceKey> pa2, OrdinalSetMapping<Statement> domain,
+    public RD(CGNode node, ExplodedControlFlowGraph cfg, PointerAnalysis<T> pa2, OrdinalSetMapping<Statement> domain,
         Map<Integer, NormalStatement> ssaInstructionIndex2Statement, HeapExclusions exclusions) {
       this.node = node;
       this.cfg = cfg;
@@ -522,7 +520,7 @@
     @Override
     public UnaryOperator<BitVectorVariable> getEdgeTransferFunction(IExplodedBasicBlock src, IExplodedBasicBlock dst) {
       if (DEBUG) {
-        System.err.println("getEdgeXfer: " + src + " " + dst + " " + src.isEntryBlock());
+        System.err.println("getEdgeXfer: " + src + ' ' + dst + ' ' + src.isEntryBlock());
       }
       if (src.isEntryBlock()) {
         if (DEBUG) {
@@ -588,7 +586,7 @@
 
       SSAInstruction s = b.getInstruction();
       if (DEBUG) {
-        System.err.println("gen " + b + " " + s);
+        System.err.println("gen " + b + ' ' + s);
       }
       if (s == null) {
         return null;
@@ -599,12 +597,12 @@
           Statement st = ssaInstructionIndex2Statement.get(b.getLastInstructionIndex());
           if (st == null) {
             System.err.println(ssaInstructionIndex2Statement);
-            Assertions.UNREACHABLE("bang " + b + " " + b.getLastInstructionIndex() + " " + s);
+            Assertions.UNREACHABLE("bang " + b + ' ' + b.getLastInstructionIndex() + ' ' + s);
           }
           int domainIndex = domain.getMappedIndex(st);
           assert (domainIndex != -1);
           if (DEBUG) {
-            System.err.println("GEN FOR " + s + " " + heapReturnCaller.getRelated(domainIndex));
+            System.err.println("GEN FOR " + s + ' ' + heapReturnCaller.getRelated(domainIndex));
           }
           return heapReturnCaller.getRelated(domainIndex);
         } else {
@@ -645,31 +643,23 @@
           return null;
         } else {
           // only static fields are actually killed
-          Predicate staticFilter = new Predicate() {
-            @Override public boolean test(Object o) {
-              return o instanceof StaticFieldKey;
-            }
-          };
+          Predicate<PointerKey> staticFilter = StaticFieldKey.class::isInstance;
           final Collection<PointerKey> kill = Iterator2Collection
-              .toSet(new FilterIterator<PointerKey>(mod.iterator(), staticFilter));
+              .toSet(new FilterIterator<>(mod.iterator(), staticFilter));
           if (kill.isEmpty()) {
             return null;
           } else {
-            Predicate f = new Predicate() {
-              // accept any statement which writes a killed location.
-              @Override public boolean test(Object o) {
-                Statement s = (Statement) o;
-                Collection m = getMod(s, node, heapModel, pa, exclusions);
-                for (PointerKey k : kill) {
-                  if (m.contains(k)) {
-                    return true;
-                  }
+            Predicate<Statement> f = s1 -> {
+              Collection m = getMod(s1, node, heapModel, pa, exclusions);
+              for (PointerKey k : kill) {
+                if (m.contains(k)) {
+                  return true;
                 }
-                return false;
               }
+              return false;
             };
             BitVector result = new BitVector();
-            for (Statement k : Iterator2Iterable.make(new FilterIterator<Statement>(domain.iterator(), f))) {
+            for (Statement k : Iterator2Iterable.make(new FilterIterator<>(domain.iterator(), f))) {
               result.set(domain.getMappedIndex(k));
             }
             return result;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/HeapStatement.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/HeapStatement.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/HeapStatement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/HeapStatement.java	2019-01-29 17:08:39.000000000 +0000
@@ -53,7 +53,7 @@
     
     @Override
     public String toString() {
-      return getKind().toString() + ":" + getNode() + " " + getLocation() + " call:" + getCall();
+      return getKind().toString() + ':' + getNode() + ' ' + getLocation() + " call:" + getCall();
     }
 
     @Override
@@ -101,7 +101,7 @@
     
     @Override
     public String toString() {
-      return getKind().toString() + ":" + getNode() + " " + getLocation();
+      return getKind().toString() + ':' + getNode() + ' ' + getLocation();
     }
   }
 
@@ -130,7 +130,7 @@
 
     @Override
     public String toString() {
-      return getKind().toString() + ":" + getNode() + " " + getLocation() + " call:" + getCall();
+      return getKind().toString() + ':' + getNode() + ' ' + getLocation() + " call:" + getCall();
     }
 
     @Override
@@ -178,7 +178,7 @@
     
     @Override
     public String toString() {
-      return getKind().toString() + ":" + getNode() + " " + getLocation();
+      return getKind().toString() + ':' + getNode() + ' ' + getLocation();
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ISDG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ISDG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ISDG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ISDG.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,6 +13,7 @@
 import java.util.Iterator;
 
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.cha.IClassHierarchyDweller;
 import com.ibm.wala.ipa.slicer.Slicer.ControlDependenceOptions;
 import com.ibm.wala.util.graph.NumberedGraph;
@@ -31,7 +32,7 @@
   /**
    * Get the program dependence graph constructed for a particular node.
    */
-  PDG getPDG(CGNode node);
+  PDG<? extends InstanceKey> getPDG(CGNode node);
 
   /**
    * Iterate over the nodes which have been discovered so far, but do <em>NOT</em> eagerly construct the entire graph.
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/NormalReturnCallee.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/NormalReturnCallee.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/NormalReturnCallee.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/NormalReturnCallee.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,4 +26,4 @@
   public Kind getKind() {
     return Kind.NORMAL_RET_CALLEE;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/NormalReturnCaller.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/NormalReturnCaller.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/NormalReturnCaller.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/NormalReturnCaller.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,4 +37,4 @@
   public Kind getKind() {
     return Kind.NORMAL_RET_CALLER;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/NormalStatement.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/NormalStatement.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/NormalStatement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/NormalStatement.java	2019-01-29 17:08:39.000000000 +0000
@@ -28,19 +28,19 @@
 
   @Override
   public String toString() {
-    String name = "";
+    StringBuilder name = new StringBuilder();
     if (getInstruction().hasDef()) {
       String[] names = getNode().getIR().getLocalNames(getInstructionIndex(), getInstruction().getDef());
       if (names != null && names.length > 0) {
-        name = "[" + names[0];
+        name = new StringBuilder("[").append(names[0]);
         for (int i = 1; i < names.length; i++) {
-          name = name + ", " + names[i];
+          name.append(", ").append(names[i]);
         }
-        name = name + "]: ";
+        name.append("]: ");
       }
     }
 
-    return "NORMAL " + getNode().getMethod().getName() + ":" + name + getInstruction().toString() + " " + getNode();
+    return "NORMAL " + getNode().getMethod().getName() + ':' + name + getInstruction().toString() + ' ' + getNode();
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ParamCallee.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ParamCallee.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ParamCallee.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ParamCallee.java	2019-01-29 17:08:39.000000000 +0000
@@ -64,4 +64,4 @@
   }
   
   
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ParamCaller.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ParamCaller.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ParamCaller.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ParamCaller.java	2019-01-29 17:08:39.000000000 +0000
@@ -70,4 +70,4 @@
   }
 
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/PDG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/PDG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/PDG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/PDG.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,6 +17,7 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Predicate;
 
 import com.ibm.wala.analysis.stackMachine.AbstractIntStackMachine;
 import com.ibm.wala.cfg.ControlFlowGraph;
@@ -29,7 +30,6 @@
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.cfg.ExceptionPrunedCFG;
 import com.ibm.wala.ipa.cfg.PrunedCFG;
-import com.ibm.wala.ipa.modref.DelegatingExtendedHeapModel;
 import com.ibm.wala.ipa.modref.ExtendedHeapModel;
 import com.ibm.wala.ipa.modref.ModRef;
 import com.ibm.wala.ipa.slicer.Slicer.ControlDependenceOptions;
@@ -53,13 +53,7 @@
 import com.ibm.wala.ssa.SSAPiInstruction;
 import com.ibm.wala.ssa.SSAReturnInstruction;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Predicate;
-import com.ibm.wala.util.collections.FilterIterator;
-import com.ibm.wala.util.collections.HashMapFactory;
-import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.collections.Iterator2Collection;
-import com.ibm.wala.util.collections.Iterator2Iterable;
-import com.ibm.wala.util.collections.MapUtil;
+import com.ibm.wala.util.collections.*;
 import com.ibm.wala.util.config.SetOfClasses;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
@@ -78,10 +72,10 @@
 public class PDG<T extends InstanceKey> implements NumberedGraph<Statement> {
 
 /** BEGIN Custom change: control deps */                
-  public enum Dependency {CONTROL_DEP, DATA_AND_CONTROL_DEP};
+  public enum Dependency {CONTROL_DEP, DATA_AND_CONTROL_DEP}
   
   private final SlowSparseNumberedLabeledGraph<Statement, Dependency> delegate =
-    new SlowSparseNumberedLabeledGraph<Statement, Dependency>(Dependency.DATA_AND_CONTROL_DEP);
+    new SlowSparseNumberedLabeledGraph<>(Dependency.DATA_AND_CONTROL_DEP);
 /** END Custom change: control deps */                
 
   private final static boolean VERBOSE = false;
@@ -118,7 +112,7 @@
 
   private final CallGraph cg;
 
-  private final ModRef modRef;
+  private final ModRef<T> modRef;
 
   private final Map<CGNode, OrdinalSet<PointerKey>> ref;
 
@@ -134,7 +128,7 @@
    */
   public PDG(final CGNode node, PointerAnalysis<T> pa, Map<CGNode, OrdinalSet<PointerKey>> mod,
       Map<CGNode, OrdinalSet<PointerKey>> ref, DataDependenceOptions dOptions, ControlDependenceOptions cOptions,
-      HeapExclusions exclusions, CallGraph cg, ModRef modRef) {
+      HeapExclusions exclusions, CallGraph cg, ModRef<T> modRef) {
     this(node, pa, mod, ref, dOptions, cOptions, exclusions, cg, modRef, false);
   }
 
@@ -146,7 +140,7 @@
    */
   public PDG(final CGNode node, PointerAnalysis<T> pa, Map<CGNode, OrdinalSet<PointerKey>> mod,
       Map<CGNode, OrdinalSet<PointerKey>> ref, DataDependenceOptions dOptions, ControlDependenceOptions cOptions,
-      HeapExclusions exclusions, CallGraph cg, ModRef modRef, boolean ignoreAllocHeapDefs) {
+      HeapExclusions exclusions, CallGraph cg, ModRef<T> modRef, boolean ignoreAllocHeapDefs) {
 
     super();
     if (node == null) {
@@ -167,7 +161,7 @@
 
   /**
    * WARNING: Since we're using a {@link HashMap} of {@link SSAInstruction}s, and equals() of {@link SSAInstruction} assumes a
-   * canonical representative for each instruction, we <bf>must</bf> ensure that we use the same IR object throughout
+   * canonical representative for each instruction, we <b>must</b> ensure that we use the same IR object throughout
    * initialization!!
    */
   private void populate() {
@@ -178,7 +172,7 @@
       isPopulated = true;
 
       Map<SSAInstruction, Integer> instructionIndices = computeInstructionIndices(ir);
-      createNodes(ref, cOptions, ir);
+      createNodes(ref, ir);
       createScalarEdges(cOptions, ir, instructionIndices);
     }
   }
@@ -234,7 +228,7 @@
       return;
     }
     ControlFlowGraph<SSAInstruction, ISSABasicBlock> controlFlowGraph = ir.getControlFlowGraph();
-    if (cOptions.equals(ControlDependenceOptions.NO_EXCEPTIONAL_EDGES)) {
+    if (cOptions.isIgnoreExceptions()) {
       PrunedCFG<SSAInstruction, ISSABasicBlock> prunedCFG = ExceptionPrunedCFG.make(controlFlowGraph);
       // In case the CFG has only the entry and exit nodes left 
       // and no edges because the only control dependencies
@@ -251,7 +245,7 @@
       Assertions.productionAssertion(cOptions.equals(ControlDependenceOptions.FULL));
     }
 
-    ControlDependenceGraph<SSAInstruction, ISSABasicBlock> cdg = new ControlDependenceGraph<SSAInstruction, ISSABasicBlock>(
+    ControlDependenceGraph<ISSABasicBlock> cdg = new ControlDependenceGraph<>(
         controlFlowGraph);
     for (ISSABasicBlock bb : cdg) {
       if (bb.isExitBlock()) {
@@ -292,10 +286,8 @@
       // any
       // control-dependent successors
       if (src != null) {
-        for (Iterator<? extends ISSABasicBlock> succ = cdg.getSuccNodes(bb); succ.hasNext();) {
-          ISSABasicBlock bb2 = succ.next();
-          for (Iterator<SSAInstruction> it2 = bb2.iterator(); it2.hasNext();) {
-            SSAInstruction st = it2.next();
+        for (ISSABasicBlock bb2 : Iterator2Iterable.make(cdg.getSuccNodes(bb))) {
+          for (SSAInstruction st : bb2) {
             if (st != null) {
               Statement dest = ssaInstruction2Statement(st, ir, instructionIndices);
               assert src != null;
@@ -340,12 +332,10 @@
      */
     if (!dOptions.equals(DataDependenceOptions.NONE)) {
       for (ISSABasicBlock bb : cdg) {
-        for (Iterator<SSAPhiInstruction> ps = bb.iteratePhis(); ps.hasNext();) {
-          SSAPhiInstruction phi = ps.next();
+        for (SSAPhiInstruction phi : Iterator2Iterable.make(bb.iteratePhis())) {
           Statement phiSt = ssaInstruction2Statement(phi, ir, instructionIndices);
           int phiUseIndex = 0;
-          for (Iterator<? extends ISSABasicBlock> preds = controlFlowGraph.getPredNodes(bb); preds.hasNext();) {
-            ISSABasicBlock pb = preds.next();
+          for (ISSABasicBlock pb : Iterator2Iterable.make(controlFlowGraph.getPredNodes(bb))) {
             int use = phi.getUse(phiUseIndex);
             if (use == AbstractIntStackMachine.TOP) {
               // the predecessor is part of some infeasible bytecode. we probably don't want slices to include such code, so ignore.
@@ -365,8 +355,7 @@
               delegate.addEdge(pst, phiSt, Dependency.CONTROL_DEP);
 /** END Custom change: control deps */                
             } else {
-              for (Iterator<? extends ISSABasicBlock> cdps = cdg.getPredNodes(pb); cdps.hasNext();) {
-                ISSABasicBlock cpb = cdps.next();
+              for (ISSABasicBlock cpb : Iterator2Iterable.make(cdg.getPredNodes(pb))) {
 /** BEGIN Custom change: control deps */                
                 if (cpb.getLastInstructionIndex() < 0) {
                   continue;
@@ -394,9 +383,6 @@
    * Scalar dependences are taken from SSA def-use information.
    * 
    * Heap dependences are computed by a reaching defs analysis.
-   * 
-   * @param pa
-   * @param mod
    */
   private void createScalarDataDependenceEdges(IR ir, Map<SSAInstruction, Integer> instructionIndices) {
     if (dOptions.equals(DataDependenceOptions.NONE)) {
@@ -438,8 +424,7 @@
       }
     }
 
-    for (Iterator<? extends Statement> it = iterator(); it.hasNext();) {
-      Statement s = it.next();
+    for (Statement s : this) {
       switch (s.getKind()) {
       case NORMAL:
       case CATCH:
@@ -459,8 +444,7 @@
           // statement
           for (int i = 0; i < statement.getNumberOfDefs(); i++) {
             int def = statement.getDef(i);
-            for (Iterator<SSAInstruction> it2 = DU.getUses(def); it2.hasNext();) {
-              SSAInstruction use = it2.next();
+            for (SSAInstruction use : Iterator2Iterable.make(DU.getUses(def))) {
               if (dOptions.isIgnoreBasePtrs()) {
                 if (use instanceof SSANewInstruction) {
                   // cut out array length parameters
@@ -496,8 +480,7 @@
         }
 
         ValueNumberCarrier a = (ValueNumberCarrier) s;
-        for (Iterator<SSAInstruction> it2 = DU.getUses(a.getValueNumber()); it2.hasNext();) {
-          SSAInstruction use = it2.next();
+        for (SSAInstruction use : Iterator2Iterable.make(DU.getUses(a.getValueNumber()))) {
           if (dOptions.isIgnoreBasePtrs()) {
             if (use instanceof SSANewInstruction) {
               // cut out array length parameters
@@ -680,31 +663,29 @@
 
     // in reaching defs calculation, exclude heap statements that are
     // irrelevant.
-    Predicate f = new Predicate() {
-      @Override public boolean test(Object o) {
-        if (o instanceof HeapStatement) {
-          HeapStatement h = (HeapStatement) o;
-          return h.getLocation().equals(pk);
-        } else {
-          return true;
-        }
+    Predicate<Statement> f = o -> {
+      if (o instanceof HeapStatement) {
+        HeapStatement h = (HeapStatement) o;
+        return h.getLocation().equals(pk);
+      } else {
+        return true;
       }
     };
-    Collection<Statement> relevantStatements = Iterator2Collection.toSet(new FilterIterator<Statement>(iterator(), f));
+    Collection<Statement> relevantStatements = Iterator2Collection.toSet(new FilterIterator<>(iterator(), f));
 
-    Map<Statement, OrdinalSet<Statement>> heapReachingDefs = new HeapReachingDefs<T>(modRef, heapModel).computeReachingDefs(node, ir, pa, mod,
+    Map<Statement, OrdinalSet<Statement>> heapReachingDefs = new HeapReachingDefs<>(modRef, heapModel).computeReachingDefs(node, ir, pa, mod,
         relevantStatements, new HeapExclusions(SetComplement.complement(new SingletonSet(t))), cg);
 
-    for (Statement st : heapReachingDefs.keySet()) {
-      switch (st.getKind()) {
+    for (Map.Entry<Statement, OrdinalSet<Statement>> entry : heapReachingDefs.entrySet()) {
+      switch (entry.getKey().getKind()) {
       case NORMAL:
       case CATCH:
       case PHI:
       case PI: {
-        OrdinalSet<Statement> defs = heapReachingDefs.get(st);
+        OrdinalSet<Statement> defs = entry.getValue();
         if (defs != null) {
           for (Statement def : defs) {
-            delegate.addEdge(def, st);
+            delegate.addEdge(def, entry.getKey());
           }
         }
       }
@@ -719,10 +700,10 @@
       case HEAP_RET_CALLEE:
       case HEAP_RET_CALLER:
       case HEAP_PARAM_CALLER: {
-        OrdinalSet<Statement> defs = heapReachingDefs.get(st);
+        OrdinalSet<Statement> defs = entry.getValue();
         if (defs != null) {
           for (Statement def : defs) {
-            delegate.addEdge(def, st);
+            delegate.addEdge(def, entry.getKey());
           }
         }
         break;
@@ -733,13 +714,13 @@
         // do nothing .. there are no incoming edges
         break;
       default:
-        Assertions.UNREACHABLE(st.toString());
+        Assertions.UNREACHABLE(entry.getKey().toString());
         break;
       }
     }
   }
 
-  private boolean hasBasePointer(SSAInstruction use) {
+  private static boolean hasBasePointer(SSAInstruction use) {
     if (use instanceof SSAFieldAccessInstruction) {
       SSAFieldAccessInstruction f = (SSAFieldAccessInstruction) use;
       return !f.isStatic();
@@ -752,7 +733,7 @@
     }
   }
 
-  private int getBasePointer(SSAInstruction use) {
+  private static int getBasePointer(SSAInstruction use) {
     if (use instanceof SSAFieldAccessInstruction) {
       SSAFieldAccessInstruction f = (SSAFieldAccessInstruction) use;
       return f.getRef();
@@ -772,24 +753,25 @@
    * @return Statements representing each return instruction in the ir
    */
   private Collection<NormalStatement> computeReturnStatements(final IR ir) {
-    Predicate filter = new Predicate() {
-      @Override public boolean test(Object o) {
-        if (o instanceof NormalStatement) {
-          NormalStatement s = (NormalStatement) o;
-          SSAInstruction st = ir.getInstructions()[s.getInstructionIndex()];
-          return st instanceof SSAReturnInstruction;
-        } else {
-          return false;
-        }
+    Predicate<Statement> filter = o -> {
+      if (o instanceof NormalStatement) {
+        NormalStatement s = (NormalStatement) o;
+        SSAInstruction st = ir.getInstructions()[s.getInstructionIndex()];
+        return st instanceof SSAReturnInstruction;
+      } else {
+        return false;
       }
     };
-    return Iterator2Collection.toSet(new FilterIterator<NormalStatement>(iterator(), filter));
+    return Iterator2Collection.toSet(
+        new MapIterator<>(
+            new FilterIterator<>(iterator(), filter),
+            NormalStatement.class::cast));
   }
 
   /**
    * @return {@link IntSet} representing instruction indices of each PEI in the ir
    */
-  private IntSet getPEIs(final IR ir) {
+  private static IntSet getPEIs(final IR ir) {
     BitVectorIntSet result = new BitVectorIntSet();
     for (int i = 0; i < ir.getInstructions().length; i++) {
       if (ir.getInstructions()[i] != null && ir.getInstructions()[i].isPEI()) {
@@ -801,7 +783,7 @@
 
   /**
    * Wrap an {@link SSAInstruction} in a {@link Statement}. WARNING: Since we're using a {@link HashMap} of {@link SSAInstruction}s,
-   * and equals() of {@link SSAInstruction} assumes a canonical representative for each instruction, we <bf>must</bf> ensure that we
+   * and equals() of {@link SSAInstruction} assumes a canonical representative for each instruction, we <b>must</b> ensure that we
    * use the same IR object throughout initialization!!
    */
   private Statement ssaInstruction2Statement(SSAInstruction s, IR ir, Map<SSAInstruction, Integer> instructionIndices) {
@@ -843,7 +825,7 @@
       for (int i = 0; i < instructions.length; i++) {
         SSAInstruction s = instructions[i];
         if (s != null) {
-          result.put(s, new Integer(i));
+          result.put(s, Integer.valueOf(i));
         }
       }
     }
@@ -853,7 +835,7 @@
   /**
    * Convert a NORMAL or PHI Statement to an SSAInstruction
    */
-  private SSAInstruction statement2SSAInstruction(SSAInstruction[] instructions, Statement s) {
+  private static SSAInstruction statement2SSAInstruction(SSAInstruction[] instructions, Statement s) {
     SSAInstruction statement = null;
     switch (s.getKind()) {
     case NORMAL:
@@ -881,7 +863,7 @@
   /**
    * Create all nodes in this PDG. Each node is a Statement.
    */
-  private void createNodes(Map<CGNode, OrdinalSet<PointerKey>> ref, ControlDependenceOptions cOptions, IR ir) {
+  private void createNodes(Map<CGNode, OrdinalSet<PointerKey>> ref, IR ir) {
 
     if (ir != null) {
       createNormalStatements(ir, ref);
@@ -897,13 +879,9 @@
 
   /**
    * create nodes representing defs of the return values
-   * 
-   * @param mod the set of heap locations which may be written (transitively) by this node. These are logically parameters in the
-   *          SDG.
-   * @param dOptions
    */
   private void createReturnStatements() {
-    ArrayList<Statement> list = new ArrayList<Statement>();
+    ArrayList<Statement> list = new ArrayList<>();
     if (!node.getMethod().getReturnType().equals(TypeReference.Void)) {
       NormalReturnCallee n = new NormalReturnCallee(node);
       delegate.addNode(n);
@@ -927,24 +905,12 @@
 
   /**
    * create nodes representing defs of formal parameters
-   * 
-   * @param ref the set of heap locations which may be read (transitively) by this node. These are logically parameters in the SDG.
    */
   private void createCalleeParams() {
     if (paramCalleeStatements == null) {
-      ArrayList<Statement> list = new ArrayList<Statement>();
+      ArrayList<Statement> list = new ArrayList<>();
       int paramCount = node.getMethod().getNumberOfParameters();
       
-      for (Iterator<CGNode> callers = cg.getPredNodes(node); callers.hasNext(); ) {
-        CGNode caller = callers.next();
-        IR callerIR = caller.getIR();
-        for (Iterator<CallSiteReference> sites = cg.getPossibleSites(caller, node); sites.hasNext(); ) {
-          for (SSAAbstractInvokeInstruction inst : callerIR.getCalls(sites.next())) {
-           paramCount = Math.max(paramCount, inst.getNumberOfParameters()-1);
-          }
-        }
-      }
-      
       for (int i = 1; i <= paramCount; i++) {
         ParamCallee s = new ParamCallee(node, i);
         delegate.addNode(s);
@@ -971,8 +937,7 @@
    */
   private void createSpecialStatements(IR ir) {
     // create a node for instructions which do not correspond to bytecode
-    for (Iterator<SSAInstruction> it = ir.iterateAllInstructions(); it.hasNext();) {
-      SSAInstruction s = it.next();
+    for (SSAInstruction s : Iterator2Iterable.make(ir.iterateAllInstructions())) {
       if (s instanceof SSAPhiInstruction) {
         delegate.addNode(new PhiStatement(node, (SSAPhiInstruction) s));
       } else if (s instanceof SSAGetCaughtExceptionInstruction) {
@@ -1051,21 +1016,19 @@
   /**
    * @return the set of all locations read by any callee at a call site.
    */
-  private OrdinalSet<PointerKey> unionHeapLocations(CallGraph cg, CGNode n, SSAAbstractInvokeInstruction call,
+  private static OrdinalSet<PointerKey> unionHeapLocations(CallGraph cg, CGNode n, SSAAbstractInvokeInstruction call,
       Map<CGNode, OrdinalSet<PointerKey>> loc) {
     BitVectorIntSet bv = new BitVectorIntSet();
     for (CGNode t : cg.getPossibleTargets(n, call.getCallSite())) {
       bv.addAll(loc.get(t).getBackingSet());
     }
-    return new OrdinalSet<PointerKey>(bv, loc.get(n).getMapping());
+    return new OrdinalSet<>(bv, loc.get(n).getMapping());
   }
 
   @Override
   public String toString() {
     populate();
-    StringBuffer result = new StringBuffer("PDG for " + node + ":\n");
-    result.append(super.toString());
-    return result.toString();
+    return "PDG for " + node + ":\n" + super.toString();
   }
 
   public Statement[] getParamCalleeStatements() {
@@ -1138,6 +1101,9 @@
     case HEAP_RET_CALLER:
       HeapStatement h = (HeapStatement) N;
       createHeapDataDependenceEdges(h.getLocation());
+      break;
+    default:
+      // do nothing
     }
   }
 
@@ -1158,6 +1124,9 @@
     case HEAP_RET_CALLER:
       HeapStatement h = (HeapStatement) N;
       createHeapDataDependenceEdges(h.getLocation());
+      break;
+    default:
+      // do nothing
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/PhiStatement.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/PhiStatement.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/PhiStatement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/PhiStatement.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,7 +49,7 @@
 
   @Override
   public String toString() {
-    return "PHI " + getNode() + ":" + phi;
+    return "PHI " + getNode() + ':' + phi;
   }
 
   public SSAPhiInstruction getPhi() {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ReachabilityFunctions.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ReachabilityFunctions.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ReachabilityFunctions.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/ReachabilityFunctions.java	2019-01-29 17:08:39.000000000 +0000
@@ -38,7 +38,7 @@
   };
 
   public static <T> ReachabilityFunctions<T> createReachabilityFunctions() {
-    return new ReachabilityFunctions<T>();
+    return new ReachabilityFunctions<>();
   }
 
   private ReachabilityFunctions() {
@@ -68,6 +68,7 @@
     return FLOW_REACHES;
   }
   
+  @SuppressWarnings("unused")
   public IFlowFunction getReturnFlowFunction(T src, T dest) {
     return FLOW_REACHES;
   }
@@ -77,4 +78,4 @@
     return FLOW_REACHES;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/SDG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/SDG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/SDG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/SDG.java	2019-01-29 17:08:39.000000000 +0000
@@ -35,6 +35,7 @@
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.IteratorUtil;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.AbstractNumberedGraph;
@@ -83,7 +84,7 @@
   /**
    * keeps track of PDG for each call graph node
    */
-  private final Map<CGNode, PDG> pdgMap = HashMapFactory.make();
+  private final Map<CGNode, PDG<T>> pdgMap = HashMapFactory.make();
 
   /**
    * governs data dependence edges in the graph
@@ -115,7 +116,7 @@
    */
   private final HeapExclusions heapExclude;
 
-  private final ModRef modRef;
+  private final ModRef<T> modRef;
 
   /**
    * Have we eagerly populated all nodes of this SDG?
@@ -123,15 +124,15 @@
   private boolean eagerComputed = false;
 
   public SDG(final CallGraph cg, PointerAnalysis<T> pa, DataDependenceOptions dOptions, ControlDependenceOptions cOptions) {
-    this(cg, pa, ModRef.make(), dOptions, cOptions, null);
+    this(cg, pa, new ModRef<T>(), dOptions, cOptions, null);
   }
 
-  public SDG(final CallGraph cg, PointerAnalysis<T> pa, ModRef modRef, DataDependenceOptions dOptions,
+  public SDG(final CallGraph cg, PointerAnalysis<T> pa, ModRef<T> modRef, DataDependenceOptions dOptions,
       ControlDependenceOptions cOptions) {
     this(cg, pa, modRef, dOptions, cOptions, null);
   }
 
-  public SDG(CallGraph cg, PointerAnalysis<T> pa, ModRef modRef, DataDependenceOptions dOptions, ControlDependenceOptions cOptions,
+  public SDG(CallGraph cg, PointerAnalysis<T> pa, ModRef<T> modRef, DataDependenceOptions dOptions, ControlDependenceOptions cOptions,
       HeapExclusions heapExclude) throws IllegalArgumentException {
     super();
     if (dOptions == null) {
@@ -179,9 +180,9 @@
   private void addPDGStatementNodes(CGNode node) {
     if (!statementsAdded.contains(node)) {
       statementsAdded.add(node);
-      PDG pdg = getPDG(node);
-      for (Iterator<? extends Statement> it = pdg.iterator(); it.hasNext();) {
-        addNode(it.next());
+      PDG<?> pdg = getPDG(node);
+      for (Statement statement : pdg) {
+        addNode(statement);
       }
     }
   }
@@ -190,14 +191,13 @@
    * force computation of all PDGs in the SDG
    */
   private void computeAllPDGs() {
-    for (Iterator<? extends CGNode> it = cg.iterator(); it.hasNext();) {
-      CGNode n = it.next();
+    for (CGNode n : cg) {
       getPDG(n);
     }
   }
 
   /**
-   * iterate over the nodes <bf>without</bf> constructing any new ones. Use with extreme care. May break graph traversals that
+   * iterate over the nodes <b>without</b> constructing any new ones. Use with extreme care. May break graph traversals that
    * lazily add more nodes.
    */
   @Override
@@ -207,6 +207,8 @@
 
   private class Nodes extends SlowNumberedNodeManager<Statement> {
 
+    private static final long serialVersionUID = -1450214776332091211L;
+
     @Override
     public boolean containsNode(Statement N) {
       if (super.containsNode(N)) {
@@ -258,7 +260,7 @@
     }
 
     /**
-     * iterate over the nodes <bf>without</bf> constructing any new ones. Use with extreme care. May break graph traversals that
+     * iterate over the nodes <b>without</b> constructing any new ones. Use with extreme care. May break graph traversals that
      * lazily add more nodes.
      */
     Iterator<? extends Statement> iterateLazyNodes() {
@@ -370,19 +372,19 @@
           }
 
           // data dependence predecessors
-          for (Iterator<? extends CGNode> it = cg.getPredNodes(N.getNode()); it.hasNext();) {
-            CGNode caller = it.next();
-            for (Iterator<CallSiteReference> it2 = cg.getPossibleSites(caller, N.getNode()); it2.hasNext();) {
-              CallSiteReference site = it2.next();
+          for (CGNode caller : Iterator2Iterable.make(cg.getPredNodes(N.getNode()))) {
+            for (CallSiteReference site : Iterator2Iterable.make(cg.getPossibleSites(caller, N.getNode()))) {
               IR ir = caller.getIR();
               IntSet indices = ir.getCallInstructionIndices(site);
               for (IntIterator ii = indices.intIterator(); ii.hasNext();) {
                 int i = ii.next();
                 SSAAbstractInvokeInstruction call = (SSAAbstractInvokeInstruction) ir.getInstructions()[i];
-                int p = call.getUse(parameterIndex);
-                Statement s = new ParamCaller(caller, i, p);
-                addNode(s);
-                result.add(s);
+                if (call.getNumberOfUses() > parameterIndex) {
+                  int p = call.getUse(parameterIndex);
+                  Statement s = new ParamCaller(caller, i, p);
+                  addNode(s);
+                  result.add(s);
+                }
               }
             }
           }
@@ -399,10 +401,8 @@
         Collection<Statement> result = HashSetFactory.make(5);
         if (!dOptions.equals(DataDependenceOptions.NONE)) {
           // data dependence predecessors
-          for (Iterator<? extends CGNode> it = cg.getPredNodes(N.getNode()); it.hasNext();) {
-            CGNode caller = it.next();
-            for (Iterator<CallSiteReference> it2 = cg.getPossibleSites(caller, N.getNode()); it2.hasNext();) {
-              CallSiteReference site = it2.next();
+          for (CGNode caller : Iterator2Iterable.make(cg.getPredNodes(N.getNode()))) {
+            for (CallSiteReference site : Iterator2Iterable.make(cg.getPossibleSites(caller, N.getNode()))) {
               IR ir = caller.getIR();
               IntSet indices = ir.getCallInstructionIndices(site);
               for (IntIterator ii = indices.intIterator(); ii.hasNext();) {
@@ -423,11 +423,9 @@
       }
       case METHOD_ENTRY:
         Collection<Statement> result = HashSetFactory.make(5);
-        if (!cOptions.equals(ControlDependenceOptions.NONE)) {
-          for (Iterator<? extends CGNode> it = cg.getPredNodes(N.getNode()); it.hasNext();) {
-            CGNode caller = it.next();
-            for (Iterator<CallSiteReference> it2 = cg.getPossibleSites(caller, N.getNode()); it2.hasNext();) {
-              CallSiteReference site = it2.next();
+        if (!cOptions.isIgnoreInterproc()) {
+          for (CGNode caller : Iterator2Iterable.make(cg.getPredNodes(N.getNode()))) {
+            for (CallSiteReference site : Iterator2Iterable.make(cg.getPossibleSites(caller, N.getNode()))) {
               IR ir = caller.getIR();
               IntSet indices = ir.getCallInstructionIndices(site);
               for (IntIterator ii = indices.intIterator(); ii.hasNext();) {
@@ -459,7 +457,7 @@
       addPDGStatementNodes(N.getNode());
       switch (N.getKind()) {
       case NORMAL:
-        if (cOptions.equals(ControlDependenceOptions.NONE)) {
+        if (cOptions.isIgnoreInterproc()) {
           return getPDG(N.getNode()).getSuccNodes(N);
         } else {
           NormalStatement ns = (NormalStatement) N;
@@ -471,7 +469,7 @@
               addNode(s);
               result.add(s);
             }
-            return new CompoundIterator<Statement>(result.iterator(), getPDG(N.getNode()).getSuccNodes(N));
+            return new CompoundIterator<>(result.iterator(), getPDG(N.getNode()).getSuccNodes(N));
           } else {
             return getPDG(N.getNode()).getSuccNodes(N);
           }
@@ -491,10 +489,8 @@
         Collection<Statement> result = HashSetFactory.make(5);
         if (!dOptions.equals(DataDependenceOptions.NONE)) {
           // data dependence predecessors
-          for (Iterator<? extends CGNode> it = cg.getPredNodes(N.getNode()); it.hasNext();) {
-            CGNode caller = it.next();
-            for (Iterator<CallSiteReference> it2 = cg.getPossibleSites(caller, N.getNode()); it2.hasNext();) {
-              CallSiteReference site = it2.next();
+          for (CGNode caller : Iterator2Iterable.make(cg.getPredNodes(N.getNode()))) {
+            for (CallSiteReference site : Iterator2Iterable.make(cg.getPossibleSites(caller, N.getNode()))) {
               IR ir = caller.getIR();
               IntSet indices = ir.getCallInstructionIndices(site);
               for (IntIterator ii = indices.intIterator(); ii.hasNext();) {
@@ -512,10 +508,8 @@
         Collection<Statement> result = HashSetFactory.make(5);
         if (!dOptions.equals(DataDependenceOptions.NONE)) {
           // data dependence predecessors
-          for (Iterator<? extends CGNode> it = cg.getPredNodes(N.getNode()); it.hasNext();) {
-            CGNode caller = it.next();
-            for (Iterator<CallSiteReference> it2 = cg.getPossibleSites(caller, N.getNode()); it2.hasNext();) {
-              CallSiteReference site = it2.next();
+          for (CGNode caller : Iterator2Iterable.make(cg.getPredNodes(N.getNode()))) {
+            for (CallSiteReference site : Iterator2Iterable.make(cg.getPossibleSites(caller, N.getNode()))) {
               IR ir = caller.getIR();
               IntSet indices = ir.getCallInstructionIndices(site);
               for (IntIterator ii = indices.intIterator(); ii.hasNext();) {
@@ -534,10 +528,8 @@
         Collection<Statement> result = HashSetFactory.make(5);
         if (!dOptions.equals(DataDependenceOptions.NONE)) {
           // data dependence predecessors
-          for (Iterator<? extends CGNode> it = cg.getPredNodes(N.getNode()); it.hasNext();) {
-            CGNode caller = it.next();
-            for (Iterator<CallSiteReference> it2 = cg.getPossibleSites(caller, N.getNode()); it2.hasNext();) {
-              CallSiteReference site = it2.next();
+          for (CGNode caller : Iterator2Iterable.make(cg.getPredNodes(N.getNode()))) {
+            for (CallSiteReference site : Iterator2Iterable.make(cg.getPossibleSites(caller, N.getNode()))) {
               IR ir = caller.getIR();
               IntSet indices = ir.getCallInstructionIndices(site);
               for (IntIterator ii = indices.intIterator(); ii.hasNext();) {
@@ -554,11 +546,15 @@
       case PARAM_CALLER: {
         ParamCaller pac = (ParamCaller) N;
         SSAAbstractInvokeInstruction call = pac.getInstruction();
+        int numParamsPassed = call.getNumberOfUses();
         Collection<Statement> result = HashSetFactory.make(5);
         if (!dOptions.equals(DataDependenceOptions.NONE)) {
           // data dependence successors
           for (CGNode t : cg.getPossibleTargets(N.getNode(), call.getCallSite())) {
-            for (int i = 0; i < t.getMethod().getNumberOfParameters(); i++) {
+            // in some languages (*cough* JavaScript *cough*) you can pass
+            // fewer parameters than the number of formals.  So, only loop
+            // over the parameters actually being passed here
+            for (int i = 0; i < t.getMethod().getNumberOfParameters() && i < numParamsPassed; i++) {
               if (dOptions.isTerminateAtCast() && call.isDispatch() && pac.getValueNumber() == call.getReceiver()) {
                 // a virtual dispatch is just like a cast.
                 continue;
@@ -620,7 +616,7 @@
       addPDGStatementNodes(dst.getNode());
       switch (src.getKind()) {
       case NORMAL:
-        if (cOptions.equals(ControlDependenceOptions.NONE)) {
+        if (cOptions.isIgnoreInterproc()) {
           return getPDG(src.getNode()).hasEdge(src, dst);
         } else {
           NormalStatement ns = (NormalStatement) src;
@@ -700,7 +696,7 @@
             // don't track reflection into reflective invokes
             return false;
           }
-          for (int i = 0; i < call.getNumberOfParameters(); i++) {
+          for (int i = 0; i < call.getNumberOfPositionalParameters(); i++) {
             if (call.getUse(i) == caller.getValueNumber()) {
               if (callee.getValueNumber() == i + 1) {
                 return true;
@@ -759,8 +755,7 @@
     public IntSet getPredNodeNumbers(Statement node) {
       // TODO: optimize me.
       MutableSparseIntSet result = MutableSparseIntSet.makeEmpty();
-      for (Iterator<? extends Statement> it = getPredNodes(node); it.hasNext();) {
-        Statement s = it.next();
+      for (Statement s : Iterator2Iterable.make(getPredNodes(node))) {
         result.add(getNumber(s));
       }
       return result;
@@ -770,8 +765,7 @@
     public IntSet getSuccNodeNumbers(Statement node) {
       // TODO: optimize me.
       MutableSparseIntSet result = MutableSparseIntSet.makeEmpty();
-      for (Iterator<? extends Statement> it = getSuccNodes(node); it.hasNext();) {
-        Statement s = it.next();
+      for (Statement s : Iterator2Iterable.make(getSuccNodes(node))) {
         result.add(getNumber(s));
       }
       return result;
@@ -789,10 +783,10 @@
   }
 
   @Override
-  public PDG getPDG(CGNode node) {
-    PDG result = pdgMap.get(node);
+  public PDG<T> getPDG(CGNode node) {
+    PDG<T> result = pdgMap.get(node);
     if (result == null) {
-      result = new PDG(node, pa, mod, ref, dOptions, cOptions, heapExclude, cg, modRef);
+      result = new PDG<>(node, pa, mod, ref, dOptions, cOptions, heapExclude, cg, modRef);
       pdgMap.put(node, result);
       // Let's not eagerly add nodes, shall we?
       // for (Iterator<? extends Statement> it = result.iterator(); it.hasNext();) {
@@ -820,7 +814,7 @@
     return cg.getClassHierarchy();
   }
 
-  public PointerAnalysis<? extends InstanceKey> getPointerAnalysis() {
+  public PointerAnalysis<T> getPointerAnalysis() {
     return pa;
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/SDGSupergraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/SDGSupergraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/SDGSupergraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/SDGSupergraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,10 +14,9 @@
 
 import com.ibm.wala.dataflow.IFDS.ISupergraph;
 import com.ibm.wala.ipa.callgraph.CGNode;
-import com.ibm.wala.ipa.slicer.Slicer.ControlDependenceOptions;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.util.collections.EmptyIterator;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.Graph;
@@ -26,7 +25,7 @@
 /**
  * A wrapper around an SDG to make it look like a supergraph for tabulation.
  */
-class SDGSupergraph implements ISupergraph<Statement, PDG> {
+class SDGSupergraph implements ISupergraph<Statement, PDG<? extends InstanceKey>> {
 
   private final ISDG sdg;
 
@@ -41,12 +40,12 @@
   }
 
   @Override
-  public Graph<PDG> getProcedureGraph() {
+  public Graph<PDG<InstanceKey>> getProcedureGraph() {
     Assertions.UNREACHABLE();
     return null;
   }
 
-  public Object[] getEntry(Statement n) {
+  public Object[] getEntry() {
     Assertions.UNREACHABLE();
     return null;
   }
@@ -64,24 +63,24 @@
    * @see com.ibm.wala.dataflow.IFDS.ISupergraph#getCallSites(java.lang.Object)
    */
   @Override
-  public Iterator<? extends Statement> getCallSites(Statement r, PDG callee) {
+  public Iterator<? extends Statement> getCallSites(Statement r, PDG<? extends InstanceKey> callee) {
     switch (r.getKind()) {
     case EXC_RET_CALLER: {
       ExceptionalReturnCaller n = (ExceptionalReturnCaller) r;
       SSAAbstractInvokeInstruction call = n.getInstruction();
-      PDG pdg = getProcOf(r);
+      PDG<?> pdg = getProcOf(r);
       return pdg.getCallStatements(call).iterator();
     }
     case NORMAL_RET_CALLER: {
       NormalReturnCaller n = (NormalReturnCaller) r;
       SSAAbstractInvokeInstruction call = n.getInstruction();
-      PDG pdg = getProcOf(r);
+      PDG<?> pdg = getProcOf(r);
       return pdg.getCallStatements(call).iterator();
     }
     case HEAP_RET_CALLER: {
       HeapStatement.HeapReturnCaller n = (HeapStatement.HeapReturnCaller) r;
       SSAAbstractInvokeInstruction call = n.getCall();
-      PDG pdg = getProcOf(r);
+      PDG<?> pdg = getProcOf(r);
       return pdg.getCallStatements(call).iterator();
     }
     default:
@@ -97,13 +96,7 @@
   public Iterator<? extends Statement> getCalledNodes(Statement call) {
     switch (call.getKind()) {
     case NORMAL:
-      Predicate f = new Predicate() {
-        @Override public boolean test(Object o) {
-          Statement s = (Statement) o;
-          return isEntry(s);
-        }
-      };
-      return new FilterIterator<Statement>(getSuccNodes(call), f);
+      return new FilterIterator<>(getSuccNodes(call), this::isEntry);
     case PARAM_CALLER:
     case HEAP_PARAM_CALLER:
       return getSuccNodes(call);
@@ -117,7 +110,7 @@
    * @see com.ibm.wala.dataflow.IFDS.ISupergraph#getEntriesForProcedure(java.lang.Object)
    */
   @Override
-  public Statement[] getEntriesForProcedure(PDG procedure) {
+  public Statement[] getEntriesForProcedure(PDG<? extends InstanceKey> procedure) {
     Statement[] normal = procedure.getParamCalleeStatements();
     Statement[] result = new Statement[normal.length + 1];
     result[0] = new MethodEntryStatement(procedure.getCallGraphNode());
@@ -129,7 +122,7 @@
    * @see com.ibm.wala.dataflow.IFDS.ISupergraph#getExitsForProcedure(java.lang.Object)
    */
   @Override
-  public Statement[] getExitsForProcedure(PDG procedure) {
+  public Statement[] getExitsForProcedure(PDG<? extends InstanceKey> procedure) {
     Statement[] normal = procedure.getReturnStatements();
     Statement[] result = new Statement[normal.length + 1];
     result[0] = new MethodExitStatement(procedure.getCallGraphNode());
@@ -141,7 +134,7 @@
    * @see com.ibm.wala.dataflow.IFDS.ISupergraph#getLocalBlock(java.lang.Object, int)
    */
   @Override
-  public Statement getLocalBlock(PDG procedure, int i) {
+  public Statement getLocalBlock(PDG<? extends InstanceKey> procedure, int i) {
     return procedure.getNode(i);
   }
 
@@ -150,7 +143,7 @@
    */
   @Override
   public int getLocalBlockNumber(Statement n) {
-    PDG pdg = getProcOf(n);
+    PDG<?> pdg = getProcOf(n);
     return pdg.getNumber(n);
   }
 
@@ -171,7 +164,7 @@
    * @see com.ibm.wala.dataflow.IFDS.ISupergraph#getNumberOfBlocks(java.lang.Object)
    */
   @Override
-  public int getNumberOfBlocks(PDG procedure) {
+  public int getNumberOfBlocks(PDG<? extends InstanceKey> procedure) {
     Assertions.UNREACHABLE();
     return 0;
   }
@@ -180,11 +173,11 @@
    * @see com.ibm.wala.dataflow.IFDS.ISupergraph#getProcOf(java.lang.Object)
    */
   @Override
-  public PDG getProcOf(Statement n) {
+  public PDG<? extends InstanceKey> getProcOf(Statement n) {
     CGNode node = n.getNode();
-    PDG result = sdg.getPDG(node);
+    PDG<? extends InstanceKey> result = sdg.getPDG(node);
     if (result == null) {
-      Assertions.UNREACHABLE("panic: " + n + " " + node);
+      Assertions.UNREACHABLE("panic: " + n + ' ' + node);
     }
     return result;
   }
@@ -193,24 +186,24 @@
    * @see com.ibm.wala.dataflow.IFDS.ISupergraph#getReturnSites(java.lang.Object)
    */
   @Override
-  public Iterator<? extends Statement> getReturnSites(Statement call, PDG callee) {
+  public Iterator<? extends Statement> getReturnSites(Statement call, PDG<? extends InstanceKey> callee) {
     switch (call.getKind()) {
     case PARAM_CALLER: {
       ParamCaller n = (ParamCaller) call;
       SSAAbstractInvokeInstruction st = n.getInstruction();
-      PDG pdg = getProcOf(call);
+      PDG<?> pdg = getProcOf(call);
       return pdg.getCallerReturnStatements(st).iterator();
     }
     case HEAP_PARAM_CALLER: {
       HeapStatement.HeapParamCaller n = (HeapStatement.HeapParamCaller) call;
       SSAAbstractInvokeInstruction st = n.getCall();
-      PDG pdg = getProcOf(call);
+      PDG<?> pdg = getProcOf(call);
       return pdg.getCallerReturnStatements(st).iterator();
     }
     case NORMAL: {
       NormalStatement n = (NormalStatement) call;
       SSAAbstractInvokeInstruction st = (SSAAbstractInvokeInstruction) n.getInstruction();
-      PDG pdg = getProcOf(call);
+      PDG<?> pdg = getProcOf(call);
       return pdg.getCallerReturnStatements(st).iterator();
     }
     default:
@@ -243,7 +236,7 @@
     case PARAM_CALLER:
       return true;
     case NORMAL:
-      if (sdg.getCOptions().equals(ControlDependenceOptions.NONE)) {
+      if (sdg.getCOptions().isIgnoreInterproc()) {
         return false;
       } else {
         NormalStatement s = (NormalStatement) n;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/Slicer.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/Slicer.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/Slicer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/Slicer.java	2019-01-29 17:08:39.000000000 +0000
@@ -28,13 +28,14 @@
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.modref.ModRef;
 import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
 import com.ibm.wala.util.collections.HashSetFactory;
 
 /**
  * A demand-driven context-sensitive slicer.
- * 
+ *
  * This computes a context-sensitive slice, building an SDG and finding realizable paths to a statement using tabulation.
- * 
+ *
  * This implementation uses a preliminary pointer analysis to compute data dependence between heap locations in the SDG.
  */
 public class Slicer {
@@ -112,43 +113,86 @@
    * options to control control dependence edges in the sdg
    */
   public static enum ControlDependenceOptions {
-    FULL("full"), NONE("none"), NO_EXCEPTIONAL_EDGES("no_exceptional_edges");
+    /**
+     * track all control dependencies
+     */
+    FULL("full", false, false),
+
+    /**
+     * track no control dependencies
+     */
+    NONE("none", true, true),
+
+    /**
+     * don't track control dependence due to exceptional control flow
+     */
+    NO_EXCEPTIONAL_EDGES("no_exceptional_edges", true, false),
+
+    /**
+     * don't track control dependence from caller to callee
+     */
+    NO_INTERPROC_EDGES("no_interproc_edges", false, true),
+
+    /**
+     * don't track interprocedural or exceptional control dependence
+     */
+    NO_INTERPROC_NO_EXCEPTION("no_interproc_no_exception", true, true);
+
 
     private final String name;
 
-    ControlDependenceOptions(String name) {
+    /**
+     * ignore control dependence due to exceptional control flow?
+     */
+    private final boolean ignoreExceptionalEdges;
+
+    /**
+     * ignore interprocedural control dependence, i.e., from caller to callee or the reverse?
+     */
+    private final boolean ignoreInterprocEdges;
+
+
+    ControlDependenceOptions(String name, boolean ignoreExceptionalEdges, boolean ignoreInterprocEdges) {
       this.name = name;
+      this.ignoreExceptionalEdges = ignoreExceptionalEdges;
+      this.ignoreInterprocEdges = ignoreInterprocEdges;
     }
 
     public final String getName() {
       return name;
     }
+
+    public final boolean isIgnoreExceptions() {
+      return ignoreExceptionalEdges;
+    }
+
+    public final boolean isIgnoreInterproc() {
+      return ignoreInterprocEdges;
+    }
+
   }
 
   /**
    * @param s a statement of interest
    * @return the backward slice of s.
-   * @throws CancelException
    */
-  public static Collection<Statement> computeBackwardSlice(Statement s, CallGraph cg, PointerAnalysis<InstanceKey> pa,
+  public static <U extends InstanceKey> Collection<Statement> computeBackwardSlice(Statement s, CallGraph cg, PointerAnalysis<U> pa,
       DataDependenceOptions dOptions, ControlDependenceOptions cOptions) throws IllegalArgumentException, CancelException {
-    return computeSlice(new SDG(cg, pa, ModRef.make(), dOptions, cOptions), Collections.singleton(s), true);
+    return computeSlice(new SDG<>(cg, pa, ModRef.<U>make(), dOptions, cOptions), Collections.singleton(s), true);
   }
 
   /**
    * @param s a statement of interest
    * @return the forward slice of s.
-   * @throws CancelException
    */
-  public static Collection<Statement> computeForwardSlice(Statement s, CallGraph cg, PointerAnalysis<InstanceKey> pa,
+  public static <U extends InstanceKey> Collection<Statement> computeForwardSlice(Statement s, CallGraph cg,
+      PointerAnalysis<U> pa,
       DataDependenceOptions dOptions, ControlDependenceOptions cOptions) throws IllegalArgumentException, CancelException {
-    return computeSlice(new SDG(cg, pa, ModRef.make(), dOptions, cOptions), Collections.singleton(s), false);
+    return computeSlice(new SDG<>(cg, pa, ModRef.<U>make(), dOptions, cOptions), Collections.singleton(s), false);
   }
 
   /**
    * Use the passed-in SDG
-   * 
-   * @throws CancelException
    */
   public static Collection<Statement> computeBackwardSlice(SDG sdg, Statement s) throws IllegalArgumentException, CancelException {
     return computeSlice(sdg, Collections.singleton(s), true);
@@ -156,8 +200,6 @@
 
   /**
    * Use the passed-in SDG
-   * 
-   * @throws CancelException
    */
   public static Collection<Statement> computeForwardSlice(SDG sdg, Statement s) throws IllegalArgumentException, CancelException {
     return computeSlice(sdg, Collections.singleton(s), false);
@@ -165,8 +207,6 @@
 
   /**
    * Use the passed-in SDG
-   * 
-   * @throws CancelException
    */
   public static Collection<Statement> computeBackwardSlice(SDG sdg, Collection<Statement> ss) throws IllegalArgumentException,
       CancelException {
@@ -175,7 +215,6 @@
 
   /**
    * @param ss a collection of statements of interest
-   * @throws CancelException
    */
   protected static Collection<Statement> computeSlice(SDG sdg, Collection<Statement> ss, boolean backward) throws CancelException {
     if (sdg == null) {
@@ -186,23 +225,36 @@
 
   /**
    * Main driver logic.
-   * 
+   *
    * @param sdg governing system dependence graph
    * @param roots set of roots to slice from
    * @param backward do a backwards slice?
    * @return the {@link Statement}s found by the slicer
-   * @throws CancelException
    */
   public Collection<Statement> slice(SDG sdg, Collection<Statement> roots, boolean backward) throws CancelException {
+    return slice(sdg, roots, backward, null);
+  }
+
+  /**
+   * Main driver logic.
+   *
+   * @param sdg governing system dependence graph
+   * @param roots set of roots to slice from
+   * @param backward do a backwards slice?
+   * @param monitor to cancel analysis if needed
+   * @return the {@link Statement}s found by the slicer
+   */
+  public Collection<Statement> slice(SDG sdg, Collection<Statement> roots, boolean backward, IProgressMonitor monitor)
+      throws CancelException {
     if (sdg == null) {
       throw new IllegalArgumentException("sdg cannot be null");
     }
 
     SliceProblem p = makeSliceProblem(roots, sdg, backward);
 
-    PartiallyBalancedTabulationSolver<Statement, PDG, Object> solver = PartiallyBalancedTabulationSolver
-        .createPartiallyBalancedTabulationSolver(p, null);
-    TabulationResult<Statement, PDG, Object> tr = solver.solve();
+    PartiallyBalancedTabulationSolver<Statement, PDG<?>, Object> solver = PartiallyBalancedTabulationSolver
+        .createPartiallyBalancedTabulationSolver(p, monitor);
+    TabulationResult<Statement, PDG<?>, Object> tr = solver.solve();
 
     Collection<Statement> slice = tr.getSupergraphNodesReached();
 
@@ -224,7 +276,6 @@
   /**
    * @param s a statement of interest
    * @return the backward slice of s.
-   * @throws CancelException
    */
   public static Collection<Statement> computeBackwardSlice(Statement s, CallGraph cg, PointerAnalysis<InstanceKey> pointerAnalysis)
       throws IllegalArgumentException, CancelException {
@@ -233,13 +284,13 @@
 
   /**
    * Tabulation problem representing slicing
-   * 
+   *
    */
-  public static class SliceProblem implements PartiallyBalancedTabulationProblem<Statement, PDG, Object> {
+  public static class SliceProblem implements PartiallyBalancedTabulationProblem<Statement, PDG<?>, Object> {
 
     private final Collection<Statement> roots;
 
-    private final ISupergraph<Statement, PDG> supergraph;
+    private final ISupergraph<Statement, PDG<? extends InstanceKey>> supergraph;
 
     private final SliceFunctions f;
 
@@ -259,7 +310,7 @@
     @Override
     public TabulationDomain<Object, Statement> getDomain() {
       // a dummy
-      return new UnorderedDomain<Object, Statement>();
+      return new UnorderedDomain<>();
     }
 
     /*
@@ -282,7 +333,7 @@
      * @see com.ibm.wala.dataflow.IFDS.TabulationProblem#getSupergraph()
      */
     @Override
-    public ISupergraph<Statement, PDG> getSupergraph() {
+    public ISupergraph<Statement, PDG<?>> getSupergraph() {
       return supergraph;
     }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/Statement.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/Statement.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/Statement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/Statement.java	2019-01-29 17:08:39.000000000 +0000
@@ -63,7 +63,7 @@
 
   @Override
   public String toString() {
-    return getKind().toString() + ":" + getNode();
+    return getKind().toString() + ':' + getNode();
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/StatementWithInstructionIndex.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/StatementWithInstructionIndex.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/StatementWithInstructionIndex.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/StatementWithInstructionIndex.java	2019-01-29 17:08:39.000000000 +0000
@@ -58,7 +58,7 @@
 
   @Override
   public String toString() {
-    return super.toString() + "[" + getInstructionIndex() + "]" + getInstruction();
+    return super.toString() + '[' + getInstructionIndex() + ']' + getInstruction();
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/thin/CISDG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/thin/CISDG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/thin/CISDG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/thin/CISDG.java	2019-01-29 17:08:39.000000000 +0000
@@ -123,7 +123,7 @@
   }
 
   @Override
-  public PDG getPDG(CGNode node) {
+  public PDG<InstanceKey> getPDG(CGNode node) {
     Assertions.UNREACHABLE();
     return noHeap.getPDG(node);
   }
@@ -264,4 +264,4 @@
   public IClassHierarchy getClassHierarchy() {
     return noHeap.getClassHierarchy();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/thin/CISlicer.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/thin/CISlicer.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/thin/CISlicer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/thin/CISlicer.java	2019-01-29 17:08:39.000000000 +0000
@@ -56,7 +56,7 @@
     this(cg, pa, ModRef.make(), dOptions, cOptions);
   }
 
-  public CISlicer(CallGraph cg, PointerAnalysis<InstanceKey> pa, ModRef modRef, DataDependenceOptions dOptions, ControlDependenceOptions cOptions)
+  public CISlicer(CallGraph cg, PointerAnalysis<InstanceKey> pa, ModRef<InstanceKey> modRef, DataDependenceOptions dOptions, ControlDependenceOptions cOptions)
       throws IllegalArgumentException {
     if (dOptions == null) {
       throw new IllegalArgumentException("dOptions == null");
@@ -65,7 +65,7 @@
       throw new IllegalArgumentException("Heap data dependences requested in CISlicer!");
     }
 
-    SDG sdg = new SDG(cg, pa, modRef, dOptions, cOptions, null);
+    SDG<InstanceKey> sdg = new SDG<>(cg, pa, modRef, dOptions, cOptions, null);
 
     Map<Statement, Set<PointerKey>> mod = scanForMod(sdg, pa, modRef);
     Map<Statement, Set<PointerKey>> ref = scanForRef(sdg, pa, modRef);
@@ -74,7 +74,7 @@
 
   }
 
-  public CISlicer(final SDG sdg, final PointerAnalysis<InstanceKey> pa, final ModRef modRef) {
+  public CISlicer(final SDG<InstanceKey> sdg, final PointerAnalysis<InstanceKey> pa, final ModRef<InstanceKey> modRef) {
     Map<Statement, Set<PointerKey>> mod = scanForMod(sdg, pa, modRef);
     Map<Statement, Set<PointerKey>> ref = scanForRef(sdg, pa, modRef);
 
@@ -94,14 +94,14 @@
   /**
    * Compute the set of pointer keys each statement mods
    */
-  public static Map<Statement, Set<PointerKey>> scanForMod(SDG sdg, PointerAnalysis<InstanceKey> pa) {
+  public static Map<Statement, Set<PointerKey>> scanForMod(SDG<InstanceKey> sdg, PointerAnalysis<InstanceKey> pa) {
     return scanForMod(sdg, pa, false, ModRef.make());
   }
 
   /**
    * Compute the set of pointer keys each statement refs
    */
-  public static Map<Statement, Set<PointerKey>> scanForRef(SDG sdg, PointerAnalysis<InstanceKey> pa) {
+  public static Map<Statement, Set<PointerKey>> scanForRef(SDG<InstanceKey> sdg, PointerAnalysis<InstanceKey> pa) {
     if (sdg == null) {
       throw new IllegalArgumentException("null sdg");
     }
@@ -111,7 +111,7 @@
   /**
    * Compute the set of pointer keys each statement mods
    */
-  public static Map<Statement, Set<PointerKey>> scanForMod(SDG sdg, PointerAnalysis<InstanceKey> pa, ModRef modRef) {
+  public static Map<Statement, Set<PointerKey>> scanForMod(SDG<InstanceKey> sdg, PointerAnalysis<InstanceKey> pa, ModRef<InstanceKey> modRef) {
     return scanForMod(sdg, pa, false, modRef);
   }
 
@@ -119,7 +119,7 @@
    * Compute the set of pointer keys each statement mods. Be careful to avoid eager PDG construction here! That means .. don't
    * iterate over SDG statements!
    */
-  public static Map<Statement, Set<PointerKey>> scanForMod(SDG sdg, PointerAnalysis<InstanceKey> pa, boolean ignoreAllocHeapDefs, ModRef modRef) {
+  public static Map<Statement, Set<PointerKey>> scanForMod(SDG<InstanceKey> sdg, PointerAnalysis<InstanceKey> pa, boolean ignoreAllocHeapDefs, ModRef<InstanceKey> modRef) {
     if (pa == null) {
       throw new IllegalArgumentException("null pa");
     }
@@ -147,7 +147,7 @@
    * Compute the set of PointerKeys each statement refs.Be careful to avoid eager PDG construction here! That means .. don't iterate
    * over SDG statements!
    */
-  public static Map<Statement, Set<PointerKey>> scanForRef(SDG sdg, PointerAnalysis<InstanceKey> pa, ModRef modRef) {
+  public static Map<Statement, Set<PointerKey>> scanForRef(SDG<InstanceKey> sdg, PointerAnalysis<InstanceKey> pa, ModRef<InstanceKey> modRef) {
     if (pa == null) {
       throw new IllegalArgumentException("null pa");
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/thin/ThinSlicer.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/thin/ThinSlicer.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/thin/ThinSlicer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/slicer/thin/ThinSlicer.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,7 +34,7 @@
     this(cg, pa, ModRef.make());
   }
 
-  public ThinSlicer(CallGraph cg, PointerAnalysis<InstanceKey> pa, ModRef modRef) {
+  public ThinSlicer(CallGraph cg, PointerAnalysis<InstanceKey> pa, ModRef<InstanceKey> modRef) {
     super(cg, pa, modRef, DataDependenceOptions.NO_HEAP, ControlDependenceOptions.NONE);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassClassTargetSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassClassTargetSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassClassTargetSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassClassTargetSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -110,4 +110,4 @@
       return parent.getAllocatedTarget(caller, site);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassMethodTargetSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassMethodTargetSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassMethodTargetSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassMethodTargetSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -45,7 +45,7 @@
   static final boolean DEBUG = false;
 
   /**
-   * Method summaries collected for methods. Mapping Object -> MethodSummary where Object is either a
+   * Method summaries collected for methods. Mapping Object -&gt; MethodSummary where Object is either a
    * <ul>
    * <li>MethodReference
    * <li>TypeReference
@@ -75,17 +75,11 @@
   private final ClassHierarchyMethodTargetSelector chaMethodTargetSelector;
 
   /**
-   * Mapping from MethodReference -> SyntheticMethod We may call syntheticMethod.put(m,null) .. in which case we use containsKey()
+   * Mapping from MethodReference -&gt; SyntheticMethod We may call syntheticMethod.put(m,null) .. in which case we use containsKey()
    * to check for having already considered m.
    */
   final private HashMap<MethodReference, SummarizedMethod> syntheticMethods = HashMapFactory.make();
 
-  /**
-   * @param parent
-   * @param methodSummaries
-   * @param ignoredPackages
-   * @param cha
-   */
   public BypassMethodTargetSelector(MethodTargetSelector parent, Map<MethodReference, MethodSummary> methodSummaries,
       Set<Atom> ignoredPackages, IClassHierarchy cha) {
     this.methodSummaries = methodSummaries;
@@ -112,7 +106,14 @@
     IMethod target = (chaTarget == null) ? findOrCreateSyntheticMethod(ref, site.isStatic()) : findOrCreateSyntheticMethod(chaTarget,
         site.isStatic());
 
-
+    // try synthetic method that matches receiver type
+    if (dispatchType != null) {
+      ref = MethodReference.findOrCreate(dispatchType.getReference(), ref.getSelector());
+      chaTarget = chaMethodTargetSelector.getCalleeTarget(caller, site, dispatchType);
+      target = (chaTarget == null) ? findOrCreateSyntheticMethod(ref, site.isStatic()) : findOrCreateSyntheticMethod(chaTarget,
+          site.isStatic());      
+    }
+    
     if (DEBUG) {
       System.err.println("target is initially " + target);
     }
@@ -179,7 +180,7 @@
           syntheticMethods.put(m, null);
           return null;
         }
-        SummarizedMethod n = new SummarizedMethod(m, summ, C);
+        SummarizedMethod n = new SummarizedMethodWithNames(m, summ, C);
         syntheticMethods.put(m, n);
         return n;
       } else {
@@ -263,7 +264,6 @@
   }
 
   /**
-   * @param m
    * @return true iff we can treat m as a no-op method
    */
   protected boolean canIgnore(MemberReference m) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassSyntheticClass.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassSyntheticClass.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassSyntheticClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassSyntheticClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -137,7 +137,7 @@
    * @see com.ibm.wala.classLoader.IClass#getDeclaredMethods()
    */
   @Override
-  public Collection<IMethod> getDeclaredMethods() {
+  public Collection<? extends IMethod> getDeclaredMethods() {
     return realType.getDeclaredMethods();
   }
 
@@ -166,7 +166,7 @@
 
   @Override
   public String toString() {
-    return "<Synthetic " + (realType.isInterface() ? "Implementor" : "Subclass") + " " + realType.toString() + ">";
+    return "<Synthetic " + (realType.isInterface() ? "Implementor" : "Subclass") + ' ' + realType.toString() + '>';
   }
 
   public IClass getRealType() {
@@ -236,7 +236,7 @@
    * @see com.ibm.wala.classLoader.IClass#getAllMethods()
    */
   @Override
-  public Collection<IMethod> getAllMethods() {
+  public Collection<? extends IMethod> getAllMethods() {
     return realType.getAllMethods();
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassSyntheticClassLoader.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassSyntheticClassLoader.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassSyntheticClassLoader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassSyntheticClassLoader.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,7 +50,7 @@
  * 
  * Code that wants to introduce synthetic classes uses the registerClass method,
  * giving it an Atom which is the class name, and an IClass which is the class
- * to load. Since the synthetic loader musat be a child of the others, it would
+ * to load. Since the synthetic loader must be a child of the others, it would
  * be very bad to use an existing name for a new synthetic class.
  * 
  * Class lookup works just as for any other classloader.
@@ -148,7 +148,7 @@
    */
   @Override
   public Language getLanguage() {
-    return Language.JAVA;
+    return parent.getLanguage();
   }
 
   /*
@@ -168,9 +168,6 @@
     return null;
   }
 
-  /**
-   * @see com.ibm.wala.classLoader.IClassLoader#getParent()
-   */
   @Override
   public IClassLoader getParent() {
     return parent;
@@ -188,10 +185,7 @@
     if (toRemove == null) {
       throw new IllegalArgumentException("toRemove is null");
     }
-    for (Iterator<IClass> it = toRemove.iterator(); it.hasNext();) {
-      IClass klass = it.next();
-      syntheticClasses.remove(klass.getName());
-    }
+    toRemove.stream().map(IClass::getName).forEach(syntheticClasses::remove);
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/LambdaMethodTargetSelector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/LambdaMethodTargetSelector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/LambdaMethodTargetSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/LambdaMethodTargetSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -28,7 +28,7 @@
 
 public class LambdaMethodTargetSelector implements MethodTargetSelector {
 
-  private final WeakHashMap<BootstrapMethod, SummarizedMethod> summaries = new WeakHashMap<BootstrapMethod, SummarizedMethod>();
+  private final WeakHashMap<BootstrapMethod, SummarizedMethod> summaries = new WeakHashMap<>();
 
   private final MethodTargetSelector base;
   
@@ -51,7 +51,7 @@
         MethodReference ref = 
             MethodReference.findOrCreate(
                 site.getDeclaredTarget().getDeclaringClass(), 
-                Atom.findOrCreateUnicodeAtom(site.getDeclaredTarget().getName().toString() +"$" + cls + "$" + bootstrapIndex),
+                Atom.findOrCreateUnicodeAtom(site.getDeclaredTarget().getName().toString() + '$' + cls + '$' + bootstrapIndex),
                 site.getDeclaredTarget().getDescriptor());
         
         MethodSummary summary = new MethodSummary(ref);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/LambdaSummaryClass.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/LambdaSummaryClass.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/LambdaSummaryClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/LambdaSummaryClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,6 +20,7 @@
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IField;
 import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.classLoader.SyntheticClass;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
@@ -42,13 +43,13 @@
 
 public class LambdaSummaryClass extends SyntheticClass {
 
-  private static WeakHashMap<BootstrapMethod, LambdaSummaryClass> summaries = new WeakHashMap<BootstrapMethod, LambdaSummaryClass>();
+  private static WeakHashMap<BootstrapMethod, LambdaSummaryClass> summaries = new WeakHashMap<>();
   
   public static LambdaSummaryClass findOrCreate(CGNode caller, SSAInvokeDynamicInstruction inst) {
     if (! summaries.containsKey(inst.getBootstrap())) {
       String bootstrapCls = caller.getMethod().getDeclaringClass().getName().toString().replace("/", "$").substring(1);
       int bootstrapIndex = inst.getBootstrap().getIndexInClassFile();
-      TypeReference ref = TypeReference.findOrCreate(ClassLoaderReference.Primordial, "Lwala/lambda" + "$" + bootstrapCls + "$" + bootstrapIndex);
+      TypeReference ref = TypeReference.findOrCreate(ClassLoaderReference.Primordial, "Lwala/lambda" + '$' + bootstrapCls + '$' + bootstrapIndex);
       LambdaSummaryClass cls = new LambdaSummaryClass(ref, caller.getClassHierarchy(), inst);
       caller.getClassHierarchy().addClass(cls);
       summaries.put(inst.getBootstrap(), cls);
@@ -150,7 +151,7 @@
    
   private Map<Atom,IField> makeFields() {
     Map<Atom,IField> result = HashMapFactory.make();
-    for(int i = 0; i < invoke.getNumberOfParameters(); i++) {
+    for(int i = 0; i < invoke.getNumberOfPositionalParameters(); i++) {
       final int yuck = i;
       result.put(Atom.findOrCreateUnicodeAtom("c" + yuck), new IField() {
         @Override
@@ -217,7 +218,7 @@
   
   private String getLambdaCalleeClass() throws IllegalArgumentException, InvalidClassFileException {
     int cpIndex = invoke.getBootstrap().callArgumentIndex(1);
-    return "L" + invoke.getBootstrap().getCP().getCPHandleClass(cpIndex);
+    return 'L' + invoke.getBootstrap().getCP().getCPHandleClass(cpIndex);
   }
 
   private String getLambdaCalleeName() throws IllegalArgumentException, InvalidClassFileException {
@@ -247,8 +248,8 @@
     MethodSummary summary = new MethodSummary(ref);
     
     int inst = 0;
-    int args = invoke.getNumberOfParameters(), v = args + 1;
-    for(int i = 0; i < invoke.getNumberOfParameters(); i++) {
+    int args = invoke.getNumberOfPositionalParameters(), v = args + 1;
+    for(int i = 0; i < invoke.getNumberOfPositionalParameters(); i++) {
       Atom f = Atom.findOrCreateUnicodeAtom("c" + i);
       summary.addStatement(insts.GetInstruction(inst++, v++, 1, getField(f).getReference()));
     }
@@ -257,27 +258,40 @@
       MethodReference callee = MethodReference.findOrCreate(ClassLoaderReference.Application, getLambdaCalleeClass(), getLambdaCalleeName(), getLambdaCalleeSignature());
 
       Dispatch code;
+      boolean isNew = false;
+      int new_v = -1;
       int kind = getLambdaCalleeKind();
       switch (kind) {
       case 5: code = Dispatch.VIRTUAL; break;
       case 6: code = Dispatch.STATIC; break;
       case 7: code = Dispatch.SPECIAL; break;
+      case 8: code = Dispatch.SPECIAL; isNew = true; break;
       case 9: code = Dispatch.INTERFACE; break;
       default:
         throw new Error("unexpected dynamic invoke type " + kind);
       }
-     
+           
       int numParams = getClassHierarchy().resolveMethod(callee).getNumberOfParameters();
       int params[] = new int[ numParams ];
-      for(int i = 0; i < invoke.getNumberOfParameters(); i++) {
+      for(int i = isNew? 1: 0; i < invoke.getNumberOfPositionalParameters(); i++) {
         params[i] = args + i + 1;
       }
-      for(int n = 2, i = invoke.getNumberOfParameters(); i < numParams; i++) {
+      int n = 2;
+      for(int i = invoke.getNumberOfPositionalParameters(); i < numParams; i++) {
         params[i] = n++;
       }
-      
+     
+      if (isNew) {
+        //v++;
+        summary.addStatement(insts.NewInstruction(inst++, new_v=n++, NewSiteReference.make(inst, callee.getDeclaringClass())));
+        params[0] = new_v;
+      }
+
       if (callee.getReturnType().equals(TypeReference.Void)) {
         summary.addStatement(insts.InvokeInstruction(inst++, params, v++, CallSiteReference.make(inst, callee, code), null));
+        if (isNew) {
+          summary.addStatement(insts.ReturnInstruction(inst++, new_v, false));          
+        } 
       } else {
         int ret = v++;
         summary.addStatement(insts.InvokeInstruction(inst++, ret, params, v++, CallSiteReference.make(inst, callee, code), null));
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodBypass.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodBypass.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodBypass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodBypass.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,7 +37,7 @@
   static final boolean DEBUG = false;
 
   /**
-   * Method summaries collected for methods. Mapping Object -> MethodSummary where Object is either a
+   * Method summaries collected for methods. Mapping Object -&gt; MethodSummary where Object is either a
    * <ul>
    * <li>MethodReference
    * <li>TypeReference
@@ -57,7 +57,7 @@
   private final IClassHierarchy cha;
 
   /**
-   * Mapping from MethodReference -> SyntheticMethod
+   * Mapping from MethodReference -&gt; SyntheticMethod
    */
   final private HashMap<MethodReference, SummarizedMethod> syntheticMethods = HashMapFactory.make();
 
@@ -76,9 +76,6 @@
    * Lookup bypass rules based on a method reference only.
    * 
    * Method getBypass.
-   * 
-   * @param m
-   * @return Object
    */
   private SyntheticMethod getBypass(MethodReference m) {
     if (DEBUG) {
@@ -155,8 +152,6 @@
   /**
    * Method getBypass. check to see if a call to the receiver 'target' should be redirected to a different receiver.
    * 
-   * @param target
-   * @return Object
    * @throws IllegalArgumentException if target is null
    */
   public SyntheticMethod getBypass(IMethod target) {
@@ -169,10 +164,9 @@
   /**
    * Method extractPackage.
    * 
-   * @param type
    * @return Atom that represents the package name, or null if this is the unnamed package.
    */
-  private Atom extractPackage(TypeReference type) {
+  private static Atom extractPackage(TypeReference type) {
     String s = type.getName().toString();
     int index = s.lastIndexOf('/');
     if (index == -1) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodSummary.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodSummary.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodSummary.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodSummary.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,6 +20,7 @@
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.strings.Atom;
 import com.ibm.wala.util.warnings.Warning;
 
 /**
@@ -40,7 +41,7 @@
   private ArrayList<SSAInstruction> statements;
 
   /**
-   * Map: value number -> constant
+   * Map: value number -&gt; constant
    */
   private Map<Integer, ConstantValue> constantValues;
 
@@ -69,6 +70,11 @@
    */
   private boolean isFactory = false;
 
+  /**
+   * Known names for values
+   */
+  private Map<Integer, Atom> valueNames = null;
+  
   public MethodSummary(MethodReference method) {
     if (method == null) {
       throw new IllegalArgumentException("null method");
@@ -76,13 +82,25 @@
     this.method = method;
   }
   
+  public void setValueNames(Map<Integer, Atom> nameTable) {
+    this.valueNames = nameTable;
+  }
+
+  public Map<Integer, Atom> getValueNames() {
+    return valueNames;
+  }
+
+  public Atom getValue(Integer v) {
+    return valueNames != null && valueNames.containsKey(v)? valueNames.get(v): null;
+  }
+  
   public int getNumberOfStatements() {
     return (statements == null ? 0 : statements.size());
   }
 
   public void addStatement(SSAInstruction statement) {
     if (statements == null) {
-      statements = new ArrayList<SSAInstruction>();
+      statements = new ArrayList<>();
     }
     statements.add(statement);
   }
@@ -107,9 +125,6 @@
     return false;
   }
 
-  /**
-   * @param reason
-   */
   public void addPoison(String reason) {
     this.poison = reason;
   }
@@ -169,7 +184,7 @@
 
   @Override
   public String toString() {
-    return "[Summary: " + method + "]";
+    return "[Summary: " + method + ']';
   }
 
   /**
@@ -194,8 +209,6 @@
   /**
    * Record if this is a "factory" method; meaning it returns some object which we know little about ... usually we'll resolve this
    * based on downstream uses of the object
-   * 
-   * @param b
    */
   public void setFactory(boolean b) {
     this.isFactory = b;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/ReflectionSummary.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/ReflectionSummary.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/ReflectionSummary.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/ReflectionSummary.java	2019-01-29 17:08:39.000000000 +0000
@@ -38,7 +38,7 @@
   }
 
   private Set<TypeReference> findOrCreateSetForBCIndex(int bcIndex) {
-    Integer I = new Integer(bcIndex);
+    Integer I = Integer.valueOf(bcIndex);
     Set<TypeReference> result = map.get(I);
     if (result == null) {
       result = HashSetFactory.make(10);
@@ -51,14 +51,14 @@
     if (cha == null) {
       throw new IllegalArgumentException("null cha");
     }
-    Set S = map.get(new Integer(bcIndex));
+    Set<TypeReference> S = map.get(Integer.valueOf(bcIndex));
     if (S == null) {
       return null;
     } else {
       PointType[] p = new PointType[S.size()];
-      Iterator it = S.iterator();
+      Iterator<TypeReference> it = S.iterator();
       for (int i = 0; i < p.length; i++) {
-        TypeReference T = (TypeReference) it.next();
+        TypeReference T = it.next();
         IClass klass = cha.lookupClass(T);
         assert klass != null : "null type for " + T;
         p[i] = new PointType(klass);
@@ -68,6 +68,6 @@
   }
 
   public Set<TypeReference> getTypesForProgramLocation(int bcIndex) {
-    return map.get(new Integer(bcIndex));
+    return map.get(Integer.valueOf(bcIndex));
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethod.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethod.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethod.java	2019-01-29 17:08:39.000000000 +0000
@@ -33,7 +33,7 @@
     this.summary = summary;
     assert declaringClass != null;
     if (DEBUG) {
-      System.err.println(("SummarizedMethod ctor: " + ref + " " + summary));
+      System.err.println(("SummarizedMethod ctor: " + ref + ' ' + summary));
     }
   }
 
@@ -77,6 +77,7 @@
     return summary.hasPoison();
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public SSAInstruction[] getStatements(SSAOptions options) {
     if (DEBUG) {
@@ -115,4 +116,9 @@
     return summary.getParameterType(i);
   }
 
+  @Override
+  public String getLocalVariableName(int bcIndex, int localNumber) {
+    return summary.getValue(localNumber).toString();
+  }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethodWithNames.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethodWithNames.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethodWithNames.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethodWithNames.java	2019-01-29 17:08:39.000000000 +0000
@@ -63,7 +63,7 @@
  *  names in synthetic methods. This should not change th analysis-result but may come in handy when
  *  debugging.
  *
- *  @author     Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author     Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since      2013-11-25
  */
 public class SummarizedMethodWithNames extends SummarizedMethod {
@@ -73,6 +73,10 @@
     private final MethodSummary summary;
     private final Map<Integer, Atom> localNames;
 
+    public SummarizedMethodWithNames(MethodReference ref, MethodSummary summary, IClass declaringClass) {
+      this(ref, summary, declaringClass, summary.getValueNames());
+    }
+
     public SummarizedMethodWithNames(MethodReference ref, MethodSummary summary, IClass declaringClass, Map<Integer, Atom> localNames) 
                 throws NullPointerException {
         super(ref, summary, declaringClass);
@@ -83,11 +87,12 @@
         if (DEBUG) { System.err.println("From old MSUM"); }
     }
     
+    @SuppressWarnings("unused")
     public SummarizedMethodWithNames(MethodReference ref, VolatileMethodSummary summary, IClass declaringClass) 
                 throws NullPointerException {
         super(ref, summary.getMethodSummary(), declaringClass);
         this.summary = summary.getMethodSummary();
-        this.localNames = ((VolatileMethodSummary)summary).getLocalNames();
+        this.localNames = summary.getLocalNames();
         if (DEBUG && this.localNames.isEmpty()) {
           System.err.println("Local names are empty for " + ref);
         }
@@ -108,8 +113,8 @@
              */
             @Override
             public String[] getLocalNames(int index, int vn) {
-                if (DEBUG) { System.err.printf("IR.getLocalNames({}, {})", index, vn); }
-                if (this.localNames.containsKey(vn)) {
+                if (DEBUG) { System.err.printf("IR.getLocalNames(%d, %d)\n", index, vn); }
+                if (localNames != null && localNames.containsKey(vn)) {
                     return new String[] { this.localNames.get(vn).toString() };
                 } else {
                     return null;
@@ -138,10 +143,10 @@
     public String getLocalVariableName(int bcIndex, int localNumber) {
         if (this.localNames.containsKey(localNumber)) {
             String name = this.localNames.get(localNumber).toString();
-            if (DEBUG) { System.err.printf("getLocalVariableName(bc={}, no={}) = {}", bcIndex, localNumber, name); }
+            if (DEBUG) { System.err.printf("getLocalVariableName(bc=%d, no=%d) = %s\n", bcIndex, localNumber, name); }
             return name;
         } else {
-            if (DEBUG) { System.err.printf("No name for {}", localNumber); }
+            if (DEBUG) { System.err.printf("No name for %d\n", localNumber); }
             return super.getLocalVariableName(bcIndex, localNumber);
         }
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SyntheticIRFactory.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SyntheticIRFactory.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SyntheticIRFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SyntheticIRFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,7 @@
 
 public class SyntheticIRFactory implements IRFactory<SyntheticMethod> {
 
-  public ControlFlowGraph makeCFG(SyntheticMethod method, Context C) {
+  public ControlFlowGraph makeCFG(SyntheticMethod method) {
     if (method == null) {
       throw new IllegalArgumentException("method is null");
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SyntheticIR.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SyntheticIR.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SyntheticIR.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SyntheticIR.java	2019-01-29 17:08:39.000000000 +0000
@@ -56,7 +56,7 @@
   /**
    * throw an assertion if the instruction array contains a phi instruction
    */
-  private void repOK(SSAInstruction[] instructions) {
+  private static void repOK(SSAInstruction[] instructions) {
     for (SSAInstruction s : instructions) {
       if (s instanceof SSAPhiInstruction) {
         Assertions.UNREACHABLE();
@@ -70,7 +70,7 @@
   /**
    * Set up the symbol table according to statements in the IR
    * 
-   * @param constants Map: value number (Integer) -> ConstantValue
+   * @param constants Map: value number (Integer) -&gt; ConstantValue
    */
   private static SymbolTable makeSymbolTable(IMethod method, SSAInstruction[] instructions, Map<Integer, ConstantValue> constants,
       AbstractCFG cfg) {
@@ -80,9 +80,8 @@
     SymbolTable symbolTable = new SymbolTable(method.getNumberOfParameters());
 
     // simulate allocation of value numbers
-    for (int i = 0; i < instructions.length; i++) {
-      if (instructions[i] != null) {
-        SSAInstruction s = instructions[i];
+    for (SSAInstruction s : instructions) {
+      if (s != null) {
         updateForInstruction(constants, symbolTable, s);
       }
     }
@@ -107,8 +106,8 @@
     for (int j = 0; j < s.getNumberOfUses(); j++) {
       int vn = s.getUse(j);
       symbolTable.ensureSymbol(vn);
-      if (constants != null && constants.containsKey(new Integer(vn)))
-        symbolTable.setConstantValue(vn, constants.get(new Integer(vn)));
+      if (constants != null && constants.containsKey(Integer.valueOf(vn)))
+        symbolTable.setConstantValue(vn, constants.get(Integer.valueOf(vn)));
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/VolatileMethodSummary.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/VolatileMethodSummary.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/VolatileMethodSummary.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/VolatileMethodSummary.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,19 +42,18 @@
  */
 package com.ibm.wala.ipa.summaries;
 
-import com.ibm.wala.ipa.summaries.MethodSummary;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.ibm.wala.ssa.ConstantValue;
 import com.ibm.wala.ssa.SSAGotoInstruction;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAInstructionFactory;
 import com.ibm.wala.ssa.SymbolTable;
-import com.ibm.wala.ssa.ConstantValue;
 import com.ibm.wala.types.MemberReference;
 import com.ibm.wala.types.TypeReference;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
 import com.ibm.wala.util.strings.Atom;
 
 /**
@@ -71,15 +70,14 @@
  *
  *  It extends the MethodSummarys capabilities by the functions:
  *  * {@link #getStatementAt(int)}
- *  * {@link #getStatementsAfter(int)}
  *  * {@link #reserveProgramCounters(int)}
  *  * {@link #allowReserved(boolean)}
  *
- *  @see com.ibm.wala.dalvik.ssa.AndroidModelInstructionFectory
- *  @see com.ibm.wala.dalvik.ipa.callgraph.impl.DexFakeRootMethod
+ *  @see com.ibm.wala.ssa.SSAInstructionFactory
+ *  @see com.ibm.wala.ipa.callgraph.impl.FakeRootMethod
  *  @see com.ibm.wala.ipa.summaries.MethodSummary
  *
- *  @author     Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author     Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since      2013-09-08
  */
 public class VolatileMethodSummary {
@@ -87,8 +85,8 @@
     private static final boolean DEBUG = false;
     private boolean allowReservedPC = false;
     private MethodSummary summary;
-    private List<SSAInstruction> instructions = new ArrayList<SSAInstruction>();
-    private Map<Integer, Atom> localNames = new HashMap<Integer, Atom>();
+    private List<SSAInstruction> instructions = new ArrayList<>();
+    private Map<Integer, Atom> localNames = new HashMap<>();
     private int currentProgramCounter = 0;
     private boolean locked = false;
 
@@ -97,12 +95,17 @@
      */
     private static final class Reserved extends SSAInstruction {
         public Reserved () { super(SSAInstruction.NO_INDEX); }
+        @Override
         public SSAInstruction copyForSSA (SSAInstructionFactory insts, int[] defs, int[] uses) {
             throw new IllegalStateException();
         }
+        @Override
         public int hashCode () { return 12384; }
+        @Override
         public boolean isFallThrough() { return true; }
+        @Override
         public String toString (SymbolTable symbolTable) { return "Reserved Slot"; }
+        @Override
         public void visit (IVisitor v) { throw new IllegalStateException(); }
     }
     private static final Reserved RESERVED = new Reserved();
@@ -216,12 +219,12 @@
     }
 
     /**
-     *  Not exactly dual to {@link #isFree(boolean)}.
+     *  Not exactly dual to {@link #isFree(int)}.
      *
      *  Returns whether an instruction is located at ProgramCounter. Thus it is a  shortcut
      *  to {@link #getStatementAt(int)} != null.
      *  <p>
-     *  It is not the exact dual to {@link #isFree(boolean)} as it does not consider reserved
+     *  It is not the exact dual to {@link #isFree(int)} as it does not consider reserved
      *  ProgramCounters.
      *
      *  @param programCounter   the ProgramCounter in question
@@ -240,7 +243,7 @@
     }
 
     /**
-     *  Like {@link addStatement(SSAInstructionWithPC <? extends SSAInstruction>) but may replace an existing one.
+     *  Like {@link #addStatement(SSAInstruction)} but may replace an existing one.
      *
      *  @param  statement    The statement to add without care of overwriting
      *  @return true if a statement has actually been overwritten 
@@ -269,7 +272,7 @@
 
         boolean didOverwrite = isUsed(statement.iindex);
         while (this.instructions.size() - 1 < statement.iindex) this.instructions.add(null);
-        if (DEBUG) { System.err.printf("Setting {} to {}", statement.iindex, statement); }
+        if (DEBUG) { System.err.printf("Setting %s to %s\n", statement.iindex, statement); }
         this.instructions.set(statement.iindex, statement);
         return didOverwrite;
     }
@@ -293,13 +296,13 @@
         for (int i = 0; i < this.instructions.size(); ++i) {
             final SSAInstruction inst = this.instructions.get(i);
             if (inst == null) {
-              if (DEBUG) { System.err.printf("No instruction at iindex {}", i); }
+              if (DEBUG) { System.err.printf("No instruction at iindex %d\n", i); }
               this.summary.addStatement(null);
             } else if (inst == RESERVED) {
               // replace reserved slots by 'goto next' statements
               this.summary.addStatement(new SSAGotoInstruction(i, i+1));
             } else {
-              if (DEBUG) { System.err.printf("Adding @{}: ", inst); }
+              if (DEBUG) { System.err.printf("Adding @%s: ", inst); }
               this.summary.addStatement(inst);
             }
         }
@@ -338,7 +341,7 @@
      *  @throws NullPointerException if statement is null
      *  @throws IllegalArgumentException if the statement has set an invalid ProgramCounter or
      *      if there is already a statement at the statements iindex. In this case you can use 
-     *      {@link #overwritetatement(SSAInstruction)}.
+     *      {@link #overwriteStatement(SSAInstruction)}.
      */
     public void addStatement(SSAInstruction statement) {
         if (isUsed(statement.iindex)) {
@@ -403,7 +406,7 @@
     /**
     *   Retrieves a mapping from SSA-Number to a constant.
     *
-    *   You can add Constants using the function {@link addConstant(java.lang.Integer, ConstantValue)}.
+    *   You can add Constants using the function {@link #addConstant(java.lang.Integer, ConstantValue)}.
     *   A call to this function gets passed directly to the internal MethodSummary.
     *
     *   @return a mapping from SSA-Number to assigned ConstantValue
@@ -429,7 +432,7 @@
     /**
      *  Gets you a non-reserved ProgramCounter you can write to.
      *
-     *  This function returns the next ProgramCounter for which not({@link #isUsed(ProgramCounter)})
+     *  This function returns the next ProgramCounter for which not({@link #isUsed(int)})
      *  holds. Thus it will _not_ give you a ProgramCounter which is reserved even if you enabled
      *  writing to reserved ProgramCounters using {@link #allowReserved(boolean)}! You'll have to
      *  keep track of them on your own.
@@ -570,7 +573,7 @@
     }
 
     /**
-     *  Set the value returned by {@link #getFactory()}
+     *  Set the value returned by {@link #isFactory()}
      *
      *  @throws IllegalStateException if summary was locked
      */
@@ -594,7 +597,7 @@
     }
 
     /**
-     *  Set the value returned by {@link #getStatic()}
+     *  Set the value returned by {@link #isStatic()}
      *
      *  @throws IllegalStateException if summary was locked
      */
@@ -608,6 +611,7 @@
     /**
      *  Generates a String-Representation of an instance of the class.
      */
+    @Override
     public java.lang.String toString() {
         return "VolatileMethodSummary of " + this.summary.toString();
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,8 +20,10 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.StringTokenizer;
 
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
 import org.xml.sax.Attributes;
@@ -61,7 +63,7 @@
  * This class reads method summaries from an XML Stream.
  */
 public class XMLMethodSummaryReader implements BytecodeConstants {
-
+  
   static final boolean DEBUG = false;
 
   /**
@@ -121,22 +123,22 @@
 
   private final static Map<String, Integer> elementMap = HashMapFactory.make(14);
   static {
-    elementMap.put("classloader", new Integer(E_CLASSLOADER));
-    elementMap.put("method", new Integer(E_METHOD));
-    elementMap.put("class", new Integer(E_CLASS));
-    elementMap.put("package", new Integer(E_PACKAGE));
-    elementMap.put("call", new Integer(E_CALL));
-    elementMap.put("new", new Integer(E_NEW));
-    elementMap.put("poison", new Integer(E_POISON));
-    elementMap.put("summary-spec", new Integer(E_SUMMARY_SPEC));
-    elementMap.put("return", new Integer(E_RETURN));
-    elementMap.put("putstatic", new Integer(E_PUTSTATIC));
-    elementMap.put("aastore", new Integer(E_AASTORE));
-    elementMap.put("putfield", new Integer(E_PUTFIELD));
-    elementMap.put("getfield", new Integer(E_GETFIELD));
-    elementMap.put("throw", new Integer(E_ATHROW));
-    elementMap.put("constant", new Integer(E_CONSTANT));
-    elementMap.put("aaload", new Integer(E_AALOAD));
+    elementMap.put("classloader", Integer.valueOf(E_CLASSLOADER));
+    elementMap.put("method", Integer.valueOf(E_METHOD));
+    elementMap.put("class", Integer.valueOf(E_CLASS));
+    elementMap.put("package", Integer.valueOf(E_PACKAGE));
+    elementMap.put("call", Integer.valueOf(E_CALL));
+    elementMap.put("new", Integer.valueOf(E_NEW));
+    elementMap.put("poison", Integer.valueOf(E_POISON));
+    elementMap.put("summary-spec", Integer.valueOf(E_SUMMARY_SPEC));
+    elementMap.put("return", Integer.valueOf(E_RETURN));
+    elementMap.put("putstatic", Integer.valueOf(E_PUTSTATIC));
+    elementMap.put("aastore", Integer.valueOf(E_AASTORE));
+    elementMap.put("putfield", Integer.valueOf(E_PUTFIELD));
+    elementMap.put("getfield", Integer.valueOf(E_GETFIELD));
+    elementMap.put("throw", Integer.valueOf(E_ATHROW));
+    elementMap.put("constant", Integer.valueOf(E_CONSTANT));
+    elementMap.put("aaload", Integer.valueOf(E_AALOAD));
   }
 
   //
@@ -182,10 +184,12 @@
 
   private final static String A_NUM_ARGS = "numArgs";
 
+  private final static String A_PARAM_NAMES = "paramNames";
+
   private final static String V_NULL = "null";
 
   private final static String V_TRUE = "true";
-
+  
   public XMLMethodSummaryReader(InputStream xmlFile, AnalysisScope scope) {
     super();
     if (xmlFile == null) {
@@ -198,8 +202,7 @@
     try {
       readXML(xmlFile);
     } catch (Exception e) {
-      e.printStackTrace();
-      Assertions.UNREACHABLE();
+      throw new Error("bad xml file", e);
     }
   }
 
@@ -208,11 +211,12 @@
 
     assert xml != null : "Null xml stream";
     SAXParserFactory factory = SAXParserFactory.newInstance();
-    factory.newSAXParser().parse(new InputSource(xml), handler);
+    SAXParser parser = factory.newSAXParser();
+    parser.parse(new InputSource(xml), handler);
   }
 
   /**
-   * @return Method summaries collected for methods. Mapping Object -> MethodSummary where Object is either a
+   * @return Method summaries collected for methods. Mapping Object -&gt; MethodSummary where Object is either a
    *         <ul>
    *         <li>MethodReference
    *         <li>TypeReference
@@ -269,7 +273,7 @@
     private int nextLocal = -1;
 
     /**
-     * A mapping from String (variable name) -> Integer (local number)
+     * A mapping from String (variable name) -&gt; Integer (local number)
      */
     private Map<String, Integer> symbolTable = null;
 
@@ -353,7 +357,7 @@
     }
 
     private void startClass(String cname, Attributes atts) {
-      String clName = "L" + governingPackage + "/" + cname;
+      String clName = governingPackage==null? 'L' + cname: "L" + governingPackage + '/' + cname;
       governingClass = className2Ref(clName);
       String allocString = atts.getValue(A_ALLOCATABLE);
       if (allocString != null) {
@@ -409,16 +413,14 @@
 
     /**
      * If a method is declared to return a value, be sure the method summary includes a return statement. Throw an assertion if not.
-     * 
-     * @param governingMethod
      */
     private void checkReturnValue(MethodSummary governingMethod) {
       Assertions.productionAssertion(governingMethod != null);
       Assertions.productionAssertion(governingMethod.getReturnType() != null);
       if (governingMethod.getReturnType().isReferenceType()) {
         SSAInstruction[] statements = governingMethod.getStatements();
-        for (int i = 0; i < statements.length; i++) {
-          if (statements[i] instanceof SSAReturnInstruction) {
+        for (SSAInstruction statement : statements) {
+          if (statement instanceof SSAReturnInstruction) {
             return;
           }
         }
@@ -429,8 +431,6 @@
 
     /**
      * Process an element indicating a call instruction
-     * 
-     * @param atts
      */
     private void processCallSite(Attributes atts) {
       String typeString = atts.getValue(A_TYPE);
@@ -459,14 +459,24 @@
       } else {
         Assertions.UNREACHABLE("Invalid call type " + typeString);
       }
+
+      String paramCount = atts.getValue(A_NUM_ARGS);
+      if (paramCount != null) {
+        nParams = Integer.parseInt(paramCount);
+      }
+      
       int[] params = new int[nParams];
 
       for (int i = 0; i < params.length; i++) {
         String argString = atts.getValue(A_ARG + i);
-        Assertions.productionAssertion(argString != null, "unspecified arg in method " + governingMethod + " " + site);
+        Assertions.productionAssertion(argString != null, "unspecified arg in method " + governingMethod + ' ' + site);
         Integer valueNumber = symbolTable.get(argString);
         if (valueNumber == null) {
-          Assertions.UNREACHABLE("Cannot lookup value: " + argString);
+          if (argString.equals(V_NULL)) {
+            valueNumber = getValueNumberForNull();
+          } else {
+            valueNumber = Integer.parseInt(argString);
+          }
         }
         params[i] = valueNumber.intValue();
       }
@@ -483,7 +493,7 @@
         }
 
         int defNum = nextLocal;
-        symbolTable.put(defVar, new Integer(nextLocal++));
+        symbolTable.put(defVar, Integer.valueOf(nextLocal++));
 
         governingMethod.addStatement(insts.InvokeInstruction(governingMethod.getNumberOfStatements(), defNum, params, exceptionValue, site, null));
       } else {
@@ -494,8 +504,6 @@
 
     /**
      * Process an element indicating a new allocation site.
-     * 
-     * @param atts
      */
     private void processAllocation(Attributes atts) {
       Language lang = scope.getLanguage(governingLoader.getLanguage());
@@ -516,7 +524,7 @@
         defVar = "L" + nextLocal;
       }
       int defNum = nextLocal;
-      symbolTable.put(defVar, new Integer(nextLocal++));
+      symbolTable.put(defVar, Integer.valueOf(nextLocal++));
 
       // create the allocation statement and add it to the method summary
       NewSiteReference ref = NewSiteReference.make(governingMethod.getNextProgramCounter(), type);
@@ -541,8 +549,6 @@
 
     /**
      * Process an element indicating an Athrow
-     * 
-     * @param atts
      */
     private void processAthrow(Attributes atts) {
       Language lang = scope.getLanguage(governingLoader.getLanguage());
@@ -564,8 +570,6 @@
 
     /**
      * Process an element indicating a putfield.
-     * 
-     * @param atts
      */
     private void processGetField(Attributes atts) {
       Language lang = scope.getLanguage(governingLoader.getLanguage());
@@ -592,7 +596,7 @@
         Assertions.UNREACHABLE("Must specify def for getfield " + governingMethod);
       }
       int defNum = nextLocal;
-      symbolTable.put(defVar, new Integer(nextLocal++));
+      symbolTable.put(defVar, Integer.valueOf(nextLocal++));
 
       // get the ref read from
       String R = atts.getValue(A_REF);
@@ -610,8 +614,6 @@
 
     /**
      * Process an element indicating a putfield.
-     * 
-     * @param atts
      */
     private void processPutField(Attributes atts) {
       Language lang = scope.getLanguage(governingLoader.getLanguage());
@@ -634,10 +636,7 @@
       if (V == null) {
         Assertions.UNREACHABLE("Must specify value for putfield " + governingMethod);
       }
-      Integer valueNumber = symbolTable.get(V);
-      if (valueNumber == null) {
-        Assertions.UNREACHABLE("Cannot lookup value: " + V);
-      }
+      Integer valueNumber = symbolTable.containsKey(V)? symbolTable.get(V): Integer.parseInt(V);
 
       // get the ref stored to
       String R = atts.getValue(A_REF);
@@ -655,8 +654,6 @@
 
     /**
      * Process an element indicating a putstatic.
-     * 
-     * @param atts
      */
     private void processPutStatic(Attributes atts) {
       Language lang = scope.getLanguage(governingLoader.getLanguage());
@@ -689,8 +686,6 @@
 
     /**
      * Process an element indicating an Aastore
-     * 
-     * @param atts
      */
     private void processAastore(Attributes atts) {
       Language lang = scope.getLanguage(governingLoader.getLanguage());
@@ -734,8 +729,6 @@
 
     /**
      * Process an element indicating an Aaload
-     * 
-     * @param atts
      */
     private void processAaload(Attributes atts) {
       //<aaload def="foo" ref="arg1" index="the-answer" />
@@ -750,11 +743,14 @@
       if (refNumber == null) {
         Assertions.UNREACHABLE("Cannot lookup value: " + R);
       }
-      // N.B: we currently ignore the index
       String I = atts.getValue(A_INDEX);
       if (I == null) {
         Assertions.UNREACHABLE("Must specify index for aaload " + governingMethod);
       }
+      Integer idxNumber = symbolTable.get(I);
+      if (idxNumber == null) {
+        Assertions.UNREACHABLE("Cannot lookup value: " + I);
+      }
       String strType = atts.getValue(A_TYPE);
       TypeReference type;
       if (strType == null) {
@@ -771,16 +767,13 @@
         Assertions.UNREACHABLE("Must specify def for getfield " + governingMethod);
       }
       int defNum = nextLocal;
-      symbolTable.put(defVar, new Integer(nextLocal++));
-      SSAArrayLoadInstruction S = insts.ArrayLoadInstruction(governingMethod.getNumberOfStatements(), defNum, refNumber.intValue(), 0,
-          type);
+      symbolTable.put(defVar, Integer.valueOf(nextLocal++));
+      SSAArrayLoadInstruction S = insts.ArrayLoadInstruction(governingMethod.getNumberOfStatements(), defNum, refNumber, idxNumber, type);
       governingMethod.addStatement(S);
     }
 
     /**
      * Process an element indicating a return statement.
-     * 
-     * @param atts
      */
     private void processReturn(Attributes atts) {
       Language lang = scope.getLanguage(governingLoader.getLanguage());
@@ -797,11 +790,7 @@
             if (!retV.equals(V_NULL)) {
               Assertions.UNREACHABLE("Cannot return value with no def: " + retV);
             } else {
-              valueNumber = symbolTable.get(V_NULL);
-              if (valueNumber == null) {
-                valueNumber = new Integer(nextLocal++);
-                symbolTable.put(V_NULL, valueNumber);
-              }
+              valueNumber = getValueNumberForNull();
             }
           }
           boolean isPrimitive = governingMethod.getReturnType().isPrimitiveType();
@@ -811,30 +800,35 @@
       }
     }
 
-    /**
-     * @param atts
-     */
+    private Integer getValueNumberForNull() {
+      Integer valueNumber;
+      valueNumber = symbolTable.get(V_NULL);
+      if (valueNumber == null) {
+        valueNumber = Integer.valueOf(nextLocal++);
+        symbolTable.put(V_NULL, valueNumber);
+      }
+      return valueNumber;
+    }
+
     private void processConstant(Attributes atts) {
       String var = atts.getValue(A_NAME);
       if (var == null)
         Assertions.UNREACHABLE("Must give name for constant");
-      Integer valueNumber = new Integer(nextLocal++);
+      Integer valueNumber = Integer.valueOf(nextLocal++);
       symbolTable.put(var, valueNumber);
 
       String typeString = atts.getValue(A_TYPE);
       String valueString = atts.getValue(A_VALUE);
 
-      governingMethod.addConstant(valueNumber, (typeString.equals("int")) ? new ConstantValue(new Integer(valueString))
-          : (typeString.equals("long")) ? new ConstantValue(new Long(valueString))
-              : (typeString.equals("short")) ? new ConstantValue(new Short(valueString))
-                  : (typeString.equals("float")) ? new ConstantValue(new Float(valueString))
-                      : (typeString.equals("double")) ? new ConstantValue(new Double(valueString)) : null);
+      governingMethod.addConstant(valueNumber, (typeString.equals("int")) ? new ConstantValue(Integer.valueOf(valueString))
+          : (typeString.equals("long")) ? new ConstantValue(Long.valueOf(valueString))
+              : (typeString.equals("short")) ? new ConstantValue(Short.valueOf(valueString))
+                  : (typeString.equals("float")) ? new ConstantValue(Float.valueOf(valueString))
+                      : (typeString.equals("double")) ? new ConstantValue(Double.valueOf(valueString)) : null);
     }
 
     /**
      * Process an element which indicates this method is "poison"
-     * 
-     * @param atts
      */
     private void processPoison(Attributes atts) {
       String reason = atts.getValue(A_REASON);
@@ -853,8 +847,6 @@
 
     /**
      * Begin processing of a method. 1. Set the governing method. 2. Initialize the nextLocal variable
-     * 
-     * @param atts
      */
     private void startMethod(Attributes atts) {
 
@@ -918,14 +910,31 @@
       symbolTable = HashMapFactory.make(5);
       // create symbols for the parameters
       for (int i = 0; i < nParams; i++) {
-        symbolTable.put("arg" + i, new Integer(i + 1));
+        symbolTable.put("arg" + i, Integer.valueOf(i + 1));
+      }
+      
+      int pn = 1;
+      String paramDescString = atts.getValue(A_PARAM_NAMES);
+      if (paramDescString != null) {
+        StringTokenizer paramNames = new StringTokenizer(paramDescString);
+        while (paramNames.hasMoreTokens()) {
+          symbolTable.put(paramNames.nextToken(), pn++);
+        }
+      }
+       
+      Map<Integer,Atom> nameTable = HashMapFactory.make();
+      for(Map.Entry<String, Integer> x : symbolTable.entrySet()) {
+        if (! x.getKey().startsWith("arg")) {
+          nameTable.put(x.getValue(), Atom.findOrCreateUnicodeAtom(x.getKey()));
+        }
       }
+      
+      governingMethod.setValueNames(nameTable);
     }
 
     /**
      * Method classLoaderName2Ref.
      * 
-     * @param clName
      * @return ClassLoaderReference
      */
     private ClassLoaderReference classLoaderName2Ref(String clName) {
@@ -935,7 +944,6 @@
     /**
      * Method classLoaderName2Ref.
      * 
-     * @param clName
      * @return ClassLoaderReference
      */
     private TypeReference className2Ref(String clName) {
Binary files /tmp/tmpdO65hx/hoNCbJkA_9/wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/model/java/lang/System.class and /tmp/tmpdO65hx/vj4dUdzt1P/wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/model/java/lang/System.class differ
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/model/java/lang/System.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/model/java/lang/System.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/model/java/lang/System.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/model/java/lang/System.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,8 @@
    * A simple model of object-array copy.
    * This is not completely correct.  TODO: fix it.
    */
-  static void arraycopy(Object src, Object dest) {   
+  @SuppressWarnings("ManualArrayCopy")
+  static void arraycopy(Object src, Object dest) {
     if (src instanceof Object[]) {
       Object[] A = (Object[]) src;
       Object[] B = (Object[]) dest;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/properties/WalaProperties.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/properties/WalaProperties.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/properties/WalaProperties.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/properties/WalaProperties.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,6 +43,12 @@
 
   public final static String ANDROID_DEX_TOOL = "android_dx_tool";
 
+  public final static String ANDROID_APK_TOOL = "android_apk_tool";
+  
+  public final static String DROIDEL_TOOL = "droidel_tool";
+  
+  public final static String DROIDEL_ANDROID_JAR = "droidel_android_jar";
+
   /**
    * Determine the classpath noted in wala.properties for J2SE standard libraries
    * 
@@ -128,28 +134,29 @@
     if (fileName == null) {
       throw new IllegalArgumentException("null fileName");
     }
-    final InputStream propertyStream = loader.getResourceAsStream(fileName);
-    if (propertyStream == null) {
-      // create default properties
-      Properties defprop = new Properties();
-      defprop.setProperty(OUTPUT_DIR, "./out");
-      defprop.setProperty(INPUT_DIR, "./in");
-      defprop.setProperty(ECLIPSE_PLUGINS_DIR, "./plugins");
-      defprop.setProperty(WALA_REPORT, "./wala_report.txt");
-      defprop.setProperty(J2EE_DIR, "./j2ee");
-      final String j2selib = guessJavaLib();
-      defprop.setProperty(J2SE_DIR, j2selib);
-      
-      return defprop;
-    }
-    Properties result = new Properties();
-    result.load(propertyStream);
-    
-    if (!result.containsKey(J2SE_DIR)) {
-      final String j2selib = guessJavaLib();
-      result.setProperty(J2SE_DIR, j2selib);
+    try (final InputStream propertyStream = loader.getResourceAsStream(fileName)) {
+      if (propertyStream == null) {
+        // create default properties
+        Properties defprop = new Properties();
+        defprop.setProperty(OUTPUT_DIR, "./out");
+        defprop.setProperty(INPUT_DIR, "./in");
+        defprop.setProperty(ECLIPSE_PLUGINS_DIR, "./plugins");
+        defprop.setProperty(WALA_REPORT, "./wala_report.txt");
+        defprop.setProperty(J2EE_DIR, "./j2ee");
+        final String j2selib = guessJavaLib();
+        defprop.setProperty(J2SE_DIR, j2selib);
+
+        return defprop;
+      }
+      Properties result = new Properties();
+      result.load(propertyStream);
+
+      if (!result.containsKey(J2SE_DIR)) {
+        final String j2selib = guessJavaLib();
+        result.setProperty(J2SE_DIR, j2selib);
+      }
+      return result;
     }
-    return result;
   }
 
   public static String guessJavaLib() throws IOException {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/AllIntegerDueToBranchePiPolicy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/AllIntegerDueToBranchePiPolicy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/AllIntegerDueToBranchePiPolicy.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/AllIntegerDueToBranchePiPolicy.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ssa;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.ibm.wala.util.collections.Pair;
+
+/**
+ * A policy, that adds pi nodes for all variables, that are used in a branch
+ * instruction.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ */
+public class AllIntegerDueToBranchePiPolicy implements SSAPiNodePolicy {
+
+  @Override
+  public Pair<Integer, SSAInstruction> getPi(SSAAbstractInvokeInstruction call, SymbolTable symbolTable) {
+    return null;
+  }
+
+  @Override
+  public Pair<Integer, SSAInstruction> getPi(SSAConditionalBranchInstruction cond, SSAInstruction def1, SSAInstruction def2,
+      SymbolTable symbolTable) {
+    final List<Pair<Integer, SSAInstruction>> pis = this.getPis(cond, def1, def2, symbolTable);
+    if (pis.size() == 0) {
+      return null;
+    } else if (pis.size() == 1) {
+      return pis.get(0);
+    } else {
+      throw new IllegalArgumentException(
+          "getPi was called but pi nodes should be inserted for more than one variable. Use getPis instead.");
+    }
+  }
+
+  @Override
+  public List<Pair<Integer, SSAInstruction>> getPis(SSAConditionalBranchInstruction cond, SSAInstruction def1, SSAInstruction def2,
+      SymbolTable symbolTable) {
+    if (cond.isIntegerComparison()) {
+      final LinkedList<Pair<Integer, SSAInstruction>> result = new LinkedList<>();
+      for (int i = 0; i < cond.getNumberOfUses(); i++) {
+        result.add(Pair.make(cond.getUse(i), (SSAInstruction) cond));
+      }
+      return result;
+    } else {
+      return Collections.emptyList();
+    }
+
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/DeadAssignmentElimination.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/DeadAssignmentElimination.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/DeadAssignmentElimination.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/DeadAssignmentElimination.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,22 +11,20 @@
 package com.ibm.wala.ssa.analysis;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.fixedpoint.impl.DefaultFixedPointSolver;
 import com.ibm.wala.fixpoint.BooleanVariable;
 import com.ibm.wala.fixpoint.UnaryOr;
-import com.ibm.wala.ssa.DefUse;
-import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.*;
 import com.ibm.wala.ssa.SSACFG.BasicBlock;
-import com.ibm.wala.ssa.SSAInstruction;
-import com.ibm.wala.ssa.SSAPhiInstruction;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.CancelRuntimeException;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 /**
  * Eliminate dead assignments (phis) from an SSA IR.
@@ -59,16 +57,15 @@
    * @param solution dataflow solution for dead assignment elimination
    */
   private static void doTransformation(IR ir, DeadValueSystem solution) {
-    ControlFlowGraph cfg = ir.getControlFlowGraph();
-    for (Iterator x = cfg.iterator(); x.hasNext();) {
-      BasicBlock b = (BasicBlock) x.next();
+    ControlFlowGraph<?, ISSABasicBlock> cfg = ir.getControlFlowGraph();
+    for (ISSABasicBlock issaBasicBlock : cfg) {
+      BasicBlock b = (BasicBlock) issaBasicBlock;
       if (DEBUG) {
         System.err.println("eliminateDeadPhis: " + b);
       }
       if (b.hasPhi()) {
         HashSet<SSAPhiInstruction> toRemove = HashSetFactory.make(5);
-        for (Iterator it = b.iteratePhis(); it.hasNext();) {
-          SSAPhiInstruction phi = (SSAPhiInstruction) it.next();
+        for (SSAPhiInstruction phi : Iterator2Iterable.make(b.iteratePhis())) {
           if (phi != null) {
             int def = phi.getDef();
             if (solution.isDead(def)) {
@@ -90,7 +87,7 @@
   private static class DeadValueSystem extends DefaultFixedPointSolver<BooleanVariable> {
 
     /**
-     * Map: value number -> BooleanVariable isLive
+     * Map: value number -&gt; BooleanVariable isLive
      */
     final private Map<Integer, BooleanVariable> vars = HashMapFactory.make();
 
@@ -105,19 +102,18 @@
      */
     DeadValueSystem(IR ir, DefUse DU) {
       // create a variable for each potentially dead phi instruction.
-      for (Iterator it = ir.iteratePhis(); it.hasNext();) {
-        SSAPhiInstruction phi = (SSAPhiInstruction) it.next();
+      for (SSAInstruction inst : Iterator2Iterable.make(ir.iteratePhis())) {
+        SSAPhiInstruction phi = (SSAPhiInstruction) inst;
         if (phi == null) {
           continue;
         }
         int def = phi.getDef();
-        if (DU.getNumberOfUses(def) == 0) {
+        if (DU.isUnused(def)) {
           // the phi is certainly dead ... record this with a dataflow fact.
-          trivialDead.add(new Integer(def));
+          trivialDead.add(Integer.valueOf(def));
         } else {
           boolean maybeDead = true;
-          for (Iterator uses = DU.getUses(def); uses.hasNext();) {
-            SSAInstruction u = (SSAInstruction) uses.next();
+          for (SSAInstruction u : Iterator2Iterable.make(DU.getUses(def))) {
             if (!(u instanceof SSAPhiInstruction)) {
               // certainly not dead
               maybeDead = false;
@@ -127,19 +123,18 @@
           if (maybeDead) {
             // perhaps the phi is dead .. create a variable
             BooleanVariable B = new BooleanVariable(false);
-            vars.put(new Integer(def), B);
+            vars.put(Integer.valueOf(def), B);
           }
         }
       }
 
       // Now create dataflow equations; v is live iff any phi that uses v is live
-      for (Iterator it = vars.entrySet().iterator(); it.hasNext();) {
-        Map.Entry E = (Map.Entry) it.next();
-        Integer def = (Integer) E.getKey();
-        BooleanVariable B = (BooleanVariable) E.getValue();
-        for (Iterator uses = DU.getUses(def.intValue()); uses.hasNext();) {
-          SSAPhiInstruction u = (SSAPhiInstruction) uses.next();
-          Integer ud = new Integer(u.getDef());
+      for (Entry<Integer, BooleanVariable> E : vars.entrySet()) {
+        Integer def = E.getKey();
+        BooleanVariable B = E.getValue();
+        for (SSAInstruction use : Iterator2Iterable.make(DU.getUses(def.intValue()))) {
+          SSAPhiInstruction u = (SSAPhiInstruction) use;
+          Integer ud = Integer.valueOf(u.getDef());
           if (trivialDead.contains(ud)) {
             // do nothing ... u will not keep def live
           } else {
@@ -169,7 +164,6 @@
     }
 
     /**
-     * @param value
      * @return true iff there are no uses of the given value number
      */
     private boolean isDead(int value) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/ExplodedControlFlowGraph.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/ExplodedControlFlowGraph.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/ExplodedControlFlowGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/ExplodedControlFlowGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -30,6 +30,7 @@
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
 import com.ibm.wala.util.collections.SimpleVector;
 import com.ibm.wala.util.debug.Assertions;
@@ -40,7 +41,7 @@
 
 /**
  * A view of a control flow graph where each basic block corresponds to exactly one SSA instruction index.
- * 
+ *
  * Prototype: Not terribly efficient.
  */
 public class ExplodedControlFlowGraph implements ControlFlowGraph<SSAInstruction, IExplodedBasicBlock> {
@@ -54,7 +55,7 @@
   /**
    * The ith element of this vector is the basic block holding instruction i. this basic block has number i+1.
    */
-  private final SimpleVector<IExplodedBasicBlock> normalNodes = new SimpleVector<IExplodedBasicBlock>();
+  private final SimpleVector<IExplodedBasicBlock> normalNodes = new SimpleVector<>();
 
   private final Collection<IExplodedBasicBlock> allNodes = HashSetFactory.make();
 
@@ -127,7 +128,7 @@
       return Collections.emptySet();
     }
     if (eb.isExitBlock() || eb.instructionIndex == eb.original.getFirstInstructionIndex()) {
-      List<IExplodedBasicBlock> result = new ArrayList<IExplodedBasicBlock>();
+      List<IExplodedBasicBlock> result = new ArrayList<>();
       for (ISSABasicBlock s : ir.getControlFlowGraph().getExceptionalPredecessors(eb.original)) {
         assert normalNodes.get(s.getLastInstructionIndex()) != null;
         result.add(normalNodes.get(s.getLastInstructionIndex()));
@@ -140,18 +141,18 @@
 
   @Override
   public List<IExplodedBasicBlock> getExceptionalSuccessors(IExplodedBasicBlock bb) {
-    ExplodedBasicBlock eb = (ExplodedBasicBlock) bb;    
+    ExplodedBasicBlock eb = (ExplodedBasicBlock) bb;
     assert eb != null;
     if (eb.equals(exit)) {
       return Collections.emptyList();
     }
     if (eb.isEntryBlock() || eb.instructionIndex == eb.original.getLastInstructionIndex()) {
-      List<IExplodedBasicBlock> result = new ArrayList<IExplodedBasicBlock>();
+      List<IExplodedBasicBlock> result = new ArrayList<>();
       ISSABasicBlock orig = eb.original;
       if (eb.isEntryBlock() && orig == null) {
         orig = ir.getControlFlowGraph().entry();
       }
-      
+
       for (ISSABasicBlock s : ir.getControlFlowGraph().getExceptionalSuccessors(orig)) {
         if (s.equals(ir.getControlFlowGraph().exit())) {
           result.add(exit());
@@ -184,7 +185,7 @@
       return Collections.emptySet();
     }
     if (eb.isExitBlock() || eb.instructionIndex == eb.original.getFirstInstructionIndex()) {
-      List<IExplodedBasicBlock> result = new ArrayList<IExplodedBasicBlock>();
+      List<IExplodedBasicBlock> result = new ArrayList<>();
       for (ISSABasicBlock s : ir.getControlFlowGraph().getNormalPredecessors(eb.original)) {
         if (s.equals(ir.getControlFlowGraph().entry())) {
           if (s.getLastInstructionIndex() >= 0) {
@@ -216,7 +217,7 @@
       return Collections.singleton(normalNodes.get(0));
     }
     if (eb.instructionIndex == eb.original.getLastInstructionIndex()) {
-      List<IExplodedBasicBlock> result = new ArrayList<IExplodedBasicBlock>();
+      List<IExplodedBasicBlock> result = new ArrayList<>();
       for (ISSABasicBlock s : ir.getControlFlowGraph().getNormalSuccessors(eb.original)) {
         if (s.equals(ir.getControlFlowGraph().exit())) {
           result.add(exit());
@@ -277,7 +278,7 @@
 
   @Override
   public int getPredNodeCount(IExplodedBasicBlock bb) throws IllegalArgumentException {
-    ExplodedBasicBlock eb = (ExplodedBasicBlock) bb;    
+    ExplodedBasicBlock eb = (ExplodedBasicBlock) bb;
     if (eb == null) {
       throw new IllegalArgumentException("eb == null");
     }
@@ -309,12 +310,11 @@
     }
     ISSABasicBlock original = eb.isExitBlock() ? ir.getControlFlowGraph().exit() : eb.original;
     if (eb.isExitBlock() || eb.instructionIndex == eb.original.getFirstInstructionIndex()) {
-      List<IExplodedBasicBlock> result = new ArrayList<IExplodedBasicBlock>();
+      List<IExplodedBasicBlock> result = new ArrayList<>();
       if (eb.original != null && eb.original.isEntryBlock()) {
         result.add(entry);
       }
-      for (Iterator<ISSABasicBlock> it = ir.getControlFlowGraph().getPredNodes(original); it.hasNext();) {
-        ISSABasicBlock s = it.next();
+      for (ISSABasicBlock s : Iterator2Iterable.make(ir.getControlFlowGraph().getPredNodes(original))) {
         if (s.isEntryBlock()) {
           // it's possible for an entry block to have instructions; in this case, add
           // the exploded basic block for the last instruction in the entry block
@@ -355,9 +355,8 @@
       return z == null ? EmptyIterator.<IExplodedBasicBlock> instance() : NonNullSingletonIterator.make(z);
     }
     if (eb.instructionIndex == eb.original.getLastInstructionIndex()) {
-      List<IExplodedBasicBlock> result = new ArrayList<IExplodedBasicBlock>();
-      for (Iterator<ISSABasicBlock> it = ir.getControlFlowGraph().getSuccNodes(eb.original); it.hasNext();) {
-        ISSABasicBlock s = it.next();
+      List<IExplodedBasicBlock> result = new ArrayList<>();
+      for (ISSABasicBlock s : Iterator2Iterable.make(ir.getControlFlowGraph().getSuccNodes(eb.original))) {
         if (s.equals(ir.getControlFlowGraph().exit())) {
           result.add(exit());
         } else {
@@ -379,13 +378,12 @@
 
   @Override
   public boolean hasEdge(IExplodedBasicBlock src, IExplodedBasicBlock dst) throws UnimplementedError {
-    for (Iterator<IExplodedBasicBlock> it = getSuccNodes(src); it.hasNext();) {
-      IExplodedBasicBlock succ = it.next();
+    for (IExplodedBasicBlock succ : Iterator2Iterable.make(getSuccNodes(src))) {
       if (succ == dst) {
         return true;
       }
     }
-    
+
     return false;
   }
 
@@ -443,8 +441,8 @@
   @Override
   public IntSet getPredNodeNumbers(IExplodedBasicBlock node) {
     MutableSparseIntSet result = MutableSparseIntSet.makeEmpty();
-    for (Iterator<? extends IExplodedBasicBlock> it = getPredNodes(node); it.hasNext();) {
-      result.add(getNumber(it.next()));
+    for (IExplodedBasicBlock ebb : Iterator2Iterable.make(getPredNodes(node))) {
+      result.add(getNumber(ebb));
     }
     return result;
   }
@@ -458,7 +456,7 @@
   /**
    * A basic block with exactly one normal instruction (which may be null), corresponding to a single instruction index in the SSA
    * instruction array.
-   * 
+   *
    * The block may also have phis.
    */
   private class ExplodedBasicBlock implements IExplodedBasicBlock {
@@ -627,25 +625,29 @@
     @Override
     public String toString() {
       if (isEntryBlock()) {
-        return "ExplodedBlock[" + getNumber() + "](entry:" + getMethod() + ")";
+        return "ExplodedBlock[" + getNumber() + "](entry:" + getMethod() + ')';
       }
       if (isExitBlock()) {
-        return "ExplodedBlock[" + getNumber() + "](exit:" + getMethod() + ")";
+        return "ExplodedBlock[" + getNumber() + "](exit:" + getMethod() + ')';
       }
-      return "ExplodedBlock[" + getNumber() + "](original:" + original + ")";
+      return "ExplodedBlock[" + getNumber() + "](original:" + original + ')';
+    }
+
+    @Override
+    public int getOriginalNumber() {
+      return original.getNumber();
     }
   }
 
   @Override
   public String toString() {
-    StringBuffer s = new StringBuffer("");
-    for (Iterator<IExplodedBasicBlock> it = iterator(); it.hasNext();) {
-      IExplodedBasicBlock bb = it.next();
-      s.append("BB").append(getNumber(bb)).append("\n");
+    StringBuilder s = new StringBuilder();
+    for (IExplodedBasicBlock bb : this) {
+      s.append("BB").append(getNumber(bb)).append('\n');
 
       Iterator<? extends IExplodedBasicBlock> succNodes = getSuccNodes(bb);
       while (succNodes.hasNext()) {
-        s.append("    -> BB").append(getNumber(succNodes.next())).append("\n");
+        s.append("    -> BB").append(getNumber(succNodes.next())).append('\n');
       }
     }
     return s.toString();
@@ -655,4 +657,4 @@
     return ir;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/IExplodedBasicBlock.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/IExplodedBasicBlock.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/IExplodedBasicBlock.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/IExplodedBasicBlock.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,7 @@
 /**
  * A basic block with exactly one normal instruction (which may be null), corresponding to a single instruction index in the SSA
  * instruction array.
- * 
+ *
  * The block may also have phis.
  */
 public interface IExplodedBasicBlock extends ISSABasicBlock {
@@ -29,9 +29,15 @@
 
   /**
    * if this represents an exception handler block, return the corresponding {@link SSAGetCaughtExceptionInstruction}
-   * 
+   *
    * @throws IllegalArgumentException if this does not represent an exception handler block
    */
   public SSAGetCaughtExceptionInstruction getCatchInstruction();
 
+  /**
+   * get the number of the original basic block containing the instruction of
+   * this exploded block
+   */
+  public int getOriginalNumber();
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/AuxiliaryCache.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/AuxiliaryCache.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/AuxiliaryCache.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/AuxiliaryCache.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,8 +12,8 @@
 
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.Context;
@@ -26,19 +26,19 @@
 /**
  * A cache for auxiliary information based on an SSA representation
  * 
- * A mapping from (IMethod,Context) -> SSAOptions -> SoftReference -> something
+ * A mapping from (IMethod,Context) -&gt; SSAOptions -&gt; SoftReference -&gt; something
  * 
  * This doesn't work very well ... GCs don't do such a great job with SoftReferences ... revamp it.
  */
-class AuxiliaryCache {
+public class AuxiliaryCache implements IAuxiliaryCache {
 
   /**
-   * A mapping from IMethod -> SSAOptions -> SoftReference -> IR
+   * A mapping from IMethod -&gt; SSAOptions -&gt; SoftReference -&gt; IR
    */
   private HashMap<Pair<IMethod, Context>, Map<SSAOptions, Object>> dictionary = HashMapFactory.make();
 
   /**
-   * Help out the garbage collector: clear this cache when the number of items is > RESET_THRESHOLD
+   * Help out the garbage collector: clear this cache when the number of items is &gt; RESET_THRESHOLD
    */
   final private static int RESET_THRESHOLD = 2000;
 
@@ -47,9 +47,10 @@
    */
   private int nItems = 0;
 
-  /**
-   * The existence of this is unfortunate.
+  /* 
+   * @see com.ibm.wala.ssa.IAuxiliaryCache#wipe()
    */
+  @Override
   public synchronized void wipe() {
     dictionary = HashMapFactory.make();
     nItems = 0;
@@ -63,33 +64,29 @@
     dictionary = HashMapFactory.make();
     nItems = 0;
 
-    for (Iterator<Map.Entry<Pair<IMethod, Context>, Map<SSAOptions, Object>>> it = oldDictionary.entrySet().iterator(); it
-        .hasNext();) {
-      Map.Entry<Pair<IMethod, Context>, Map<SSAOptions, Object>> e = it.next();
-      Map<SSAOptions, Object> m = e.getValue();
-      HashSet<Object> toRemove = HashSetFactory.make();
-      for (Iterator it2 = m.entrySet().iterator(); it2.hasNext();) {
-        Map.Entry e2 = (Map.Entry) it2.next();
-        Object key = e2.getKey();
-        Object val = e2.getValue();
-        if (CacheReference.get(val) == null) {
-          toRemove.add(key);
-        }
-      }
-      for (Iterator<Object> it2 = toRemove.iterator(); it2.hasNext();) {
-        m.remove(it2.next());
-      }
-      if (m.size() > 0) {
-        dictionary.put(e.getKey(), m);
-      }
+    for (Entry<Pair<IMethod, Context>, Map<SSAOptions, Object>> e : oldDictionary.entrySet()) {
+   Map<SSAOptions, Object> m = e.getValue();
+   HashSet<Object> toRemove = HashSetFactory.make();
+   for (Entry<SSAOptions, Object> e2 : m.entrySet()) {
+    Object key = e2.getKey();
+    Object val = e2.getValue();
+    if (CacheReference.get(val) == null) {
+      toRemove.add(key);
     }
+   }
+   for (Object object : toRemove) {
+    m.remove(object);
+   }
+   if (m.size() > 0) {
+    dictionary.put(e.getKey(), m);
+   }
+  }
   }
 
-  /**
-   * @param m a method
-   * @param options options governing ssa construction
-   * @return the object cached for m, or null if none found
+  /* 
+   * @see com.ibm.wala.ssa.IAuxiliaryCache#find(com.ibm.wala.classLoader.IMethod, com.ibm.wala.ipa.callgraph.Context, com.ibm.wala.ssa.SSAOptions)
    */
+  @Override
   public synchronized Object find(IMethod m, Context c, SSAOptions options) {
     // methodMap: SSAOptions -> SoftReference
     Pair<IMethod, Context> p = Pair.make(m, c);
@@ -102,12 +99,10 @@
     }
   }
 
-  /**
-   * cache new auxiliary information for an <m,options> pair
-   * 
-   * @param m a method
-   * @param options options governing ssa construction
+  /* 
+   * @see com.ibm.wala.ssa.IAuxiliaryCache#cache(com.ibm.wala.classLoader.IMethod, com.ibm.wala.ipa.callgraph.Context, com.ibm.wala.ssa.SSAOptions, java.lang.Object)
    */
+  @Override
   public synchronized void cache(IMethod m, Context c, SSAOptions options, Object aux) {
     nItems++;
 
@@ -121,9 +116,10 @@
     methodMap.put(options, ref);
   }
 
-  /**
-   * invalidate all cached information about a method
+  /* 
+   * @see com.ibm.wala.ssa.IAuxiliaryCache#invalidate(com.ibm.wala.classLoader.IMethod, com.ibm.wala.ipa.callgraph.Context)
    */
+  @Override
   public void invalidate(IMethod method, Context c) {
     dictionary.remove(Pair.make(method, c));
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/CompoundPiPolicy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/CompoundPiPolicy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/CompoundPiPolicy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/CompoundPiPolicy.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,6 +10,9 @@
  *******************************************************************************/
 package com.ibm.wala.ssa;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import com.ibm.wala.util.collections.Pair;
 
 /**
@@ -101,5 +104,13 @@
     return true;
   }
 
-  
+  @Override
+  public List<Pair<Integer, SSAInstruction>> getPis(SSAConditionalBranchInstruction cond, SSAInstruction def1, SSAInstruction def2,
+      SymbolTable symbolTable) {
+    LinkedList<Pair<Integer, SSAInstruction>> result = new LinkedList<>();
+    result.addAll(p1.getPis(cond, def1, def2, symbolTable));
+    result.addAll(p2.getPis(cond, def1, def2, symbolTable));
+    return result;
+  }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/ConstantValue.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/ConstantValue.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/ConstantValue.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/ConstantValue.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,11 +21,11 @@
   }
 
   public ConstantValue(int constant) {
-    this(new Integer(constant));
+    this(Integer.valueOf(constant));
   }
 
   public ConstantValue(double constant) {
-    this(new Double(constant));
+    this(Double.valueOf(constant));
   }
 
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/DefaultIRFactory.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/DefaultIRFactory.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/DefaultIRFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/DefaultIRFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,6 +18,7 @@
 import com.ibm.wala.classLoader.SyntheticMethod;
 import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ipa.summaries.SyntheticIRFactory;
+import com.ibm.wala.shrikeBT.IInstruction;
 import com.ibm.wala.util.debug.Assertions;
 
 /**
@@ -35,14 +36,16 @@
    * @see com.ibm.wala.ssa.IRFactory#makeCFG(com.ibm.wala.classLoader.IMethod, com.ibm.wala.ipa.callgraph.Context,
    * com.ibm.wala.ipa.cha.IClassHierarchy, com.ibm.wala.util.warnings.WarningSet)
    */
-  public ControlFlowGraph makeCFG(IMethod method, Context c) throws IllegalArgumentException {
+  public ControlFlowGraph makeCFG(IMethod method, @SuppressWarnings("unused") Context c) throws IllegalArgumentException {
     if (method == null) {
       throw new IllegalArgumentException("method cannot be null");
     }
-    if (method.isSynthetic()) {
-      return syntheticFactory.makeCFG((SyntheticMethod) method, c);
+    if (method.isWalaSynthetic()) {
+      return syntheticFactory.makeCFG((SyntheticMethod) method);
     } else if (method instanceof IBytecodeMethod) {
-      return shrikeFactory.makeCFG((IBytecodeMethod) method, c);
+      @SuppressWarnings("unchecked")
+      final IBytecodeMethod<IInstruction> castMethod = (IBytecodeMethod) method;
+      return shrikeFactory.makeCFG(castMethod);
     } else {
       Assertions.UNREACHABLE();
       return null;
@@ -58,10 +61,12 @@
     if (method == null) {
       throw new IllegalArgumentException("method cannot be null");
     }
-    if (method.isSynthetic()) {
+    if (method.isWalaSynthetic()) {
       return syntheticFactory.makeIR((SyntheticMethod) method, c, options);
     } else if (method instanceof IBytecodeMethod) {
-      return shrikeFactory.makeIR((IBytecodeMethod) method, c, options);
+      @SuppressWarnings("unchecked")
+      final IBytecodeMethod<IInstruction> castMethod = (IBytecodeMethod<IInstruction>) method;
+      return shrikeFactory.makeIR(castMethod, c, options);
     } else {
       Assertions.UNREACHABLE();
       return null;
@@ -76,7 +81,7 @@
     if (method == null) {
       throw new IllegalArgumentException("null method");
     }
-    if (method.isSynthetic()) {
+    if (method.isWalaSynthetic()) {
       return syntheticFactory.contextIsIrrelevant((SyntheticMethod) method);
     } else if (method instanceof ShrikeCTMethod) {
       // we know ShrikeFactory contextIsIrrelevant
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/DefUse.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/DefUse.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/DefUse.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/DefUse.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,6 +14,7 @@
 import java.util.Iterator;
 
 import com.ibm.wala.util.collections.EmptyIterator;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.intset.IntIterator;
 import com.ibm.wala.util.intset.IntSet;
@@ -27,19 +28,19 @@
   static final boolean DEBUG = false;
 
   /**
-   * A mapping from integer (value number) -> {@link SSAInstruction} that defines the value
+   * A mapping from integer (value number) -&gt; {@link SSAInstruction} that defines the value
    */
   final private SSAInstruction[] defs;
 
   /**
-   * A mapping from integer (value number) -> bit vector holding integers representing instructions that use the value number
+   * A mapping from integer (value number) -&gt; bit vector holding integers representing instructions that use the value number
    */
   final private MutableIntSet[] uses;
 
   /**
-   * A Mapping from integer -> Instruction
+   * A Mapping from integer -&gt; Instruction
    */
-  final protected ArrayList<SSAInstruction> allInstructions = new ArrayList<SSAInstruction>();
+  final protected ArrayList<SSAInstruction> allInstructions = new ArrayList<>();
 
   /**
    * prevent the IR from being collected while this is live.
@@ -63,9 +64,9 @@
     if (DEBUG) {
       System.err.println(("DefUse: defs.length " + defs.length));
     }
-    Iterator it = allInstructions.iterator();
+    Iterator<SSAInstruction> it = allInstructions.iterator();
     for (int i = 0; i < allInstructions.size(); i++) {
-      SSAInstruction s = (SSAInstruction) it.next();
+      SSAInstruction s = it.next();
       if (s == null) {
         continue;
       }
@@ -82,7 +83,7 @@
             uses[use].add(i);
           }
         } catch (ArrayIndexOutOfBoundsException e) {
-          throw new InternalError("unexpected value number " + use);
+          assert false : "unexpected value number " + use;
         }
       }
     }
@@ -99,8 +100,8 @@
    * Initialize the allInstructions field with every {@link SSAInstruction} in the ir.
    */
   protected void initAllInstructions() {
-    for (Iterator<SSAInstruction> it = ir.iterateAllInstructions(); it.hasNext();) {
-      allInstructions.add(it.next());
+    for (SSAInstruction inst : Iterator2Iterable.make(ir.iterateAllInstructions())) {
+      allInstructions.add(inst);
     }
   }
 
@@ -186,4 +187,14 @@
   public int getNumberOfUses(int v) {
     return uses[v] == null ? 0 : uses[v].size();
   }
+
+  /**
+   * @param v a value number
+   * @return true if the variable with the given value number has no uses
+   */
+  public boolean isUnused(int v) {
+    final MutableIntSet usesSet = uses[v];
+    assert usesSet == null || !usesSet.isEmpty();
+    return usesSet == null;
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/IAuxiliaryCache.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/IAuxiliaryCache.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/IAuxiliaryCache.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/IAuxiliaryCache.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ssa;
+
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.ipa.callgraph.Context;
+
+interface IAuxiliaryCache {
+
+  /**
+   * The existence of this is unfortunate.
+   */
+  void wipe();
+
+  /**
+   * @param m a method
+   * @param options options governing ssa construction
+   * @return the object cached for m, or null if none found
+   */
+  Object find(IMethod m, Context c, SSAOptions options);
+
+  /**
+   * cache new auxiliary information for an &lt;m,options&gt; pair
+   * 
+   * @param m a method
+   * @param options options governing ssa construction
+   */
+  void cache(IMethod m, Context c, SSAOptions options, Object aux);
+
+  /**
+   * invalidate all cached information about a method
+   */
+  void invalidate(IMethod method, Context c);
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/InstanceOfPiPolicy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/InstanceOfPiPolicy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/InstanceOfPiPolicy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/InstanceOfPiPolicy.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,18 +10,21 @@
  *******************************************************************************/
 package com.ibm.wala.ssa;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import com.ibm.wala.util.collections.Pair;
 
 /**
  * A pi node policy with the following rule:
  * 
  * If we have the following code:
- * <p>
- * <verbatim> S1: c = v1 instanceof T S2: if (c == 0) { ... } </verbatim>
+ *
+ * <pre> S1: c = v1 instanceof T S2: if (c == 0) { ... } </pre>
  * 
  * replace it with:
- * <p>
- * <verbatim> S1: c = v1 instanceof T S2: if (c == 0) { v2 = PI(v1, S1) .... } </verbatim>
+ *
+ * <pre> S1: c = v1 instanceof T S2: if (c == 0) { v2 = PI(v1, S1) .... } </pre>
  * 
  * The same pattern holds if the test is c == 1. This renaming allows SSA-based analysis to reason about the type of v2 depending on
  * the outcome of the branch.
@@ -75,4 +78,12 @@
     return null;
   }
 
+  @Override
+  public List<Pair<Integer, SSAInstruction>> getPis(SSAConditionalBranchInstruction cond, SSAInstruction def1, SSAInstruction def2,
+      SymbolTable symbolTable) {
+    LinkedList<Pair<Integer, SSAInstruction>> result = new LinkedList<>();
+    result.add(getPi(cond, def1, def2, symbolTable));
+    return result;
+  }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/IR.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/IR.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/IR.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/IR.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,6 +26,7 @@
 import com.ibm.wala.util.collections.CompoundIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.intset.BasicNaturalRelation;
 import com.ibm.wala.util.intset.IntIterator;
@@ -42,7 +43,7 @@
  * 
  * See http://wala.sourceforge.net/wiki/index.php/UserGuide:IR for more details on the IR API.
  */
-public abstract class IR {
+public abstract class IR implements IRView {
 
   /**
    * The method that defined this IR's bytecodes
@@ -124,10 +125,10 @@
           callSiteMapping.add(((SSAAbstractInvokeInstruction) x).getCallSite().getProgramCounter(), i);
         }
         if (x instanceof SSANewInstruction) {
-          newSiteMapping.put(((SSANewInstruction) x).getNewSite(), new Integer(i));
+          newSiteMapping.put(((SSANewInstruction) x).getNewSite(), Integer.valueOf(i));
         }
         if (x.isPEI()) {
-           peiMapping.put(new ProgramCounter(cfg.getProgramCounter(i)), new Integer(i));
+           peiMapping.put(new ProgramCounter(cfg.getProgramCounter(i)), Integer.valueOf(i));
         }
       }
     }
@@ -144,7 +145,7 @@
     if (getIndirectionData() != null) {
       names = getIndirectionData().getNames();
     }
-    StringBuffer result = new StringBuffer(method.toString());
+    StringBuilder result = new StringBuilder(method.toString());
     result.append("\nCFG:\n");
     result.append(cfg.toString());
     result.append("Instructions:\n");
@@ -154,20 +155,29 @@
       int end = bb.getLastInstructionIndex();
       result.append("BB").append(bb.getNumber());
       if (bb instanceof ExceptionHandlerBasicBlock) {
-        result.append("<Handler>");
+
+        result.append("<Handler> (");
+        Iterator<TypeReference> catchIter = ((ExceptionHandlerBasicBlock) bb).getCaughtExceptionTypes();
+        while (catchIter.hasNext()) {
+          TypeReference next = catchIter.next();
+          result.append(next);
+          if (catchIter.hasNext()) {
+            result.append(',');
+          }
+        }
+        result.append(')');
       }
-      result.append("\n");
-      for (Iterator it = bb.iteratePhis(); it.hasNext();) {
-        SSAPhiInstruction phi = (SSAPhiInstruction) it.next();
+      result.append('\n');
+      for (SSAPhiInstruction phi : Iterator2Iterable.make(bb.iteratePhis())) {
         if (phi != null) {
-          result.append("           " + phi.toString(symbolTable)).append("\n");
+          result.append("           ").append(phi.toString(symbolTable)).append('\n');
         }
       }
       if (bb instanceof ExceptionHandlerBasicBlock) {
         ExceptionHandlerBasicBlock ebb = (ExceptionHandlerBasicBlock) bb;
         SSAGetCaughtExceptionInstruction s = ebb.getCatchInstruction();
         if (s != null) {
-          result.append("           " + s.toString(symbolTable)).append("\n");
+          result.append("           ").append(s.toString(symbolTable)).append('\n');
         } else {
           result.append("           " + " No catch instruction. Unreachable?\n");
         }
@@ -178,15 +188,15 @@
             boolean any = false;
             for(SSAIndirectionData.Name n : names) {
               if (getIndirectionData().getUse(j, n) != -1) {
-                result.append(" " + n + " -> " + getIndirectionData().getUse(j, n));
+                result.append(' ').append(n).append(" -> ").append(getIndirectionData().getUse(j, n));
                 any = true;
               }
             }
             if (any) {
-              result.append("\n");
+              result.append('\n');
             }
           }
-          StringBuffer x = new StringBuffer(j + "   " + instructions[j].toString(symbolTable));
+          StringBuilder x = new StringBuilder(j + "   " + instructions[j].toString(symbolTable));
           StringStuff.padWithSpaces(x, 45);
           result.append(x);
           result.append(instructionPosition(j));
@@ -201,29 +211,32 @@
             addNames(j, valNames, valNum);
           }
           if (!valNames.isEmpty()) {
-            result.append(" ").append(valNames);
+            result.append(" [");
+            for(Map.Entry<Integer,Set<String>> e : valNames.entrySet()) {
+              result.append(e.getKey()).append('=').append(e.getValue());
+            }
+            result.append(']');
           }
  
-          result.append("\n");
+          result.append('\n');
           
           if (names != null) {
             boolean any = false;
             for(SSAIndirectionData.Name n : names) {
               if (getIndirectionData().getDef(j, n) != -1) {
-                result.append(" " + n + " <- " + getIndirectionData().getDef(j, n));
+                result.append(' ').append(n).append(" <- ").append(getIndirectionData().getDef(j, n));
                 any = true;
               }
             }
             if (any) {
-              result.append("\n");
+              result.append('\n');
             }
           }
         }
       }
-      for (Iterator it = bb.iteratePis(); it.hasNext();) {
-        SSAPiInstruction pi = (SSAPiInstruction) it.next();
+      for (SSAPiInstruction pi : Iterator2Iterable.make(bb.iteratePis())) {
         if (pi != null) {
-          result.append("           " + pi.toString(symbolTable)).append("\n");
+          result.append("           ").append(pi.toString(symbolTable)).append('\n');
         }
       }
     }
@@ -248,6 +261,7 @@
    * 
    * This may go away someday.
    */
+  @Override
   public SSAInstruction[] getInstructions() {
     return instructions;
   }
@@ -255,6 +269,7 @@
   /**
    * @return the {@link SymbolTable} managing attributes for values in this method
    */
+  @Override
   public SymbolTable getSymbolTable() {
     return symbolTable;
   }
@@ -262,10 +277,16 @@
   /**
    * @return the underlying {@link ControlFlowGraph} which defines this IR.
    */
+  @Override
   public SSACFG getControlFlowGraph() {
     return cfg;
   }
 
+  @Override
+  public Iterator<ISSABasicBlock> getBlocks() {
+    return getControlFlowGraph().iterator();
+  }
+
   /**
    * Return an {@link Iterator} of all {@link SSAPhiInstruction}s for this IR.
    */
@@ -378,6 +399,7 @@
   /**
    * @return the method this IR represents
    */
+  @Override
   public IMethod getMethod() {
     return method;
   }
@@ -440,18 +462,18 @@
   /**
    * visit each normal (non-phi, non-pi, non-catch) instruction in this IR
    */
-  public void visitNormalInstructions(SSAInstruction.Visitor v) {
-    for (Iterator i = iterateNormalInstructions(); i.hasNext();) {
-      ((SSAInstruction) i.next()).visit(v);
+  public void visitNormalInstructions(SSAInstruction.IVisitor v) {
+    for (SSAInstruction inst : Iterator2Iterable.make(iterateNormalInstructions())) {
+      inst.visit(v);
     }
   }
 
   /**
    * visit each instruction in this IR
    */
-  public void visitAllInstructions(SSAInstruction.Visitor v) {
-    for (Iterator i = iterateAllInstructions(); i.hasNext();) {
-      ((SSAInstruction) i.next()).visit(v);
+  public void visitAllInstructions(SSAInstruction.IVisitor v) {
+    for (SSAInstruction inst : Iterator2Iterable.make(iterateAllInstructions())) {
+      inst.visit(v);
     }
   }
 
@@ -503,13 +525,14 @@
    * @return an {@link Iterator} of all instructions (Normal, Phi, and Catch)
    */
   public Iterator<SSAInstruction> iterateAllInstructions() {
-    return new CompoundIterator<SSAInstruction>(iterateNormalInstructions(), new CompoundIterator<SSAInstruction>(
-        iterateCatchInstructions(), new CompoundIterator<SSAInstruction>(iteratePhis(), iteratePis())));
+    return new CompoundIterator<>(iterateNormalInstructions(), new CompoundIterator<>(
+        iterateCatchInstructions(), new CompoundIterator<>(iteratePhis(), iteratePis())));
   }
 
   /**
    * @return the exit basic block
    */
+  @Override
   public BasicBlock getExitBlock() {
     return cfg.exit();
   }
@@ -570,6 +593,7 @@
    * @param pc a program counter
    * @return the instruction (a PEI) at this program counter
    */
+  @Override
   public SSAInstruction getPEI(ProgramCounter pc) {
     Integer i = peiMapping.get(pc);
     return instructions[i.intValue()];
@@ -578,6 +602,7 @@
   /**
    * @return an {@link Iterator} of all the allocation sites ( {@link NewSiteReference}s ) in this IR
    */
+  @Override
   public Iterator<NewSiteReference> iterateNewSites() {
     return newSiteMapping.keySet().iterator();
   }
@@ -585,6 +610,7 @@
   /**
    * @return an {@link Iterator} of all the call sites ( {@link CallSiteReference}s ) in this IR
    */
+  @Override
   public Iterator<CallSiteReference> iterateCallSites() {
     return new Iterator<CallSiteReference>() {
       private final int limit = callSiteMapping.maxKeyValue();
@@ -624,6 +650,7 @@
    * @return the basic block corresponding to this instruction
    * @throws IllegalArgumentException if site is null
    */
+  @Override
   public ISSABasicBlock[] getBasicBlocksForCall(final CallSiteReference site) {
     if (site == null) {
       throw new IllegalArgumentException("site is null");
@@ -671,8 +698,8 @@
     if (instructions == null)
       return true;
 
-    for (int i = 0; i < instructions.length; i++)
-      if (instructions[i] != null)
+    for (SSAInstruction instruction : instructions)
+      if (instruction != null)
         return false;
 
     return true;
@@ -684,6 +711,7 @@
    * @return if we know that immediately after the given program counter, v_vn corresponds to one or more locals and local variable
    *         names are available, the name of the locals which v_vn represents. Otherwise, null.
    */
+  @Override
   public String[] getLocalNames(int index, int vn) {
     if (getLocalMap() == null) {
       return new String[0];
@@ -722,5 +750,5 @@
    */
   public SSAOptions getOptions() {
     return options;
-  };
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/IRView.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/IRView.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/IRView.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/IRView.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.ssa;
+
+import java.util.Iterator;
+
+import com.ibm.wala.cfg.ControlFlowGraph;
+import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.classLoader.NewSiteReference;
+import com.ibm.wala.classLoader.ProgramCounter;
+
+public interface IRView {
+
+  SymbolTable getSymbolTable();
+
+  ControlFlowGraph<SSAInstruction, ISSABasicBlock> getControlFlowGraph();
+
+  ISSABasicBlock[] getBasicBlocksForCall(CallSiteReference callSite);
+
+  SSAInstruction[] getInstructions();
+
+  SSAInstruction getPEI(ProgramCounter peiLoc);
+
+  IMethod getMethod();
+
+  ISSABasicBlock getExitBlock();
+
+  Iterator<NewSiteReference> iterateNewSites();
+
+  Iterator<CallSiteReference> iterateCallSites();
+
+  Iterator<ISSABasicBlock> getBlocks();
+
+  String[] getLocalNames(int i, int v);
+  
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/NullTestPiPolicy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/NullTestPiPolicy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/NullTestPiPolicy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/NullTestPiPolicy.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,14 +10,17 @@
  *******************************************************************************/
 package com.ibm.wala.ssa;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import com.ibm.wala.util.collections.Pair;
 
 /**
  * A pi node policy with the following rule:
  * 
- * If we have the following code: <verbatim> S1: if (c op null) { ... } </verbatim>
+ * If we have the following code: <pre> S1: if (c op null) { ... } </pre>
  * 
- * replace it with: <verbatim> S1: if (c op null) { v2 = PI(c, S1) .... } </verbatim>
+ * replace it with: <pre> S1: if (c op null) { v2 = PI(c, S1) .... } </pre>
  * 
  * This renaming allows SSA-based analysis to reason about the nullness of v2 depending on the outcome of the branch.
  */
@@ -58,4 +61,12 @@
     return null;
   }
 
+  @Override
+  public List<Pair<Integer, SSAInstruction>> getPis(SSAConditionalBranchInstruction cond, SSAInstruction def1, SSAInstruction def2,
+      SymbolTable symbolTable) {
+    LinkedList<Pair<Integer, SSAInstruction>> result = new LinkedList<>();
+    result.add(getPi(cond, def1, def2, symbolTable));
+    return result;
+  }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/ReflectiveMemberAccess.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/ReflectiveMemberAccess.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/ReflectiveMemberAccess.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/ReflectiveMemberAccess.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,7 +27,7 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return "fieldref " + getValueString(symbolTable, objectRef) + "." + getValueString(symbolTable, memberRef);
+    return "fieldref " + getValueString(symbolTable, objectRef) + '.' + getValueString(symbolTable, memberRef);
   }
 
   /*
@@ -60,4 +60,4 @@
     return true;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/ShrikeIndirectionData.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/ShrikeIndirectionData.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/ShrikeIndirectionData.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/ShrikeIndirectionData.java	2019-01-29 17:08:39.000000000 +0000
@@ -54,7 +54,7 @@
 
     @Override
     public String toString() {
-      return "(local:" + bytecodeLocalNumber + ")";
+      return "(local:" + bytecodeLocalNumber + ')';
     }
   }
 
@@ -89,7 +89,7 @@
   @Override
   public void setDef(int instructionIndex, ShrikeLocalName name, int newDef) {
     if (defs[instructionIndex] == null) {
-      defs[instructionIndex] = new HashMap<ShrikeLocalName, Integer>(2);
+      defs[instructionIndex] = new HashMap<>(2);
     }
 
     defs[instructionIndex].put(name, newDef);
@@ -98,7 +98,7 @@
   @Override
   public void setUse(int instructionIndex, ShrikeLocalName name, int newUse) {
     if (uses[instructionIndex] == null) {
-      uses[instructionIndex] = new HashMap<ShrikeLocalName, Integer>(2);
+      uses[instructionIndex] = new HashMap<>(2);
     }
 
     uses[instructionIndex].put(name, newUse);
@@ -106,7 +106,7 @@
 
   @Override
   public Collection<ShrikeLocalName> getNames() {
-    HashSet<ShrikeLocalName> result = new HashSet<ShrikeLocalName>();
+    HashSet<ShrikeLocalName> result = new HashSet<>();
     for (int i = 0; i < uses.length; i++) {
       if (uses[i] != null) {
         result.addAll(uses[i].keySet());
@@ -120,13 +120,13 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     for (int i = 0; i < defs.length; i++) {
       if (defs[i] != null) {
-        result.append(i + " <- " + defs[i] + "\n");
+        result.append(i).append(" <- ").append(defs[i]).append('\n');
       }
       if (uses[i] != null) {
-        result.append(i + " -> " + uses[i] + "\n");
+        result.append(i).append(" -> ").append(uses[i]).append('\n');
       }
     }
     return result.toString();
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractBinaryInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractBinaryInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractBinaryInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractBinaryInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -54,9 +54,6 @@
     return 2;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) {
     assert j <= 1;
@@ -68,4 +65,4 @@
     return 6311 * result ^ 2371 * val1 + val2;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractInvokeInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractInvokeInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractInvokeInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractInvokeInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -139,7 +139,7 @@
   /**
    * How many parameters does this call specify?
    */
-  public abstract int getNumberOfParameters();
+  public abstract int getNumberOfPositionalParameters();
 
   /**
    * How many distinct values does this call return?
@@ -191,18 +191,18 @@
   @Override
   public String toString(SymbolTable symbolTable) {
     String code = site.getInvocationString();
-    StringBuffer s = new StringBuffer();
+    StringBuilder s = new StringBuilder();
     if (hasDef()) {
       s.append(getValueString(symbolTable, getDef())).append(" = ");
     }
     s.append("invoke").append(code);
-    s.append(" ");
+    s.append(' ');
     s.append(site.getDeclaredTarget().toString());
 
-    if (getNumberOfParameters() > 0) {
-      s.append(" ").append(getValueString(symbolTable, getUse(0)));
-      for (int i = 1; i < getNumberOfParameters(); i++) {
-        s.append(",").append(getValueString(symbolTable, getUse(i)));
+    if (getNumberOfPositionalParameters() > 0) {
+      s.append(' ').append(getValueString(symbolTable, getUse(0)));
+      for (int i = 1; i < getNumberOfPositionalParameters(); i++) {
+        s.append(',').append(getValueString(symbolTable, getUse(i)));
       }
     }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractThrowInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractThrowInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractThrowInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractThrowInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -28,17 +28,11 @@
     return "throw " + getValueString(symbolTable, exception);
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses()
-   */
   @Override
   public int getNumberOfUses() {
     return 1;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) {
     if (j != 0) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractUnaryInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractUnaryInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractUnaryInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAbstractUnaryInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -57,9 +57,6 @@
     return 1;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) {
     assert j == 0;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAddressOfInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAddressOfInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAddressOfInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAAddressOfInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -113,7 +113,7 @@
         + " (" + pointeeType.getName() + ") " 
         + " = &"
         + getValueString(symbolTable, addressVal)
-        + ((indexVal != -1) ? "[" + getValueString(symbolTable, indexVal) + "]" : (field != null) ? "."
+        + ((indexVal != -1) ? '[' + getValueString(symbolTable, indexVal) + ']' : (field != null) ? '.'
             + field.getName().toString() : "");
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayLengthInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayLengthInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayLengthInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayLengthInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -41,17 +41,11 @@
     return getValueString(symbolTable, result) + " = arraylength " + getValueString(symbolTable, arrayref);
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
-   */
   @Override
   public void visit(IVisitor v) throws NullPointerException {
     v.visitArrayLength(this);
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getDef()
-   */
   @Override
   public int getDef() {
     return result;
@@ -79,17 +73,11 @@
     return arrayref;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses()
-   */
   @Override
   public int getNumberOfUses() {
     return 1;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) {
     if (j != 0) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayLoadInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayLoadInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayLoadInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayLoadInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,8 +37,8 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return getValueString(symbolTable, result) + " = arrayload " + getValueString(symbolTable, getArrayRef()) + "["
-        + getValueString(symbolTable, getIndex()) + "]";
+    return getValueString(symbolTable, result) + " = arrayload " + getValueString(symbolTable, getArrayRef()) + '['
+        + getValueString(symbolTable, getIndex()) + ']';
   }
 
   /**
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayReferenceInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayReferenceInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayReferenceInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayReferenceInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -41,9 +41,6 @@
     return 2;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) {
     assert j <= 1;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayStoreInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayStoreInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayStoreInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAArrayStoreInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -35,7 +35,7 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return "arraystore " + getValueString(symbolTable, getArrayRef()) + "[" + getValueString(symbolTable, getIndex())
+    return "arraystore " + getValueString(symbolTable, getArrayRef()) + '[' + getValueString(symbolTable, getIndex())
         + "] = " + getValueString(symbolTable, value);
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSABuilder.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSABuilder.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSABuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSABuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.ssa;
 
-import java.util.Iterator;
-
 import com.ibm.wala.analysis.stackMachine.AbstractIntStackMachine;
 import com.ibm.wala.cfg.IBasicBlock;
 import com.ibm.wala.cfg.ShrikeCFG;
@@ -61,6 +59,8 @@
 import com.ibm.wala.util.intset.IntPair;
 import com.ibm.wala.util.shrike.ShrikeUtil;
 
+import java.util.Arrays;
+
 /**
  * This class constructs an SSA {@link IR} from a backing ShrikeBT instruction stream.
  * 
@@ -89,7 +89,7 @@
   final private SymbolTable symbolTable;
 
   /**
-   * A logical mapping from <bcIndex, valueNumber> -> local number if null, don't build it.
+   * A logical mapping from &lt;bcIndex, valueNumber&gt; -&gt; local number if null, don't build it.
    */
   private final SSA2LocalMap localMap;
 
@@ -144,9 +144,9 @@
       }
 
       if (allTheSame(rhs)) {
-        for (int i = 0; i < rhs.length; i++) {
-          if (rhs[i] != TOP) {
-            return rhs[i];
+        for (int rh : rhs) {
+          if (rh != TOP) {
+            return rh;
           }
         }
         // didn't find anything but TOP
@@ -172,15 +172,12 @@
       }
     }
 
-    /**
-     * @see com.ibm.wala.analysis.stackMachine.AbstractIntStackMachine.Meeter#meetLocal(int, int[], BasicBlock)
-     */
     @Override
     public int meetLocal(int n, int[] rhs, BasicBlock bb) {
       if (allTheSame(rhs)) {
-        for (int i = 0; i < rhs.length; i++) {
-          if (rhs[i] != TOP) {
-            return rhs[i];
+        for (int rh : rhs) {
+          if (rh != TOP) {
+            return rh;
           }
         }
         // didn't find anything but TOP
@@ -212,8 +209,7 @@
 
     /**
      * Are all rhs values all the same? Note, we consider TOP (-1) to be same as everything else.
-     * 
-     * @param rhs
+     *
      * @return boolean
      */
     private boolean allTheSame(int[] rhs) {
@@ -234,9 +230,6 @@
       return true;
     }
 
-    /**
-     * @see com.ibm.wala.analysis.stackMachine.AbstractIntStackMachine.Meeter#meetStackAtCatchBlock(BasicBlock)
-     */
     @Override
     public int meetStackAtCatchBlock(BasicBlock bb) {
       int bbNumber = shrikeCFG.getNumber(bb);
@@ -331,9 +324,7 @@
         instructions[getCurrentInstructionIndex()] = s;
         for (int i = 0; i < s.getNumberOfDefs(); i++) {
           if (creators.length < (s.getDef(i) + 1)) {
-            SSAInstruction[] arr = new SSAInstruction[2 * s.getDef(i)];
-            System.arraycopy(creators, 0, arr, 0, creators.length);
-            creators = arr;
+            creators = Arrays.copyOf(creators, 2 * s.getDef(i));
           }
 
           assert s.getDef(i) != -1 : "invalid def " + i + " for " + s;
@@ -550,6 +541,7 @@
           int ref = workingState.pop();
           emitInstruction(insts.GetInstruction(getCurrentInstructionIndex(), result, ref, f));
         }
+        assert result != -1;
         workingState.push(result);
       }
 
@@ -781,8 +773,8 @@
       }
 
       private void doIndirectReads(int[] locals) {
-        for(int i = 0; i < locals.length; i++) {
-          ssaIndirections.setUse(getCurrentInstructionIndex(), new ShrikeLocalName(locals[i]), workingState.getLocal(locals[i]));
+        for (int local : locals) {
+          ssaIndirections.setUse(getCurrentInstructionIndex(), new ShrikeLocalName(local), workingState.getLocal(local));
         }
       }
       
@@ -797,13 +789,13 @@
       }
 
       private void doIndirectWrites(int[] locals, int rval) {
-        for(int i = 0; i < locals.length; i++) {
-          ShrikeLocalName name = new ShrikeLocalName(locals[i]);
+        for (int local : locals) {
+          ShrikeLocalName name = new ShrikeLocalName(local);
           int idx = getCurrentInstructionIndex();
           if (ssaIndirections.getDef(idx, name) == -1) {
             ssaIndirections.setDef(idx, name, rval==-1? symbolTable.newSymbol(): rval);
           }
-          workingState.setLocal(locals[i], ssaIndirections.getDef(idx, name));
+          workingState.setLocal(local, ssaIndirections.getDef(idx, name));
         }        
       }
       
@@ -818,10 +810,6 @@
 
     }
 
-    /**
-     * @param piCause
-     * @param ref
-     */
     private void reuseOrCreatePi(SSAInstruction piCause, int ref) {
       int n = getCurrentInstructionIndex();
       SSACFG.BasicBlock bb = cfg.getBlockForInstruction(n);
@@ -863,9 +851,11 @@
 
     private void maybeInsertPi(SSAConditionalBranchInstruction cond) {
       if (piNodePolicy != null) {
-        Pair<Integer, SSAInstruction> pi = piNodePolicy.getPi(cond, getDef(cond.getUse(0)), getDef(cond.getUse(1)), symbolTable);
-        if (pi != null) {
-          reuseOrCreatePi(pi.snd, pi.fst);
+        for (Pair<Integer, SSAInstruction> pi : piNodePolicy.getPis(cond, getDef(cond.getUse(0)), getDef(cond.getUse(1)),
+            symbolTable)) {
+          if (pi != null) {
+            reuseOrCreatePi(pi.snd, pi.fst);
+          }
         }
       }
     }
@@ -922,7 +912,7 @@
   }
   
   /**
-   * A logical mapping from <pc, valueNumber> -> local number Note: make sure this class remains static: this persists as part of
+   * A logical mapping from &lt;pc, valueNumber&gt; -&gt; local number Note: make sure this class remains static: this persists as part of
    * the IR!!
    */
   private static class SSA2LocalMap implements com.ibm.wala.ssa.IR.SSA2LocalMap {
@@ -930,7 +920,7 @@
     private final ShrikeCFG shrikeCFG;
 
     /**
-     * Mapping Integer -> IntPair where p maps to (vn,L) iff we've started a range at pc p where value number vn corresponds to
+     * Mapping Integer -&gt; IntPair where p maps to (vn,L) iff we've started a range at pc p where value number vn corresponds to
      * local L
      */
     private final IntPair[] localStoreMap;
@@ -962,8 +952,7 @@
      * Finish populating the map of local variable information
      */
     private void finishLocalMap(SSABuilder builder) {
-      for (Iterator it = shrikeCFG.iterator(); it.hasNext();) {
-        ShrikeCFG.BasicBlock bb = (ShrikeCFG.BasicBlock) it.next();
+      for (BasicBlock bb : shrikeCFG) {
         MachineState S = builder.getIn(bb);
         int number = bb.getNumber();
         block2LocalState[number] = S.getLocals();
@@ -1047,11 +1036,11 @@
     /**
      * @return the indices i s.t. x[i] == y, or null if none found.
      */
-    private int[] extractIndices(int[] x, int y) {
+    private static int[] extractIndices(int[] x, int y) {
       assert x != null;
       int count = 0;
-      for (int i = 0; i < x.length; i++) {
-        if (x[i] == y) {
+      for (int element : x) {
+        if (element == y) {
           count++;
         }
       }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACache.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACache.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACache.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACache.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,7 +15,7 @@
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 
 /**
- * A mapping from IMethod -> SSAOptions -> SoftReference -> Something
+ * A mapping from IMethod -&gt; SSAOptions -&gt; SoftReference -&gt; Something
  * 
  * This doesn't work very well ... GCs don't do such a great job with SoftReferences ... revamp it.
  */
@@ -34,18 +34,20 @@
   /**
    * A cache of SSA IRs
    */
-  final private AuxiliaryCache irCache = new AuxiliaryCache();
+  final private IAuxiliaryCache irCache;
 
   /**
    * A cache of DefUse information
    */
-  final private AuxiliaryCache duCache = new AuxiliaryCache();
+  final private IAuxiliaryCache duCache;
 
   /**
    * @param factory a factory for creating IRs
    */
-  public SSACache(IRFactory<IMethod> factory) {
+  public SSACache(IRFactory<IMethod> factory, IAuxiliaryCache irCache, IAuxiliaryCache duCache) {
     this.factory = factory;
+    this.irCache = irCache;
+    this.duCache = duCache;
   }
 
   /**
@@ -130,21 +132,21 @@
   }
 
   /**
-   * Invalidate the cached IR for a <method,context> pair
+   * Invalidate the cached IR for a &lt;method,context&gt; pair
    */
   public void invalidateIR(IMethod method, Context c) {
     irCache.invalidate(method, c);
   }
 
   /**
-   * Invalidate the cached {@link DefUse} for a <method,context> pair
+   * Invalidate the cached {@link DefUse} for a &lt;method,context&gt; pair
    */
   public void invalidateDU(IMethod method, Context c) {
     duCache.invalidate(method, c);
   }
 
   /**
-   * Invalidate all cached information for a <method,context> pair
+   * Invalidate all cached information for a &lt;method,context&gt; pair
    */
   public void invalidate(IMethod method, Context c) {
     invalidateIR(method, c);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACFG.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACFG.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACFG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACFG.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,31 +11,35 @@
 package com.ibm.wala.ssa;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 
 import com.ibm.wala.cfg.AbstractCFG;
 import com.ibm.wala.cfg.BytecodeCFG;
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.cfg.IBasicBlock;
 import com.ibm.wala.cfg.InducedCFG;
+import com.ibm.wala.cfg.MinimalCFG;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IClassLoader;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.shrikeBT.ExceptionHandler;
 import com.ibm.wala.shrikeBT.IInstruction;
+import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.MapIterator;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.debug.UnimplementedError;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.graph.impl.NumberedNodeIterator;
 import com.ibm.wala.util.intset.BitVector;
 import com.ibm.wala.util.intset.IntSet;
@@ -55,7 +59,7 @@
  * As the current implementation stands, the delegate graph stores the graph structure, and this class additionally stores
  * {@link BasicBlock}s and the {@link SSAInstruction} array.
  */
-public class SSACFG implements ControlFlowGraph<SSAInstruction, ISSABasicBlock> {
+public class SSACFG implements ControlFlowGraph<SSAInstruction, ISSABasicBlock>, MinimalCFG<ISSABasicBlock> {
 
   private static final boolean DEBUG = false;
 
@@ -96,7 +100,7 @@
     }
     this.delegate = cfg;
     if (DEBUG) {
-      System.err.println(("Incoming CFG for " + method + ":"));
+      System.err.println(("Incoming CFG for " + method + ':'));
       System.err.println(cfg.toString());
     }
 
@@ -119,8 +123,7 @@
    * SSABasicBlocks
    */
   private void addPisFromInducedCFG(InducedCFG cfg) {
-    for (Iterator<? extends InducedCFG.BasicBlock> it = cfg.iterator(); it.hasNext();) {
-      InducedCFG.BasicBlock ib = it.next();
+    for (com.ibm.wala.cfg.InducedCFG.BasicBlock ib : cfg) {
       // we rely on the invariant that basic blocks in this cfg are numbered identically as in the source
       // InducedCFG
       BasicBlock b = getBasicBlock(ib.getNumber());
@@ -136,8 +139,7 @@
    * SSABasicBlocks
    */
   private void addPhisFromInducedCFG(InducedCFG cfg) {
-    for (Iterator<? extends InducedCFG.BasicBlock> it = cfg.iterator(); it.hasNext();) {
-      InducedCFG.BasicBlock ib = it.next();
+    for (com.ibm.wala.cfg.InducedCFG.BasicBlock ib : cfg) {
       // we rely on the invariant that basic blocks in this cfg are numbered identically as in the source
       // InducedCFG
       BasicBlock b = getBasicBlock(ib.getNumber());
@@ -163,12 +165,13 @@
   }
 
   private void recordExceptionTypes(Set<ExceptionHandler> set, IClassLoader loader) {
-    for (Iterator<ExceptionHandler> it = set.iterator(); it.hasNext();) {
-      ExceptionHandler handler = it.next();
+    for (ExceptionHandler handler : set) {
       TypeReference t = null;
       if (handler.getCatchClass() == null) {
         // by convention, in ShrikeCT this means catch everything
         t = TypeReference.JavaLangThrowable;
+      } else if (handler.getCatchClassLoader() instanceof ClassLoaderReference) {
+        t = ShrikeUtil.makeTypeReference((ClassLoaderReference)handler.getCatchClassLoader(), handler.getCatchClass());
       } else {
         TypeReference exceptionType = ShrikeUtil.makeTypeReference(loader.getReference(), handler.getCatchClass());
         IClass klass = null;
@@ -312,7 +315,7 @@
         if (localPhis == null) {
           return EmptyIterator.instance();
         } else {
-          LinkedList<SSAPhiInstruction> result = new LinkedList<SSAPhiInstruction>();
+          LinkedList<SSAPhiInstruction> result = new LinkedList<>();
           for (SSAPhiInstruction phi : localPhis) {
             if (phi != null) {
               result.add(phi);
@@ -322,7 +325,7 @@
         }
       } else {
         // stackSlotPhis != null
-        LinkedList<SSAPhiInstruction> result = new LinkedList<SSAPhiInstruction>();
+        LinkedList<SSAPhiInstruction> result = new LinkedList<>();
         for (SSAPhiInstruction phi : stackSlotPhis) {
           if (phi != null) {
             result.add(phi);
@@ -376,9 +379,7 @@
         stackSlotPhis = new SSAPhiInstruction[initialCapacity];
       }
       if (slot >= stackSlotPhis.length) {
-        SSAPhiInstruction[] temp = stackSlotPhis;
-        stackSlotPhis = new SSAPhiInstruction[slot * 2];
-        System.arraycopy(temp, 0, stackSlotPhis, 0, temp.length);
+        stackSlotPhis = Arrays.copyOf(stackSlotPhis, slot * 2);
       }
       stackSlotPhis[slot] = phi;
     }
@@ -388,9 +389,7 @@
         localPhis = new SSAPhiInstruction[initialCapacity];
       }
       if (n >= localPhis.length) {
-        SSAPhiInstruction[] temp = localPhis;
-        localPhis = new SSAPhiInstruction[n * 2];
-        System.arraycopy(temp, 0, localPhis, 0, temp.length);
+        localPhis = Arrays.copyOf(localPhis, n * 2);
       }
       localPhis[n] = phi;
     }
@@ -416,9 +415,9 @@
           SSAPhiInstruction[] old = stackSlotPhis;
           stackSlotPhis = new SSAPhiInstruction[newLength];
           int j = 0;
-          for (int i = 0; i < old.length; i++) {
-            if (old[i] != null) {
-              stackSlotPhis[j++] = old[i];
+          for (SSAPhiInstruction element : old) {
+            if (element != null) {
+              stackSlotPhis[j++] = element;
             }
           }
         }
@@ -440,9 +439,9 @@
           SSAPhiInstruction[] old = localPhis;
           localPhis = new SSAPhiInstruction[newLength];
           int j = 0;
-          for (int i = 0; i < old.length; i++) {
-            if (old[i] != null) {
-              localPhis[j++] = old[i];
+          for (SSAPhiInstruction element : old) {
+            if (element != null) {
+              localPhis[j++] = element;
             }
           }
         }
@@ -453,13 +452,12 @@
       return piInstructions.get(new RefPathKey(n, this, path));
     }
 
-    private final LinkedList<SSAPiInstruction> blockPiInstructions = new LinkedList<SSAPiInstruction>();
+    private final LinkedList<SSAPiInstruction> blockPiInstructions = new LinkedList<>();
 
     /**
      * 
      * @param n can be the val in the pi instruction
      * @param path can be the successor block in the pi instruction
-     * @param pi
      */
     public void addPiForRefAndPath(int n, Object path, SSAPiInstruction pi) {
       piInstructions.put(new RefPathKey(n, this, path), pi);
@@ -510,9 +508,9 @@
     public List<SSAInstruction> getAllInstructions() {
       compressPhis();
 
-      ArrayList<SSAInstruction> result = new ArrayList<SSAInstruction>();
-      for (Iterator<? extends SSAInstruction> it = iteratePhis(); it.hasNext();) {
-        result.add(it.next());
+      ArrayList<SSAInstruction> result = new ArrayList<>();
+      for (SSAInstruction inst : Iterator2Iterable.make(iteratePhis())) {
+        result.add(inst);
       }
 
       for (int i = getFirstInstructionIndex(); i <= getLastInstructionIndex(); i++) {
@@ -522,8 +520,8 @@
         }
       }
 
-      for (Iterator<? extends SSAInstruction> it = iteratePis(); it.hasNext();) {
-        result.add(it.next());
+      for (SSAInstruction inst : Iterator2Iterable.make(iteratePis())) {
+        result.add(inst);
       }
       return result;
     }
@@ -540,9 +538,9 @@
           SSAPhiInstruction[] old = stackSlotPhis;
           stackSlotPhis = new SSAPhiInstruction[size];
           int j = 0;
-          for (int i = 0; i < old.length; i++) {
-            if (old[i] != null) {
-              stackSlotPhis[j++] = old[i];
+          for (SSAPhiInstruction element : old) {
+            if (element != null) {
+              stackSlotPhis[j++] = element;
             }
           }
         }
@@ -555,9 +553,9 @@
           SSAPhiInstruction[] old = localPhis;
           localPhis = new SSAPhiInstruction[size];
           int j = 0;
-          for (int i = 0; i < old.length; i++) {
-            if (old[i] != null) {
-              localPhis[j++] = old[i];
+          for (SSAPhiInstruction element : old) {
+            if (element != null) {
+              localPhis[j++] = element;
             }
           }
         }
@@ -566,8 +564,8 @@
 
     private int countNonNull(SSAPhiInstruction[] a) {
       int result = 0;
-      for (int i = 0; i < a.length; i++) {
-        if (a[i] != null) {
+      for (SSAPhiInstruction element : a) {
+        if (element != null) {
           result++;
         }
       }
@@ -602,12 +600,9 @@
       // TODO Auto-generated method stub
     }
 
-    /**
-     * @see java.lang.Object#toString()
-     */
     @Override
     public String toString() {
-      return "BB[SSA:" + getFirstInstructionIndex() + ".." + getLastInstructionIndex() + "]" + getNumber() + " - "
+      return "BB[SSA:" + getFirstInstructionIndex() + ".." + getLastInstructionIndex() + ']' + getNumber() + " - "
           + method.getSignature();
     }
 
@@ -666,8 +661,7 @@
 
     /**
      * The {@link ExceptionHandlerBasicBlock} subclass will override this.
-     * 
-     * @see com.ibm.wala.ssa.ISSABasicBlock#getCaughtExceptionTypes()
+     *
      */
     @Override
     public Iterator<TypeReference> getCaughtExceptionTypes() {
@@ -736,9 +730,7 @@
       }
       nExceptionTypes++;
       if (nExceptionTypes > exceptionTypes.length) {
-        TypeReference[] temp = exceptionTypes;
-        exceptionTypes = new TypeReference[nExceptionTypes * 2];
-        System.arraycopy(temp, 0, exceptionTypes, 0, temp.length);
+        exceptionTypes = Arrays.copyOf(exceptionTypes, nExceptionTypes * 2);
       }
       exceptionTypes[nExceptionTypes - 1] = exceptionType;
     }
@@ -760,15 +752,15 @@
 
   @Override
   public String toString() {
-    StringBuffer s = new StringBuffer("");
+    StringBuilder s = new StringBuilder();
     for (int i = 0; i <= getNumber(exit()); i++) {
       BasicBlock bb = getNode(i);
-      s.append("BB").append(i).append("[").append(bb.getFirstInstructionIndex()).append("..").append(bb.getLastInstructionIndex())
+      s.append("BB").append(i).append('[').append(bb.getFirstInstructionIndex()).append("..").append(bb.getLastInstructionIndex())
           .append("]\n");
 
-      Iterator succNodes = getSuccNodes(bb);
+      Iterator<ISSABasicBlock> succNodes = getSuccNodes(bb);
       while (succNodes.hasNext()) {
-        s.append("    -> BB").append(((BasicBlock) succNodes.next()).getNumber()).append("\n");
+        s.append("    -> BB").append(((BasicBlock) succNodes.next()).getNumber()).append('\n');
       }
     }
     return s.toString();
@@ -836,11 +828,7 @@
    */
   @Override
   public Iterator<ISSABasicBlock> iterator() {
-    ArrayList<ISSABasicBlock> list = new ArrayList<ISSABasicBlock>();
-    for (BasicBlock b : basicBlocks) {
-      list.add(b);
-    }
-    return list.iterator();
+    return Arrays.<ISSABasicBlock>asList(basicBlocks).iterator();
   }
 
   /*
@@ -860,7 +848,7 @@
       throw new IllegalArgumentException("b == null");
     }
     IBasicBlock<IInstruction> n = delegate.getNode(b.getNumber());
-    final Iterator i = delegate.getPredNodes(n);
+    final Iterator<IBasicBlock<IInstruction>> i = delegate.getPredNodes(n);
     return new Iterator<ISSABasicBlock>() {
       @Override
       public boolean hasNext() {
@@ -869,7 +857,7 @@
 
       @Override
       public BasicBlock next() {
-        IBasicBlock n = (IBasicBlock) i.next();
+        IBasicBlock n = i.next();
         int number = n.getNumber();
         return basicBlocks[number];
       }
@@ -902,7 +890,7 @@
       throw new IllegalArgumentException("b == null");
     }
     IBasicBlock<IInstruction> n = delegate.getNode(b.getNumber());
-    final Iterator i = delegate.getSuccNodes(n);
+    final Iterator<IBasicBlock<IInstruction>> i = delegate.getSuccNodes(n);
     return new Iterator<ISSABasicBlock>() {
       @Override
       public boolean hasNext() {
@@ -911,7 +899,7 @@
 
       @Override
       public ISSABasicBlock next() {
-        IBasicBlock n = (IBasicBlock) i.next();
+        IBasicBlock n = i.next();
         int number = n.getNumber();
         return basicBlocks[number];
       }
@@ -1015,10 +1003,9 @@
       throw new IllegalArgumentException("b is null");
     }
     final IBasicBlock<IInstruction> n = delegate.getNode(b.getNumber());
-    final Iterator<IBasicBlock<IInstruction>> i = delegate.getExceptionalSuccessors(n).iterator();
-    final List<ISSABasicBlock> c = new ArrayList<ISSABasicBlock>(getSuccNodeCount(b));
-    for (; i.hasNext();) {
-      final IBasicBlock<IInstruction> s = i.next();
+    final Collection<IBasicBlock<IInstruction>> ss = delegate.getExceptionalSuccessors(n);
+    final List<ISSABasicBlock> c = new ArrayList<>(getSuccNodeCount(b));
+    for (final IBasicBlock<IInstruction> s : ss) {
       c.add(basicBlocks[delegate.getNumber(s)]);
     }
     return c;
@@ -1033,13 +1020,8 @@
       throw new IllegalArgumentException("b is null");
     }
     IBasicBlock<IInstruction> n = delegate.getNode(b.getNumber());
-    Function<IBasicBlock<IInstruction>, ISSABasicBlock> f = new Function<IBasicBlock<IInstruction>, ISSABasicBlock>() {
-      @Override
-      public ISSABasicBlock apply(IBasicBlock<IInstruction> object) {
-        return basicBlocks[delegate.getNumber(object)];
-      }
-    };
-    return Iterator2Collection.toSet(new MapIterator<IBasicBlock<IInstruction>, ISSABasicBlock>(delegate
+    Function<IBasicBlock<IInstruction>, ISSABasicBlock> f = object -> basicBlocks[delegate.getNumber(object)];
+    return Iterator2Collection.toSet(new MapIterator<>(delegate
         .getExceptionalPredecessors(n).iterator(), f));
   }
 
@@ -1048,7 +1030,7 @@
   }
 
   /**
-   * has exceptional edge src -> dest
+   * has exceptional edge src -&gt; dest
    * 
    * @throws IllegalArgumentException if dest is null
    */
@@ -1064,7 +1046,7 @@
   }
 
   /**
-   * has normal edge src -> dest
+   * has normal edge src -&gt; dest
    * 
    * @throws IllegalArgumentException if dest is null
    */
@@ -1088,10 +1070,9 @@
       throw new IllegalArgumentException("b is null");
     }
     IBasicBlock<IInstruction> n = delegate.getNode(b.getNumber());
-    final Iterator<IBasicBlock<IInstruction>> i = delegate.getNormalSuccessors(n).iterator();
-    Collection<ISSABasicBlock> c = new ArrayList<ISSABasicBlock>(getSuccNodeCount(b));
-    for (; i.hasNext();) {
-      IBasicBlock<IInstruction> s = i.next();
+    final Collection<IBasicBlock<IInstruction>> ss = delegate.getNormalSuccessors(n);
+    Collection<ISSABasicBlock> c = new ArrayList<>(getSuccNodeCount(b));
+    for (IBasicBlock<IInstruction> s : ss) {
       c.add(basicBlocks[delegate.getNumber(s)]);
     }
     return c;
@@ -1106,10 +1087,9 @@
       throw new IllegalArgumentException("b is null");
     }
     IBasicBlock<IInstruction> n = delegate.getNode(b.getNumber());
-    final Iterator<IBasicBlock<IInstruction>> i = delegate.getNormalPredecessors(n).iterator();
-    Collection<ISSABasicBlock> c = new ArrayList<ISSABasicBlock>(getPredNodeCount(b));
-    for (; i.hasNext();) {
-      IBasicBlock<IInstruction> s = i.next();
+    final Collection<IBasicBlock<IInstruction>> ss = delegate.getNormalPredecessors(n);
+    Collection<ISSABasicBlock> c = new ArrayList<>(getPredNodeCount(b));
+    for (IBasicBlock<IInstruction> s : ss) {
       c.add(basicBlocks[delegate.getNumber(s)]);
     }
     return c;
@@ -1120,7 +1100,7 @@
    */
   @Override
   public Iterator<ISSABasicBlock> iterateNodes(IntSet s) {
-    return new NumberedNodeIterator<ISSABasicBlock>(s, this);
+    return new NumberedNodeIterator<>(s, this);
   }
 
   @Override
@@ -1170,7 +1150,7 @@
 
     @Override
     public String getMsg() {
-      return getClass().toString() + " : " + type + " " + method;
+      return getClass().toString() + " : " + type + ' ' + method;
     }
 
     public static ExceptionLoadFailure create(TypeReference type, IMethod method) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACheckCastInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACheckCastInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACheckCastInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACheckCastInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -46,10 +46,11 @@
   /**
    * @param result A new value number def'fed by this instruction when the type check succeeds.
    * @param val The value being checked by this instruction
-   * @param type The type which this instruction checks
+   * @param types The types which this instruction checks
    */
   protected SSACheckCastInstruction(int iindex, int result, int val, TypeReference[] types, boolean isPEI) {
     super(iindex);
+    assert val != -1;
     this.result = result;
     this.val = val;
     this.declaredResultTypes = types;
@@ -69,11 +70,12 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    String v = getValueString(symbolTable, result) + " = checkcast";
+    final StringBuilder v = new StringBuilder(getValueString(symbolTable, result)).append(" = checkcast");
     for (TypeReference t : declaredResultTypes) {
-        v = v + " " + t;
+        v.append(' ').append(t);
     }
-    return v + getValueString(symbolTable, val);
+    v.append(getValueString(symbolTable, val));
+    return v.toString();
   }
 
   /*
@@ -127,9 +129,6 @@
     return 1;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) {
     assert j == 0;
@@ -181,11 +180,11 @@
 
   @Override
   public String toString() {
-    String s = super.toString();
+    final StringBuilder s = new StringBuilder(super.toString());
     for (TypeReference t : declaredResultTypes) {
-      s = s + " " + t;
+      s.append(' ').append(t);
     }
-    return s;
+    return s.toString();
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAComparisonInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAComparisonInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAComparisonInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAComparisonInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -45,13 +45,10 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return getValueString(symbolTable, result) + " = compare " + getValueString(symbolTable, val1) + ","
+    return getValueString(symbolTable, result) + " = compare " + getValueString(symbolTable, val1) + ','
         + getValueString(symbolTable, val2) + " opcode=" + operator;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
-   */
   @Override
   public void visit(IVisitor v) throws NullPointerException {
     v.visitComparison(this);
@@ -89,9 +86,6 @@
     return 2;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) {
     assert j <= 1;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAConditionalBranchInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAConditionalBranchInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAConditionalBranchInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAConditionalBranchInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -63,13 +63,9 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return "conditional branch(" + operator + ", to iindex=" + target + ") " + getValueString(symbolTable, val1) + "," + getValueString(symbolTable, val2);
+    return "conditional branch(" + operator + ", to iindex=" + target + ") " + getValueString(symbolTable, val1) + ',' + getValueString(symbolTable, val2);
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
-   * @throws IllegalArgumentException if v is null
-   */
   @Override
   public void visit(IVisitor v) {
     if (v == null) {
@@ -78,17 +74,11 @@
     v.visitConditionalBranch(this);
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses()
-   */
   @Override
   public int getNumberOfUses() {
     return 2;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) {
     assert j <= 1;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAConversionInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAConversionInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAConversionInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAConversionInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,9 +37,6 @@
     return getValueString(symbolTable, result) + " = conversion(" + toType.getName() + ") " + getValueString(symbolTable, val);
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
-   */
   @Override
   public void visit(IVisitor v) throws NullPointerException {
     v.visitConversion(this);
@@ -64,9 +61,6 @@
     return result;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses()
-   */
   @Override
   public int getNumberOfUses() {
     return 1;
@@ -85,9 +79,6 @@
     return fromType;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) {
     assert j == 0;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGetCaughtExceptionInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGetCaughtExceptionInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGetCaughtExceptionInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGetCaughtExceptionInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -36,15 +36,9 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    StringBuffer s = new StringBuffer();
-    s.append(getValueString(symbolTable, exceptionValueNumber)).append(" = getCaughtException ");
-    return s.toString();
+    return getValueString(symbolTable, exceptionValueNumber) + " = getCaughtException ";
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
-   * @throws IllegalArgumentException if v is null
-   */
   @Override
   public void visit(IVisitor v) {
     if (v == null) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGetInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGetInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGetInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGetInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,7 +43,7 @@
     if (isStatic()) {
       return getValueString(symbolTable, result) + " = getstatic " + getDeclaredField();
     } else {
-      return getValueString(symbolTable, result) + " = getfield " + getDeclaredField() + " "
+      return getValueString(symbolTable, result) + " = getfield " + getDeclaredField() + ' '
           + getValueString(symbolTable, getRef());
     }
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGotoInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGotoInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGotoInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGotoInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -36,14 +36,9 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return "goto (from iindex= " + this.iindex + " to iindex = " + this.target  + ")";
+    return "goto (from iindex= " + this.iindex + " to iindex = " + this.target  + ')';
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
-   * @throws IllegalArgumentException
-   *           if v is null
-   */
   @Override
   public void visit(IVisitor v) {
     if (v == null) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAIndirectionData.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAIndirectionData.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAIndirectionData.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAIndirectionData.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,11 +21,11 @@
  * So if we have
  * 
  * Example A:
- * <tt>
+ * <pre>
  * v2 = SSAAddressOf v1;
  * v7 = #1;
  * v3 = SSALoadIndirect v2; (1)
- * <\tt>
+ * </pre>
  * 
  * Then this map will tell us that instruction (1) indirectly uses whichever source-level entity (in the source or bytecode) v1 represents.
  * 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstanceofInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstanceofInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstanceofInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstanceofInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,12 +43,9 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return getValueString(symbolTable, result) + " = instanceof " + getValueString(symbolTable, ref) + " " + checkedType;
+    return getValueString(symbolTable, result) + " = instanceof " + getValueString(symbolTable, ref) + ' ' + checkedType;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
-   */
   @Override
   public void visit(IVisitor v) throws NullPointerException {
     v.visitInstanceof(this);
@@ -90,9 +87,6 @@
     return 1;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) {
     assert j == 0;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstructionFactory.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstructionFactory.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstructionFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstructionFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -66,7 +66,7 @@
 
   SSAInstanceofInstruction InstanceofInstruction(int iindex, int result, int ref, TypeReference checkedType);
 
-  SSAInvokeInstruction InvokeInstruction(int iindex, int result, int[] params, int exception, CallSiteReference site, BootstrapMethod bootstrap);
+  SSAAbstractInvokeInstruction InvokeInstruction(int iindex, int result, int[] params, int exception, CallSiteReference site, BootstrapMethod bootstrap);
 
   SSAInvokeInstruction InvokeInstruction(int iindex, int[] params, int exception, CallSiteReference site, BootstrapMethod bootstrap);
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -69,52 +69,53 @@
   /**
    * This interface is used by Instruction.visit to dispatch based on the instruction type.
    */
+  @SuppressWarnings("unused")
   public static interface IVisitor {
-    void visitGoto(SSAGotoInstruction instruction);
+    default void visitGoto(SSAGotoInstruction instruction){ }
 
-    void visitArrayLoad(SSAArrayLoadInstruction instruction);
+    default void visitArrayLoad(SSAArrayLoadInstruction instruction){ }
 
-    void visitArrayStore(SSAArrayStoreInstruction instruction);
+    default void visitArrayStore(SSAArrayStoreInstruction instruction){ }
 
-    void visitBinaryOp(SSABinaryOpInstruction instruction);
+    default void visitBinaryOp(SSABinaryOpInstruction instruction){ }
 
-    void visitUnaryOp(SSAUnaryOpInstruction instruction);
+    default void visitUnaryOp(SSAUnaryOpInstruction instruction){ }
 
-    void visitConversion(SSAConversionInstruction instruction);
+    default void visitConversion(SSAConversionInstruction instruction){ }
 
-    void visitComparison(SSAComparisonInstruction instruction);
+    default void visitComparison(SSAComparisonInstruction instruction){ }
 
-    void visitConditionalBranch(SSAConditionalBranchInstruction instruction);
+    default void visitConditionalBranch(SSAConditionalBranchInstruction instruction){ }
 
-    void visitSwitch(SSASwitchInstruction instruction);
+    default void visitSwitch(SSASwitchInstruction instruction){ }
 
-    void visitReturn(SSAReturnInstruction instruction);
+    default void visitReturn(SSAReturnInstruction instruction){ }
 
-    void visitGet(SSAGetInstruction instruction);
+    default void visitGet(SSAGetInstruction instruction){ }
 
-    void visitPut(SSAPutInstruction instruction);
+    default void visitPut(SSAPutInstruction instruction){ }
 
-    void visitInvoke(SSAInvokeInstruction instruction);
+    default void visitInvoke(SSAInvokeInstruction instruction){ }
 
-    void visitNew(SSANewInstruction instruction);
+    default void visitNew(SSANewInstruction instruction){ }
 
-    void visitArrayLength(SSAArrayLengthInstruction instruction);
+    default void visitArrayLength(SSAArrayLengthInstruction instruction){ }
 
-    void visitThrow(SSAThrowInstruction instruction);
+    default void visitThrow(SSAThrowInstruction instruction){ }
 
-    void visitMonitor(SSAMonitorInstruction instruction);
+    default void visitMonitor(SSAMonitorInstruction instruction){ }
 
-    void visitCheckCast(SSACheckCastInstruction instruction);
+    default void visitCheckCast(SSACheckCastInstruction instruction){ }
 
-    void visitInstanceof(SSAInstanceofInstruction instruction);
+    default void visitInstanceof(SSAInstanceofInstruction instruction){ }
 
-    void visitPhi(SSAPhiInstruction instruction);
+    default void visitPhi(SSAPhiInstruction instruction){ }
 
-    void visitPi(SSAPiInstruction instruction);
+    default void visitPi(SSAPiInstruction instruction){ }
 
-    void visitGetCaughtException(SSAGetCaughtExceptionInstruction instruction);
+    default void visitGetCaughtException(SSAGetCaughtExceptionInstruction instruction){ }
 
-    void visitLoadMetadata(SSALoadMetadataInstruction instruction);
+    default void visitLoadMetadata(SSALoadMetadataInstruction instruction){ }
   }
 
   /**
@@ -248,7 +249,7 @@
   /**
    * @return value number representing the jth use in this instruction. -1 means TOP (i.e., the value doesn't matter)
    */
-  public int getUse(int j) throws UnsupportedOperationException {
+  public int getUse(@SuppressWarnings("unused") int j) throws UnsupportedOperationException {
     throw new UnsupportedOperationException();
   }
 
@@ -285,8 +286,7 @@
    * objects that will not equal old ones. Thus, do not  compare for identity SSAInstructions obtained from 
    * distinct calls that retrieve cached values (e.g. distinct CGNode.getIR() calls).
    * See <a href="https://github.com/wala/WALA/issues/6"> the github issue </a> for details.
-   * 
-   * @see java.lang.Object#equals(java.lang.Object)
+   *
    */
   @Override
   public final boolean equals(Object obj) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInvokeInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInvokeInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInvokeInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInvokeInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -65,9 +65,7 @@
 
     nExpected += site.getDeclaredTarget().getNumberOfParameters();
     if (nExpected > 0) {
-      if (params == null) {
-        assert params != null : "null params for " + site;
-      }
+      assert params != null : "null params for " + site;
       if (params.length != nExpected) {
         assert params.length == nExpected : "wrong number of params for " + site + " Expected " + nExpected + " got "
             + params.length;
@@ -103,7 +101,7 @@
   }
 
   @Override
-  public int getNumberOfParameters() {
+  public int getNumberOfPositionalParameters() {
     return getNumberOfUses();
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAMonitorInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAMonitorInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAMonitorInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAMonitorInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -46,10 +46,6 @@
     return "monitor" + (isEnter ? "enter " : "exit ") + getValueString(symbolTable, ref);
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
-   * @throws IllegalArgumentException if v is null
-   */
   @Override
   public void visit(IVisitor v) {
     if (v == null) {
@@ -58,17 +54,11 @@
     v.visitMonitor(this);
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses()
-   */
   @Override
   public int getNumberOfUses() {
     return 1;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) {
     assert j == 0;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSANewInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSANewInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSANewInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSANewInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -61,8 +61,7 @@
         || site.getDeclaredType().getClassLoader().getLanguage() != ClassLoaderReference.Java;
     this.result = result;
     this.site = site;
-    this.params = new int[params.length];
-    System.arraycopy(params, 0, this.params, 0, params.length);
+    this.params = params.clone();
   }
 
   @Override
@@ -76,23 +75,19 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return getValueString(symbolTable, result) + " = new " + site.getDeclaredType() + "@" + site.getProgramCounter()
+    return getValueString(symbolTable, result) + " = new " + site.getDeclaredType() + '@' + site.getProgramCounter()
         + (params == null ? "" : array2String(params, symbolTable));
   }
 
   private String array2String(int[] params, SymbolTable symbolTable) {
-    StringBuffer result = new StringBuffer();
-    for (int i = 0; i < params.length; i++) {
-      result.append(getValueString(symbolTable, params[i]));
-      result.append(" ");
+    StringBuilder result = new StringBuilder();
+    for (int param : params) {
+      result.append(getValueString(symbolTable, param));
+      result.append(' ');
     }
     return result.toString();
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
-   * @throws IllegalArgumentException if v is null
-   */
   @Override
   public void visit(IVisitor v) {
     if (v == null) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPhiInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPhiInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPhiInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPhiInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,11 +26,11 @@
  * normal instruction array returned by IR.getInstructions(); instead these
  * instructions live in {@link ISSABasicBlock}.
  * 
- * <code>getUse(i)</code> corresponds to the value number from the
+ * {@code getUse(i)} corresponds to the value number from the
  * i<sup>th</sup> predecessor of the corresponding {@link ISSABasicBlock}
- * <code>b</code> in {@link ControlFlowGraph} <code>g</code>, where predecessor
+ * {@code b} in {@link ControlFlowGraph} {@code g}, where predecessor
  * order is the order of nodes returned by the {@link Iterator}
- * <code>g.getPredNodes(b)</code>.
+ * {@code g.getPredNodes(b)}.
  * 
  * Note: if getUse(i) returns {@link AbstractIntStackMachine}.TOP (that is, -1),
  * then that use represents an edge in the CFG which is infeasible in verifiable
@@ -68,20 +68,16 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    StringBuffer s = new StringBuffer();
+    StringBuilder s = new StringBuilder();
 
     s.append(getValueString(symbolTable, result)).append(" = phi ");
-    s.append(" ").append(getValueString(symbolTable, params[0]));
+    s.append(' ').append(getValueString(symbolTable, params[0]));
     for (int i = 1; i < params.length; i++) {
-      s.append(",").append(getValueString(symbolTable, params[i]));
+      s.append(',').append(getValueString(symbolTable, params[i]));
     }
     return s.toString();
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
-   * @throws IllegalArgumentException if v is null
-   */
   @Override
   public void visit(IVisitor v) {
     if (v == null) {
@@ -111,9 +107,6 @@
     return result;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses()
-   */
   @Override
   public int getNumberOfUses() {
     return params.length;
@@ -124,9 +117,6 @@
     return 1;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) throws IllegalArgumentException {
     if (j >= params.length || j < 0) {
@@ -146,9 +136,6 @@
     this.params = i;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getValueString(SymbolTable, ValueDecorator, int)
-   */
   @Override
   protected String getValueString(SymbolTable symbolTable, int valueNumber) {
     if (valueNumber == AbstractIntStackMachine.TOP) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPiInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPiInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPiInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPiInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,27 +11,26 @@
 package com.ibm.wala.ssa;
 
 /**
- * A Pi instruction is a dummy assignment inserted at the tail of a basic block, in order
+ * <p>A Pi instruction is a dummy assignment inserted at the tail of a basic block, in order
  * to get a new variable name to associate with some flow-insensitive dataflow fact.
- * You can build an {@link IR} with or without Pi instructions, depending on {@link SSAOptions} selected.
+ * You can build an {@link IR} with or without Pi instructions, depending on {@link SSAOptions} selected.</p>
  * 
- * A Pi instruction is linked to its "cause" instruction, which is usually a conditional 
- * branch.
+ * <p>A Pi instruction is linked to its "cause" instruction, which is usually a conditional
+ * branch.</p>
  * 
- * for example, the following pseudo-code
- * <p>
- * <verbatim>
+ * <p>For example, the following pseudo-code</p>
+ * <pre>
  *     boolean condition = (x instanceof Integer);
  *     if (condition) {
  *        S1;
  *     else {
  *        S2;
  *     }
- * </verbatim>
+ * </pre>
  * 
- * could be translated roughly as follows:
+ * <p>could be translated roughly as follows:</p>
  * 
- * <verbatim>
+ * <pre>
  *     boolean condition = (x instanceof Integer);
  *     LABEL1: if (condition) {
  *        x_1 = pi(x, LABEL1);
@@ -40,7 +39,7 @@
  *        x_2 = pi(x, LABEL2);
  *        S2;
  *     }
- * </verbatim>
+ * </pre>
  */
 public class SSAPiInstruction extends SSAUnaryOpInstruction {
   private final SSAInstruction cause;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPiNodePolicy.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPiNodePolicy.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPiNodePolicy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPiNodePolicy.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package com.ibm.wala.ssa;
 
+import java.util.List;
+
 import com.ibm.wala.util.collections.Pair;
 
 /**
@@ -43,5 +45,8 @@
    */
   Pair<Integer, SSAInstruction> getPi(SSAConditionalBranchInstruction cond, SSAInstruction def1, SSAInstruction def2,
       SymbolTable symbolTable);
+  
+  List<Pair<Integer, SSAInstruction>> getPis(SSAConditionalBranchInstruction cond, SSAInstruction def1, SSAInstruction def2,
+      SymbolTable symbolTable);  
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPutInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPutInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPutInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAPutInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,7 +42,7 @@
     if (isStatic()) {
       return "putstatic " + getDeclaredField() + " = " + getValueString(symbolTable, val);
     } else {
-      return "putfield " + getValueString(symbolTable, getRef()) + "." + getDeclaredField() + " = " + getValueString(symbolTable, val);
+      return "putfield " + getValueString(symbolTable, getRef()) + '.' + getDeclaredField() + " = " + getValueString(symbolTable, val);
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAReturnInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAReturnInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAReturnInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAReturnInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -56,10 +56,6 @@
     }
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
-   * @throws IllegalArgumentException if v is null
-   */
   @Override
   public void visit(IVisitor v) {
     if (v == null) {
@@ -68,17 +64,11 @@
     v.visitReturn(this);
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses()
-   */
   @Override
   public int getNumberOfUses() {
     return (result == -1) ? 0 : 1;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) {
     if (j != 0) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAStoreIndirectInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAStoreIndirectInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAStoreIndirectInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAStoreIndirectInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -59,7 +59,7 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return "*" + getValueString(symbolTable, addressVal) + " = " + getValueString(symbolTable, rval);
+    return '*' + getValueString(symbolTable, addressVal) + " = " + getValueString(symbolTable, rval);
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSASwitchInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSASwitchInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSASwitchInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSASwitchInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -41,7 +41,7 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    StringBuffer result = new StringBuffer("switch ");
+    StringBuilder result = new StringBuilder("switch ");
     result.append(getValueString(symbolTable, val));
     result.append(" [");
     for (int i = 0; i < casesAndLabels.length - 1; i++) {
@@ -50,17 +50,13 @@
       result.append("->");
       result.append(casesAndLabels[i]);
       if (i < casesAndLabels.length - 2) {
-        result.append(",");
+        result.append(',');
       }
     }
-    result.append("]");
+    result.append(']');
     return result.toString();
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#visit(IVisitor)
-   * @throws IllegalArgumentException if v is null
-   */
   @Override
   public void visit(IVisitor v) {
     if (v == null) {
@@ -69,17 +65,11 @@
     v.visitSwitch(this);
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses()
-   */
   @Override
   public int getNumberOfUses() {
     return 1;
   }
 
-  /**
-   * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
-   */
   @Override
   public int getUse(int j) {
     assert j <= 1;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAUnaryOpInstruction.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAUnaryOpInstruction.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAUnaryOpInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAUnaryOpInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -36,7 +36,7 @@
 
   @Override
   public String toString(SymbolTable symbolTable) {
-    return getValueString(symbolTable, result) + " = " + operator + " " + getValueString(symbolTable, val);
+    return getValueString(symbolTable, result) + " = " + operator + ' ' + getValueString(symbolTable, val);
   }
 
   /**
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SymbolTable.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SymbolTable.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/ssa/SymbolTable.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/ssa/SymbolTable.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.ssa;
 
+import java.util.Arrays;
 import java.util.HashMap;
 
 import com.ibm.wala.util.collections.HashMapFactory;
@@ -32,7 +33,7 @@
   final private int[] parameters;
 
   /**
-   * Mapping from Constant -> value number
+   * Mapping from Constant -&gt; value number
    */
   private HashMap<ConstantValue, Integer> constants = HashMapFactory.make(10);
 
@@ -52,7 +53,7 @@
   }
 
   /**
-   * Values. Note: this class must maintain the following invariant: values.length > nextFreeValueNumber.
+   * Values. Note: this class must maintain the following invariant: values.length &gt; nextFreeValueNumber.
    */
   private Value[] values = new Value[5];
 
@@ -95,7 +96,7 @@
       assert vn < nextFreeValueNumber;
       values[vn] = val;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid vn: " + vn);
+      throw new IllegalArgumentException("invalid vn: " + vn, e);
     }
   }
 
@@ -118,9 +119,7 @@
       }
       
       if (defaultValues.length <= vn) {
-        Object temp[] = defaultValues;
-        defaultValues = new Object[ vn*2 + 1];
-        System.arraycopy(temp, 0, defaultValues, 0, temp.length);
+        defaultValues = Arrays.copyOf(defaultValues, vn*2 + 1);
       }
       
       defaultValues[vn] = defaultValue;
@@ -147,11 +146,11 @@
   }
 
   public int getConstant(float f) {
-    return findOrCreateConstant(new Float(f));
+    return findOrCreateConstant(Float.valueOf(f));
   }
 
   public int getConstant(double d) {
-    return findOrCreateConstant(new Double(d));
+    return findOrCreateConstant(Double.valueOf(d));
   }
 
   public int getConstant(String s) {
@@ -167,15 +166,13 @@
     try {
       return parameters[i];
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid i: " + i);
+      throw new IllegalArgumentException("invalid i: " + i, e);
     }
   }
 
   private void expandForNewValueNumber(int vn) {
     if (vn >= values.length) {
-      Value[] temp = values;
-      values = new Value[2 * vn];
-      System.arraycopy(temp, 0, values, 0, temp.length);
+      values = Arrays.copyOf(values, 2 * vn);
     }
   }
 
@@ -204,7 +201,7 @@
         }
       }
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid i: " + i);
+      throw new IllegalArgumentException("invalid i: " + i, e);
     }
 
   }
@@ -214,7 +211,7 @@
         || values[valueNumber] instanceof PhiValue) {
       return "v" + valueNumber;
     } else {
-      return "v" + valueNumber + ":" + values[valueNumber].toString();
+      return "v" + valueNumber + ':' + values[valueNumber].toString();
     }
   }
 
@@ -222,7 +219,7 @@
     try {
       return v < values.length && values[v] instanceof ConstantValue;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid v: " + v);
+      throw new IllegalArgumentException("invalid v: " + v, e);
     }
   }
 
@@ -230,7 +227,7 @@
     try {
       return (values[v] instanceof ConstantValue) && ((ConstantValue) values[v]).isZeroConstant();
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid v: " + v);
+      throw new IllegalArgumentException("invalid v: " + v, e);
     }
   }
 
@@ -238,7 +235,7 @@
     try {
       return (values[v] instanceof ConstantValue) && ((ConstantValue) values[v]).isOneConstant();
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid v: " + v);
+      throw new IllegalArgumentException("invalid v: " + v, e);
     }
   }
 
@@ -246,7 +243,7 @@
     try {
       return (values[v] instanceof ConstantValue) && ((ConstantValue) values[v]).isTrueConstant();
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid v: " + v);
+      throw new IllegalArgumentException("invalid v: " + v, e);
     }
   }
 
@@ -262,7 +259,7 @@
     try {
       return (values[v] instanceof ConstantValue) && ((ConstantValue) values[v]).isFalseConstant();
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid v: " + v);
+      throw new IllegalArgumentException("invalid v: " + v, e);
     }
   }
 
@@ -274,7 +271,7 @@
     try {
       return (values[v] instanceof ConstantValue) && ((ConstantValue) values[v]).getValue() instanceof Boolean;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid v: " + v);
+      throw new IllegalArgumentException("invalid v: " + v, e);
     }
   }
 
@@ -282,7 +279,7 @@
     try {
       return (values[v] instanceof ConstantValue) && (((ConstantValue) values[v]).getValue() instanceof Integer);
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid v: " + v);
+      throw new IllegalArgumentException("invalid v: " + v, e);
     }
   }
 
@@ -290,7 +287,7 @@
     try {
       return (values[v] instanceof ConstantValue) && (((ConstantValue) values[v]).getValue() instanceof Long);
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid v: " + v);
+      throw new IllegalArgumentException("invalid v: " + v, e);
     }
   }
 
@@ -298,7 +295,7 @@
     try {
       return (values[v] instanceof ConstantValue) && ((ConstantValue) values[v]).getValue() instanceof Float;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid v: " + v);
+      throw new IllegalArgumentException("invalid v: " + v, e);
     }
   }
 
@@ -306,7 +303,7 @@
     try {
       return (values[v] instanceof ConstantValue) && ((ConstantValue) values[v]).getValue() instanceof Double;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid v: " + v);
+      throw new IllegalArgumentException("invalid v: " + v, e);
     }
   }
 
@@ -314,7 +311,7 @@
     try {
       return (values[v] instanceof ConstantValue) && ((ConstantValue) values[v]).getValue() instanceof Number;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid v: " + v);
+      throw new IllegalArgumentException("invalid v: " + v, e);
     }
   }
 
@@ -322,7 +319,7 @@
     try {
       return (values[v] instanceof ConstantValue) && ((ConstantValue) values[v]).getValue() instanceof String;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid v: " + v);
+      throw new IllegalArgumentException("invalid v: " + v, e);
     }
   }
 
@@ -330,7 +327,7 @@
     try {
       return (values.length > v) && (values[v] instanceof ConstantValue) && (((ConstantValue) values[v]).getValue() == null);
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid v: " + v);
+      throw new IllegalArgumentException("invalid v: " + v, e);
     }
   }
 
@@ -355,9 +352,9 @@
     try {
       return (PhiValue) values[valueNumber];
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid valueNumber: " + valueNumber);
+      throw new IllegalArgumentException("invalid valueNumber: " + valueNumber, e);
     } catch (ClassCastException e) {
-      throw new IllegalArgumentException("invalid valueNumber: " + valueNumber);
+      throw new IllegalArgumentException("invalid valueNumber: " + valueNumber, e);
     }
   }
 
@@ -434,7 +431,6 @@
   }
 
   /**
-   * @param valueNumber
    * @return true iff this valueNumber is a parameter
    */
   public boolean isParameter(int valueNumber) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/annotations/Annotation.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/annotations/Annotation.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/annotations/Annotation.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/annotations/Annotation.java	2019-01-29 17:08:39.000000000 +0000
@@ -113,26 +113,29 @@
   
   @Override
   public String toString() {
-    StringBuffer sb = new StringBuffer("Annotation type " + type);
+    StringBuilder sb = new StringBuilder("Annotation type " + type);
     if (unnamedArguments != null) {
-      sb.append("[");
+      sb.append('[');
       for (Pair<TypeReference, Object> arg : unnamedArguments) {
-        sb.append(" " + arg.fst.getName().getClassName() + ":" + arg.snd);
+        sb.append(' ').append(arg.fst.getName().getClassName()).append(':').append(arg.snd);
       }
       sb.append(" ]");
     }
     if (!namedArguments.isEmpty()) {
-      sb.append(" " + new TreeMap<String, ElementValue>(namedArguments));
+      sb.append(' ').append(new TreeMap<>(namedArguments));
     }
     return sb.toString();
   }
 
+
+
   @Override
   public int hashCode() {
     final int prime = 31;
     int result = 1;
-    result = prime * result + Arrays.hashCode(unnamedArguments);
+    result = prime * result + ((namedArguments == null) ? 0 : namedArguments.hashCode());
     result = prime * result + ((type == null) ? 0 : type.hashCode());
+    result = prime * result + Arrays.hashCode(unnamedArguments);
     return result;
   }
 
@@ -145,13 +148,18 @@
     if (getClass() != obj.getClass())
       return false;
     Annotation other = (Annotation) obj;
-    if (!Arrays.equals(unnamedArguments, other.unnamedArguments))
+    if (namedArguments == null) {
+      if (other.namedArguments != null)
+        return false;
+    } else if (!namedArguments.equals(other.namedArguments))
       return false;
     if (type == null) {
       if (other.type != null)
         return false;
     } else if (!type.equals(other.type))
       return false;
+    if (!Arrays.equals(unnamedArguments, other.unnamedArguments))
+      return false;
     return true;
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/annotations/TypeAnnotation.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/annotations/TypeAnnotation.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/annotations/TypeAnnotation.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/annotations/TypeAnnotation.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,990 @@
+/*******************************************************************************
+ * Copyright (c) 2016 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Martin Hecker, KIT - initial implementation
+ *******************************************************************************/
+package com.ibm.wala.types.annotations;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import com.ibm.wala.classLoader.FieldImpl;
+import com.ibm.wala.classLoader.IBytecodeMethod;
+import com.ibm.wala.classLoader.ShrikeCTMethod;
+import com.ibm.wala.classLoader.ShrikeClass;
+import com.ibm.wala.shrikeCT.AnnotationsReader.AnnotationAttribute;
+import com.ibm.wala.shrikeCT.InvalidClassFileException;
+import com.ibm.wala.shrikeCT.TypeAnnotationsReader;
+import com.ibm.wala.shrikeCT.TypeAnnotationsReader.TargetInfo;
+import com.ibm.wala.shrikeCT.TypeAnnotationsReader.TargetType;
+import com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeAnnotationAttribute;
+import com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeAnnotationLocation;
+import com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeAnnotationTargetVisitor;
+import com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypePathKind;
+import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.collections.Pair;
+
+/**
+ * A {@link TypeAnnotation} represents a JSR 308 Java Type Annotation.
+ * 
+ * @author Martin Hecker martin.hecker@kit.edu
+ *
+ * @see Annotation
+ * @see TypeAnnotationTarget
+ * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20">JLS (SE8), 4.7.20</a>
+ * @see <a href="https://jcp.org/en/jsr/detail?id=308">JSR 308: Annotations on Java Types</a> 
+ * @see <a href="http://types.cs.washington.edu/jsr308/">Type Annotations (JSR 308) and the Checker Framework</a>
+ * 
+ */
+public class TypeAnnotation {
+  
+  private final Annotation annotation;
+  private final List<Pair<TypePathKind, Integer>> typePath;
+  private final TypeAnnotationTarget typeAnnotationTarget;
+  private final TargetType targetType;
+    
+  private TypeAnnotation(Annotation annotation, List<Pair<TypePathKind, Integer>> typePath,
+      TypeAnnotationTarget typeAnnotationTarget, TargetType targetType) {
+    this.annotation = annotation;
+    this.typePath = Collections.unmodifiableList(typePath);
+    this.typeAnnotationTarget = typeAnnotationTarget;
+    this.targetType = targetType;
+  }
+  
+
+  @Override
+  public String toString() {
+    return "TypeAnnotation" + "{ annotation = " + annotation + ", path = " + typePath + ", target = "
+            + typeAnnotationTarget + '}';
+  }
+
+  @Override
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+    result = prime * result + ((annotation == null) ? 0 : annotation.hashCode());
+    result = prime * result + ((typeAnnotationTarget == null) ? 0 : typeAnnotationTarget.hashCode());
+    result = prime * result + ((typePath == null) ? 0 : typePath.hashCode());
+    result = prime * result + ((targetType == null) ? 0 : targetType.hashCode());
+    return result;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    TypeAnnotation other = (TypeAnnotation) obj;
+    if (annotation == null) {
+      if (other.annotation != null)
+        return false;
+    } else if (!annotation.equals(other.annotation))
+      return false;
+    if (typeAnnotationTarget == null) {
+      if (other.typeAnnotationTarget != null)
+        return false;
+    } else if (!typeAnnotationTarget.equals(other.typeAnnotationTarget))
+      return false;
+    if (typePath == null) {
+      if (other.typePath != null)
+        return false;
+    } else if (!typePath.equals(other.typePath))
+      return false;
+    if (targetType == null) {
+      if (other.targetType != null)
+        return false;
+    } else if (!targetType.equals(other.targetType))
+      return false;
+    return true;
+  }
+  
+  public static Collection<TypeAnnotation> getTypeAnnotationsFromReader(TypeAnnotationsReader r, TypeAnnotationTargetConverter converter, ClassLoaderReference clRef) throws InvalidClassFileException {
+    if (r != null) {
+      TypeAnnotationAttribute[] allTypeAnnotations = r.getAllTypeAnnotations();
+      
+      Collection<TypeAnnotation> result = new ArrayList<>(allTypeAnnotations.length);
+      for (TypeAnnotationAttribute tatt : allTypeAnnotations) {
+        final Collection<Annotation> annotations = 
+            Annotation.convertToAnnotations(clRef, new AnnotationAttribute[] { tatt.annotationAttribute});
+        assert annotations.size() == 1;
+        
+        final Annotation annotation = annotations.iterator().next();
+        
+        result.add(
+          new TypeAnnotation(
+            annotation,
+            tatt.typePath,
+            tatt.annotationTarget.acceptVisitor(converter),
+            tatt.targetType
+          )
+        );
+      }
+      return result;
+    } else {
+      return Collections.emptySet();
+    }
+    
+  }
+  
+  /**
+   * This method is intended to be used in testing only.
+   * 
+   * Otherwise, obtain TypeAnnotations from
+   * <ul>
+   *   <li> {@link ShrikeCTMethod#getTypeAnnotationsAtCode(boolean)} </li>
+   *   <li> {@link ShrikeCTMethod#getTypeAnnotationsAtMethodInfo(boolean)} </li>
+   *   <li> {@link FieldImpl#getTypeAnnotations()}
+   *   <li> {@link ShrikeClass#getTypeAnnotations(boolean)}
+   * </ul>
+   *  
+   * @return A {@link TypeAnnotation} comprised of annotation, typePath and targetType
+   */
+  public static TypeAnnotation make(Annotation annotation, List<Pair<TypePathKind, Integer>> typePath,
+      TypeAnnotationTarget typeAnnotationTarget, TargetType targetType) {
+    return new TypeAnnotation(annotation, typePath, typeAnnotationTarget, targetType);
+  }
+
+  /**
+   * This method is intended to be used in testing only.
+   * 
+   * Otherwise, obtain TypeAnnotations from
+   * <ul>
+   *   <li> {@link ShrikeCTMethod#getTypeAnnotationsAtCode(boolean)} </li>
+   *   <li> {@link ShrikeCTMethod#getTypeAnnotationsAtMethodInfo(boolean)} </li>
+   *   <li> {@link FieldImpl#getTypeAnnotations()}
+   *   <li> {@link ShrikeClass#getTypeAnnotations(boolean)}
+   * </ul>
+   *  
+   * @return A {@link TypeAnnotation} comprised of annotation, an empty typePath,  and targetType
+   */
+  public static TypeAnnotation make(Annotation annotation,
+      TypeAnnotationTarget typeAnnotationTarget, TargetType targetType) {
+    return new TypeAnnotation(annotation, TypeAnnotationsReader.TYPEPATH_EMPTY, typeAnnotationTarget, targetType);
+  }
+  
+  /**
+   * A {@link TypeAnnotationTarget} represents the "target" of a Type Annotation.
+   * 
+   * In contrast to {@link com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeAnnotationTarget},
+   * subclasses of {@link TypeAnnotationTarget} usually have already resolved bytecode-specific data
+   * (such as bcIndices) to their WALA counterparts.
+   * 
+   * @author Martin Hecker martin.hecker@kit.edu
+   *
+   */
+  public static abstract class TypeAnnotationTarget {
+    public static final int INSTRUCTION_INDEX_UNAVAILABLE = -1;
+  }
+  
+  
+  public static class TypeParameterTarget extends TypeAnnotationTarget {
+    private final int type_parameter_index;
+    public TypeParameterTarget(int type_parameter_index) {
+      this.type_parameter_index = type_parameter_index;
+    }
+
+    public int getIndex() {
+      return type_parameter_index;
+    }
+
+    @Override
+    public String toString() {
+      return "TypeParameterTarget" + "{ type_parameter_index = " + type_parameter_index + '}';
+    }
+
+    @Override
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + type_parameter_index;
+      return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      TypeParameterTarget other = (TypeParameterTarget) obj;
+      if (type_parameter_index != other.type_parameter_index)
+        return false;
+      return true;
+    }
+  }
+
+  public static class SuperTypeTarget extends TypeAnnotationTarget {
+    private final TypeReference superType;
+    public SuperTypeTarget(TypeReference superType) {
+      this.superType = superType;
+    }
+
+    public TypeReference getSuperType() {
+      return superType;
+    }
+
+    @Override
+    public String toString() {
+      return "SuperTypeTarget{ superType = " + superType + '}';
+    }
+
+    @Override
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((superType == null) ? 0 : superType.hashCode());
+      return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      SuperTypeTarget other = (SuperTypeTarget) obj;
+      if (superType == null) {
+        if (other.superType != null)
+          return false;
+      } else if (!superType.equals(other.superType))
+        return false;
+      return true;
+    }
+  }
+  
+  public static class TypeParameterBoundTarget extends TypeAnnotationTarget {
+    private final int type_parameter_index;
+    private final int bound_index;
+    
+    public TypeParameterBoundTarget(int type_parameter_index, int bound_index) {
+      this.type_parameter_index = type_parameter_index;
+      this.bound_index = bound_index;
+    }
+
+    @Override
+    public String toString() {
+      return "TypeParameterBoundTarget{ type_parameter_index = " + type_parameter_index
+              + ", bound_index = " + bound_index + '}';
+    }
+
+    public int getParameterIndex() {
+      return type_parameter_index;
+    }
+
+    public int getBoundIndex() {
+      return bound_index;
+    }
+
+    @Override
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + bound_index;
+      result = prime * result + type_parameter_index;
+      return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      TypeParameterBoundTarget other = (TypeParameterBoundTarget) obj;
+      if (bound_index != other.bound_index)
+        return false;
+      if (type_parameter_index != other.type_parameter_index)
+        return false;
+      return true;
+    }
+
+    
+  }
+
+  public static class EmptyTarget extends TypeAnnotationTarget {
+    public EmptyTarget() {
+    }
+
+    @Override
+    public String toString() {
+      return "EmptyTarget";
+    }
+
+    @Override
+    public int hashCode() {
+      return 1;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      return true;
+    }
+  }
+
+  
+  public static class FormalParameterTarget  extends TypeAnnotationTarget {
+    private final int formal_parameter_index;
+    public FormalParameterTarget(int index) {
+      this.formal_parameter_index = index;
+    }
+
+    public int getIndex() {
+      return formal_parameter_index;
+    }
+
+    @Override
+    public String toString() {
+      return "FormalParameterTarget" + "{ formal_parameter_index = " + formal_parameter_index + '}';
+    }
+
+    @Override
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + formal_parameter_index;
+      return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      FormalParameterTarget other = (FormalParameterTarget) obj;
+      if (formal_parameter_index != other.formal_parameter_index)
+        return false;
+      return true;
+    }
+  }
+  
+  public static class ThrowsTarget extends TypeAnnotationTarget {
+    private final TypeReference throwType;
+    public ThrowsTarget(TypeReference throwType) {
+      this.throwType = throwType;
+    }
+
+    public TypeReference getThrowType() {
+      return throwType;
+    }
+
+    @Override
+    public String toString() {
+      return "ThrowsTarget{ throwType = " + throwType + '}';
+    }
+
+    @Override
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((throwType == null) ? 0 : throwType.hashCode());
+      return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      ThrowsTarget other = (ThrowsTarget) obj;
+      if (throwType == null) {
+        if (other.throwType != null)
+          return false;
+      } else if (!throwType.equals(other.throwType))
+        return false;
+      return true;
+    }
+  }
+  
+  public static class LocalVarTarget extends TypeAnnotationTarget {
+    // TODO: we might want to relate bytecode-ranges to ranges in the
+    // IInstruction[] array returned by IBytecodeMethod.getInstructions(),
+    // but is this even meaningful?
+    private final int     varIindex;
+    private final String  name;
+    public LocalVarTarget(int varIindex, String name) {
+      this.varIindex = varIindex;
+      this.name = name;
+    }
+
+    @Override
+    public String toString() {
+      return "LocalVarTarget{ varIindex = " + varIindex + ", name = " + name + '}';
+    }
+
+    public int getIndex() {
+      return varIindex;
+    }
+
+    /**
+     * 
+     * @return the name of the local Variable, or null if it could not be determined
+     * (for example, if the LocalVariableTable in the corresponding class file is missing). 
+     */
+    public String getName() {
+      return name;
+    }
+
+    @Override
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((name == null) ? 0 : name.hashCode());
+      result = prime * result + varIindex;
+      return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      LocalVarTarget other = (LocalVarTarget) obj;
+      if (name == null) {
+        if (other.name != null)
+          return false;
+      } else if (!name.equals(other.name))
+        return false;
+      if (varIindex != other.varIindex)
+        return false;
+      return true;
+    }
+  }
+  
+  public static class CatchTarget extends TypeAnnotationTarget {
+    // TODO: as per LocalVarTarget, can we record a meaningful range in terms
+    // of IInstriction[] or SSAInstruction[] indices?!?! this is currently missing..
+    private final int catchIIndex;
+    private final TypeReference catchType;
+
+    // TODO: or should this be TypeReference.JavaLangThrowable?
+    public static final TypeReference ALL_EXCEPTIONS = null;
+
+    public CatchTarget(int catchIIndex, TypeReference catchType) {
+      this.catchIIndex = catchIIndex;
+      this.catchType = catchType;
+    }
+
+    /**
+     * @return the handlers type, or {@link CatchTarget#ALL_EXCEPTIONS}
+     */
+    public TypeReference getCatchType() {
+      return catchType;
+    }
+
+    /**
+     * @return the handlers instruction index (if available),
+     *         or {@link TypeAnnotationTarget#INSTRUCTION_INDEX_UNAVAILABLE} otherwise.
+     */
+    public int getCatchIIndex() {
+      return catchIIndex;
+    }
+
+    @Override
+    public String toString() {
+      return "CatchTarget{ catchIIndex = " + catchIIndex + ", catchType = " + catchType + '}';
+    }
+
+    @Override
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + catchIIndex;
+      result = prime * result + ((catchType == null) ? 0 : catchType.hashCode());
+      return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      CatchTarget other = (CatchTarget) obj;
+      if (catchIIndex != other.catchIIndex)
+        return false;
+      if (catchType == null) {
+        if (other.catchType != null)
+          return false;
+      } else if (!catchType.equals(other.catchType))
+        return false;
+      return true;
+    }
+  }
+  
+  public static class OffsetTarget extends TypeAnnotationTarget {
+    private final int iindex;
+
+    public OffsetTarget(int iindex) {
+      this.iindex = iindex;
+    }
+
+    /**
+     * @return the targets instruction index (if available), 
+     *         or {@link TypeAnnotationTarget#INSTRUCTION_INDEX_UNAVAILABLE} otherwise.
+     */
+    public int getIIndex() {
+      return iindex;
+    }
+
+    @Override
+    public String toString() {
+      return "OffsetTarget{ iindex = " + iindex + '}';
+    }
+
+    @Override
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + iindex;
+      return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      OffsetTarget other = (OffsetTarget) obj;
+      if (iindex != other.iindex)
+        return false;
+      return true;
+    }
+  }
+  
+  public static class TypeArgumentTarget extends TypeAnnotationTarget {
+    private final int iindex;
+    private final int type_argument_index;
+
+    public TypeArgumentTarget(int iindex, int type_argument_index) {
+      this.iindex = iindex;
+      this.type_argument_index = type_argument_index;
+    }
+
+    public int getOffset() {
+      return iindex;
+    }
+
+    public int getTypeArgumentIndex() {
+      return type_argument_index;
+    }
+
+    @Override
+    public String toString() {
+      return "TypeArgumentTarget{ iindex = " + iindex + ", type_argument_index = " + type_argument_index + '}';
+    }
+
+    @Override
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + iindex;
+      result = prime * result + type_argument_index;
+      return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      TypeArgumentTarget other = (TypeArgumentTarget) obj;
+      if (iindex != other.iindex)
+        return false;
+      if (type_argument_index != other.type_argument_index)
+        return false;
+      return true;
+    }
+  }
+  
+  private static TypeReference fromString(ClassLoaderReference clRef, String typeName) {
+    // TODO: should we not use some lookup that try to (recursively) find a TypeReference in clRefs parents,
+    // and only create a new TypeReference in clRef if this fails? I can't find a such a utility method, though..?!?!
+    return TypeReference.findOrCreate(clRef, 'L' +typeName.replaceAll(";", ""));
+  }
+
+  private static boolean mayAppearIn(TargetInfo info, TypeAnnotationLocation location) {
+    for (TargetType targetType : TargetType.values()) {
+      if (targetType.target_info == info && targetType.location == location) return true; 
+    }
+    return false;
+  }
+
+  /**
+   * A @{TypeAnnotationTargetConverter} takes "unresolved" instances of
+   * {@link com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeAnnotationTarget}, resolves some byte-code specific data,
+   * and returns instances of the corresponding {@link TypeAnnotationTarget} subclass.
+   * 
+   * @author Martin Hecker martin.hecker@kit.edu
+   *
+   */
+  public static interface TypeAnnotationTargetConverter extends TypeAnnotationTargetVisitor<TypeAnnotationTarget> {}
+  
+  public static TypeAnnotationTargetConverter targetConverterAtCode(final ClassLoaderReference clRef, final IBytecodeMethod method) {
+    return new TypeAnnotationTargetConverter() {
+      @Override
+      public TypeAnnotationTarget visitTypeParameterTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeParameterTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.Code);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitSuperTypeTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.SuperTypeTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.Code);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitTypeParameterBoundTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeParameterBoundTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.Code);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitEmptyTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.EmptyTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.Code);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitFormalParameterTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.FormalParameterTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.Code);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitThrowsTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.ThrowsTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.Code);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitLocalVarTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.LocalVarTarget target) {
+        assert mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.Code);
+        
+        // TODO: is this even allowed? Should we have thrown an exception earlier?
+        if (target.getNrOfRanges() == 0) return new LocalVarTarget(-1, null);
+        
+        final int varIndex = target.getIndex(0);
+        final String name = method.getLocalVariableName(target.getStartPc(0), target.getIndex(0));
+        if (name == null ) {
+          return new LocalVarTarget(varIndex, null);
+        }
+        for (int i = 0; i < target.getNrOfRanges(); i++) {
+          if ( target.getIndex(i) != varIndex) throw new IllegalArgumentException();
+          
+          if (!method.getLocalVariableName(target.getStartPc(0), target.getIndex(0)).equals(name)) {
+            throw new IllegalArgumentException();
+          }
+        }
+        return new LocalVarTarget(varIndex, name);
+      }
+
+      @Override
+      public TypeAnnotationTarget visitCatchTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.CatchTarget target) {
+        assert mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.Code);
+        
+        final TypeReference catchType;
+        if (target.getCatchType() == com.ibm.wala.shrikeCT.TypeAnnotationsReader.CatchTarget.ALL_EXCEPTIONS) {
+          catchType = CatchTarget.ALL_EXCEPTIONS;
+        } else {
+          catchType = fromString(clRef, target.getCatchType());
+        }
+        
+        
+        // well this is awkward..
+        try {
+          final int catchIIndex = method.getInstructionIndex(target.getCatchPC());
+          return new CatchTarget(catchIIndex, catchType);
+        } catch (InvalidClassFileException e) {
+          return new CatchTarget(TypeAnnotationTarget.INSTRUCTION_INDEX_UNAVAILABLE, catchType);
+        }
+        
+      }
+
+      @Override
+      public TypeAnnotationTarget visitOffsetTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.OffsetTarget target) {
+        assert mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.Code);
+        try {
+          final int iindex = method.getInstructionIndex(target.getOffset());
+          return new OffsetTarget(iindex);
+        } catch (InvalidClassFileException e) {
+          return new OffsetTarget(TypeAnnotationTarget.INSTRUCTION_INDEX_UNAVAILABLE);
+        }
+      }
+
+      @Override
+      public TypeAnnotationTarget visitTypeArgumentTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeArgumentTarget target) {
+        assert mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.Code);
+        try {
+          final int iindex = method.getInstructionIndex(target.getOffset());
+          return new TypeArgumentTarget(iindex, target.getTypeArgumentIndex());
+        } catch (InvalidClassFileException e) {
+          return new TypeArgumentTarget(TypeAnnotationTarget.INSTRUCTION_INDEX_UNAVAILABLE, target.getTypeArgumentIndex());
+        }
+      }
+    };
+  }
+
+  // TODO: method is currently unused, but we may want to use it if we decide to resolve generic signature indices here
+  public static TypeAnnotationTargetConverter targetConverterAtMethodInfo(final ClassLoaderReference clRef) {
+    return new TypeAnnotationTargetConverter() {
+      @Override
+      public TypeAnnotationTarget visitTypeParameterTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeParameterTarget target) {
+        assert mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.method_info);
+        return new TypeParameterTarget(target.getIndex()); 
+      }
+
+      @Override
+      public TypeAnnotationTarget visitSuperTypeTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.SuperTypeTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.method_info);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitTypeParameterBoundTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeParameterBoundTarget target) {
+        assert mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.method_info);
+        return new TypeParameterBoundTarget(target.getParameterIndex(), target.getBoundIndex());
+      }
+
+      @Override
+      public TypeAnnotationTarget visitEmptyTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.EmptyTarget target) {
+        assert mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.method_info);
+        return new EmptyTarget();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitFormalParameterTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.FormalParameterTarget target) {
+        assert mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.method_info);
+        return new FormalParameterTarget(target.getIndex());
+      }
+
+      @Override
+      public TypeAnnotationTarget visitThrowsTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.ThrowsTarget target) {
+        assert mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.method_info);
+        return new ThrowsTarget(fromString(clRef, target.getThrowType()));
+      }
+
+      @Override
+      public TypeAnnotationTarget visitLocalVarTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.LocalVarTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.method_info);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitCatchTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.CatchTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.method_info);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitOffsetTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.OffsetTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.method_info);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitTypeArgumentTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeArgumentTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.method_info);
+        throw new UnsupportedOperationException();
+      }
+    };
+  }
+  
+  public static TypeAnnotationTargetConverter targetConverterAtClassFile(final ClassLoaderReference clRef) {
+    return new TypeAnnotationTargetConverter() {
+      @Override
+      public TypeAnnotationTarget visitTypeParameterTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeParameterTarget target) {
+        assert mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.ClassFile);
+        return new TypeParameterTarget(target.getIndex()); 
+      }
+
+      @Override
+      public TypeAnnotationTarget visitSuperTypeTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.SuperTypeTarget target) {
+        assert mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.ClassFile);
+        return new SuperTypeTarget(fromString(clRef, target.getSuperType()));
+      }
+
+      @Override
+      public TypeAnnotationTarget visitTypeParameterBoundTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeParameterBoundTarget target) {
+        assert mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.ClassFile);
+        return new TypeParameterBoundTarget(target.getParameterIndex(), target.getBoundIndex());
+      }
+
+      @Override
+      public TypeAnnotationTarget visitEmptyTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.EmptyTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.ClassFile);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitFormalParameterTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.FormalParameterTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.ClassFile);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitThrowsTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.ThrowsTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.ClassFile);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitLocalVarTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.LocalVarTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.ClassFile);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitCatchTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.CatchTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.ClassFile);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitOffsetTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.OffsetTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.ClassFile);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitTypeArgumentTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeArgumentTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.ClassFile);
+        throw new UnsupportedOperationException();
+      }
+    };
+  }
+  
+  public static TypeAnnotationTargetConverter targetConverterAtFieldInfo() {
+    return new TypeAnnotationTargetConverter() {
+      @Override
+      public TypeAnnotationTarget visitTypeParameterTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeParameterTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.field_info);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitSuperTypeTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.SuperTypeTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.field_info);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitTypeParameterBoundTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeParameterBoundTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.field_info);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitEmptyTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.EmptyTarget target) {
+        assert mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.field_info);
+        return new EmptyTarget();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitFormalParameterTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.FormalParameterTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.field_info);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitThrowsTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.ThrowsTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.field_info);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitLocalVarTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.LocalVarTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.field_info);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitCatchTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.CatchTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.field_info);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitOffsetTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.OffsetTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.field_info);
+        throw new UnsupportedOperationException();
+      }
+
+      @Override
+      public TypeAnnotationTarget visitTypeArgumentTarget(com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypeArgumentTarget target) {
+        assert !mayAppearIn(target.getTargetInfo(), TypeAnnotationLocation.field_info);
+        throw new UnsupportedOperationException();
+      }
+    };
+  }
+
+  /**
+   * @return the {@link Annotation} of this {@link TypeAnnotation}
+   */
+  public Annotation getAnnotation() {
+    return annotation;
+  }
+
+  /**
+   * @return the typePath of this {@link TypeAnnotation}
+   * 
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20.2"> JLS (SE8), 4.7.20.2</a>
+   */
+  public List<Pair<TypePathKind, Integer>> getTypePath() {
+    return typePath;
+  }
+
+  /**
+   * @return the {@link TypeAnnotationTarget} of this {@link TypeAnnotation}
+   */
+  public TypeAnnotationTarget getTypeAnnotationTarget() {
+    return typeAnnotationTarget;
+  }
+
+  /**
+   * @return the {@link TargetType} of this {@link TypeAnnotation}
+   */
+  public TargetType getTargetType() {
+    return targetType;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/ClassLoaderReference.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/ClassLoaderReference.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/ClassLoaderReference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/ClassLoaderReference.java	2019-01-29 17:08:39.000000000 +0000
@@ -111,11 +111,7 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer();
-    result.append(name.toString());
-    result.append(" classloader");
-    result.append("\n");
-    return result.toString();
+    return name + " classloader\n";
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/Descriptor.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/Descriptor.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/Descriptor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/Descriptor.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,7 +26,7 @@
 public final class Descriptor {
 
   /**
-   * A mapping from Key -> Descriptor
+   * A mapping from Key -&gt; Descriptor
    */
   private static final Map<Key, Descriptor> map = HashMapFactory.make();
 
@@ -203,48 +203,46 @@
 
     @Override
     public String toString() {
-      StringBuffer result = new StringBuffer();
-      result.append("(");
+      StringBuilder result = new StringBuilder();
+      result.append('(');
       if (parameters != null) {
-        for (int i = 0; i < parameters.length; i++) {
-          TypeName p = parameters[i];
+        for (TypeName p : parameters) {
           result.append(p);
           appendSemicolonIfNeeded(result, p);
         }
       }
-      result.append(")");
+      result.append(')');
       result.append(returnType);
       appendSemicolonIfNeeded(result, returnType);
       return result.toString();
     }
 
     public String toUnicodeString() {
-      StringBuffer result = new StringBuffer();
-      result.append("(");
+      StringBuilder result = new StringBuilder();
+      result.append('(');
       if (parameters != null) {
-        for (int i = 0; i < parameters.length; i++) {
-          TypeName p = parameters[i];
+        for (TypeName p : parameters) {
           result.append(p.toUnicodeString());
           appendSemicolonIfNeeded(result, p);
         }
       }
-      result.append(")");
+      result.append(')');
       result.append(returnType);
       appendSemicolonIfNeeded(result, returnType);
       return result.toString();
     }
 
-    private void appendSemicolonIfNeeded(StringBuffer result, TypeName p) {
+    private static void appendSemicolonIfNeeded(StringBuilder result, TypeName p) {
       if (p.isArrayType()) {
         TypeName e = p.getInnermostElementType();
         String x = e.toUnicodeString();
         if (x.startsWith("L") || x.startsWith("P")) {
-          result.append(";");
+          result.append(';');
         }
       } else {
         String x = p.toUnicodeString();
         if (x.startsWith("L") || x.startsWith("P")) {
-          result.append(";");
+          result.append(';');
         }
       }
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/FieldReference.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/FieldReference.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/FieldReference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/FieldReference.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,7 +25,7 @@
   private final static boolean DEBUG = false;
 
   /**
-   * Used to canonicalize MemberReferences a mapping from Key -> MemberReference
+   * Used to canonicalize MemberReferences a mapping from Key -&gt; MemberReference
    */
   final private static HashMap<Key, FieldReference> dictionary = HashMapFactory.make();
 
@@ -33,7 +33,7 @@
 
   @Override
   public String getSignature() {
-    return getDeclaringClass().getName() + "." + getName() + " " + getFieldType().getName();
+    return getDeclaringClass().getName() + "." + getName() + ' ' + getFieldType().getName();
   }
 
   /**
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassSignature.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassSignature.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassSignature.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassSignature.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,7 @@
  * Under construction.
  * 
  * ClassSignature: 
- *    (<FormalTypeParameter+>)? SuperclassSignature SuperinterfaceSignature*
+ *    (&lt;FormalTypeParameter+&gt;)? SuperclassSignature SuperinterfaceSignature*
  * 
  * SuperclassSignature:
  *    ClassTypeSignature
@@ -86,7 +86,7 @@
   
   public ClassTypeSignature[] getSuperinterfaceSignatures() throws IllegalArgumentException {
     int start = endOfClassTypeSig(endOfFormalTypeParameters());
-    ArrayList<ClassTypeSignature> result = new ArrayList<ClassTypeSignature>();
+    ArrayList<ClassTypeSignature> result = new ArrayList<>();
     while (start < rawString().length() - 1) {
       int end = endOfClassTypeSig(start);
       result.add(ClassTypeSignature.makeClassTypeSig(rawString().substring(start,end)));
@@ -119,9 +119,7 @@
   }
   
   /**
-   * @param klass
    * @return the class signature, or null if none
-   * @throws InvalidClassFileException
    */
   public static ClassSignature getClassSignature(IClass klass) throws InvalidClassFileException {
     if (klass instanceof ShrikeClass) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassTypeSignature.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassTypeSignature.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassTypeSignature.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassTypeSignature.java	2019-01-29 17:08:39.000000000 +0000
@@ -28,7 +28,7 @@
  *   Identifier TypeArguments?
  *   
  * TypeArguments:
- *   <TypeArguments+>
+ *   &lt;TypeArguments+&gt;
  * 
  * @author sjfink
  * 
@@ -76,7 +76,7 @@
   public TypeName getRawName() {
     // note: need to handle type arguments for raw signatures like the following:
     // Ljava/util/IdentityHashMap<TK;TV;>.IdentityHashMapIterator<TV;>;
-    StringBuffer s = new StringBuffer();
+    StringBuilder s = new StringBuilder();
     StringTokenizer t = new StringTokenizer(rawString(),".");
     while (t.hasMoreTokens()) {
       String x = t.nextToken();
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/FormalTypeParameter.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/FormalTypeParameter.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/FormalTypeParameter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/FormalTypeParameter.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
     interfaceBounds = parseForInterfaceBounds(s);
   }
 
-  private TypeSignature parseForClassBound(String s) {
+  private static TypeSignature parseForClassBound(String s) {
     int start = s.indexOf(':');
     if (start == s.length() - 1) {
       return null;
@@ -64,8 +64,8 @@
     }
   }
 
-  private TypeSignature[] parseForInterfaceBounds(String s) {
-    List<TypeSignature> list = new LinkedList<TypeSignature>();
+  private static TypeSignature[] parseForInterfaceBounds(String s) {
+    List<TypeSignature> list = new LinkedList<>();
 
     int start = s.indexOf(':');
     if (start == s.length() - 1) {
@@ -85,7 +85,7 @@
     return list.toArray(result);
   }
 
-  private String parseForId(String s) throws IllegalArgumentException {
+  private static String parseForId(String s) throws IllegalArgumentException {
     if (s.indexOf(':') == -1) {
       throw new IllegalArgumentException(s);
     }
@@ -136,14 +136,14 @@
       case ':':
         break;
       default:
-        assert false : "bad type signature list " + s + " " + (result - 1);
+        assert false : "bad type signature list " + s + ' ' + (result - 1);
       }
     } while (s.charAt(result) == ':');
     return result;
   }
 
   static String[] parseForFormalTypeParameters(String s) {
-    ArrayList<String> sigs = new ArrayList<String>(10);
+    ArrayList<String> sigs = new ArrayList<>(10);
 
     int beginToken = 1;
     while (s.charAt(beginToken) != '>') {
@@ -164,9 +164,7 @@
   }
 
   /**
-   * @param klass
    * @return the formal type parameters, or null if none
-   * @throws InvalidClassFileException
    */
   public static FormalTypeParameter[] getTypeParameters(IClass klass) throws InvalidClassFileException {
     if (klass instanceof ShrikeClass) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/MethodTypeSignature.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/MethodTypeSignature.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/MethodTypeSignature.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/MethodTypeSignature.java	2019-01-29 17:08:39.000000000 +0000
@@ -96,7 +96,6 @@
 
   /**
    * @return {@link TypeSignature} for arguments, which includes information about generic types
-   * @throws InvalidClassFileException
    */
   public static TypeSignature[] getArguments(IMethod method) throws InvalidClassFileException {
     if (method instanceof ShrikeCTMethod) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/TypeArgument.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/TypeArgument.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/TypeArgument.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/TypeArgument.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,12 +18,12 @@
 /**
  * UNDER CONSTRUCTION
  * 
- * <verbatim> TypeArgument: WildcardIndicator? FieldTypeSignature *
+ * <pre> TypeArgument: WildcardIndicator? FieldTypeSignature *
  * 
  * WildcardIndicator: + -
  * 
  * 
- * </verbatim>
+ * </pre>
  * 
  * @author sjfink
  * 
@@ -103,11 +103,11 @@
   }
 
   /**
-   * @param typeSigs TypeSignature*
+   * @param typeArgs TypeSignature*
    * @return tokenize it
    */
   static String[] parseForTypeArguments(String typeArgs) {
-    ArrayList<String> args = new ArrayList<String>(10);
+    ArrayList<String> args = new ArrayList<>(10);
 
     int i = 1;
     while (true) {
@@ -131,13 +131,14 @@
         while (typeArgs.charAt(i) == TypeReference.ArrayTypeCode) {
           ++i;
         }
-        if (typeArgs.charAt(i++) == TypeReference.ClassTypeCode) {
+        if (typeArgs.charAt(i) == TypeReference.ClassTypeCode) {
+          while (typeArgs.charAt(i++) != ';')
+            ;
+        } else if (typeArgs.charAt(i++) == (byte) 'T'){
           while (typeArgs.charAt(i++) != ';')
             ;
-          args.add(typeArgs.substring(off, i - off - 1));
-        } else {
-          args.add(typeArgs.substring(off, i - off));
         }
+        args.add(typeArgs.substring(off, i));
         continue;
       }
       case (byte) '-':
@@ -180,9 +181,9 @@
     if (w == null) {
       return sig.toString();
     } else if (w.equals(WildcardIndicator.PLUS)) {
-      return "+" + sig.toString();
+      return '+' + sig.toString();
     } else {
-      return "-" + sig.toString();
+      return '-' + sig.toString();
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/TypeSignature.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/TypeSignature.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/TypeSignature.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/TypeSignature.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,13 +19,13 @@
 /**
  * UNDER CONSTRUCTION.
  * 
- * <verbatim> TypeSignature: FieldTypeSignature BaseType (code for a primitive)
+ * <pre> TypeSignature: FieldTypeSignature BaseType (code for a primitive)
  * 
  * FieldTypeSignature: ClassTypeSignature ArrayTypeSignature TypeVariableSignature
  * 
  * TypeVariableSignature: T identifier ;
  * 
- * </verbatim>
+ * </pre>
  * 
  * @author sjfink
  * 
@@ -88,7 +88,7 @@
    * @return tokenize it
    */
   static String[] parseForTypeSignatures(String typeSigs) throws IllegalArgumentException {
-    ArrayList<String> sigs = new ArrayList<String>(10);
+    ArrayList<String> sigs = new ArrayList<>(10);
     if (typeSigs.length() < 2) {
       // TODO: check this?
       throw new IllegalArgumentException("illegal string of TypeSignature " + typeSigs);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/TypeVariableSignature.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/TypeVariableSignature.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/generics/TypeVariableSignature.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/generics/TypeVariableSignature.java	2019-01-29 17:08:39.000000000 +0000
@@ -64,8 +64,6 @@
   }
 
   /**
-   * @param v
-   * @param klass
    * @return -1 if there is no match
    */
   public static int getTypeVariablePosition(TypeVariableSignature v, ShrikeClass klass) throws IllegalArgumentException {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/MethodReference.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/MethodReference.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/MethodReference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/MethodReference.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,7 +22,7 @@
  */
 public final class MethodReference extends MemberReference {
   /**
-   * Used to canonicalize MethodReferences a mapping from Key -> MethodReference
+   * Used to canonicalize MethodReferences a mapping from Key -&gt; MethodReference
    */
   final private static HashMap<Key, MethodReference> dictionary = HashMapFactory.make();
 
@@ -208,7 +208,7 @@
   @Override
   public String getSignature() {
     // TODO: check that we're not calling this often.
-    String s = getDeclaringClass().getName().toString().substring(1).replace('/', '.') + "." + getName() + getDescriptor();
+    String s = getDeclaringClass().getName().toString().substring(1).replace('/', '.') + '.' + getName() + getDescriptor();
     return s;
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/Selector.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/Selector.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/Selector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/Selector.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,7 +37,7 @@
       String desc = selectorStr.substring(selectorStr.indexOf('('));
       return new Selector(Atom.findOrCreateUnicodeAtom(methodName), Descriptor.findOrCreateUTF8(l, desc));
     } catch (StringIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid selectorStr: " + selectorStr);
+      throw new IllegalArgumentException("invalid selectorStr: " + selectorStr, e);
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java	2019-01-29 17:08:39.000000000 +0000
@@ -39,7 +39,7 @@
   private static final long serialVersionUID = -3256390509887654326L;
 
   /**
-   * canonical mapping from TypeNameKey -> TypeName
+   * canonical mapping from TypeNameKey -&gt; TypeName
    */
   private final static Map<TypeNameKey, TypeName> map = HashMapFactory.make();
 
@@ -236,6 +236,8 @@
    * A key into the dictionary; this is just like a type name, but uses value equality instead of object equality.
    */
   private final static class TypeNameKey implements Serializable {
+    private static final long serialVersionUID = -8284030936836318929L;
+
     /**
      * The package, like "java/lang". null means the unnamed package.
      */
@@ -251,7 +253,7 @@
      *                  0 => class 
      *                  >0 => mask of levels of array, reference, pointer
      *                  
-     *  When the mask is > 0, it represents levels of type qualifiers (in C 
+     *  When the mask is &gt; 0, it represents levels of type qualifiers (in C
      *  terminology) for array, reference and pointer types.  There is also a
      *  special mask for when the innermost type is a primitive.  The mask is
      *  a bitfield laid out in inverse dimension order. 
@@ -299,50 +301,53 @@
 
     @Override
     public String toString() {
-      StringBuffer result = new StringBuffer();
+      StringBuilder result = new StringBuilder();
       toStringPrefix(result);
       
       if (packageName != null) {
         result.append(packageName.toString());
-        result.append("/");
+        result.append('/');
       }
       result.append(className.toString());
 
       return result.toString();
     }
 
-    private void toStringPrefix(StringBuffer result) {
+    private void toStringPrefix(StringBuilder result) {
       boolean isPrimitive = (dim==-1) || (dim&ElementMask)==PrimitiveMask;
       if (dim != -1) {
         for (int d = (dim&ElementMask) == PrimitiveMask? dim>>ElementBits: dim; d != 0; d>>=ElementBits) {
-          switch (d&ElementMask) {
+          final int masked = d&ElementMask;
+          switch (masked) {
           case ArrayMask:
-            result.append("[");
+            result.append('[');
             break;
           case PointerMask:
-            result.append("*");
+            result.append('*');
             break;
           case ReferenceMask:
-            result.append("&");
+            result.append('&');
             break;
+          default:
+            throw new UnsupportedOperationException("unexpected masked type-name component " + masked);
           }
         }
       }
       if (!isPrimitive) {
-        result.append("L");
+        result.append('L');
       } else if (packageName != null && isPrimitive) {
-        result.append("P");        
+        result.append('P');
       }
     }
 
     public String toUnicodeString() {
       try {
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         toStringPrefix(result);
         
         if (packageName != null) {
           result.append(packageName.toUnicodeString());
-          result.append("/");
+          result.append('/');
         }
         result.append(className.toUnicodeString());
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/TypeReference.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/TypeReference.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/types/TypeReference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/types/TypeReference.java	2019-01-29 17:08:39.000000000 +0000
@@ -158,6 +158,10 @@
 
   public final static TypeReference JavaLangInvokeMethodHandle = findOrCreate(ClassLoaderReference.Primordial, JavaLangInvokeMethodHandleName);
 
+  private final static TypeName JavaLangInvokeMethodHandlesLookupName = TypeName.string2TypeName("Ljava/lang/invoke/MethodHandles$Lookup");
+
+  public final static TypeReference JavaLangInvokeMethodHandlesLookup = findOrCreate(ClassLoaderReference.Primordial, JavaLangInvokeMethodHandlesLookupName);
+
   private final static TypeName JavaLangInvokeMethodTypeName = TypeName.string2TypeName("Ljava/lang/invoke/MethodType");
 
   public final static TypeReference JavaLangInvokeMethodType = findOrCreate(ClassLoaderReference.Primordial, JavaLangInvokeMethodTypeName);
@@ -579,9 +583,9 @@
    * TypeReferences are canonical. However, note that two TypeReferences can be non-equal, yet still represent the same
    * IClass.
    * 
-   * For example, the there can be two TypeReferences <Application,java.lang.Object> and <Primordial,java.lang.Object>.
-   * These two TypeReference are <bf>NOT</bf> equal(), but they both represent the IClass which is named
-   * <Primordial,java.lang.Object>
+   * For example, the there can be two TypeReferences &lt;Application,java.lang.Object&gt; and &lt;Primordial,java.lang.Object&gt;.
+   * These two TypeReference are <b>NOT</b> equal(), but they both represent the IClass which is named
+   * &lt;Primordial,java.lang.Object&gt;
    */
   @Override
   public final boolean equals(Object other) {
@@ -590,7 +594,7 @@
 
   @Override
   public final String toString() {
-    return "<" + classloader.getName() + "," + name + ">";
+    return "<" + classloader.getName() + ',' + name + '>';
   }
 
   public static TypeReference findOrCreateClass(ClassLoaderReference loader, String packageName, String className) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/bytecode/BytecodeStream.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/bytecode/BytecodeStream.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/bytecode/BytecodeStream.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/bytecode/BytecodeStream.java	2019-01-29 17:08:39.000000000 +0000
@@ -243,7 +243,7 @@
   }
 
   /**
-   * Returns the offset of the branch (as a signed short) Used for if<cond>, ificmp<cond>, ifacmp<cond>, goto, jsr
+   * Returns the offset of the branch (as a signed short) Used for if&lt;cond&gt;, ificmp&lt;cond&gt;, ifacmp&lt;cond&gt;, goto, jsr
    * 
    * @return branch offset
    * @see #getWideBranchOffset()
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/CancelRuntimeException.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/CancelRuntimeException.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/CancelRuntimeException.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/CancelRuntimeException.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,6 +16,8 @@
  */
 public class CancelRuntimeException extends RuntimeException {
 
+  private static final long serialVersionUID = 5859062345002606705L;
+
   protected CancelRuntimeException(String msg) {
     super(msg);
   }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/config/AnalysisScopeReader.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/config/AnalysisScopeReader.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/config/AnalysisScopeReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/config/AnalysisScopeReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,9 +16,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.URI;
 import java.util.StringTokenizer;
 import java.util.jar.JarFile;
-import java.net.URI;
 
 import com.ibm.wala.classLoader.BinaryDirectoryTreeModule;
 import com.ibm.wala.classLoader.Module;
@@ -43,19 +43,17 @@
   /**
    * read in an analysis scope for a Java application from a text file
    * @param scopeFileName the text file specifying the scope
-   * @param exclusionsFile a file specifying code to be excluded from the scope; can be <code>null</code>
+   * @param exclusionsFile a file specifying code to be excluded from the scope; can be {@code null}
    * @param javaLoader the class loader used to read in files referenced in the scope file, via {@link ClassLoader#getResource(String)}
    * @return the analysis scope
-   * @throws IOException
    */
   public static AnalysisScope readJavaScope(String scopeFileName, File exclusionsFile, ClassLoader javaLoader) throws IOException {
     AnalysisScope scope = AnalysisScope.createJavaAnalysisScope();
-    return read(scope, scopeFileName, exclusionsFile, javaLoader, new FileProvider());
+    return read(scope, scopeFileName, exclusionsFile, javaLoader);
   }
 
 
-  public static AnalysisScope read(AnalysisScope scope, String scopeFileName, File exclusionsFile, ClassLoader javaLoader,
-      FileProvider fp) throws IOException {
+  public static AnalysisScope read(AnalysisScope scope, String scopeFileName, File exclusionsFile, ClassLoader javaLoader) throws IOException {
     BufferedReader r = null;
     try {
       // Now reading from jar is included in WALA, but we can't use their version, because they load from
@@ -82,8 +80,9 @@
       }
 
       if (exclusionsFile != null) {
-        InputStream fs = exclusionsFile.exists()? new FileInputStream(exclusionsFile): FileProvider.class.getClassLoader().getResourceAsStream(exclusionsFile.getName());
-        scope.setExclusions(new FileOfClasses(fs));
+        try (InputStream fs = exclusionsFile.exists()? new FileInputStream(exclusionsFile): FileProvider.class.getClassLoader().getResourceAsStream(exclusionsFile.getName())) {
+          scope.setExclusions(new FileOfClasses(fs));
+        }
       }
 
     } finally {
@@ -99,8 +98,7 @@
     return scope;
   }
 
-  protected static AnalysisScope read(AnalysisScope scope, final URI scopeFileURI, final File exclusionsFile, ClassLoader javaLoader,
-      FileProvider fp) throws IOException {
+  protected static AnalysisScope read(AnalysisScope scope, final URI scopeFileURI, final File exclusionsFile, ClassLoader javaLoader) throws IOException {
     BufferedReader r = null;
     try {
       String line;
@@ -115,11 +113,11 @@
       }
 
       if (exclusionsFile != null) {
-        final InputStream fs = exclusionsFile.exists()
+        try (final InputStream fs = exclusionsFile.exists()
             ? new FileInputStream(exclusionsFile)
-            : FileProvider.class.getClassLoader().getResourceAsStream(exclusionsFile.getName());
-
-        scope.setExclusions(new FileOfClasses(fs));
+            : FileProvider.class.getClassLoader().getResourceAsStream(exclusionsFile.getName())) {
+          scope.setExclusions(new FileOfClasses(fs));
+        }
       }
 
     } finally {
@@ -176,8 +174,8 @@
       scope.setLoaderImpl(walaLoader, entryPathname);
     } else if ("stdlib".equals(entryType)) {
       String[] stdlibs = WalaProperties.getJ2SEJarFiles();
-      for (int i = 0; i < stdlibs.length; i++) {
-        scope.addToScope(walaLoader, new JarFile(stdlibs[i]));
+      for (String stdlib : stdlibs) {
+        scope.addToScope(walaLoader, new JarFile(stdlib, false));
       }
     } else {
       Assertions.UNREACHABLE();
@@ -186,7 +184,6 @@
 
   /**
    * @param exclusionsFile file holding class hierarchy exclusions. may be null
-   * @throws IOException 
    * @throws IllegalStateException if there are problmes reading wala properties
    */
   public static AnalysisScope makePrimordialScope(File exclusionsFile) throws IOException {
@@ -198,7 +195,6 @@
   /**
    * @param classPath class path to analyze, delimited by {@link File#pathSeparator}
    * @param exclusionsFile file holding class hierarchy exclusions. may be null
-   * @throws IOException 
    * @throws IllegalStateException if there are problems reading wala properties
    */
   public static AnalysisScope makeJavaBinaryAnalysisScope(String classPath, File exclusionsFile) throws IOException {
@@ -222,7 +218,7 @@
       while (paths.hasMoreTokens()) {
         String path = paths.nextToken();
         if (path.endsWith(".jar")) {
-          JarFile jar = new JarFile(path);
+          JarFile jar = new JarFile(path, false);
           scope.addToScope(loader, jar);
           try {
             if (jar.getManifest() != null) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/io/FileProvider.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/io/FileProvider.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/io/FileProvider.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/io/FileProvider.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,7 +42,6 @@
   private final static int DEBUG_LEVEL = Integer.parseInt(System.getProperty("wala.debug.file", "0"));
   
   /**
-   * @param fileName
    * @return the jar file packaged with this plug-in of the given name, or null
    *         if not found.
    */
@@ -54,14 +53,14 @@
     return getJarFileFromClassLoader(fileName, loader);
   }
 
-  public URL getResource(String fileName) throws IOException {
+  public URL getResource(String fileName) {
     if (fileName == null) {
       throw new IllegalArgumentException("null fileName");
     }
     return getResource(fileName, FileProvider.class.getClassLoader());
   }
 
-  public URL getResource(String fileName, ClassLoader loader) throws IOException {
+  public URL getResource(String fileName, ClassLoader loader) {
     if (fileName == null) {
       throw new IllegalArgumentException("null fileName");
     }
@@ -82,9 +81,6 @@
     return getFileFromClassLoader(fileName, loader);
   }
 
-  /**
-   * @throws FileNotFoundException
-   */
   public File getFileFromClassLoader(String fileName, ClassLoader loader) throws FileNotFoundException {
     if (loader == null) {
       throw new IllegalArgumentException("null loader");
@@ -140,7 +136,6 @@
   /**
    * @return the jar file packaged with this plug-in of the given name, or null
    *         if not found: wrapped as a JarFileModule or a NestedJarFileModule
-   * @throws IOException
    */
   public Module getJarFileFromClassLoader(String fileName, ClassLoader loader) throws IOException {
     if (fileName == null) {
@@ -159,7 +154,7 @@
       try {
         return new JarFileModule(new JarFile(fileName, false));
       } catch (ZipException e) {
-        throw new IOException("Could not find file: " + fileName);
+        throw new IOException("Could not find file: " + fileName, e);
       }
     }
     if (url.getProtocol().equals("jar")) {
@@ -175,7 +170,7 @@
       return new JarFileModule(new JarFile(filePath, false));
     } else {
       final URLConnection in = url.openConnection();
-      final JarInputStream jarIn = new JarInputStream(in.getInputStream());
+      final JarInputStream jarIn = new JarInputStream(in.getInputStream(), false);
       return new JarStreamModule(jarIn);
     }
   }
@@ -187,7 +182,6 @@
    * "http://sourceforge.net/tracker/index.php?func=detail&aid=1565842&group_id=176742&atid=878458"
    * >bug report</a>). For now, fails with an assertion if the url is malformed.
    * 
-   * @param url
    * @return the path name for the url
    * @throws IllegalArgumentException
    *           if url is null
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/io/FileSuffixes.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/io/FileSuffixes.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/io/FileSuffixes.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/io/FileSuffixes.java	2019-01-29 17:08:39.000000000 +0000
@@ -29,8 +29,6 @@
   /**
    * Does the URI refer to a .dex file?
    * 
-   * @param uri
-   * @return boolean
    * @throws IllegalArgumentException if uri is null
    */
   public static boolean isDexFile(final URI uri) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/PrimitiveAssignability.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/PrimitiveAssignability.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/PrimitiveAssignability.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/PrimitiveAssignability.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,19 +42,19 @@
  */
 package com.ibm.wala.util;
 
-import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.types.TypeName;
-
-import java.util.Map;
 import java.util.EnumMap;
 import java.util.HashMap;
+import java.util.Map;
+
+import com.ibm.wala.types.TypeName;
+import com.ibm.wala.types.TypeReference;
 
 /**
  *  Offers checks like ClassHierarchy.isAssignable but for primitives.
  *
  *  This Class does not consider Boxing / Unboxing 
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-11-21
  */
 public class PrimitiveAssignability {
@@ -78,13 +78,13 @@
     }
 
     private static final Map<Primitive, Map<Primitive, AssignabilityKind>> assignability =
-        new EnumMap<Primitive, Map<Primitive, AssignabilityKind>>(Primitive.class);
+        new EnumMap<>(Primitive.class);
 
     static {
         // fill assignability
 
         for (final Primitive t : Primitive.values()) {
-            final Map<Primitive, AssignabilityKind> addendum = new EnumMap<Primitive, AssignabilityKind>(Primitive.class);
+            final Map<Primitive, AssignabilityKind> addendum = new EnumMap<>(Primitive.class);
             addendum.put(t, AssignabilityKind.IDENTITY);
             assignability.put(t, addendum);
         }
@@ -145,7 +145,7 @@
         assignability.get(from).put(to, AssignabilityKind.WIDENING);
     }
 
-    private static final Map<TypeName, Primitive> namePrimitiveMap = new HashMap<TypeName, Primitive>();
+    private static final Map<TypeName, Primitive> namePrimitiveMap = new HashMap<>();
 
     static {
         // fill namePrimitiveMap
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ProgressMaster.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ProgressMaster.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ProgressMaster.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ProgressMaster.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,7 +18,6 @@
 
 import javax.management.InstanceNotFoundException;
 import javax.management.ListenerNotFoundException;
-import javax.management.Notification;
 import javax.management.NotificationListener;
 import javax.management.openmbean.CompositeData;
 
@@ -80,7 +79,7 @@
 
   public synchronized void reset() {
     killNanny();
-    setCanceled(false);
+    setCanceled();
     timedOut = false;
     tooMuchMemory = false;
   }
@@ -118,7 +117,7 @@
     return delegate.isCanceled() || timedOut || tooMuchMemory;
   }
 
-  public void setCanceled(boolean value) {
+  public void setCanceled() {
     killNanny();
   }
 
@@ -131,7 +130,7 @@
 
   @Override
   public void cancel() {
-    setCanceled(true);
+    setCanceled();
   }
 /** END Custom change: subtasks and canceling */
   @Override
@@ -147,6 +146,8 @@
 
   public static class TooMuchMemoryUsed extends Exception {
 
+    private static final long serialVersionUID = -7174940833610292692L;
+
   }
 
   private class Timeout extends Thread {
@@ -167,24 +168,21 @@
           final Thread nannyThread = this;
           gcbean = ManagementFactory.getMemoryMXBean();
 
-          listener = new NotificationListener() {
-            @Override
-            public void handleNotification(Notification notification, Object arg1) {
-              MemoryNotificationInfo info = MemoryNotificationInfo.from((CompositeData) notification.getUserData());
-              long used = info.getUsage().getUsed();
-              long max = Runtime.getRuntime().maxMemory();
-
-              if (((double)used/(double)max) > MAX_USED_MEM_BEFORE_BACKING_OUT) {
-                System.err.println("used " + used + " of " + max);
-                tooMuchMemory = true;
-                nannyThread.interrupt();
-              }
+          listener = (notification, arg1) -> {
+            MemoryNotificationInfo info = MemoryNotificationInfo.from((CompositeData) notification.getUserData());
+            long used = info.getUsage().getUsed();
+            long max = Runtime.getRuntime().maxMemory();
+
+            if (((double)used/(double)max) > MAX_USED_MEM_BEFORE_BACKING_OUT) {
+              System.err.println("used " + used + " of " + max);
+              tooMuchMemory = true;
+              nannyThread.interrupt();
             }
           };
           try {
             ManagementFactory.getPlatformMBeanServer().addNotificationListener(gcbean.getObjectName(), listener, null, null);
           } catch (InstanceNotFoundException e) {
-            throw new Error("cannot find existing bean");
+            throw new Error("cannot find existing bean", e);
           }
         }
 
@@ -194,7 +192,7 @@
           try {
           ManagementFactory.getPlatformMBeanServer().removeNotificationListener(gcbean.getObjectName(), listener);
           } catch (InstanceNotFoundException | ListenerNotFoundException e) {
-            throw new Error("cannot find existing bean");
+            throw new Error("cannot find existing bean", e);
           }
         }
         
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ref/CacheReference.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ref/CacheReference.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ref/CacheReference.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ref/CacheReference.java	2019-01-29 17:08:39.000000000 +0000
@@ -33,9 +33,9 @@
 
     switch (choice) {
     case SOFT:
-      return new SoftReference<Object>(referent);
+      return new SoftReference<>(referent);
     case WEAK:
-      return new WeakReference<Object>(referent);
+      return new WeakReference<>(referent);
     case HARD:
       return referent;
     default:
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ref/ReferenceCleanser.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ref/ReferenceCleanser.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ref/ReferenceCleanser.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ref/ReferenceCleanser.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,13 +11,12 @@
 package com.ibm.wala.util.ref;
 
 import java.lang.ref.WeakReference;
-import java.util.Iterator;
-
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.ShrikeCTMethod;
 import com.ibm.wala.classLoader.ShrikeClass;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 
 /**
@@ -33,10 +32,10 @@
 
   private static WeakReference<IClassHierarchy> cha;
 
-  private static WeakReference<AnalysisCache> cache;
+  private static WeakReference<AnalysisCacheImpl> cache;
 
   public static void registerClassHierarchy(IClassHierarchy cha) {
-    ReferenceCleanser.cha = new WeakReference<IClassHierarchy>(cha);
+    ReferenceCleanser.cha = new WeakReference<>(cha);
   }
 
   private static IClassHierarchy getClassHierarchy() {
@@ -47,12 +46,14 @@
     return result;
   }
 
-  public static void registerCache(AnalysisCache cache) {
-    ReferenceCleanser.cache = new WeakReference<AnalysisCache>(cache);
+  public static void registerCache(IAnalysisCacheView cache) {
+    if (cache instanceof AnalysisCacheImpl) {
+      ReferenceCleanser.cache = new WeakReference<>((AnalysisCacheImpl) cache);
+    }
   }
 
-  private static AnalysisCache getAnalysisCache() {
-    AnalysisCache result = null;
+  private static AnalysisCacheImpl getAnalysisCache() {
+    AnalysisCacheImpl result = null;
     if (cache != null) {
       result = cache.get();
     }
@@ -67,7 +68,7 @@
     if (occupancy < OCCUPANCY_TRIGGER) {
       return;
     }
-    AnalysisCache cache = getAnalysisCache();
+    AnalysisCacheImpl cache = getAnalysisCache();
     if (cache != null) {
       cache.getSSACache().wipe();
     }
@@ -78,10 +79,11 @@
           ShrikeClass c = (ShrikeClass) klass;
           c.clearSoftCaches();
         } else {
-          for (Iterator it2 = klass.getDeclaredMethods().iterator(); it2.hasNext(); ) {
-            IMethod m = (IMethod)it2.next();
-            if (m instanceof ShrikeCTMethod) {
-              ((ShrikeCTMethod)m).clearCaches();
+          if (klass.getDeclaredMethods() != null) {
+            for (IMethod m : klass.getDeclaredMethods()) {
+              if (m instanceof ShrikeCTMethod) {
+                ((ShrikeCTMethod)m).clearCaches();
+              }
             }
           }
         }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/scope/JUnitEntryPoints.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/scope/JUnitEntryPoints.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/scope/JUnitEntryPoints.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/scope/JUnitEntryPoints.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,6 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 import com.ibm.wala.ipa.callgraph.impl.DefaultEntrypoint;
-import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeName;
@@ -55,11 +54,11 @@
           System.out.println("application class: " + klass);
 
           // return all the tests methods
-          Collection methods = klass.getAllMethods();
-          Iterator methodsIt = methods.iterator();
+          Collection<? extends IMethod> methods = klass.getAllMethods();
+          Iterator<? extends IMethod> methodsIt = methods.iterator();
 
           while (methodsIt.hasNext()) {
-            IMethod m = (IMethod) methodsIt.next();
+            IMethod m = methodsIt.next();
             if (isJUnitMethod(m)) {
               result.add(new DefaultEntrypoint(m, cha));
               System.out.println("- adding test method as entry point: " + m.getName().toString());
@@ -68,12 +67,7 @@
         }
       }
     }
-    return new Iterable<Entrypoint>() {
-      @Override
-      public Iterator<Entrypoint> iterator() {
-        return result.iterator();
-      }
-    };
+    return result::iterator;
   }
 
   /**
@@ -98,42 +92,29 @@
 
     final Set<Entrypoint> entryPts = HashSetFactory.make();
 
-    // TODO: improve this so that we don't need to check all the
-    // classes and method to find a match
-    try {
-      for (IClass klass : cha) {
-        TypeName klassType = klass.getName();
-        if (klassType.equals(targetType) && isJUnitTestCase(klass)) {
-          if (DEBUG) {
-            System.err.println("found test class");
-          }
-          // add entry point corresponding to the target method
-          for (Iterator methodsIt = klass.getDeclaredMethods().iterator(); methodsIt.hasNext();) {
-            IMethod method = (IMethod) methodsIt.next();
-            Atom methodAtom = method.getName();
-            if (methodAtom.equals(targetMethodAtom)) {
-              entryPts.add(new DefaultEntrypoint(method, cha));
-              System.out.println("- adding entry point of the call graph: " + methodAtom.toString());
-            }
+    for (IClass klass : cha) {
+      TypeName klassType = klass.getName();
+      if (klassType.equals(targetType) && isJUnitTestCase(klass)) {
+        if (DEBUG) {
+          System.err.println("found test class");
+        }
+        // add entry point corresponding to the target method
+        for (IMethod method : klass.getDeclaredMethods()) {
+          Atom methodAtom = method.getName();
+          if (methodAtom.equals(targetMethodAtom)) {
+            entryPts.add(new DefaultEntrypoint(method, cha));
+            System.out.println("- adding entry point of the call graph: " + methodAtom.toString());
           }
+        }
 
-          // add entry points of setUp/tearDown methods
-          Set<IMethod> setUpTearDowns = getSetUpTearDownMethods(klass);
-          for (IMethod m : setUpTearDowns) {
-            entryPts.add(new DefaultEntrypoint(m, cha));
-          }
+        // add entry points of setUp/tearDown methods
+        Set<IMethod> setUpTearDowns = getSetUpTearDownMethods(klass);
+        for (IMethod m : setUpTearDowns) {
+          entryPts.add(new DefaultEntrypoint(m, cha));
         }
       }
-    } catch (ClassHierarchyException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
-    }
-    return new Iterable<Entrypoint>() {
-      @Override
-      public Iterator<Entrypoint> iterator() {
-        return entryPts.iterator();
-      }
-    };
+    }
+    return entryPts::iterator;
   }
 
   /**
@@ -184,7 +165,7 @@
   /**
    * Get the "setUp" and "tearDown" methods in the given class
    */
-  public static Set<IMethod> getSetUpTearDownMethods(IClass testClass) throws ClassHierarchyException {
+  public static Set<IMethod> getSetUpTearDownMethods(IClass testClass) {
     final Atom junitPackage = Atom.findOrCreateAsciiAtom("junit/framework");
     final Atom junitClass = Atom.findOrCreateAsciiAtom("TestCase");
     final Atom junitSuite = Atom.findOrCreateAsciiAtom("TestSuite");
@@ -199,9 +180,8 @@
     IClass currClass = testClass;
     while (currClass != null && !currClass.getName().equals(junitTestCaseType) && !currClass.getName().equals(junitTestSuiteType)) {
 
-      for (Iterator methodsIt = currClass.getDeclaredMethods().iterator(); methodsIt.hasNext();) {
+      for (IMethod method : currClass.getDeclaredMethods()) {
 
-        IMethod method = (IMethod) methodsIt.next();
         final Atom methodAtom = method.getName();
         if (methodAtom.equals(setUpMethodAtom) || methodAtom.equals(tearDownMethodAtom) || method.isClinit() || method.isInit()) {
           result.add(method);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/shrike/ShrikeClassReaderHandle.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/shrike/ShrikeClassReaderHandle.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/shrike/ShrikeClassReaderHandle.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/shrike/ShrikeClassReaderHandle.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,7 +51,7 @@
 
   /**
    * @return an instance of the class reader ... create one if necessary
-   * @throw InvalidClassFileException iff Shrike fails to read the class file
+   * @throws InvalidClassFileException iff Shrike fails to read the class file
    *        correctly.
    */
   public ClassReader get() throws InvalidClassFileException {
@@ -60,7 +60,7 @@
       hydrateCount++;
       if (DEBUG) {
         if (hydrateCount > 1) {
-          System.err.println(("Hydrate " + entry + " " + hydrateCount));
+          System.err.println(("Hydrate " + entry + ' ' + hydrateCount));
           try {
             throw new Exception();
           } catch (Exception e) {
@@ -85,9 +85,8 @@
 
   /**
    * Read is into bytes
-   * @throws IOException
    */
-  private void readBytes(InputStream is, ByteArrayOutputStream bytes) throws IOException {
+  private static void readBytes(InputStream is, ByteArrayOutputStream bytes) throws IOException {
     int n = 0;
     byte[] buffer = new byte[1024];
     while (n > -1) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/shrike/ShrikeUtil.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/shrike/ShrikeUtil.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/shrike/ShrikeUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/shrike/ShrikeUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -65,4 +65,4 @@
     //}
     return TypeReference.findOrCreate(loader, T);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ClassLookupException.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ClassLookupException.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ClassLookupException.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ClassLookupException.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,9 +51,11 @@
  *  In typical cases this should not be propergated out from the utility
  *  classes.
  *
- *  @author     Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author     Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public class ClassLookupException extends RuntimeException {
+    private static final long serialVersionUID = 7551139209041666026L;
+
     public ClassLookupException(String message) {
         super(message);
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/IInstantiator.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/IInstantiator.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/IInstantiator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/IInstantiator.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,7 +52,7 @@
  *
  * This mainly applies to the connectThrough-Function.
  *
- * @author Tobias Blaschke <code@tobiasblaschke.de>
+ * @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public interface IInstantiator {
     /**
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/InstructionByIIndexMap.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/InstructionByIIndexMap.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/InstructionByIIndexMap.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/InstructionByIIndexMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.util.ssa;
+
+import java.util.AbstractMap;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.ibm.wala.ssa.SSAInstruction;
+
+public class InstructionByIIndexMap<Instruction extends SSAInstruction, T> implements Map<Instruction, T> {
+  private Map<InstructionByIIndexWrapper<Instruction>, T> map;
+
+  public InstructionByIIndexMap(Map<InstructionByIIndexWrapper<Instruction>, T> map) {
+    this.map = map;
+  }
+
+  public InstructionByIIndexMap() {
+    this.map = new LinkedHashMap<>();
+  }
+
+  @Override
+  public int size() {
+    return map.size();
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return map.isEmpty();
+  }
+
+  @Override
+  public boolean containsKey(Object key) {
+    if (key instanceof SSAInstruction) {
+      SSAInstruction instruction = (SSAInstruction) key;
+      if (instruction.iindex >= 0) {
+        return map.containsKey(new InstructionByIIndexWrapper<>(instruction));
+      }
+    }
+    return false;
+  }
+
+  @Override
+  public boolean containsValue(Object value) {
+    return map.containsValue(value);
+  }
+
+  @Override
+  public T get(Object key) {
+    if (key instanceof SSAInstruction) {
+      SSAInstruction instruction = (SSAInstruction) key;
+      if (instruction.iindex >= 0) {
+        return map.get(new InstructionByIIndexWrapper<>(instruction));
+      }
+    }
+    return null;
+  }
+
+  @Override
+  public T put(Instruction key, T value) {
+    return map.put(new InstructionByIIndexWrapper<>(key), value);
+  }
+
+  @Override
+  public T remove(Object key) {
+    if (key instanceof SSAInstruction) {
+      SSAInstruction instruction = (SSAInstruction) key;
+      if (instruction.iindex >= 0) {
+        return map.remove(new InstructionByIIndexWrapper<>(instruction));
+      }
+    }
+    return null;
+  }
+
+  @Override
+  public void putAll(Map<? extends Instruction, ? extends T> m) {
+    for (java.util.Map.Entry<? extends Instruction, ? extends T> entry:m.entrySet()) {
+      this.put(entry.getKey(), entry.getValue());
+    }
+  }
+
+  @Override
+  public void clear() {
+    map.clear();
+  }
+
+  @Override
+  public Set<Instruction> keySet() {
+    Set<Instruction> result = new LinkedHashSet<>();
+    for (InstructionByIIndexWrapper<Instruction> wrapper : map.keySet()) {
+      result.add(wrapper.getInstruction());
+    }
+
+    return result;
+  }
+
+  @Override
+  public Collection<T> values() {
+    return map.values();
+  }
+
+  @Override
+  public Set<java.util.Map.Entry<Instruction, T>> entrySet() {
+    Set<java.util.Map.Entry<Instruction, T>> result = new LinkedHashSet<>();
+    for (java.util.Map.Entry<InstructionByIIndexWrapper<Instruction>, T> entry:map.entrySet()) {
+      result.add(new AbstractMap.SimpleImmutableEntry<>(entry.getKey().getInstruction(), entry.getValue()));
+    }
+
+    return result;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/InstructionByIIndexWrapper.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/InstructionByIIndexWrapper.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/InstructionByIIndexWrapper.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/InstructionByIIndexWrapper.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.util.ssa;
+
+import com.ibm.wala.ssa.SSAInstruction;
+
+public class InstructionByIIndexWrapper<T extends SSAInstruction> {
+  private T instruction;
+  
+  @Override
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+    result = prime * result + getInstruction().iindex;
+    return result;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (getClass() != obj.getClass())
+      return false;
+    InstructionByIIndexWrapper other = (InstructionByIIndexWrapper) obj;
+    if (getInstruction().iindex != other.getInstruction().iindex)
+      return false;
+    return true;
+  }
+
+  public T getInstruction() {
+    return instruction;
+  }
+    
+  public InstructionByIIndexWrapper(T instruction) {
+    if (instruction.iindex < 0) {
+      throw new IllegalArgumentException("The given instruction, can not be identified by iindex.");
+    }
+    this.instruction = instruction;    
+  }
+
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/package-info.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/package-info.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/package-info.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/package-info.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,6 +51,6 @@
  *  the regular one.
  *
  *  @since  2013-10-25
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 package com.ibm.wala.util.ssa;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java	2019-01-29 17:08:39.000000000 +0000
@@ -77,7 +77,7 @@
  *  If you want to alter the values of the incoming parameters you may also want to use the ParameterManager
  *  which tracks the changes.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-19
  */
 public class ParameterAccessor {
@@ -142,12 +142,10 @@
      *
      *  Use .getNumber() to access the associated SSA-Value.
      *
-     *  @author Tobias Blaschke <code@tobiasblaschke.de>
+     *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
      *  @since  2013-10-19
      */
     public static class Parameter extends SSAValue {
-        /** Is Accessor constructed with IMethod or MethodReference */
-        private final BasedOn basedOn;      
         /** Implicit this or regular parameter? */
         private final ParamerterDisposition disp;   
         /** Add to number to get position in descriptor */
@@ -189,7 +187,7 @@
             if ((disp == ParamerterDisposition.PARAM) && (number + descriptorOffset > mRef.getNumberOfParameters())) {
                 throw new IllegalArgumentException("The SSA-Value " + number + " (with added offset " + descriptorOffset + 
                         ") is beyond the number of Arguments (" + mRef.getNumberOfParameters() + ") of the Method " +
-                        mRef.getName() + "\n" + mRef.getSignature());
+                        mRef.getName() + '\n' + mRef.getSignature());
             }
             if ((disp == ParamerterDisposition.THIS) && (basedOn == BasedOn.METHOD_REFERENCE) && (number != 1)) {
                 throw new IllegalArgumentException("The implicit this-pointer of a MethodReference is located at SSA-Value 1. " +
@@ -205,7 +203,6 @@
             }
 
             this.disp = disp;
-            this.basedOn = basedOn;
             this.descriptorOffset = descriptorOffset;
             super.isAssigned();
         }
@@ -294,7 +291,7 @@
      *
      *  Using this Constructor influences the SSA-Values returned later. The cha is needed to
      *  determine whether mRef is static. If this is already known one should prefer the faster
-     *  {@link #ParameterAccessor(ParameterAccessor, boolean)}.
+     *  {@link #ParameterAccessor(MethodReference, boolean)}.
      *
      *  @param  mRef    The method to read the parameters from.
      */
@@ -313,10 +310,10 @@
         if (targets.size() < 1) {
             warn("Unable to look up the method {} starting extensive search...", mRef);
 
-            targets = new HashSet<IMethod>();
+            targets = new HashSet<>();
             final TypeReference mClass = mRef.getDeclaringClass();
             final Selector mSel = mRef.getSelector();
-            final Set<IClass> testClasses = new HashSet<IClass>();
+            final Set<IClass> testClasses = new HashSet<>();
 
             // Look up all classes matching exactly
             for (IClassLoader loader : cha.getLoaders()) {
@@ -393,7 +390,7 @@
      *
      *  Do _not_ use ParameterAceesor(IMethod.getReference()), but ParameterAceesor(IMehod)!
      *
-     *  This constructor is faster than {@link #ParameterAccessor(MethodReference, IClassHierarchy}.
+     *  This constructor is faster than {@link #ParameterAccessor(MethodReference, IClassHierarchy)}.
      *
      *  @param  mRef    The method to read the parameters from.
      */
@@ -457,7 +454,7 @@
      *
      *  @param  no  the number in the Selector
      *  @return new Parameter-Object for no
-     *  @throws IllegalArgumentExceptions if the parameter is zero
+     *  @throws IllegalArgumentException if the parameter is zero
      *  @throws ArrayIndexOutOfBoundsException if no is not within bounds [1 to numberOfParameters]
      */
     public Parameter getParameter(final int no) {
@@ -534,7 +531,7 @@
      */
     public List<Parameter> all() {
         // TODO: Cache!
-        List<Parameter> all = new ArrayList<Parameter>(this.getNumberOfParameters());
+        List<Parameter> all = new ArrayList<>(this.getNumberOfParameters());
 
         if (this.getNumberOfParameters() == 0) {
             return all;
@@ -542,7 +539,7 @@
             switch (this.base) {
                 case IMETHOD:
                     {
-                        final int firstInSelector = firstInSelector();
+                        // final int firstInSelector = firstInSelector();
                         for (int i = ((hasImplicitThis())?1:0); i < this.method.getNumberOfParameters(); ++i) {   
                             debug("all() adding: Parameter({}, {}, {}, {}, {})", (i + 1), this.method.getParameterType(i),
                                     this.base,  this.method, this.descriptorOffset);
@@ -839,7 +836,7 @@
         }
 
         final List<Parameter> all = all();
-        final List<Parameter> allExctends = new ArrayList();
+        final List<Parameter> allExctends = new ArrayList<>();
         IClass searchType = null;
         final IClassLoader[] allLoaders = cha.getLoaders();
 
@@ -908,7 +905,7 @@
 
         final IClass searchType = cha.lookupClass(tRef);
         final List<Parameter> all = all();
-        final List<Parameter> allExctends = new ArrayList();
+        final List<Parameter> allExctends = new ArrayList<>();
             
         if (searchType == null) {
             throw new IllegalStateException("Could not find the IClass of " + tRef);
@@ -1281,10 +1278,10 @@
             defaults = Collections.EMPTY_SET;
         }
         if (callee.getNumberOfParameters() == 0) {
-            return new ArrayList<SSAValue>(0);
+            return new ArrayList<>(0);
         }
         
-        final List<SSAValue> assigned = new ArrayList<SSAValue>(); // TODO: Set initial size
+        final List<SSAValue> assigned = new ArrayList<>(); // TODO: Set initial size
         final List<Parameter> calleeParams = callee.all();
         final List<Parameter> thisParams = all();
 
@@ -1585,7 +1582,7 @@
     }
 
     /**
-     *  Shorthand for forInvokeStatic(final List<? extends Parameter> args, final ParameterAccessor target, final IClassHierarchy cha).
+     *  Shorthand for forInvokeStatic(final List&lt;? extends Parameter&gt; args, final ParameterAccessor target, final IClassHierarchy cha).
      *
      *  Generates a new ParameterAccessor for target and hands the call through.
      */
@@ -1594,7 +1591,7 @@
     }
 
     /**
-     *  Shorthand for forInvokeVirtual(final int self, final List<? extends Parameter> args, final ParameterAccessor target, final IClassHierarchy cha).
+     *  Shorthand for forInvokeVirtual(final int self, final List&lt;? extends Parameter&gt; args, final ParameterAccessor target, final IClassHierarchy cha).
      *
      *  Generates a new ParameterAccessor for target and hands the call through.
      */
@@ -1653,8 +1650,10 @@
      *  Extensive output for debugging purposes.
      */
     public String dump() {
-        String ret = "Parameter Accessor for " + ((this.mRef!=null)?"mRef:" + this.mRef.toString():"IMethod: " + this.method.toString()) +
-            "\nContains " + this.numberOfParameters + " Parameters " + this.base + "\n";
+        final StringBuilder ret = new StringBuilder().append("Parameter Accessor for ")
+                .append((this.mRef != null) ? "mRef:" + this.mRef.toString() : "IMethod: " + this.method.toString())
+                .append("\nContains ").append(this.numberOfParameters).append(" Parameters ").append(this.base)
+                .append('\n');
         /*for (int i = 1; i <= this.numberOfParameters; ++i) {
             try {
                 ret += "\t" + getParameter(i).toString() + "\n";
@@ -1662,18 +1661,19 @@
                 ret += "\tNone at " + i + "\n";
             }
         }*/
-        ret += "\nAnd all is:\n";
+        ret.append("\nAnd all is:\n");
         for (Parameter p : all()) {
-            ret += "\t" + p + "\n";
+            ret.append('\t').append(p).append('\n');
         }
         if (hasImplicitThis ()) {
-            ret +="This: " + getThis();
+            ret.append("This: ").append(getThis());
         } else {
-            ret +="Is static";
+            ret.append("Is static");
         }
-        return ret;
+        return ret.toString();
     }
 
+    @Override
     public String toString() {
         return "<ParamAccessor forMethod=" + this.forMethod() + " />";
     }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValue.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValue.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValue.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValue.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,9 +42,9 @@
  */
 package com.ibm.wala.util.ssa;
 
-import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.types.TypeName;
+import com.ibm.wala.types.TypeReference;
 
 /**
  *  A number representating an SSA-Value and its type.
@@ -55,9 +55,9 @@
  *  Use ParameterAccessor to get the parameters of a function as SSAValues.
  *
  *  @see    com.ibm.wala.util.ssa.TypeSafeInstructionFactory
- *  @see    com.ibm.wala.util.ParameterAccessor
+ *  @see    com.ibm.wala.util.ssa.ParameterAccessor
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-20
  */
 public class SSAValue {
@@ -188,7 +188,6 @@
      *
      *  @param  number  access the value using this number
      *  @param  validIn optionally assign this value to a method
-     *  @param  variableName    optional name of the variable
      *  @throws IllegalArgumentException on negative parameter number
      */
     public SSAValue(final int number, final TypeReference type, final MethodReference validIn, final VariableKey key) {
@@ -308,7 +307,7 @@
 
     @Override 
     public String toString() {
-        return "<SSAValue " + this.number + " type=" + this.type + " validIn=" + this.mRef + ">";
+        return "<SSAValue " + this.number + " type=" + this.type + " validIn=" + this.mRef + '>';
     }
 
     @Override
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValueManager.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValueManager.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValueManager.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValueManager.java	2019-01-29 17:08:39.000000000 +0000
@@ -57,7 +57,7 @@
 /**
  *  Manage SSA-Variables in synthetic methods.
  *
- *  @author  Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author  Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since   2013-09-19
  */
 public class SSAValueManager {
@@ -109,7 +109,7 @@
 
     /** The main data-structure of the management  */
     private Map<VariableKey, List<Managed<? extends SSAValue>>> seenTypes = HashMapFactory.make();
-    private List<SSAValue> unmanaged = new ArrayList<SSAValue>();
+    private List<SSAValue> unmanaged = new ArrayList<>();
    
     public SSAValueManager(ParameterAccessor acc) {
         this.nextLocal = acc.getFirstAfter();
@@ -168,7 +168,7 @@
                 }
             }
             { // DEBUG
-                System.out.println("Keys for " + value + ":");
+                System.out.println("Keys for " + value + ':');
                 for (Managed<? extends SSAValue> param : seenTypes.get(value.key)) {
                     System.out.println("\tKey " + param.key + "\t=>" + param.status);
                 }
@@ -176,12 +176,12 @@
             throw new IllegalStateException("The parameter " + value + " using Key " + value.key + " has already been allocated");
         } else {
             info("New variable in management: {}", value);
-            final Managed<SSAValue> param = new Managed(value, value.key);
+            final Managed<SSAValue> param = new Managed<>(value, value.key);
             param.status = ValueStatus.ALLOCATED;
             param.setInScope = currentScope;
             param.setBy = setBy;
 
-            final List<Managed<? extends SSAValue>> aParam = new ArrayList<Managed<? extends SSAValue>>();
+            final List<Managed<? extends SSAValue>> aParam = new ArrayList<>();
             aParam.add(param);
 
             seenTypes.put(value.key, aParam);
@@ -191,11 +191,10 @@
     /**
      *  Register a Phi-Instruction _after_ added to the model.
      *
-     *  @param  type    the type the Phi-Instruction sets
-     *  @param  ssaValue the number the SSA-Instruction assigns to
+     *  @param  value   the number the SSA-Instruction assigns to
      *  @param  setBy   the Phi-Instruction itself - may be null
      *  @throws IllegalArgumentException if you assign to a number requested using
-     *      {@link #getFree(TypeReference)} but types mismatch.
+     *      {@link #getFree} but types mismatch.
      *  @throws IllegalStateException if you forgot to close some Phis
      */
     public void setPhi(final SSAValue value, SSAInstruction setBy) {
@@ -276,7 +275,7 @@
         }
 
         final SSAValue var = new SSAValue(nextLocal++, type, this.forMethod, key);
-        final Managed<SSAValue> param = new Managed(var, key);
+        final Managed<SSAValue> param = new Managed<>(var, key);
 
         param.status = ValueStatus.FREE;
         param.setInScope = currentScope;
@@ -284,7 +283,7 @@
         if (seenTypes.containsKey(key)) {
             seenTypes.get(key).add(param);
         } else {
-            List<Managed<? extends SSAValue>> aParam = new ArrayList<Managed<? extends SSAValue>>();
+            List<Managed<? extends SSAValue>> aParam = new ArrayList<>();
             aParam.add(param);
 
             seenTypes.put(key, aParam);
@@ -321,7 +320,7 @@
         }
 
         final SSAValue var = new SSAValue(nextLocal++, type, this.forMethod, key);
-        final Managed<SSAValue> param = new Managed(var, key);
+        final Managed<SSAValue> param = new Managed<>(var, key);
 
         param.status = ValueStatus.UNALLOCATED;
         param.setInScope = currentScope;
@@ -329,7 +328,7 @@
         if (seenTypes.containsKey(key)) {
             seenTypes.get(key).add(param);
         } else {
-            List<Managed<? extends SSAValue>> aParam = new ArrayList<Managed<? extends SSAValue>>();
+            List<Managed<? extends SSAValue>> aParam = new ArrayList<>();
             aParam.add(param);
 
             seenTypes.put(key, aParam);
@@ -417,7 +416,7 @@
             throw new IllegalArgumentException("The argument key may not be null");
         }
 
-        final SSAValue cand;;
+        final SSAValue cand;
         currentScope--;
         assert(currentScope >= 0 );
         cand = getCurrent(key);
@@ -437,7 +436,7 @@
             throw new IllegalArgumentException("The argument key may not be null");
         }
 
-        List<SSAValue> ret = new ArrayList<SSAValue>();
+        List<SSAValue> ret = new ArrayList<>();
 
         if (seenTypes.containsKey(key)) {
             for (Managed<? extends SSAValue> param : seenTypes.get(key)) {
@@ -640,7 +639,7 @@
 
     @Override
     public String toString() {
-        return "<AndroidModelParameterManager " + this.description + ">";
+        return "<AndroidModelParameterManager " + this.description + '>';
     }
 
     /**
@@ -660,8 +659,8 @@
      *  Collect the variable-names of all known variables.
      */
     public Map<Integer, Atom> makeLocalNames() {
-        final Map<Integer, Atom> names = new HashMap<Integer, Atom>();
-        final Map<VariableKey, Integer> suffix = new HashMap<VariableKey, Integer>();
+        final Map<Integer, Atom> names = new HashMap<>();
+        final Map<VariableKey, Integer> suffix = new HashMap<>();
         int currentSuffix = 0;
 
         for (final List<Managed<? extends SSAValue>> manageds : seenTypes.values()) {
@@ -672,12 +671,13 @@
                     final Atom nameAtom = Atom.findOrCreateAsciiAtom(name);
                     names.put(val.getNumber(), nameAtom);
                 } else if (AUTOMAKE_NAMES) {
+                    @SuppressWarnings("NonConstantStringShouldBeStringBuffer")
                     String autoName = val.getType().getName().toString();
                     if (autoName.contains("/")) {
-                        autoName = autoName.substring(autoName.lastIndexOf("/") + 1);
+                        autoName = autoName.substring(autoName.lastIndexOf('/') + 1);
                     }
                     if (autoName.contains("$")) {
-                        autoName = autoName.substring(autoName.lastIndexOf("$") + 1);
+                        autoName = autoName.substring(autoName.lastIndexOf('$') + 1);
                     }
                     autoName = autoName.replace("[", "Ar");
                     final int mySuffix;
@@ -687,7 +687,7 @@
                         mySuffix = currentSuffix++;
                         suffix.put(val.key, mySuffix);
                     }
-                    autoName = "m" + autoName + "_" + mySuffix;
+                    autoName = 'm' + autoName + '_' + mySuffix;
                     final Atom nameAtom = Atom.findOrCreateAsciiAtom(autoName);
                     names.put(val.getNumber(), nameAtom);
                 }
@@ -700,12 +700,13 @@
                 final Atom nameAtom = Atom.findOrCreateAsciiAtom(name);
                 names.put(val.getNumber(), nameAtom);
             } else if (AUTOMAKE_NAMES) {
+                @SuppressWarnings("NonConstantStringShouldBeStringBuffer")
                 String autoName = val.getType().getName().toString();
                 if (autoName.contains("/")) {
-                    autoName = autoName.substring(autoName.lastIndexOf("/") + 1);
+                    autoName = autoName.substring(autoName.lastIndexOf('/') + 1);
                 }
                 if (autoName.contains("$")) {
-                    autoName = autoName.substring(autoName.lastIndexOf("$") + 1);
+                    autoName = autoName.substring(autoName.lastIndexOf('$') + 1);
                 }
                 autoName = autoName.replace("[", "Ar");
                 final int mySuffix;
@@ -715,7 +716,7 @@
                     mySuffix = currentSuffix++;
                     suffix.put(val.key, mySuffix);
                 }
-                autoName = "m" + autoName + "_" + mySuffix;
+                autoName = 'm' + autoName + '_' + mySuffix;
                 final Atom nameAtom = Atom.findOrCreateAsciiAtom(autoName);
                 names.put(val.getNumber(), nameAtom);
             }
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,6 +52,7 @@
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeBT.IConditionalBranchInstruction;
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
+import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSAArrayLoadInstruction;
 import com.ibm.wala.ssa.SSAArrayStoreInstruction;
 import com.ibm.wala.ssa.SSAConditionalBranchInstruction;
@@ -76,7 +77,7 @@
  *
  *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-20
  */
 public class TypeSafeInstructionFactory {
@@ -100,7 +101,7 @@
      *
      *  Calls result.setAssigned()
      *
-     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory.InvokeInstruction(int, int, int[], int, CallSiteReference)
+     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory#InvokeInstruction(int, int, int[], int, CallSiteReference, com.ibm.wala.shrikeCT.BootstrapMethodsReader.BootstrapMethod)
      *
      *  @param  iindex  Zero or a positive number unique to any instruction of the same method
      *  @param  result  Where to place the return-value of the called method. Is SSAValue.setAssigned() automatically.
@@ -108,7 +109,7 @@
      *  @param  exception   An SSAValue receiving the exception-object when something in the method throws unhandled
      *  @param  site    The CallSiteReference to this call.
      */
-    public SSAInvokeInstruction InvokeInstruction(final int iindex, final SSAValue result, List<? extends SSAValue> params, 
+    public SSAAbstractInvokeInstruction InvokeInstruction(final int iindex, final SSAValue result, List<? extends SSAValue> params, 
             final SSAValue exception, final CallSiteReference site) {
         info("Now: InvokeInstruction to {} using {}", site, params);
         if (iindex < 0) {
@@ -121,7 +122,7 @@
             throw new IllegalArgumentException("The parameter exception may not be null");
         }
         if (params == null) {
-            params = Collections.EMPTY_LIST;
+            params = Collections.emptyList();
         }
         if (site == null) {
             throw new IllegalArgumentException("The CallSite may not be null");
@@ -147,7 +148,7 @@
             }
         }
 
-        final MethodReference mRef = site.getDeclaredTarget();
+        // final MethodReference mRef = site.getDeclaredTarget();
 
         // ***********
         // Params cosher, start typechecks
@@ -213,7 +214,7 @@
      *  All parameters (but exception) are typechecked first. If the check passes they get unpacked and handed over
      *  to the corresponding JavaInstructionFactory.InvokeInstruction.
      *
-     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory.InvokeInstruction(int, int[], int, CallSiteReference)
+     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory#InvokeInstruction(int, int[], int, CallSiteReference, com.ibm.wala.shrikeCT.BootstrapMethodsReader.BootstrapMethod)
      *
      *  @param  iindex  Zero or a positive number unique to any instruction of the same method
      *  @param  params  Parameters to the call starting with the implicit this-pointer if necessary 
@@ -230,7 +231,7 @@
             throw new IllegalArgumentException("The parameter exception may not be null");
         }
         if (params == null) {
-            params = Collections.EMPTY_LIST;
+            params = Collections.emptyList();
         }
         if (site == null) {
             throw new IllegalArgumentException("The CallSite may not be null");
@@ -269,7 +270,7 @@
 
         final int[] aParams = new int[params.size()];
         if (acc.hasImplicitThis()) { // Implicit This
-            final SSAValue targetThis = acc.getThis();
+            // final SSAValue targetThis = acc.getThis();
             final SSAValue givenThis = params.get(0);
 
             aParams[0] = givenThis.getNumber();
@@ -311,7 +312,7 @@
      *
      *  If type check passes the corresponding ReturnInstruction of the JavaInstructionFactory is called.
      *
-     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory.ReturnInstruction(int, int, boolean)
+     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory#ReturnInstruction(int, int, boolean)
      *
      *  @param  iindex  Zero or a positive number unique to any instruction of the same method
      *  @param  result  SSAValue to return _with_ validIn _set_!
@@ -337,7 +338,7 @@
      *  If type check passes the corresponding GetInstruction of the JavaInstructionFactory is called.
      *  Calls targetValue.setAssigned()
      *
-     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory.GetInstruction(int, int, int, FieldReference)
+     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory#GetInstruction(int, int, int, FieldReference)
      *
      *  @param  iindex      Zero or a positive number unique to any instruction of the same method
      *  @param  targetValue the result of the GetInstruction is placed there
@@ -386,11 +387,10 @@
      *  If type check passes the corresponding GetInstruction of the JavaInstructionFactory is called.
      *  Calls targetValue.setAssigned()
      *
-     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory.GetInstruction(int, int, int, FieldReference)
+     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory#GetInstruction(int, int, int, FieldReference)
      *
      *  @param  iindex      Zero or a positive number unique to any instruction of the same method
      *  @param  targetValue the result of the GetInstruction is placed there
-     *  @param  containingInstance The Object instance to read the field from
      *  @param  field       The description of the field
      */
     public SSAGetInstruction GetInstruction(final int iindex, final SSAValue targetValue, FieldReference field) {
@@ -420,7 +420,7 @@
      *
      *  If type check passes the corresponding PutInstruction of the JavaInstructionFactory is called.
      *
-     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory.PutInstruction(int, int, int, FieldReference)
+     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory#PutInstruction(int, int, int, FieldReference)
      *
      *  @param  iindex      Zero or a psitive number unique to any instruction of the same method
      *  @param  targetInstance the instance of the object to write a field of
@@ -467,10 +467,9 @@
      *
      *  If type check passes the corresponding PutInstruction of the JavaInstructionFactory is called.
      *
-     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory.PutInstruction(int, int, int, FieldReference)
+     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory#PutInstruction(int, int, int, FieldReference)
      *
      *  @param  iindex      Zero or a psitive number unique to any instruction of the same method
-     *  @param  targetInstance the instance of the object to write a field of
      *  @param  newValue    The value to write to the field
      *  @param  field       The description of the target
      */
@@ -490,7 +489,7 @@
             throw new IllegalArgumentException("The field " + field + " is not assignable from " + newValue);
         }
     
-        final MethodReference newValueValidIn = newValue.getValidIn();
+        // final MethodReference newValueValidIn = newValue.getValidIn();
 
         return insts.PutInstruction(iindex, newValue.getNumber(), field);
     }
@@ -559,7 +558,7 @@
      *  If type check passes the corresponding PhiInstruction of the JavaInstructionFactory is called.
      *  Calls result.setAssigned().
      *
-     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory.PhiInstruction(int, int, int[])
+     *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory#PhiInstruction(int, int, int[])
      *
      *  @param  iindex  Zero or a positive number unique to any instruction of the same method
      *  @param  result  Where to write result to
@@ -610,7 +609,8 @@
         return insts.PhiInstruction(iindex, result.getNumber(), aParams);
     }
 
-    private boolean isSuperclassOf(final TypeReference superClass, final TypeReference subClass) {
+    @SuppressWarnings("unused")
+    private static boolean isSuperclassOf(final TypeReference superClass, final TypeReference subClass) {
         return true; // TODO
     }
 
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/strings/Atom.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/strings/Atom.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/strings/Atom.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/strings/Atom.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.util.strings;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.HashMap;
 
 import com.ibm.wala.util.collections.HashMapFactory;
@@ -28,7 +29,7 @@
   private static final long serialVersionUID = -3256390509887654329L;
 
   /**
-   * Used to canonicalize Atoms, a mapping from AtomKey -> Atom. AtomKeys are not canonical, but Atoms are.
+   * Used to canonicalize Atoms, a mapping from AtomKey -&gt; Atom. AtomKeys are not canonical, but Atoms are.
    */
   final private static HashMap<AtomKey, Atom> dictionary = HashMapFactory.make();
 
@@ -85,7 +86,7 @@
   /**
    * create an Atom from utf8[off] of length len
    * 
-   * @throws IllegalArgumentException if utf8.length <= off
+   * @throws IllegalArgumentException if utf8.length &lt;= off
    */
   public static Atom findOrCreate(byte utf8[], int off, int len) throws IllegalArgumentException, IllegalArgumentException,
       IllegalArgumentException {
@@ -173,6 +174,11 @@
   public final boolean startsWith(Atom start) {
       assert (start != null);
 
+      // can't start with something that's longer.
+      if (val.length < start.val.length)
+        return false;
+
+      // otherwise, we know that this length is greater than or equal to the length of start.
       for (int i = 0; i < start.val.length; ++i) {
           if (val[i] != start.val[i])
               return false;
@@ -196,8 +202,8 @@
   }
 
 /**
-   * Is "this" atom a reserved member name? Note: Sun has reserved all member names starting with '<' for future use. At present,
-   * only <init> and <clinit> are used.
+   * Is "this" atom a reserved member name? Note: Sun has reserved all member names starting with '&lt;' for future use. At present,
+   * only &lt;init&gt; and &lt;clinit&gt; are used.
    */
   public final boolean isReservedMemberName() {
     if (length() == 0) {
@@ -278,7 +284,7 @@
         }
       }
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalStateException("not an array: " + this);
+      throw new IllegalStateException("not an array: " + this, e);
     }
 
   }
@@ -299,7 +305,7 @@
       }
       return findOrCreate(val, i, val.length - i);
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalStateException("not an array: " + this);
+      throw new IllegalStateException("not an array: " + this, e);
     }
   }
 
@@ -329,9 +335,6 @@
       this.hash = tmp;
     }
 
-    /**
-     * @see java.lang.Object#equals(Object)
-     */
     @Override
     public final boolean equals(Object other) {
 
@@ -362,9 +365,6 @@
       return new String(val);
     }
 
-    /**
-     * @see java.lang.Object#hashCode()
-     */
     @Override
     public final int hashCode() {
       return hash;
@@ -372,9 +372,6 @@
 
   }
 
-  /**
-   * @see java.lang.Object#hashCode()
-   */
   @Override
   public int hashCode() {
     return hash;
@@ -394,16 +391,14 @@
    * return an array of bytes representing the utf8 characters in this
    */
   public byte[] getValArray() {
-    byte[] result = new byte[val.length];
-    System.arraycopy(val, 0, result, 0, val.length);
-    return result;
+    return val.clone();
   }
   
   public byte getVal(int i) throws IllegalArgumentException {
     try {
       return val[i];
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("Illegal index: " + i + " length is " + val.length);
+      throw new IllegalArgumentException("Illegal index: " + i + " length is " + val.length, e);
     }
   }
 
@@ -411,8 +406,8 @@
    * @return true iff this atom contains the specified byte
    */
   public boolean contains(byte b) {
-    for (int i = 0; i < val.length; i++) {
-      if (val[i] == b) {
+    for (byte element : val) {
+      if (element == b) {
         return true;
       }
     }
@@ -447,9 +442,7 @@
       throw new IllegalArgumentException("argument may not be null!");
     }
 
-    byte[] val = new byte[ma.val.length + mb.val.length];
- 
-    System.arraycopy(ma.val, 0, val, 0, ma.val.length);
+    byte[] val = Arrays.copyOf(ma.val, ma.val.length + mb.val.length);
     System.arraycopy(mb.val, 0, val, ma.val.length, mb.val.length);
 
     return findOrCreate(val);
@@ -468,8 +461,6 @@
   /**
    * Special method that is called by Java deserialization process. Any HashCons'ed object should implement it, in order to make
    * sure that all equal objects are consolidated.
-   * 
-   * @return
    */
   private Object readResolve() {
     return findOrCreate(this.val);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/strings/ImmutableByteArray.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/strings/ImmutableByteArray.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/strings/ImmutableByteArray.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/strings/ImmutableByteArray.java	2019-01-29 17:08:39.000000000 +0000
@@ -39,7 +39,7 @@
     try {
       System.arraycopy(b, start, this.b, 0, length);
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("illegal parameters " + b.length + " " + start + " " + length);
+      throw new IllegalArgumentException("illegal parameters " + b.length + ' ' + start + ' ' + length, e);
     }
   }
 
@@ -49,7 +49,7 @@
 
   public byte get(int i) throws IllegalArgumentException {
     if (i < 0 || i >= b.length) {
-      throw new IllegalArgumentException("index out of bounds " + b.length + " " + i);
+      throw new IllegalArgumentException("index out of bounds " + b.length + ' ' + i);
     }
     return b[i];
   }
@@ -65,7 +65,7 @@
     try {
       System.arraycopy(b, i, result, 0, length);
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("Invalid combination: " + i + " " + length);
+      throw new IllegalArgumentException("Invalid combination: " + i + ' ' + length, e);
     }
     return result;
   }
@@ -89,4 +89,4 @@
     return new ImmutableByteArray(UTF8Convert.toUTF8(s));
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/strings/StringStuff.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/strings/StringStuff.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/strings/StringStuff.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/strings/StringStuff.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,13 +49,13 @@
     primitiveClassNames.put("void", "V");
   }
 
-  public static void padWithSpaces(StringBuffer b, int length) {
+  public static void padWithSpaces(StringBuilder b, int length) {
     if (b == null) {
       throw new IllegalArgumentException("b is null");
     }
     if (b.length() < length) {
       for (int i = b.length(); i < length; i++) {
-        b.append(" ");
+        b.append(' ');
       }
     }
   }
@@ -77,9 +77,9 @@
       String baseType = dString.substring(0, arrayIndex);
       int dim = (dString.length() - arrayIndex) / 2;
       baseType = deployment2CanonicalTypeString(baseType);
-      StringBuffer result = new StringBuffer("[");
+      StringBuilder result = new StringBuilder("[");
       for (int i = 1; i < dim; i++) {
-        result.append("[");
+        result.append('[');
       }
       result.append(baseType);
       return result.toString();
@@ -87,7 +87,7 @@
       if (primitiveClassNames.get(dString) != null) {
         return primitiveClassNames.get(dString);
       } else {
-        return "L" + dString;
+        return 'L' + dString;
       }
     }
   }
@@ -109,9 +109,9 @@
       String baseType = dString.substring(0, arrayIndex);
       int dim = (dString.length() - arrayIndex) / 2;
       baseType = deployment2CanonicalDescriptorTypeString(baseType);
-      StringBuffer result = new StringBuffer("[");
+      StringBuilder result = new StringBuilder("[");
       for (int i = 1; i < dim; i++) {
-        result.append("[");
+        result.append('[');
       }
       result.append(baseType);
       return result.toString();
@@ -119,7 +119,7 @@
       if (primitiveClassNames.get(dString) != null) {
         return primitiveClassNames.get(dString);
       } else {
-        return "L" + dString + ";";
+        return 'L' + dString + ';';
       }
     }
   }
@@ -223,7 +223,7 @@
       throw new IllegalArgumentException("invalid descriptor: " + b);
     }
 
-    ArrayList<TypeName> sigs = new ArrayList<TypeName>(10);
+    ArrayList<TypeName> sigs = new ArrayList<>(10);
 
     int i = 1;
     while (true) {
@@ -340,7 +340,7 @@
       }
       return new ImmutableByteArray(name.b, start + 1 + dim, lastSlash - start - 1 - dim);
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid name " + name + " start: " + start + " length: " + length);
+      throw new IllegalArgumentException("invalid name " + name + " start: " + start + " length: " + length, e);
     }
   }
 
@@ -394,7 +394,7 @@
         return new ImmutableByteArray(name.b, lastSlash + 1, L);
       }
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("Malformed name: " + name + " " + start + " " + length);
+      throw new IllegalArgumentException("Malformed name: " + name + ' ' + start + ' ' + length, e);
     }
   }
 
@@ -443,7 +443,7 @@
       }
       return code;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("ill-formed array descriptor " + b);
+      throw new IllegalArgumentException("ill-formed array descriptor " + b, e);
     }
   }
 
@@ -468,7 +468,7 @@
       }
       return new ImmutableByteArray(b.b, i, length - (i - start));
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid element desciptor: " + b);
+      throw new IllegalArgumentException("invalid element desciptor: " + b, e);
     }
   }
 
@@ -506,7 +506,7 @@
 
       return name.b[start] != 'L';
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException(name.toString());
+      throw new IllegalArgumentException(name.toString(), e);
     }
   }
 
@@ -546,7 +546,7 @@
     if (jvmType == null) {
       throw new IllegalArgumentException("jvmType is null");
     }
-    StringBuffer readable = new StringBuffer(); // human readable version
+    StringBuilder readable = new StringBuilder(); // human readable version
     int numberOfDimensions = 0; // the number of array dimensions
 
     if (jvmType.length() == 0) {
@@ -586,8 +586,8 @@
           jvmType.length()) // Trim off the trailing ';'
           );
       // Convert to standard Java dot-notation
-      readable = new StringBuffer(slashToDot(readable.toString()));
-      readable = new StringBuffer(dollarToDot(readable.toString()));
+      readable = new StringBuilder(slashToDot(readable.toString()));
+      readable = new StringBuilder(dollarToDot(readable.toString()));
     }
     // append trailing "[]" for each array dimension
     for (int i = 0; i < numberOfDimensions; ++i) {
@@ -607,7 +607,7 @@
     if (jvmType == null) {
       throw new IllegalArgumentException("jvmType is null");
     }
-    StringBuffer readable = new StringBuffer(); // human readable version
+    StringBuilder readable = new StringBuilder(); // human readable version
     int numberOfDimensions = 0; // the number of array dimensions
 
     if (jvmType.length() == 0) {
@@ -647,7 +647,7 @@
           jvmType.length()) // Trim off the trailing ';'
           );
       // Convert to standard Java dot-notation
-      readable = new StringBuffer(slashToDot(readable.toString()));
+      readable = new StringBuilder(slashToDot(readable.toString()));
     }
     // append trailing "[]" for each array dimension
     for (int i = 0; i < numberOfDimensions; ++i) {
@@ -666,7 +666,7 @@
     if (path == null) {
       throw new IllegalArgumentException("path is null");
     }
-    StringBuffer dotForm = new StringBuffer(path);
+    StringBuilder dotForm = new StringBuilder(path);
     // replace all '/' in the path with '.'
     for (int i = 0; i < dotForm.length(); ++i) {
       if (dotForm.charAt(i) == '/') {
@@ -687,7 +687,7 @@
     if (path == null) {
       throw new IllegalArgumentException("path is null");
     }
-    StringBuffer dotForm = new StringBuffer(path);
+    StringBuilder dotForm = new StringBuilder(path);
     // replace all '$' in the path with '.'
     for (int i = 0; i < dotForm.length(); ++i) {
       if (dotForm.charAt(i) == '$') {
@@ -708,7 +708,7 @@
     if (path == null) {
       throw new IllegalArgumentException("path is null");
     }
-    StringBuffer dotForm = new StringBuffer(path);
+    StringBuilder dotForm = new StringBuilder(path);
     // replace all '.' in the path with '$'
     for (int i = 0; i < dotForm.length(); ++i) {
       if (dotForm.charAt(i) == '.') {
@@ -726,9 +726,9 @@
       int stop = typeName.length() - 1;
 
       if (typeName.contains(".")) {
-        start = typeName.lastIndexOf(".");
+        start = typeName.lastIndexOf('.');
       } else if (typeName.contains("/")) {
-        start = typeName.lastIndexOf("/");
+        start = typeName.lastIndexOf('/');
       }
 
       if (typeName.endsWith(";")) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/strings/UTF8Convert.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/strings/UTF8Convert.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/strings/UTF8Convert.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/strings/UTF8Convert.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,9 +51,10 @@
    * 
    * @param utf8 (pseudo-)utf8 byte array
    * @throws UTFDataFormatException if the (pseudo-)utf8 byte array is not valid (pseudo-)utf8
-   * @returns unicode string
+   * @return unicode string
    * @throws IllegalArgumentException if utf8 is null
    */
+  @SuppressWarnings("unused")
   public static String fromUTF8(byte[] utf8) throws UTFDataFormatException {
     if (utf8 == null) {
       throw new IllegalArgumentException("utf8 is null");
@@ -111,7 +112,7 @@
    * The output format is controlled by the WRITE_PSEUDO_UTF8 flag.
    * 
    * @param s String to convert
-   * @returns array containing sequence of (pseudo-)utf8 formatted bytes
+   * @return array containing sequence of (pseudo-)utf8 formatted bytes
    * @throws IllegalArgumentException if s is null
    */
   public static byte[] toUTF8(String s) {
@@ -164,7 +165,7 @@
    * Check whether the given sequence of bytes is valid (pseudo-)utf8.
    * 
    * @param bytes byte array to check
-   * @returns true iff the given sequence is valid (pseudo-)utf8.
+   * @return true iff the given sequence is valid (pseudo-)utf8.
    * @throws IllegalArgumentException if bytes is null
    */
   public static boolean check(byte[] bytes) {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/warnings/Warning.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/warnings/Warning.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/warnings/Warning.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/warnings/Warning.java	2019-01-29 17:08:39.000000000 +0000
@@ -78,10 +78,7 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer();
-    result.append("[").append(severityString()).append("] ");
-    result.append(getMsg());
-    return result.toString();
+    return '[' + severityString() + "] " + getMsg();
   }
 
   protected String severityString() {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/warnings/Warnings.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/warnings/Warnings.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/util/warnings/Warnings.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/util/warnings/Warnings.java	2019-01-29 17:08:39.000000000 +0000
@@ -32,14 +32,13 @@
   }
 
   public static synchronized String asString() {
-    TreeSet<Warning> T = new TreeSet<Warning>();
-    T.addAll(warnings);
+    TreeSet<Warning> T = new TreeSet<>(warnings);
     Iterator<Warning> it = T.iterator();
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     for (int i = 1; i <= T.size(); i++) {
       result.append(i).append(". ");
       result.append(it.next());
-      result.append("\n");
+      result.append('\n');
     }
     return result.toString();
   }
@@ -47,4 +46,4 @@
   public static synchronized Iterator<Warning> iterator() {
     return warnings.iterator();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/PDFViewUtil.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/PDFViewUtil.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/PDFViewUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/PDFViewUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,8 +11,6 @@
 package com.ibm.wala.viz;
 
 import java.util.HashMap;
-import java.util.Iterator;
-
 import com.ibm.wala.cfg.CFGSanitizer;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.IR;
@@ -26,6 +24,7 @@
 import com.ibm.wala.ssa.SSAPiInstruction;
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.strings.StringStuff;
 
@@ -60,7 +59,7 @@
 
     NodeDecorator<ISSABasicBlock> labels = makeIRDecorator(ir);
     if (annotations != null) {
-      labels = new ConcatenatingNodeDecorator<ISSABasicBlock>(annotations, labels);
+      labels = new ConcatenatingNodeDecorator<>(annotations, labels);
     }
 
     g = CFGSanitizer.sanitize(ir, cha);
@@ -75,16 +74,11 @@
       throw new IllegalArgumentException("ir is null");
     }
     final HashMap<ISSABasicBlock,String> labelMap = HashMapFactory.make();
-    for (Iterator it = ir.getControlFlowGraph().iterator(); it.hasNext();) {
-      SSACFG.BasicBlock bb = (SSACFG.BasicBlock) it.next();
+    for (ISSABasicBlock issaBasicBlock : ir.getControlFlowGraph()) {
+      SSACFG.BasicBlock bb = (SSACFG.BasicBlock) issaBasicBlock;
       labelMap.put(bb, getNodeLabel(ir, bb));
     }
-    NodeDecorator<ISSABasicBlock> labels = new NodeDecorator<ISSABasicBlock>() {
-      @Override
-      public String getLabel(ISSABasicBlock bb) {
-        return labelMap.get(bb);
-      }
-    };
+    NodeDecorator<ISSABasicBlock> labels = labelMap::get;
     return labels;
   }
 
@@ -111,7 +105,7 @@
   }
 
   private static String getNodeLabel(IR ir, BasicBlock bb) {
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
 
     int start = bb.getFirstInstructionIndex();
     int end = bb.getLastInstructionIndex();
@@ -125,17 +119,16 @@
       result.append("<Handler>");
     }
     result.append("\\n");
-    for (Iterator it = bb.iteratePhis(); it.hasNext();) {
-      SSAPhiInstruction phi = (SSAPhiInstruction) it.next();
+    for (SSAPhiInstruction phi : Iterator2Iterable.make(bb.iteratePhis())) {
       if (phi != null) {
-        result.append("           " + phi.toString(ir.getSymbolTable())).append("\\l");
+        result.append("           ").append(phi.toString(ir.getSymbolTable())).append("\\l");
       }
     }
     if (bb instanceof ExceptionHandlerBasicBlock) {
       ExceptionHandlerBasicBlock ebb = (ExceptionHandlerBasicBlock) bb;
       SSAGetCaughtExceptionInstruction s = ebb.getCatchInstruction();
       if (s != null) {
-        result.append("           " + s.toString(ir.getSymbolTable())).append("\\l");
+        result.append("           ").append(s.toString(ir.getSymbolTable())).append("\\l");
       } else {
         result.append("           " + " No catch instruction. Unreachable?\\l");
       }
@@ -143,16 +136,15 @@
     SSAInstruction[] instructions = ir.getInstructions();
     for (int j = start; j <= end; j++) {
       if (instructions[j] != null) {
-        StringBuffer x = new StringBuffer(j + "   " + instructions[j].toString(ir.getSymbolTable()));
+        StringBuilder x = new StringBuilder(j + "   " + instructions[j].toString(ir.getSymbolTable()));
         StringStuff.padWithSpaces(x, 35);
         result.append(x);
         result.append("\\l");
       }
     }
-    for (Iterator it = bb.iteratePis(); it.hasNext();) {
-      SSAPiInstruction pi = (SSAPiInstruction) it.next();
+    for (SSAPiInstruction pi : Iterator2Iterable.make(bb.iteratePis())) {
       if (pi != null) {
-        result.append("           " + pi.toString(ir.getSymbolTable())).append("\\l");
+        result.append("           ").append(pi.toString(ir.getSymbolTable())).append("\\l");
       }
     }
     return result.toString();
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/CgPanel.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/CgPanel.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/CgPanel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/CgPanel.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,6 @@
 package com.ibm.wala.viz.viewer;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -29,9 +28,11 @@
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 public class CgPanel extends JSplitPane{
 
+  private static final long serialVersionUID = -4094408933344852549L;
   private final CallGraph cg;
 
   public CgPanel(CallGraph cg) {
@@ -41,30 +42,30 @@
     this.setLeftComponent(new JScrollPane(tree));
 
     
-    final IrAndSourceViewer irViewer = new IrAndSourceViewer(cg);
+    final IrAndSourceViewer irViewer = new IrAndSourceViewer();
     this.setRightComponent(irViewer.getComponent());
 
     tree.addTreeSelectionListener(new TreeSelectionListener() {
+
       @Override
       public void valueChanged(TreeSelectionEvent e) {
-        TreePath newLeadSelectionPath = e.getNewLeadSelectionPath();
-        if (null == newLeadSelectionPath){
-          return;
-        }
-        DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) newLeadSelectionPath.getLastPathComponent();
-        Object userObject = treeNode.getUserObject();
-        if (userObject instanceof CGNode) {
-          CGNode node = (CGNode) userObject;
-          IR ir = node.getIR();
-          irViewer.setIR(ir);
-        } else if (userObject instanceof CallSiteReference){
-          CGNode parentNode =  (CGNode) ((DefaultMutableTreeNode) treeNode.getParent()).getUserObject();
-          IR ir = parentNode.getIR();
-          irViewer.setIRAndPc(ir, ((CallSiteReference) userObject).getProgramCounter());
-        }
+      TreePath newLeadSelectionPath = e.getNewLeadSelectionPath();
+      if (null == newLeadSelectionPath){
+        return;
+      }
+      DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) newLeadSelectionPath.getLastPathComponent();
+      Object userObject = treeNode.getUserObject();
+      if (userObject instanceof CGNode) {
+        CGNode node = (CGNode) userObject;
+        IR ir1 = node.getIR();
+        irViewer.setIR(ir1);
+      } else if (userObject instanceof CallSiteReference){
+        CGNode parentNode =  (CGNode) ((DefaultMutableTreeNode) treeNode.getParent()).getUserObject();
+        IR ir2 = parentNode.getIR();
+        irViewer.setIRAndPc(ir2, ((CallSiteReference) userObject).getProgramCounter());
+      }
       }
     });
-
   }
 
   private JTree buildTree() {
@@ -106,12 +107,11 @@
     }
 
     if (treeNode.getChildCount() == 0) {
-      List<DefaultMutableTreeNode> newChilds = new ArrayList<DefaultMutableTreeNode>();
+      List<DefaultMutableTreeNode> newChilds = new ArrayList<>();
       Object userObject = treeNode.getUserObject();
       if (userObject instanceof CGNode) {
         CGNode cgNode = (CGNode) userObject;
-        for (Iterator<CallSiteReference> iter = cgNode.iterateCallSites(); iter.hasNext();) {
-          CallSiteReference csr = iter.next();
+        for (CallSiteReference csr : Iterator2Iterable.make(cgNode.iterateCallSites())) {
           newChilds.add(new DefaultMutableTreeNode(csr));
         }
       } else {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/ChaPanel.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/ChaPanel.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/ChaPanel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/ChaPanel.java	2019-01-29 17:08:39.000000000 +0000
@@ -30,6 +30,7 @@
 
 public class ChaPanel extends JSplitPane {
 
+  private static final long serialVersionUID = -9058908127737757320L;
   private final IClassHierarchy cha;
 
   public ChaPanel(IClassHierarchy cha) {
@@ -39,26 +40,25 @@
     JTree tree = buildTree();
     this.setLeftComponent(new JScrollPane(tree));
     
-    final DefaultListModel methodListModel = new DefaultListModel();
-    JList methodList = new JList(methodListModel);
+    final DefaultListModel<String> methodListModel = new DefaultListModel<>();
+    JList methodList = new JList<>(methodListModel);
     this.setRightComponent(methodList);
     
-    tree.addTreeSelectionListener(new TreeSelectionListener(){
+    tree.addTreeSelectionListener(new TreeSelectionListener() {
       @Override
       public void valueChanged(TreeSelectionEvent e) {
-        TreePath newLeadSelectionPath = e.getNewLeadSelectionPath();
-        if (null == newLeadSelectionPath){
-          return;
-        }
-        DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) newLeadSelectionPath.getLastPathComponent();
-        IClass klass = (IClass) treeNode.getUserObject();
-        methodListModel.clear();
-        for (IMethod m : klass.getDeclaredMethods()){
-          methodListModel.addElement(m.toString());
-        }
+      TreePath newLeadSelectionPath = e.getNewLeadSelectionPath();
+      if (null == newLeadSelectionPath){
+        return;
       }
-    });
-    
+      DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) newLeadSelectionPath.getLastPathComponent();
+      IClass klass = (IClass) treeNode.getUserObject();
+      methodListModel.clear();
+      for (IMethod m : klass.getDeclaredMethods()){
+        methodListModel.addElement(m.toString());
+      }
+    }   
+  });
   }
 
   private JTree buildTree() {
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrAndSourceViewer.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrAndSourceViewer.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrAndSourceViewer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrAndSourceViewer.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,9 +19,7 @@
 
 import com.ibm.wala.classLoader.IClassLoader;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ssa.IR;
-import com.ibm.wala.viz.viewer.IrViewer.SelectedPcListner;
 
 public class IrAndSourceViewer {
 
@@ -30,9 +28,6 @@
   
   private IR ir;
   
-  public IrAndSourceViewer(CallGraph cg) {
-  }
-
   public Component getComponent() {
 
 
@@ -43,35 +38,30 @@
     sourceViewer = new SourceViewer();    
     splitPane.setRightComponent(sourceViewer);
 
-    irViewer.addSelectedPcListner(new SelectedPcListner(){
-
-      @Override
-      public void valueChanged(int pc) {
-        IMethod method = ir.getMethod();
-        int sourceLineNumber = IrViewer.NA;
-        String sourceFileName = null;
-        if (pc != IrViewer.NA){
-          try{
-            sourceLineNumber = method.getLineNumber(pc);
-            IClassLoader loader = method.getDeclaringClass().getClassLoader();
-            sourceFileName = loader.getSourceFileName(method, pc);
-          } catch (Exception e){
-            e.printStackTrace();
-          }
+    irViewer.addSelectedPcListner(pc -> {
+      IMethod method = ir.getMethod();
+      int sourceLineNumber = IrViewer.NA;
+      String sourceFileName = null;
+      if (pc != IrViewer.NA){
+        try{
+          sourceLineNumber = method.getLineNumber(pc);
+          IClassLoader loader = method.getDeclaringClass().getClassLoader();
+          sourceFileName = loader.getSourceFileName(method, pc);
+        } catch (Exception e1){
+          e1.printStackTrace();
         }
-        if (sourceFileName != null){
-          URL url;
-          try {
-            url = (new File(sourceFileName)).toURI().toURL();
-            sourceViewer.setSource(url, sourceLineNumber);
-          } catch (MalformedURLException e) {
-            e.printStackTrace();
-          }
-        } else {
-           sourceViewer.removeSource();
+      }
+      if (sourceFileName != null){
+        URL url;
+        try {
+          url = (new File(sourceFileName)).toURI().toURL();
+          sourceViewer.setSource(url, sourceLineNumber);
+        } catch (MalformedURLException e2) {
+          e2.printStackTrace();
         }
+      } else {
+         sourceViewer.removeSource();
       }
-      
     });
     
     return splitPane;
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrViewer.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrViewer.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrViewer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/IrViewer.java	2019-01-29 17:08:39.000000000 +0000
@@ -32,9 +32,10 @@
 import com.ibm.wala.util.collections.HashMapFactory;
 
 public class IrViewer extends JPanel{
+  private static final long serialVersionUID = -5668847442988389016L;
   private JTextField methodName;
-  private DefaultListModel irLineList = new DefaultListModel();
-  private JList irLines;
+  private DefaultListModel<String> irLineList = new DefaultListModel<>();
+  private JList<String> irLines;
 
   // mapping from ir viewer list line to source code line number.
   private Map<Integer, Integer> lineToPosition = null;
@@ -46,11 +47,11 @@
   public interface SelectedPcListner{
     void valueChanged(int pc);
   }
-  Set<SelectedPcListner> selectedPcListners = new HashSet<SelectedPcListner>();
+  Set<SelectedPcListner> selectedPcListners = new HashSet<>();
   
   public IrViewer() {
     super(new BorderLayout());
-    irLines = new JList(irLineList);
+    irLines = new JList<>(irLineList);
     methodName = new JTextField("IR");
     this.add(methodName, BorderLayout.PAGE_START);
     this.add(new JScrollPane(irLines, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
@@ -58,18 +59,18 @@
     
     
     irLines.addListSelectionListener(new ListSelectionListener() {
+
       @Override
       public void valueChanged(ListSelectionEvent e) {
-        int index = irLines.getSelectedIndex();
-        Integer pc = lineToPc.get(index);
-        if (pc == null) {
-          pc = NA;
-        }
-        for (SelectedPcListner selectedPcListner : selectedPcListners) {
-          selectedPcListner.valueChanged(pc);
-        }
+      int index = irLines.getSelectedIndex();
+      Integer pc = lineToPc.get(index);
+      if (pc == null) {
+        pc = NA;
+      }
+      for (SelectedPcListner selectedPcListner : selectedPcListners) {
+        selectedPcListner.valueChanged(pc);
       }
-    });
+    }});
   }
   
   public void setIR(IR ir) {
@@ -121,7 +122,7 @@
 
   static final int NA = -1;
 
-  private int parseIrLine(String line) {
+  private static int parseIrLine(String line) {
     int firstSpace = line.indexOf(' ');
     if (firstSpace > 0) {
       String pcString = line.substring(0, firstSpace);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/PaPanel.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/PaPanel.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/PaPanel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/PaPanel.java	2019-01-29 17:08:39.000000000 +0000
@@ -54,6 +54,7 @@
  */
 public class PaPanel extends JSplitPane {
 
+  private static final long serialVersionUID = 8120735305334110889L;
   protected final PointerAnalysis<InstanceKey> pa;
   protected final CallGraph cg;
 
@@ -97,7 +98,7 @@
     this.setRightComponent(rightPanel);
     fullName = new JTextField("");
     rightPanel.add(fullName, BorderLayout.PAGE_START);
-    irViewer = new IrAndSourceViewer(cg);
+    irViewer = new IrAndSourceViewer();
     rightPanel.add(irViewer.getComponent(), BorderLayout.CENTER);
 
     heapTree.addTreeExpansionListener(new TreeExpansionListener() {
@@ -121,53 +122,51 @@
 
       @Override
       public void valueChanged(TreeSelectionEvent e) {
-        TreePath newLeadSelectionPath = e.getNewLeadSelectionPath();
-        if (null == newLeadSelectionPath){
-          return;
-        }
-        DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) newLeadSelectionPath.getLastPathComponent();
-        Object userObject = treeNode.getUserObject();
-        fullName.setText(userObject.toString());
-        if (userObject instanceof LocalPointerKey){
-          LocalPointerKey lpk = (LocalPointerKey) userObject;
-          IR ir = lpk.getNode().getIR();
-          SSAInstruction def = lpk.getNode().getDU().getDef(lpk.getValueNumber());
-          int pc = IrViewer.NA;
-          if (def != null){
-            SSAInstruction[] instructions = ir.getInstructions();
-            for (int i = 0; i < instructions.length; i++) {
-              SSAInstruction instruction = instructions[i];
-              if (def == instruction){
-                pc = i;
-              }
+      TreePath newLeadSelectionPath = e.getNewLeadSelectionPath();
+      if (null == newLeadSelectionPath){
+        return;
+      }
+      DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) newLeadSelectionPath.getLastPathComponent();
+      Object userObject = treeNode.getUserObject();
+      fullName.setText(userObject.toString());
+      if (userObject instanceof LocalPointerKey){
+        LocalPointerKey lpk = (LocalPointerKey) userObject;
+        IR ir1 = lpk.getNode().getIR();
+        SSAInstruction def = lpk.getNode().getDU().getDef(lpk.getValueNumber());
+        int pc1 = IrViewer.NA;
+        if (def != null){
+          SSAInstruction[] instructions = ir1.getInstructions();
+          for (int i = 0; i < instructions.length; i++) {
+            SSAInstruction instruction = instructions[i];
+            if (def == instruction){
+              pc1 = i;
             }
           }
-          irViewer.setIRAndPc(ir, pc);
-        } else if (userObject instanceof InstanceFieldPointerKey){
-          InstanceKey ik = ((InstanceFieldPointerKey) userObject).getInstanceKey();
-          if (ik instanceof NormalAllocationInNode){
-            NormalAllocationInNode normalIk = (NormalAllocationInNode) ik;
-            IR ir = normalIk.getNode().getIR();
-            int pc = normalIk.getSite().getProgramCounter();
-            irViewer.setIRAndPc(ir, pc);
-          }
-        } else if (userObject instanceof NormalAllocationInNode){
-          NormalAllocationInNode normalIk = (NormalAllocationInNode) userObject;
-          IR ir = normalIk.getNode().getIR();
-          int pc = normalIk.getSite().getProgramCounter();
-          irViewer.setIRAndPc(ir, pc);
-        } else if (userObject instanceof CGNode){
-          irViewer.setIR(((CGNode)userObject).getIR());
         }
-
-
+        irViewer.setIRAndPc(ir1, pc1);
+      } else if (userObject instanceof InstanceFieldPointerKey){
+        InstanceKey ik = ((InstanceFieldPointerKey) userObject).getInstanceKey();
+        if (ik instanceof NormalAllocationInNode){
+          NormalAllocationInNode normalIk1 = (NormalAllocationInNode) ik;
+          IR ir2 = normalIk1.getNode().getIR();
+          int pc2 = normalIk1.getSite().getProgramCounter();
+          irViewer.setIRAndPc(ir2, pc2);
+        }
+      } else if (userObject instanceof NormalAllocationInNode){
+        NormalAllocationInNode normalIk2 = (NormalAllocationInNode) userObject;
+        IR ir3 = normalIk2.getNode().getIR();
+        int pc3 = normalIk2.getSite().getProgramCounter();
+        irViewer.setIRAndPc(ir3, pc3);
+      } else if (userObject instanceof CGNode){
+        irViewer.setIR(((CGNode)userObject).getIR());
       }
-    });
 
+
+    }});
   }
 
   private void initDataStructures(PointerAnalysis<InstanceKey> pa) {
-    HeapGraph heapGraph = pa.getHeapGraph();
+    HeapGraph<InstanceKey> heapGraph = pa.getHeapGraph();
     OrdinalSetMapping<InstanceKey> instanceKeyMapping = pa.getInstanceKeyMapping();
     for (Object n : heapGraph){
       if (heapGraph.getPredNodeCount(n) == 0){ // considering only roots of the heap graph.
@@ -195,10 +194,9 @@
 
   /**
    * Override if you want different roots for your heap tree.
-   * @return
    */
   protected List<Object> getRootNodes(){
-    List<Object> ret = new ArrayList<Object>();
+    List<Object> ret = new ArrayList<>();
     for (CGNode n : cg){
       ret.add(n);
     }
@@ -207,8 +205,6 @@
 
   /**
    * expands the given "treeNode" "rec" levels.
-   * @param treeNode
-   * @param rec
    */
   private void expandNodeRec(DefaultMutableTreeNode treeNode, int rec) {
     if (rec == 0){
@@ -230,11 +226,9 @@
 
   /**
    * Used for filling the tree dynamically. Override and handle your own nodes / different links.
-   * @param node
-   * @return
    */
   protected List<Object> getChildrenFor(Object node) {
-    List<Object> ret = new ArrayList<Object>();
+    List<Object> ret = new ArrayList<>();
     if (node instanceof InstanceKey){
       ret.addAll(getPointerKeysUnderInstanceKey((InstanceKey) node));
     } else if (node instanceof PointerKey){
@@ -254,9 +248,6 @@
   /**
    * Get the set of pointer keys that should be presented below an instance key in the heap tree. Override if you have special
    * pointer keys (not just for fields)
-   * 
-   * @param ik
-   * @return
    */
   protected List<? extends PointerKey> getPointerKeysUnderInstanceKey(InstanceKey ik) {
     int ikIndex = pa.getInstanceKeyMapping().getMappedIndex(ik);
@@ -272,10 +263,6 @@
 
   /**
    * Utility method for mutable mapping. map[index] U= o
-   * @param <T>
-   * @param map
-   * @param index
-   * @param o
    */
   protected static <T> void mapUsingMutableMapping(MutableMapping<List<T>> map, int index, T o){
     List<T> set;
@@ -285,7 +272,7 @@
       set = null;
     }
     if (null == set){
-      set = new ArrayList<T>();
+      set = new ArrayList<>();
       map.put(index, set);
     }
     set.add(o);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/SourceViewer.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/SourceViewer.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/SourceViewer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/SourceViewer.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,15 +23,16 @@
 import javax.swing.JTextField;
 
 public class SourceViewer extends JPanel{
+  private static final long serialVersionUID = -1688405955293925453L;
   private URL sourceURL;
   private JTextField sourceCodeLocation;
-  private DefaultListModel sourceCodeLinesList = new DefaultListModel();
-  private JList sourceCodeLines;
+  private DefaultListModel<String> sourceCodeLinesList = new DefaultListModel<>();
+  private JList<String> sourceCodeLines;
 
   public SourceViewer() {
     super(new BorderLayout());
     sourceURL = null;
-    sourceCodeLines = new JList(sourceCodeLinesList);
+    sourceCodeLines = new JList<>(sourceCodeLinesList);
     sourceCodeLocation = new JTextField("Source code");
     this.add(sourceCodeLocation, BorderLayout.PAGE_START);
     this.add(new JScrollPane(sourceCodeLines), BorderLayout.CENTER);
diff -Nru wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/WalaViewer.java wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/WalaViewer.java
--- wala-1.3.9/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/WalaViewer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core/src/com/ibm/wala/viz/viewer/WalaViewer.java	2019-01-29 17:08:39.000000000 +0000
@@ -29,6 +29,7 @@
  */
 public class WalaViewer extends JFrame {
 
+  private static final long serialVersionUID = -8580178580211053765L;
   protected static final String DefaultMutableTreeNode = null;
 
 
@@ -70,4 +71,4 @@
       System.exit(0);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/build.gradle wala-1.5.1/com.ibm.wala.core.testdata/build.gradle
--- wala-1.3.9/com.ibm.wala.core.testdata/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,272 @@
+plugins {
+	id 'eclipse'
+}
+
+eclipse.project.natures 'org.eclipse.pde.PluginNature'
+
+sourceSets.test.java.srcDirs = ['src']
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  download and extract kawa 3.0 "kawa.jar"
+//
+
+task downloadKawa(type: VerifiedDownload) {
+	ext.version = '3.0'
+	final def archive = "kawa-${version}.zip"
+	src "https://ftp.gnu.org/pub/gnu/kawa/$archive"
+	dest "$temporaryDir/$archive"
+	checksum '2713e6dfb939274ba3b1d36daea68436'
+}
+
+task extractKawa(type: Sync, dependsOn: downloadKawa) {
+	from(zipTree(downloadKawa.dest)) {
+		include "kawa-${downloadKawa.version}/lib/kawa.jar"
+		eachFile {
+			relativePath new RelativePath(!directory, relativePath.lastName)
+		}
+	}
+	into temporaryDir
+	includeEmptyDirs false
+	outputs.file "$temporaryDir/kawa.jar"
+}
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  specialized task for Kawa compilation into jar archive
+//
+
+@CacheableTask
+class CompileKawaJar extends Jar {
+
+	@Nested final def compile = project.task("compileKawaInto${name.capitalize()}", type: JavaExec) {
+		dependsOn(project.extractKawa)
+		final def kawaJar = project.files(project.extractKawa)[0]
+		classpath kawaJar
+		main 'kawa.repl'
+
+		args '-d', temporaryDir
+		outputs.dir temporaryDir
+
+		logging.captureStandardError LogLevel.INFO
+		args '--main', '-C'
+	}
+
+	CompileKawaJar() {
+		compile.dependsOn(dependsOn)
+		from compile
+		version null
+	}
+
+	void setArgs(Object... args) {
+		compile.args args
+	}
+}
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  download, unpack, and build kawa chess
+//
+
+task downloadKawaChess(type: VerifiedDownload) {
+	ext.commitHash = 'f1d2dcc707a1ef19dc159e2eaee5aecc8a41d7a8'
+	src "https://github.com/ttu-fpclub/kawa-chess/archive/${commitHash}.zip"
+	dest "$temporaryDir/kawa-chess.zip"
+	checksum 'cf29613d2be5f476a475ee28b4df9d9e'
+}
+
+task unpackKawaChess(type: Sync, dependsOn: downloadKawaChess) {
+	from zipTree(downloadKawaChess.dest)
+	into temporaryDir
+	ext.top = "$destinationDir/kawa-chess-${downloadKawaChess.commitHash}"
+}
+
+task buildChessJar(type: CompileKawaJar, dependsOn: unpackKawaChess) {
+	final def schemePath = { "$unpackKawaChess.top/${it}.scm" }
+	final def schemeFiles = files(['chess', 'gui', 'img', 'main', 'pos'].collect(schemePath))
+	args schemePath('main')
+	inputs.files schemeFiles
+	baseName 'kawachess'
+}
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  build the kawa test jar
+//
+
+task buildKawaTestJar(type: CompileKawaJar) {
+	final def schemeFile = file('kawasrc/test.scm')
+	args schemeFile
+	inputs.files schemeFile
+	baseName 'kawatest'
+}
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  download and extract "bcel-5.2.jar"
+//
+
+task downloadBcel(type: VerifiedDownload) {
+	ext.version = '5.2'
+	def archive = "bcel-${version}.tar.gz"
+	src "http://archive.apache.org/dist/jakarta/bcel/binaries/$archive"
+	dest "$temporaryDir/$archive"
+	checksum '19bffd7f217b0eae415f1ef87af2f0bc'
+	useETag false
+}
+
+task extractBcel(type: Copy, dependsOn: downloadBcel) {
+	from(tarTree(downloadBcel.dest)) {
+		include "bcel-${downloadBcel.version}/bcel-${downloadBcel.version}.jar"
+		eachFile {
+			relativePath new RelativePath(!directory, relativePath.lastName)
+		}
+	}
+	into projectDir
+	includeEmptyDirs false
+	outputs.file "bcel-${downloadBcel.version}.jar"
+}
+
+task cleanExtractBcel(type: Delete) {
+	delete files(extractBcel)[0]
+}
+
+clean.dependsOn cleanExtractBcel
+
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  download "java-cup-11a.jar"
+//
+
+task downloadJavaCup(type: VerifiedDownload) {
+	def archive = 'java-cup-11a.jar'
+	src "http://www2.cs.tum.edu/projects/cup/$archive"
+	dest "$projectDir/$archive"
+	checksum '2bda8c40abd0cbc295d3038643d6e4ec'
+}
+
+task cleanDownloadJavaCup(type: Delete) {
+	delete downloadJavaCup
+}
+
+clean.dependsOn cleanDownloadJavaCup
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  collect "JLex.jar"
+//
+
+task collectJLex(type: Jar) {
+	from project(':com.ibm.wala.cast.java.test.data').compileTestJava
+	include 'JLex/'
+	baseName 'JLex'
+	version null
+	destinationDir projectDir
+}
+
+task cleanCollectJLex(type: Delete) {
+	delete collectJLex
+}
+
+clean.dependsOn cleanCollectJLex
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  generate "hello_hash.jar"
+//
+
+task downloadOcamlJava(type: VerifiedDownload) {
+	def version = '2.0-alpha1'
+	ext.basename = "ocamljava-$version"
+	def archive = "${basename}.tar.gz"
+	src "http://www.ocamljava.org/downloads/download.php?version=$version-bin"
+	dest "$temporaryDir/$archive"
+	checksum '45feec6e3889f5073a39c2c4c84878d1'
+}
+
+task unpackOcamlJava(type: Sync, dependsOn: downloadOcamlJava) {
+	from tarTree(downloadOcamlJava.dest)
+	into temporaryDir
+}
+
+task generateHelloHashJar(type: JavaExec, dependsOn: unpackOcamlJava) {
+	def ocamlSource = file('ocaml/hello_hash.ml')
+	inputs.file ocamlSource
+
+	def jarTarget = file('hello_hash.jar')
+	outputs.file jarTarget
+	outputs.cacheIf { true }
+
+	def ocamlJavaJar = new File("$unpackOcamlJava.destinationDir/$downloadOcamlJava.basename/lib/ocamljava.jar")
+	inputs.file ocamlJavaJar
+	classpath ocamlJavaJar
+
+	main 'ocaml.compilers.ocamljavaMain'
+	args ocamlSource, '-o', jarTarget
+}
+
+task cleanGenerateHelloHashJar(type: Delete) {
+	delete generateHelloHashJar
+	delete fileTree('ocaml') {
+		exclude '*.ml'
+		exclude '.gitignore'
+	}
+}
+
+clean.dependsOn cleanGenerateHelloHashJar
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  collect "com.ibm.wala.core.testdata_1.0.0.jar"
+//
+
+task collectTestData(type: Jar) {
+	version '1.0.0'
+	archiveName "${baseName}_${version}.${extension}"
+	from compileTestJava
+	from 'classes'
+	includeEmptyDirs false
+	destinationDir projectDir
+}
+
+task cleanCollectTestData(type: Delete) {
+	delete collectTestData
+}
+
+clean.dependsOn cleanCollectTestData
+
+
+////////////////////////////////////////////////////////////////////////
+//
+//  collect "com.ibm.wala.core.testdata_1.0.0a.jar"
+//
+
+task collectTestDataA(type: Jar) {
+	version '1.0.0a'
+	archiveName "${baseName}_${version}.${extension}"
+	from compileTestJava
+	from 'classes'
+	includeEmptyDirs false
+	destinationDir projectDir
+	exclude (
+		'**/CodeDeleted.class',
+		'**/SortingExample.class',
+		'**/A.class',
+		)
+}
+
+task cleanColllectTestDataA(type: Delete) {
+	delete collectTestDataA
+}
+
+clean.dependsOn cleanCollectTestDataA
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/build.properties wala-1.5.1/com.ibm.wala.core.testdata/build.properties
--- wala-1.3.9/com.ibm.wala.core.testdata/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,5 @@
 source.. = src/
-output.. = bin/
+output.. = bin/test
 bin.includes = META-INF/,\
                .,\
                hello_hash.jar,\
@@ -7,5 +7,6 @@
                bcel-5.2.jar,\
                java-cup-11a.jar,\
                com.ibm.wala.core.testdata_1.0.0.jar,\
-               com.ibm.wala.core.testdata_1.0.0a.jar
-               
\ No newline at end of file
+               com.ibm.wala.core.testdata_1.0.0a.jar,\
+               OSGI-INF/
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/build.xml wala-1.5.1/com.ibm.wala.core.testdata/build.xml
--- wala-1.3.9/com.ibm.wala.core.testdata/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/build.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project>
 <project name="com.ibm.wala.core.testdata" default="build.update.jar" basedir=".">
 
 	<property name="basews" value="${ws}"/>
@@ -34,7 +35,7 @@
      <delete dir="${temp.folder}"/>
      <mkdir dir="${temp.folder}/JLex"/>
      <get src="http://www.cs.princeton.edu/~appel/modern/java/JLex/current/Main.java" dest="${temp.folder}/JLex/Main.java"/>
-     <javac target="1.4" source="1.4" includeAntRuntime="no" srcdir="${temp.folder}" destdir="${temp.folder}"/>
+     <javac includeAntRuntime="no" srcdir="${temp.folder}" destdir="${temp.folder}"/>
      <jar destfile="${plugin.destination}/JLex.jar" basedir="${temp.folder}" />
      <delete dir="${temp.folder}"/>
    </target>
@@ -87,13 +88,59 @@
      <delete dir="${temp.folder}"/>
    </target>
 
-	<target name="copyJars" depends="fetchJLex,fetchJavaCup,fetchBcel,buildOCamlHelloHash">
+	<target name="copyJars" depends="fetchJLex,fetchJavaCup,fetchBcel,buildOCamlHelloHash,compileKawaTest,compileKawaChess">
 	  <copy todir="${plugin.destination}/bin">
 	  	<fileset dir="${plugin.destination}" includes="*.jar" />
 	  </copy>
 	</target>
 
+	
+	<target name="KawaChessPresent" depends="init">
+          <available file="${plugin.destination}/kawa-chess/chess.scm" property="kawa.chess.present"/>
+	</target>
+
+	<target name="getKawaChess" depends="KawaChessPresent" unless="kawa.chess.present" >
+	  <exec executable="git"
+		dir="${plugin.destination}">
+	    <arg value="clone"/>
+	    <arg value="http://github.com/ttu-fpclub/kawa-chess" />
+	  </exec>
+	</target>
+
+	
+	<target name="KawaPresent" depends="init">
+          <available file="${plugin.destination}/kawa-3.0/lib/kawa.jar" property="kawa.present"/>
+	</target>
+	
+	<target name="fetchKawa" depends="KawaPresent" unless="kawa.present">
+	  <delete dir="${temp.folder}"/>
+	  <mkdir dir="${temp.folder}"/>
+	  <exec executable="wget" dir="${temp.folder}">
+	    <arg line="ftp://ftp.gnu.org/pub/gnu/kawa/kawa-3.0.zip"/>
+	  </exec>	
+	  <unzip src="${temp.folder}/kawa-3.0.zip" dest="${plugin.destination}"/>
+	  <copy file="${plugin.destination}/kawa-3.0/lib/kawa.jar" todir="${plugin.destination}" failonerror="false" overwrite="false"/>
+	  <delete dir="${temp.folder}"/>
+	</target>
+	
+	<target name="compileKawaTest" depends="fetchKawa">
+	  <exec executable="java" dir="${plugin.destination}/kawasrc">
+	    <arg line="-cp ${plugin.destination}/kawa-3.0/lib/kawa.jar kawa.repl --main -C test.scm"/>
+	  </exec>	
+	  <jar destfile="${plugin.destination}/kawatest.jar" basedir="${plugin.destination}/kawasrc" />
+	</target>
+	
+	<target name="compileKawaChess" depends="fetchKawa,getKawaChess">
+	  <exec executable="java" dir="${plugin.destination}/kawa-chess">
+	    <arg line="-cp ${plugin.destination}/kawa-3.0/lib/kawa.jar kawa.repl -C img.scm pos.scm chess.scm gui.scm"/>
+	  </exec>
+	  <exec executable="java" dir="${plugin.destination}/kawa-chess">
+	    <arg line="-cp ${plugin.destination}/kawa-3.0/lib/kawa.jar kawa.repl --main -C main.scm"/>
+	  </exec>	
+	  <jar destfile="${plugin.destination}/kawachess.jar" basedir="${plugin.destination}/kawa-chess" />
+	</target>
 
+	
 	<target name="init" depends="properties">
 		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
 			<isset property="buildTempFolder"/>
@@ -119,12 +166,7 @@
 		<antcall target="gather.bin.parts">
 		  <param name="destination.temp.folder" value="${temp.folder}/jdk"/>
 		</antcall>
-		<antcall target="gather.bin.parts">
-		  <param name="destination.temp.folder" value="${temp.folder}/dalvik/"/>
-		</antcall>
-		<zip destfile="${plugin.destination}/bin/com.ibm.wala.core.testdata_1.0.0a.jar" basedir="${temp.folder}/dalvik/com.ibm.wala.core.testdata_1.0.0" filesonly="false" whenempty="skip" update="false" excludes="**/CodeDeleted.class"/>
-		<zip destfile="${plugin.destination}/com.ibm.wala.core.testdata_1.0.0a.jar" basedir="${temp.folder}/dalvik/com.ibm.wala.core.testdata_1.0.0" filesonly="false" whenempty="skip" update="false" excludes="**/CodeDeleted.class"/>
-		<zip destfile="${plugin.destination}/bin/com.ibm.wala.core.testdata_1.0.0.jar" basedir="${temp.folder}/jdk/com.ibm.wala.core.testdata_1.0.0" filesonly="false" whenempty="skip" update="false"/>
+		<zip destfile="${plugin.destination}/com.ibm.wala.core.testdata_1.0.0a.jar" basedir="${temp.folder}/jdk/com.ibm.wala.core.testdata_1.0.0" filesonly="false" whenempty="skip" update="false" excludes="**/CodeDeleted.class,**/SortingExample.class,**/A.class"/>
 		<zip destfile="${plugin.destination}/com.ibm.wala.core.testdata_1.0.0.jar" basedir="${temp.folder}/jdk/com.ibm.wala.core.testdata_1.0.0" filesonly="false" whenempty="skip" update="false"/>
 		<delete dir="${temp.folder}"/>
 	</target>
@@ -162,12 +204,6 @@
 		  <param name="jtv" value="${bundleJavacTarget}"/>
 		  <param name="excludes" value="**/bak/"/>
 		</antcall>
-		<antcall target="@dot">
-		  <param name="destdir" value="${temp.folder}/dalvik/@dot"/>
-		  <param name="jsv" value="1.6"/>
-		  <param name="jtv" value="1.6"/>
-		  <param name="excludes" value="**/bak/,**/SortingExample.java,defaultMethods/*.java"/>
-		</antcall>
 	</target>
 
 	<target name="build.sources" depends="init">
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/classes/.gitignore wala-1.5.1/com.ibm.wala.core.testdata/classes/.gitignore
--- wala-1.3.9/com.ibm.wala.core.testdata/classes/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/classes/.gitignore	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1 @@
+!/*.class
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/classes/missingsuper/.gitignore wala-1.5.1/com.ibm.wala.core.testdata/classes/missingsuper/.gitignore
--- wala-1.3.9/com.ibm.wala.core.testdata/classes/missingsuper/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/classes/missingsuper/.gitignore	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1 @@
+!/*.class
Binary files /tmp/tmpdO65hx/hoNCbJkA_9/wala-1.3.9/com.ibm.wala.core.testdata/classes/missingsuper/MissingSuper.class and /tmp/tmpdO65hx/vj4dUdzt1P/wala-1.5.1/com.ibm.wala.core.testdata/classes/missingsuper/MissingSuper.class differ
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/.classpath wala-1.5.1/com.ibm.wala.core.testdata/.classpath
--- wala-1.3.9/com.ibm.wala.core.testdata/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/.gitignore wala-1.5.1/com.ibm.wala.core.testdata/.gitignore
--- wala-1.3.9/com.ibm.wala.core.testdata/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/.gitignore	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1 @@
+/kawa-chess/
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/kawasrc/test.scm wala-1.5.1/com.ibm.wala.core.testdata/kawasrc/test.scm
--- wala-1.3.9/com.ibm.wala.core.testdata/kawasrc/test.scm	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/kawasrc/test.scm	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,11 @@
+
+(define (doit op args)
+  (apply op args))
+
+(define plusish
+  (lambda args
+    (if (= (length args) 1)
+	(car args)
+	(+ (car args) (plusish (cdr args))))))
+
+(write (doit plusish (list 3 4 5)))
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,8 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Testdata Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.core.testdata
-Bundle-Version: 1.3.9
-Bundle-Vendor: IBM
+Bundle-Version: 1.5.1
+Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-BuddyPolicy: registered
+Automatic-Module-Name: com.ibm.wala.core.testdata
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/ocaml/.gitignore wala-1.5.1/com.ibm.wala.core.testdata/ocaml/.gitignore
--- wala-1.3.9/com.ibm.wala.core.testdata/ocaml/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/ocaml/.gitignore	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+/hello_hash.cmi
+/hello_hash.cmj
+/hello_hash.jo
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.core.testdata/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.core.testdata/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.core.testdata
+Bundle-Vendor = IBM
+Bundle-Name = Testdata Plug-in
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/pom.xml wala-1.5.1/com.ibm.wala.core.testdata/pom.xml
--- wala-1.3.9/com.ibm.wala.core.testdata/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,22 +5,13 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
     <packaging>eclipse-plugin</packaging>
     <artifactId>com.ibm.wala.core.testdata</artifactId>
     <build>
       <plugins>
 	<plugin>
-	  <groupId>org.eclipse.tycho</groupId>
-	  <artifactId>tycho-compiler-plugin</artifactId>
-	  <version>${tycho-version}</version>
-	  <configuration>
-	    <source>1.8</source>
-	    <target>1.8</target>
-	  </configuration>
-	</plugin>
-	<plugin>
 	  <artifactId>maven-antrun-plugin</artifactId>
 	  <version>1.7</version>
 	  <executions>
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/.project wala-1.5.1/com.ibm.wala.core.testdata/.project
--- wala-1.3.9/com.ibm.wala.core.testdata/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.core.testdata</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/scripts/cruise/config_nashira.xml wala-1.5.1/com.ibm.wala.core.testdata/scripts/cruise/config_nashira.xml
--- wala-1.3.9/com.ibm.wala.core.testdata/scripts/cruise/config_nashira.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/scripts/cruise/config_nashira.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,3 +1,4 @@
+<!DOCTYPE cruisecontrol>
 <cruisecontrol>
 
 	<!-- ************************************************************************** -->
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,11 +1,16 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
@@ -13,89 +18,101 @@
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=ignore
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
 org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
 org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
 org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
 org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
 org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
@@ -103,8 +120,9 @@
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.core.testdata/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.core.testdata/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=1
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=2
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=1
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.core.testdata/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.core.testdata/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0304file141ocaml/ocamljava-2.0-alpha1/doc/concurrentT0204file137ocaml/ocamljava-2.0-alpha1/doc/manualT0204file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude08113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT0304file128target/antrun/build-main.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/annotations/AnnotationWithParams.java wala-1.5.1/com.ibm.wala.core.testdata/src/annotations/AnnotationWithParams.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/annotations/AnnotationWithParams.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/annotations/AnnotationWithParams.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,7 +14,7 @@
 
   String strParam() default "strdef";
   int intParam() default 0;
-  Class klassParam() default Object.class;
+  Class<?> klassParam() default Object.class;
   AnnotationEnum enumParam() default AnnotationEnum.VAL2;
   String[] strArrParam() default {"foo","baz"};
   int[] intArrParam() default {3,4};
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass1.java wala-1.5.1/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass1.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass1.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass1.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2016 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Martin Hecker, KIT - initial implementation
+ *******************************************************************************/
+package annotations;
+
+import java.util.List;
+import java.util.Set;
+
+public class TypeAnnotatedClass1 extends @TypeAnnotationTypeUse Object {
+  
+  
+  @TypeAnnotationTypeUse
+  List<Set<@TypeAnnotationTypeUse TypeAnnotatedClass1>> field;
+  
+  @TypeAnnotationTypeUse Integer foo(@TypeAnnotationTypeUse int a, @TypeAnnotationTypeUse Object b) {
+    
+    @TypeAnnotationTypeUse
+    int x = 3;
+    
+    @TypeAnnotationTypeUse
+    Object y = new Object();
+    
+    if (y instanceof @TypeAnnotationTypeUse(someKey = "lul") String) {
+      x = 7;
+    }
+    
+    try {
+      throw new NullPointerException();
+    } catch (@TypeAnnotationTypeUse RuntimeException e) {
+      x = 911;
+    }
+    
+    return x;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass2.java wala-1.5.1/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass2.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass2.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/annotations/TypeAnnotatedClass2.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2016 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Martin Hecker, KIT - initial implementation
+ *******************************************************************************/
+package annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.List;
+import java.util.Map;
+
+public class TypeAnnotatedClass2 extends @TypeAnnotationTypeUse Object {
+  
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE})
+  @interface A {}
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE})
+  @interface B {}
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE})
+  @interface C {}
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE})
+  @interface D {}
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE})
+  @interface E {}
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE})
+  @interface F {}
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE})
+  @interface G {}
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE})
+  @interface H {}
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE})
+  @interface I {}
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE})
+  @interface J {}
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE})
+  @interface K {}
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE})
+  @interface L {}
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE_USE})
+  @interface M {}
+  
+  @A Map<@B ? extends @C String, @D List<@E Object>>        field1;
+  @I String @F [] @G [] @H []                               field2;
+  @A List<@B Comparable<@F Object @C [] @D [] @E []>>       field3;
+  @C Outer . @B Middle . @A Inner                           field4;
+  Outer2 . Middle<@D Foo . @C Bar> . Inner<@B String @A []> field5;
+}
+
+class Outer {
+  class Middle {
+    class Inner {
+    }
+  }
+}
+
+class Outer2 {
+  @SuppressWarnings("unused")
+  class Middle<S> {
+    class Inner<T> {
+    }
+  }
+}
+
+class Foo {
+  class Bar {
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/annotations/TypeAnnotationTypeUse.java wala-1.5.1/com.ibm.wala.core.testdata/src/annotations/TypeAnnotationTypeUse.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/annotations/TypeAnnotationTypeUse.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/annotations/TypeAnnotationTypeUse.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Joana IFC project,
+ * Programming Paradigms Group,
+ * Karlsruhe Institute of Technology (KIT).
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    martin.hecker@kit.edu, KIT - 
+ *******************************************************************************/
+package annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.TYPE_USE})
+public @interface TypeAnnotationTypeUse {
+  String someKey() default "lol";
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/arraybounds/Detectable.java wala-1.5.1/com.ibm.wala.core.testdata/src/arraybounds/Detectable.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/arraybounds/Detectable.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/arraybounds/Detectable.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,215 @@
+package arraybounds;
+
+/**
+ * 
+ * All array accesses in the following class are unnecessary and they will be
+ * detected correctly by the array bounds analysis.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class Detectable {
+  private int[] memberArr = new int[5];
+
+  /**
+   * Note: This is correct, even if memberArr is not final!
+   * 
+   * @return memberArr[i]
+   */
+  public int memberLocalGet(int i) {
+    int[] arr = memberArr;
+    if (i >= 0 && i < arr.length) {
+      return arr[i];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  public int[] constantCreation() {
+    return new int[] { 3, 4, 5 };
+  }
+
+  public int get(int i, int[] arr) {
+    if (i >= 0 && i < arr.length) {
+      return arr[i];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  public void loop(int[] arr) {
+    for (int i = 0; i < arr.length; i++) {
+      arr[i] = 0;
+    }
+  }
+
+  public boolean equals(int[] a, int[] b) {
+    int lenA = a.length;
+    int lenB = b.length;
+    boolean result;
+
+    if (lenA == lenB) {
+      result = true;
+      for (int i = 0; i < lenA; i++) {
+        if (a[i] != b[i]) {
+          result = false;
+        }
+      }
+    } else {
+      result = false;
+    }
+
+    return result;
+  }
+
+  @SuppressWarnings("ManualArrayCopy")
+  public void copy(int[] src, int[] dst) {
+    int lenSrc = src.length;
+    int lenDst = dst.length;
+
+    if (lenSrc < lenDst) {
+      for (int i = 0; i < lenSrc; i++) {
+        dst[i] = src[i];
+      }
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  /**
+   * swaps elements of a and b for all i: 0 &lt;= i &lt; min(a.length, b.length)
+   */
+  public void swapWithMin(int[] a, int[] b) {
+    final int l1 = a.length;
+    final int l2 = b.length;
+    int length;
+    if (l1 < l2) {
+      length = l1;
+    } else {
+      length = l2;
+    }
+
+    for (int i = 0; i < length; i++) {
+      int tmp = a[i];
+      a[i] = b[i];
+      b[i] = tmp;
+    }
+  }
+
+  /**
+   * Invert the order of all elements of arr with index i: fromIndex &lt;= i <
+   * toIndex.
+   */
+  public void partialInvert(int[] arr, int fromIndex, int toIndex) {
+    if (fromIndex >= 0 && toIndex <= arr.length && fromIndex < toIndex) {
+      for (int next = fromIndex; next < toIndex; ++next) {
+        int tmp = arr[toIndex - 1];
+        int i;
+        for (i = toIndex - 1; i > next; --i) {
+          arr[i] = arr[i - 1];
+        }
+        arr[i] = tmp; // i == next
+      }
+    }
+  }
+
+  /**
+   * The constant 3 is stored in a variable. The pi construction for the
+   * variable allows to detect, that the array access is in bound.
+   * 
+   * Compare to {@link NotDetectable#dueToConstantPropagation(int[])}
+   * 
+   * @return arr[3]
+   */
+  public int nonFinalConstant(int[] arr) {
+    int i = 3;
+    if (i < arr.length) {
+      return arr[i];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  /**
+   * Workaround for {@link NotDetectable#constants(int[])}
+   * 
+   * Note: It is important, that the variable five, is compared directly to the
+   * length, and that further computations are performed with this variable.
+   * 
+   * @return arr[3]
+   */
+  public int constantsWorkaround(int[] arr) {
+    int five = 5;
+    if (arr.length > five) {
+      return arr[five - 2];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  /**
+   * Actually aliasing is only working, because it is removed during
+   * construction by wala.
+   * 
+   * @return arr[i]
+   */
+  public int aliasing(int i, int[] arr) {
+    int[] a = arr;
+    int[] b = arr;
+
+    if (0 <= i && i < a.length) {
+      return b[i];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  public String afterLoop(int[] arr) {
+    int len = arr.length - 1;
+    StringBuilder buffer = new StringBuilder();
+    int zero = 0;
+    if (zero < arr.length) {
+      int i = zero;
+      while (i < len) {
+        buffer.append(arr[i]);
+        buffer.append(", ");
+        i++;
+      }
+
+      buffer.append(arr[i]);
+    }
+    return buffer.toString();
+  }
+
+  public static void quickSort(int[] arr, int left, int right) {
+    if (0 <= left && right <= arr.length && left < right - 1) {
+      int pivot = arr[left];
+      int lhs = left + 1;
+      int rhs = right - 1;
+      while (lhs < rhs) {
+        while (arr[lhs] <= pivot && lhs < right - 1) {
+          lhs++;
+        }
+
+        while (arr[rhs] >= pivot && rhs > left) {
+          rhs--;
+        }
+
+        if (lhs < rhs) {
+          int tmp = arr[lhs];
+          arr[lhs] = arr[rhs];
+          arr[rhs] = tmp;
+        }
+      }
+
+      if (arr[lhs] < pivot) {
+        arr[left] = arr[lhs];
+        arr[lhs] = pivot;
+      }
+
+      quickSort(arr, left, lhs);
+      quickSort(arr, lhs, right);
+
+    }
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/arraybounds/NotDetectable.java wala-1.5.1/com.ibm.wala.core.testdata/src/arraybounds/NotDetectable.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/arraybounds/NotDetectable.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/arraybounds/NotDetectable.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,164 @@
+package arraybounds;
+
+/**
+ * 
+ * All array accesses in the following class are unnecessary but they will not
+ * be detected correctly by the array bounds analysis.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class NotDetectable {
+  private final int[] memberArr = new int[5];
+
+  /**
+   * Member calls are not supported. See {@link Detectable#memberLocalGet(int)}
+   * for workaround.
+   * 
+   * @return memberArr[i]
+   */
+  public int memberGet(int i) {
+    if (i >= 0 && i < memberArr.length) {
+      return memberArr[i];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  private int getLength() {
+    return memberArr.length;
+  }
+
+  /**
+   * Interprocedural analysis is not supported.
+   * 
+   * @return memberArr[i]
+   */
+  public int interproceduralGet(int i) {
+    if (i >= 0 && i < getLength()) {
+      return memberArr[i];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  /**
+   * This example does not work: We know 5 &gt; 3 and sometimes length &gt; 5 &gt; 3. In
+   * case of variables this conditional relation is resolved by introducing pi
+   * nodes. For constants pi nodes can be generated, but the pi variables will
+   * not be used (maybe due to constant propagation?). Additionally 5 != 3, so
+   * even if we would use pi-variables for 5, there would be no relation to 3: 0
+   * -(5)-&gt; 5, 5 -(-5)-&gt; 0, {5,length} -(0)-&gt; 5', 0 -(3)-&gt; 3, 3 -(-3)-&gt; 0 Given
+   * the inequality graph above, we know that 5,5',3 are larger than 0 and 5
+   * larger 3 and length is larger than 5', but not 5' larger than 3. Which is
+   * not always the case in general anyway.
+   * 
+   * This may be implemented by replacing each use of a constant dominated by a
+   * definition of a pi of a constant, with a fresh variable, that is connected
+   * to the inequality graph accordingly.
+   * 
+   * For a workaround see {@link Detectable#nonFinalConstant(int[])}
+   * 
+   * @return arr[3]
+   */
+  public int constants(int[] arr) {
+    if (arr.length > 5) {
+      return arr[3];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  /**
+   * As the variable i is final, constant propagation will prevent the detection
+   * (See also {@link NotDetectable#constants(int[])}), for a working example
+   * see {@link Detectable#nonFinalConstant(int[])}.
+   * 
+   * @return arr[3]
+   */
+  public int dueToConstantPropagation(int[] arr) {
+    final int i = 3;
+    if (i < arr.length) {
+      return arr[i];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  public int indirectComparison(int[] arr) {
+    int i = 3;
+    int e = i + 1;
+    if (e < arr.length) {
+      return arr[i];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  /**
+   * Neither modulo, multiplication or division with constants will work.
+   * 
+   * Note: Any operation can be performed BEFORE comparing a variable to the
+   * array length.
+   * 
+   * @return arr[i]
+   */
+  public int modulo(int[] arr, int i) {
+    if (0 <= i && i < arr.length) {
+      return arr[i % 2];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  /**
+   * Neither subtraction of variables nor inverting variables will work.
+   * 
+   * Note: Any operation can be performed BEFORE comparing a variable to the
+   * array length.
+   * 
+   * @return arr[i]
+   */
+  public int variableSubtraction(int[] arr, int i) {
+    if (0 <= i && i < arr.length) {
+      int i2 = 0 - i;
+      int i3 = -i2;
+      return arr[i3];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  /**
+   * The analysis can not detect, that forward is false every other iteration.
+   * So there is a positive and a negative loop. The positive loop is bound by
+   * the loop condition, while the negative loop is unbound, so index might be
+   * smaller than zero. This should result in the lower bound check beeing
+   * necessary.
+   * 
+   * @return sum of all elements in arr
+   */
+  public int nonMonotounous(int arr[]) {
+    int index = 0;
+    int sum = 0;
+    boolean forward = true;
+    while (index < arr.length) {
+      sum += arr[index];
+      if (forward) {
+        index += 2;
+      } else {
+        index -= 1;
+      }
+      forward = !forward;
+    }
+    return sum;
+  }
+  
+  /**
+   * Multidimensional Arrays are not supported yet.
+   */  
+  public int multiDimensional(){
+    int arr[][] = new int[5][10];
+    return arr[2][3];
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/arraybounds/NotInBound.java wala-1.5.1/com.ibm.wala.core.testdata/src/arraybounds/NotInBound.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/arraybounds/NotInBound.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/arraybounds/NotInBound.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,80 @@
+package arraybounds;
+
+/**
+ * 
+ * All array accesses in the following class are necessary and they will be
+ * detected correctly by the array bounds analysis.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class NotInBound {
+  public int phiOverwrite(int[] arr, boolean condition) {
+    if (arr.length > 0) {
+      int l = arr.length;
+      if (condition) {
+        l = 5;
+      }
+
+      return arr[l - 1];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  public void offByOne(int[] arr) {
+    for (int i = 0; i <= arr.length; i++) {
+      arr[i] = 0;
+    }
+  }
+
+  public int unknownLength(int[] arr) {
+    return arr[4];
+  }
+
+  public int ambiguity(int[] arr1, int[] arr2, int i) {
+    int[] arr = arr2;
+    if (0 <= i && i < arr.length) {
+      arr = arr1;
+      return arr[i];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  public int innerLoop(int[] arr) {
+    int sum = 0;
+    int i = 0;
+    while (i < arr.length) {
+      while (i < 6) {
+        i++;
+        sum += arr[i];
+      }
+    }
+    return sum;
+  }
+
+  public int comparedWrong(int[] arr, int index) {
+    if (index > 0 && index > arr.length) {
+      return arr[index];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+
+  public int nonTrackedOperationIsSafe(int[] arr, int index) {
+    if (index > 0 && index > arr.length) {
+      return arr[2*index];
+    } else {
+      throw new IllegalArgumentException();
+    }
+  }
+  
+  public int unboundNegativeLoop(int[] arr, int index) {
+    int sum = 0;
+    for (int i = 5; i < arr.length; i--) {
+      sum += arr[i];
+    }
+    return sum;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/bug144/A.java wala-1.5.1/com.ibm.wala.core.testdata/src/bug144/A.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/bug144/A.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/bug144/A.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,18 @@
+package bug144;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+class A {
+  void m() {
+    Set<Object> set = new HashSet<>();
+    Stream<Object> stream = set.parallelStream();
+    stream.sorted(); 
+    stream.collect(Collectors.toList()); // this call forces the error.
+  }
+  public static void main(String[] args) {
+    new A().m();
+  }
+}
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/cfg/exc/inter/CallFieldAccess.java wala-1.5.1/com.ibm.wala.core.testdata/src/cfg/exc/inter/CallFieldAccess.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/cfg/exc/inter/CallFieldAccess.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/cfg/exc/inter/CallFieldAccess.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,66 @@
+package cfg.exc.inter;
+
+import cfg.exc.intra.B;
+import cfg.exc.intra.FieldAccess;
+import cfg.exc.intra.FieldAccessDynamic;
+
+public class CallFieldAccess {
+  static boolean unknown;
+  public static void main(String[] args) {
+    unknown = (args.length == 0);
+    callIfException();
+    callIfNoException();
+    callDynamicIfException();
+    callDynamicIfNoException();
+    callIf2Exception();
+    callIf2NoException();
+    callDynamicIf2Exception();
+    callDynamicIf2NoException();
+    callGetException();
+    callDynamicGetException();
+  }
+  
+  static B callIfException() {
+    return FieldAccess.testIf(unknown, new B(), null);
+  }
+  static B callIfNoException() {
+    return FieldAccess.testIf(unknown, new B(), new B());
+  }
+  
+  static B callDynamicIfException() {
+    FieldAccessDynamic fad = new FieldAccessDynamic();
+    return fad.testIf(unknown, new B(), null);
+  }
+  static B callDynamicIfNoException() {
+    FieldAccessDynamic fad = new FieldAccessDynamic();
+    return fad.testIf(unknown, new B(), new B());
+  }
+  
+  static B callIf2Exception() {
+    return FieldAccess.testIf2(unknown, null, null);
+  }
+  static B callIf2NoException() {
+    return FieldAccess.testIf2(unknown, new B(), null);
+  }
+  
+  static B callDynamicIf2Exception() {
+    FieldAccessDynamic fad = new FieldAccessDynamic();
+    return fad.testIf2(unknown, null, null);
+  }
+  static B callDynamicIf2NoException() {
+    FieldAccessDynamic fad = new FieldAccessDynamic();
+    return fad.testIf2(unknown, new B(), null);
+  }
+  
+  static B callGetException() {
+    B b = new B();
+    return FieldAccess.testGet(unknown, b);
+  }
+  
+  static B callDynamicGetException() {
+    FieldAccessDynamic fad = new FieldAccessDynamic();
+    B b = new B();
+    return fad.testGet(unknown, b);
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/cfg/exc/intra/B.java wala-1.5.1/com.ibm.wala.core.testdata/src/cfg/exc/intra/B.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/cfg/exc/intra/B.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/cfg/exc/intra/B.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,11 @@
+package cfg.exc.intra;
+
+/**
+ * @author Martin Hecker
+ */
+
+
+public class B {
+	public int f;
+	public B b;
+}
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/cfg/exc/intra/FieldAccessDynamic.java wala-1.5.1/com.ibm.wala.core.testdata/src/cfg/exc/intra/FieldAccessDynamic.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/cfg/exc/intra/FieldAccessDynamic.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/cfg/exc/intra/FieldAccessDynamic.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,126 @@
+/**
+ * This file is part of the Joana IFC project. It is developed at the
+ * Programming Paradigms Group of the Karlsruhe Institute of Technology.
+ *
+ * For further details on licensing please read the information at
+ * http://joana.ipd.kit.edu or contact the authors.
+ */
+package cfg.exc.intra;
+
+
+public class FieldAccessDynamic {
+  
+  
+  public B testParam(boolean unknown, B b1, B b2) {
+    b1 = null;
+    return b1;
+  }
+
+  public B testParam2(boolean unknown, B b1, B b2) {
+    b1.f = 42;
+    return b1;
+  }
+  
+  
+  public B testIf(boolean unknown, B b1, B b2) {
+    b1.f = 42;
+    b2.f = 17;
+
+    B b3;
+    if (unknown) {
+      b3 = b1;
+    } else {
+      b3 = b2;
+    }
+    
+    return b3;
+  }
+
+  public B testIf2(boolean unknown, B b1, B b2) {
+    b1.f = 42;
+
+    B b3;
+    if (unknown) {
+      b3 = b1;
+    } else {
+      b3 = b2;
+    }
+    
+    return b3;
+  }
+  
+  public B testIfContinued(boolean unknown, B b1, B b2, B b4) {
+    b1.f = 42;
+
+    B b3;
+    if (unknown) {
+      b3 = b1;
+    } else {
+      b3 = b2;
+    }
+    
+    if (unknown) {
+      b1.f = 42;
+    }
+    
+    b3.f = 17;
+    return b2;
+  }
+  
+  public B testIf3(boolean unknown, B b1) {
+    if (unknown) {
+      b1.f = 42;
+    } else {
+      System.out.println("rofl");
+    }
+    
+    return b1;
+  }
+  
+  public B testWhile(boolean unknown, B b1) {
+    b1.f = 42;
+
+    B b3 = null;
+    while (unknown) {
+      b3 = b1;
+    }
+    
+    return b3;
+  }
+  
+  public B testWhile2(boolean unknown, B b1) {
+    b1.f = 42;
+
+    B b3 = new B();
+    b3.f = 17;
+    
+    while (unknown) {
+      b3 = b1;
+    }
+    
+    return b3;
+  }
+  
+  public B testGet(boolean unknown, B b1) {
+    b1.f = 42;
+
+    B b3 = b1.b;
+
+    if (unknown) {
+      b3.f = 17;
+    }
+    
+    return b3;
+  }
+  
+
+	public static void main(String[] args) {
+
+		B b1 = new B();
+		B b2 = new B();
+		final boolean unknown = (args.length == 0);
+
+		FieldAccessDynamic fa = new FieldAccessDynamic();
+		fa.testIf(unknown, b1, b2);
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/cfg/exc/intra/FieldAccess.java wala-1.5.1/com.ibm.wala.core.testdata/src/cfg/exc/intra/FieldAccess.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/cfg/exc/intra/FieldAccess.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/cfg/exc/intra/FieldAccess.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,125 @@
+/**
+ * This file is part of the Joana IFC project. It is developed at the
+ * Programming Paradigms Group of the Karlsruhe Institute of Technology.
+ *
+ * For further details on licensing please read the information at
+ * http://joana.ipd.kit.edu or contact the authors.
+ */
+package cfg.exc.intra;
+
+
+public class FieldAccess {
+  
+  
+  public static B testParam(boolean unknown, B b1, B b2) {
+    b1 = null;
+    return b1;
+  }
+
+  public static B testParam2(boolean unknown, B b1, B b2) {
+    b1.f = 42;
+    return b1;
+  }
+  
+  
+  public static B testIf(boolean unknown, B b1, B b2) {
+    b1.f = 42;
+    b2.f = 17;
+
+    B b3;
+    if (unknown) {
+      b3 = b1;
+    } else {
+      b3 = b2;
+    }
+    
+    return b3;
+  }
+
+  public static B testIf2(boolean unknown, B b1, B b2) {
+    b1.f = 42;
+
+    B b3;
+    if (unknown) {
+      b3 = b1;
+    } else {
+      b3 = b2;
+    }
+    
+    return b3;
+  }
+  
+  public static B testIfContinued(boolean unknown, B b1, B b2, B b4) {
+    b1.f = 42;
+
+    B b3;
+    if (unknown) {
+      b3 = b1;
+    } else {
+      b3 = b2;
+    }
+    
+    if (unknown) {
+      b1.f = 42;
+    }
+    
+    b3.f = 17;
+    return b2;
+  }
+  
+  public static B testIf3(boolean unknown, B b1) {
+    if (unknown) {
+      b1.f = 42;
+    } else {
+      System.out.println("rofl");
+    }
+    
+    return b1;
+  }
+  
+  public static B testWhile(boolean unknown, B b1) {
+    b1.f = 42;
+
+    B b3 = null;
+    while (unknown) {
+      b3 = b1;
+    }
+    
+    return b3;
+  }
+  
+  public static B testWhile2(boolean unknown, B b1) {
+    b1.f = 42;
+
+    B b3 = new B();
+    b3.f = 17;
+    
+    while (unknown) {
+      b3 = b1;
+    }
+    
+    return b3;
+  }
+  
+  public static B testGet(boolean unknown, B b1) {
+    b1.f = 42;
+
+    B b3 = b1.b;
+
+    if (unknown) {
+      b3.f = 17;
+    }
+    
+    return b3;
+  }
+  
+
+	public static void main(String[] args) {
+
+		B b1 = new B();
+		B b2 = new B();
+		final boolean unknown = (args.length == 0);
+
+		testIf(unknown, b1, b2);
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/cfg/MonitorTest.java wala-1.5.1/com.ibm.wala.core.testdata/src/cfg/MonitorTest.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/cfg/MonitorTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/cfg/MonitorTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,4 +44,4 @@
 
   void dummy() {
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/classConstant/ClassConstant.java wala-1.5.1/com.ibm.wala.core.testdata/src/classConstant/ClassConstant.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/classConstant/ClassConstant.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/classConstant/ClassConstant.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,7 +13,7 @@
 class ClassConstant {
 
   public static void main(String args[]) {
-    Class x = ClassConstant.class;
+    Class<ClassConstant> x = ClassConstant.class;
     x.hashCode();
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/cornerCases/AliasNames.java wala-1.5.1/com.ibm.wala.core.testdata/src/cornerCases/AliasNames.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/cornerCases/AliasNames.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/cornerCases/AliasNames.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,6 +14,6 @@
 
   public static void foo(String[] a) {
     @SuppressWarnings("unused")
-    String s = a[0].toString();
+    String s = a[0];
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/cornerCases/Main.java wala-1.5.1/com.ibm.wala.core.testdata/src/cornerCases/Main.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/cornerCases/Main.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/cornerCases/Main.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,6 +19,7 @@
  * TODO To change the template for this generated type comment go to
  * Window - Preferences - Java - Code Style - Code Templates
  */
+@SuppressWarnings("restriction")
 public class Main {
 
   public static void main(String[] args) {
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/cornerCases/TryFinally.java wala-1.5.1/com.ibm.wala.core.testdata/src/cornerCases/TryFinally.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/cornerCases/TryFinally.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/cornerCases/TryFinally.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,6 +17,7 @@
 
 public class TryFinally {
   
+  @SuppressWarnings("resource")
   public void test1(InputStream i1, InputStream i2) throws IOException {
     BufferedInputStream in = new BufferedInputStream(i1);
     try {
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/cornerCases/YuckyInterface.java wala-1.5.1/com.ibm.wala.core.testdata/src/cornerCases/YuckyInterface.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/cornerCases/YuckyInterface.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/cornerCases/YuckyInterface.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,6 +18,7 @@
  * When analyzed with J2EEClassHierarchy exclusions, the superinterface
  * FontSupport should not be found because we exclude sun.java2d.*
  */
+@SuppressWarnings("restriction")
 public interface YuckyInterface extends FontSupport {
 
 
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/cpa/CPATest1.java wala-1.5.1/com.ibm.wala.core.testdata/src/cpa/CPATest1.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/cpa/CPATest1.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/cpa/CPATest1.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,56 @@
+package cpa;
+
+public class CPATest1 {
+
+    protected static abstract class N {
+      abstract N op(N other);
+    }
+    
+    public static class I extends N {
+      int I;
+      
+      I(int i) {
+        this.I = i;
+      }
+      
+      @Override
+      N op(N other) {
+        if (other instanceof I) {
+          return new I(I + ((I)other).I); 
+        } else {
+          return new F(I + ((F)other).F);
+        }
+      }
+    }
+    
+    public static class F extends N {
+      double F;
+
+      public F(double f) {
+        F = f;
+      }
+      
+      @Override
+      N op(N other) {
+        if (other instanceof I) {
+          return new F(F + ((I)other).I); 
+        } else {
+          return new F(F + ((F)other).F);
+        }
+      }
+    }
+    
+    public static N id(N x) {
+      return x;
+    }
+    
+    @SuppressWarnings("unused")
+    public static void main(String[] args) {
+      F f = new F(3.4);
+      I i = new I(7);
+      F r1 = (F) id(f.op(f));
+      F r2 = (F) id(f.op(i));
+      I r3 = (I) id(i.op(f));
+      I r4 = (I) id(i.op(i));
+    }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/cpa/CPATest2.java wala-1.5.1/com.ibm.wala.core.testdata/src/cpa/CPATest2.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/cpa/CPATest2.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/cpa/CPATest2.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,56 @@
+package cpa;
+
+public class CPATest2 {
+
+    protected static abstract class N {
+      abstract N op(int x, N other);
+    }
+    
+    public static class I extends N {
+      int I;
+      
+      I(int i) {
+        this.I = i;
+      }
+      
+      @Override
+      N op(int x, N other) {
+        if (other instanceof I) {
+          return new I(I + ((I)other).I); 
+        } else {
+          return new F(I + ((F)other).F);
+        }
+      }
+    }
+    
+    public static class F extends N {
+      double F;
+
+      public F(double f) {
+        F = f;
+      }
+      
+      @Override
+      N op(int x, N other) {
+        if (other instanceof I) {
+          return new F(F + ((I)other).I); 
+        } else {
+          return new F(F + ((F)other).F);
+        }
+      }
+    }
+    
+    public static N id(N x, int i) {
+      return x;
+    }
+    
+    @SuppressWarnings("unused")
+    public static void main(String[] args) {
+      F f = new F(3.4);
+      I i = new I(7);
+      F r1 = (F) id(f.op(0, f), 0);
+      F r2 = (F) id(f.op(0, i), 0);
+      I r3 = (I) id(i.op(0, f), 0);
+      I r4 = (I) id(i.op(0, i), 0);
+    }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestFieldsHarder.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestFieldsHarder.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestFieldsHarder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestFieldsHarder.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,9 +16,6 @@
  */
 public class FlowsToTestFieldsHarder {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     Object o1 = new FlowsToType();
     A a1 = new A();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestFields.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestFields.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestFields.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestFields.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,9 +16,6 @@
  */
 public class FlowsToTestFields {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     Object o1 = new FlowsToType();
     Object o2 = new Object();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestId.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestId.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestId.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestId.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,9 +20,6 @@
     return o;
   }
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     Object o1 = new FlowsToType();
     Object o2 = new Object();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestLocals.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestLocals.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestLocals.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/FlowsToTestLocals.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,9 +12,6 @@
 
 public class FlowsToTestLocals {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     Object x = new FlowsToType();
     DemandPATestUtil.makeVarUsed(x);
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestArrayList.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestArrayList.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestArrayList.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestArrayList.java	2019-01-29 17:08:39.000000000 +0000
@@ -41,13 +41,9 @@
 
 public class TestArrayList {
 
-  /**
-   * @param args
-   */
-  @SuppressWarnings("unchecked")
   public static void main(String[] args) {
-    ArrayList l1 = new ArrayList();
-    ArrayList l2 = new ArrayList();
+    ArrayList<Object> l1 = new ArrayList<Object>();
+    ArrayList<Object> l2 = new ArrayList<Object>();
     l1.add(new Object());
     l2.add(new Object());
     Object o1 = l1.get(0);
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestArrays.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestArrays.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestArrays.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestArrays.java	2019-01-29 17:08:39.000000000 +0000
@@ -39,9 +39,6 @@
 
 public class TestArrays {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     Object[] arr = new Object[10];
     arr[0] = new Object();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestException.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestException.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestException.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestException.java	2019-01-29 17:08:39.000000000 +0000
@@ -39,9 +39,6 @@
 
 public class TestException {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     try {
       foo(null);
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestFactory.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestFactory.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,9 +43,6 @@
     return new A();
   }
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     A a1 = makeA();
     A a2 = makeA();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestFieldsHarder.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestFieldsHarder.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestFieldsHarder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestFieldsHarder.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,9 +42,6 @@
 
 public class TestFieldsHarder {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     Object o1 = new Object();
     A a1 = new A();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestFields.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestFields.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestFields.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestFields.java	2019-01-29 17:08:39.000000000 +0000
@@ -39,9 +39,6 @@
 
 public class TestFields {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     Object o1 = new Object();
     Object o2 = new Object();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestGetterSetter.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestGetterSetter.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestGetterSetter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestGetterSetter.java	2019-01-29 17:08:39.000000000 +0000
@@ -39,9 +39,6 @@
 
 public class TestGetterSetter {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     Object o1 = new Object();
     Object o2 = new Object();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestGlobal.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestGlobal.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestGlobal.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestGlobal.java	2019-01-29 17:08:39.000000000 +0000
@@ -41,10 +41,6 @@
 
   static Object g = new Object();
 
-  /**
-   * @param args
-   */
-
   static Object getGlobal() {
     return g;
   }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestHashtableEnum.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestHashtableEnum.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestHashtableEnum.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestHashtableEnum.java	2019-01-29 17:08:39.000000000 +0000
@@ -40,9 +40,6 @@
 
 public class TestHashtableEnum {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     DummyHashMap h1 = new DummyHashMap();
     DummyHashMap h2 = new DummyHashMap();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestId.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestId.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestId.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestId.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,9 +43,6 @@
     return o;
   }
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     Object o1 = new Object();
     Object o2 = new Object();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestLinkedListIter.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestLinkedListIter.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestLinkedListIter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestLinkedListIter.java	2019-01-29 17:08:39.000000000 +0000
@@ -40,9 +40,6 @@
 
 public class TestLinkedListIter {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     DummyLinkedList l1 = new DummyLinkedList();
     DummyLinkedList l2 = new DummyLinkedList();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestLinkedList.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestLinkedList.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestLinkedList.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestLinkedList.java	2019-01-29 17:08:39.000000000 +0000
@@ -40,9 +40,6 @@
 
 public class TestLinkedList {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     DummyLinkedList l1 = new DummyLinkedList();
     DummyLinkedList l2 = new DummyLinkedList();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestLocals.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestLocals.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestLocals.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestLocals.java	2019-01-29 17:08:39.000000000 +0000
@@ -39,9 +39,6 @@
 
 public class TestLocals {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     Object x = new Object();
     DemandPATestUtil.testThisVar(x);
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestMethodRecursion.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestMethodRecursion.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestMethodRecursion.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestMethodRecursion.java	2019-01-29 17:08:39.000000000 +0000
@@ -66,4 +66,4 @@
     Object o3 = foo(o1, o2, false);
     DemandPATestUtil.testThisVar(o3);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestMultiDim.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestMultiDim.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestMultiDim.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestMultiDim.java	2019-01-29 17:08:39.000000000 +0000
@@ -39,9 +39,6 @@
 
 public class TestMultiDim {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     Object[][][] multi = new Object[10][10][10];
     multi[0] = new Object[10][10];
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestOnTheFlyCS.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestOnTheFlyCS.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestOnTheFlyCS.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestOnTheFlyCS.java	2019-01-29 17:08:39.000000000 +0000
@@ -56,9 +56,6 @@
     c1.doSomething(o);
   }
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     callDoSomething(new C1(), new Object());
     callDoSomething(new C2(), new Object());
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestOnTheFlySimple.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestOnTheFlySimple.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestOnTheFlySimple.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestOnTheFlySimple.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,9 +47,6 @@
     return new B();
   }
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     A a2 = new A();
     DemandPATestUtil.makeVarUsed(a2);
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestWithinMethodCall.java wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestWithinMethodCall.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/demandpa/TestWithinMethodCall.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/demandpa/TestWithinMethodCall.java	2019-01-29 17:08:39.000000000 +0000
@@ -39,9 +39,6 @@
 
 public class TestWithinMethodCall {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     Object o = new Object();
     testMethod(o);
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/exceptionpruning/OwnException.java wala-1.5.1/com.ibm.wala.core.testdata/src/exceptionpruning/OwnException.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/exceptionpruning/OwnException.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/exceptionpruning/OwnException.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,5 @@
+package exceptionpruning;
+
+public class OwnException extends RuntimeException {
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/exceptionpruning/TestPruning.java wala-1.5.1/com.ibm.wala.core.testdata/src/exceptionpruning/TestPruning.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/exceptionpruning/TestPruning.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/exceptionpruning/TestPruning.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,148 @@
+package exceptionpruning;
+
+public class TestPruning {
+  public void testTryCatchOwnException(int i) {
+    try {
+      switch (i) {
+      case 1:
+        invokeSingleThrowOwnException();
+        break;
+      case 2:
+        throw new OwnException();
+      case 3:
+        invokeSinglePassThrough();
+        break;
+      case 5:
+        invokeSingleRecursive(i);
+        break;
+      case 4:
+        invokeSingleRecursive2(i);
+        break;
+      }
+    } catch (OwnException e) {
+
+    }
+  }
+
+  public int testTryCatchImplicitException(int i) {    
+    int res = 0;
+
+    try {
+      int[] a = new int[]{1,3,4};
+      
+      switch (i) {
+      case 3:
+        invokeSingleImplicitException(a);
+        break;
+      case 4:       
+        res = a[5];
+      }
+    } catch (ArrayIndexOutOfBoundsException e) {
+
+    }
+    
+    return res;
+  }
+
+  public void testTryCatchSuper(int i) {
+    try {
+      switch (i) {
+      case 5:
+        invokeSingleThrowOwnException();
+        break;
+      case 6:
+        throw new OwnException();
+      case 7:
+        invokeAllPassThrough();
+        break;
+      }
+    } catch (RuntimeException e) {
+
+    }
+  }
+
+  public int testTryCatchMultipleExceptions(int i) {    
+    int res = 0;
+
+    try {
+      int[] a = new int[]{1,3,4};
+      
+      switch (i) {
+      case 7:
+        invokeAll();
+        break;
+      case 8:
+        throw new OwnException();
+      case 10:
+        res = a[5];
+        break;
+      case 11:
+        invokeSingleRecursive(i);
+        break;
+      case 12:
+        invokeSingleRecursive2(i);
+        break;
+      case 13:
+        invokeAllPassThrough();
+        break;
+      }
+    } catch (ArrayIndexOutOfBoundsException e) {
+
+    } catch (OwnException e) {
+
+    }    
+    return res;
+  }
+
+  public void invokeAll() {
+    invokeSingleThrowOwnException();   
+    invokeSingleImplicitException(null);
+  }
+
+  public void invokeAllPassThrough() {
+    invokeAll();
+  }
+
+  public void invokeSinglePassThrough() {
+    invokeSingleThrowOwnException();
+  }
+
+  public void invokeSingleThrowOwnException() {
+    throw new OwnException();
+  }
+
+  public int invokeSingleImplicitException(int[] a) {
+    // may throw NullPointerException implicit
+    return a[5];
+  }
+  
+  public void invokeSingleRecursive(int i) {
+    if (i == 0) {
+      throw new OwnException();
+    } else {
+      invokeSingleRecursive(i - 1);
+    }
+  }
+  
+  public void invokeSingleRecursive2(int i) {
+    if (i == 0) {
+      throw new OwnException();
+    } else {
+      invokeSingleRecursive2Helper(i - 1);
+    }
+  }
+  
+  public void invokeSingleRecursive2Helper(int i) {
+    invokeSingleRecursive2(i);
+  }  
+
+  public static void main(String[] args) {
+    TestPruning test = new TestPruning();
+    for (int i = 0; i < 50; i++) {
+      test.testTryCatchOwnException(i);
+      test.testTryCatchMultipleExceptions(i);
+      test.testTryCatchImplicitException(i);
+      test.testTryCatchSuper(i);
+    }
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/hello/Hello.java wala-1.5.1/com.ibm.wala.core.testdata/src/hello/Hello.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/hello/Hello.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/hello/Hello.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,9 +12,6 @@
 
 public class Hello {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     System.out.println("Hello world");
   }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/lambda/SortingExample.java wala-1.5.1/com.ibm.wala.core.testdata/src/lambda/SortingExample.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/lambda/SortingExample.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/lambda/SortingExample.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,9 @@
 		return strs;
 	}
 	
-  private static int id1(int x) { return x; }
+  private static int id0(int x) { return x; }
+
+  private static int id1(int x) { return id0(x); }
 
   public String[] sortForward() {
 		return sort( (String l, String r) -> id1(l.compareTo(r)));
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/libmodels/LibModels.java wala-1.5.1/com.ibm.wala.core.testdata/src/libmodels/LibModels.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/libmodels/LibModels.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/libmodels/LibModels.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,25 @@
+package libmodels;
+
+public class LibModels {
+
+  public static void reachable1() {}
+
+  public static void reachable2() {}
+
+  static class Handler implements Thread.UncaughtExceptionHandler {
+
+    @Override
+    public void uncaughtException(Thread t, Throwable e) {
+      reachable2();
+    }
+  }
+  public static void main( String[] argv) {
+    Runtime.getRuntime().addShutdownHook(new Thread() {
+      @Override
+      public void run() {
+        reachable1();
+      }
+    });
+    Thread.setDefaultUncaughtExceptionHandler(new Handler());
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/methodLookup/MethodLookupStuff.java wala-1.5.1/com.ibm.wala.core.testdata/src/methodLookup/MethodLookupStuff.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/methodLookup/MethodLookupStuff.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/methodLookup/MethodLookupStuff.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,15 @@
+package methodLookup;
+
+public class MethodLookupStuff {
+
+  static class A {
+    A(int foo) {      
+    }
+    
+    A() {}
+  }
+  
+  static class B extends A {
+    
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/multiDim/TestMultiDim.java wala-1.5.1/com.ibm.wala.core.testdata/src/multiDim/TestMultiDim.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/multiDim/TestMultiDim.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/multiDim/TestMultiDim.java	2019-01-29 17:08:39.000000000 +0000
@@ -29,4 +29,4 @@
     String[][][] x = new String[3][4][];
     doNothing(x);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/recurse/NList.java wala-1.5.1/com.ibm.wala.core.testdata/src/recurse/NList.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/recurse/NList.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/recurse/NList.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,6 +18,7 @@
  *
  * A simple exercise in recursive data structures.
  */
+@SuppressWarnings("rawtypes")
 public class NList implements Collection {
 
   final int value;
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/GetMethodContext.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/GetMethodContext.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/GetMethodContext.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/GetMethodContext.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,7 +15,7 @@
 import java.lang.reflect.Method;
 
 /**
- * A test targeting the {@link com.ibm.wala.analysis.reflection.GetMethodContext}.
+ * A test targeting the {@code com.ibm.wala.analysis.reflection.GetMethodContext}.
  * @author Michael Heilmann
  */
 public class GetMethodContext {
@@ -27,7 +27,7 @@
     }
     public void baz() {
     }
-  };
+  }
 
   public static class B extends A {
     @Override
@@ -39,7 +39,7 @@
     @Override
     public void baz() {
     }
-  };
+  }
 
   public static class C extends B {
     @Override
@@ -48,7 +48,7 @@
     @Override
     public void bar() {
     }
-  };
+  }
 
   public static void main(String[] args) throws IllegalAccessException, NoSuchMethodException, IllegalArgumentException, InvocationTargetException {
     Method m;
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect10.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect10.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect10.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect10.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,7 @@
 public class Reflect10 {
   public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
       IllegalAccessException, InvocationTargetException, SecurityException, NoSuchMethodException {
-    Class c = Class.forName("java.lang.Integer");
+    Class<?> c = Class.forName("java.lang.Integer");
     Method[] m = c.getMethods();
     m[0].invoke(new Integer(2), new Object[] {});
   }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect11.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect11.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect11.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect11.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,7 @@
 public class Reflect11 {
   public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
       IllegalAccessException, InvocationTargetException, SecurityException, NoSuchMethodException {
-    Class c = Class.forName("java.lang.Integer");
+    Class<?> c = Class.forName("java.lang.Integer");
     Method[] m = c.getMethods();
     m[0].invoke(new Integer(2), (Object[]) args);
   }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect12.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect12.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect12.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect12.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,7 @@
 public class Reflect12 {
   public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
       IllegalAccessException, InvocationTargetException, SecurityException, NoSuchMethodException {
-    Class c = Class.forName("reflection.Helper");
+    Class<?> c = Class.forName("reflection.Helper");
     Method[] m = c.getMethods();
     m[0].invoke(new Helper(), new Object[3]);
   }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect13.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect13.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect13.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect13.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,9 +19,9 @@
 public class Reflect13 {
   public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
       IllegalAccessException, InvocationTargetException, SecurityException, NoSuchMethodException {
-    Class c = Class.forName("reflection.Helper");
+    Class<?> c = Class.forName("reflection.Helper");
     Method[] m = c.getMethods();
-    int length = new Integer(args[0]).intValue();
+    int length = Integer.parseInt(args[0]);
     m[0].invoke(new Helper(), new Object[length]);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect14.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect14.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect14.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect14.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,7 @@
 public class Reflect14 {
   public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
       IllegalAccessException, InvocationTargetException, SecurityException, NoSuchMethodException {
-    Class c = Class.forName("reflection.Helper");
+    Class<?> c = Class.forName("reflection.Helper");
     Method[] ms = c.getMethods();
     for (Method m : ms) {
       int mods = m.getModifiers();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect15.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect15.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect15.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect15.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,12 +17,13 @@
  * Test of Class.getConstructors().
  */
 public class Reflect15 {
+  @SuppressWarnings("null")
   public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
       IllegalAccessException, InvocationTargetException {
-    Class c = Class.forName("reflection.Helper");
-    Constructor[] ctors = c.getConstructors();
+    Class<?> c = Class.forName("reflection.Helper");
+    Constructor<?>[] ctors = c.getConstructors();
     Helper h = null;
-    for (Constructor ctor : ctors) {
+    for (Constructor<?> ctor : ctors) {
       if (ctor.getParameterTypes().length == 2) {
         h = (Helper) ctor.newInstance(new Object[] {new Object(), new Object()});
       }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect19.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect19.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect19.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect19.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,7 @@
   public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
       IllegalAccessException, InvocationTargetException, SecurityException, NoSuchMethodException {
     Class<?> c = Class.forName("reflection.Helper");
-    Constructor m = c.getConstructor(new Class[] { Integer.class });
+    Constructor<?> m = c.getConstructor(new Class<?>[] { Integer.class });
     Integer i = Integer.valueOf(0);
     m.newInstance(new Object[] { i });
   }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect1.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect1.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect1.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect1.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,7 +13,7 @@
 public class Reflect1 {
 
   public static void main(String[] args) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
-    Class c = Class.forName("java.lang.Integer");
+    Class<?> c = Class.forName("java.lang.Integer");
     Integer i = (Integer)c.newInstance();
     System.err.println(i);
   }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect20.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect20.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect20.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect20.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,8 +22,8 @@
       NoSuchMethodException, IllegalAccessException, InstantiationException,
       IllegalArgumentException, InvocationTargetException {
     Class<?> helperClass = Class.forName("reflection.Helper");
-    Class objectClass = Class.forName("java.lang.Object");
-    Class[] paramArrayTypes = new Class[]{objectClass, objectClass};
+    Class<?> objectClass = Class.forName("java.lang.Object");
+    Class<?>[] paramArrayTypes = new Class[]{objectClass, objectClass};
     Method m = helperClass.getMethod("o", paramArrayTypes);
     Object helperObject = helperClass.newInstance();
     Object[] paramArrayObjects = new Object[]{new Object(), new Object()};
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect21.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect21.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect21.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect21.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,9 +22,9 @@
       NoSuchMethodException, IllegalAccessException, InstantiationException,
       IllegalArgumentException, InvocationTargetException {
     Class<?> helperClass = Class.forName("reflection.Helper");
-    Class objectClass = Class.forName("java.lang.Object");
-    Class[] paramArrayTypes = new Class[]{objectClass, objectClass};
-    Constructor constr = helperClass.getDeclaredConstructor(paramArrayTypes);
+    Class<?> objectClass = Class.forName("java.lang.Object");
+    Class<?>[] paramArrayTypes = new Class[]{objectClass, objectClass};
+    Constructor<?> constr = helperClass.getDeclaredConstructor(paramArrayTypes);
     Object[] paramArrayObjects = new Object[]{new Object(), new Object()};
     constr.newInstance(paramArrayObjects);
   }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect22.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect22.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect22.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect22.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,11 +21,11 @@
   public static void main(String[] args) throws ClassNotFoundException, SecurityException,
       NoSuchMethodException, IllegalAccessException, InstantiationException,
       IllegalArgumentException, InvocationTargetException {
-    Class helperClass = Class.forName("reflection.Helper");
-    Constructor[] constrs = helperClass.getDeclaredConstructors();
-    for (Constructor constr : constrs) {
+    Class<?> helperClass = Class.forName("reflection.Helper");
+    Constructor<?>[] constrs = helperClass.getDeclaredConstructors();
+    for (Constructor<?> constr : constrs) {
       if (constr.getParameterTypes().length == 1) {
-        Class paramType = constr.getParameterTypes()[0];
+        Class<?> paramType = constr.getParameterTypes()[0];
         if (paramType.getName().equals("java.lang.Integer")) {
           Integer i = new Integer(1);
           Object[] initArgs = new Object[]{i};
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect23.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect23.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect23.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect23.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,12 +22,12 @@
   public static void main(String[] args) throws ClassNotFoundException, SecurityException,
       NoSuchMethodException, IllegalAccessException, InstantiationException,
       IllegalArgumentException, InvocationTargetException {
-    Class helperClass = Class.forName("reflection.Helper");
+    Class<?> helperClass = Class.forName("reflection.Helper");
     Object helperObject = helperClass.newInstance();
     Method[] methods = helperClass.getDeclaredMethods();
     for (Method m : methods) {
       if (m.getParameterTypes().length == 1) {
-        Class paramType = m.getParameterTypes()[0];
+        Class<?> paramType = m.getParameterTypes()[0];
         if (! Modifier.isStatic(m.getModifiers()) && paramType.getName().equals("java.lang.Integer")) {
           Integer i = new Integer(1);
           Object[] initArgs = new Object[]{i};
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect3.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect3.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect3.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect3.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,13 +15,13 @@
 public class Reflect3 {
 
   public static void main(String[] args) throws ClassNotFoundException, IllegalAccessException, InstantiationException {
-    Class c = Class.forName("java.util.Properties");
-    Hashtable h = (Hashtable) c.newInstance();
+    Class<?> c = Class.forName("java.util.Properties");
+    Hashtable<Object, Object> h = (Hashtable<Object, Object>) c.newInstance();
     System.out.println(h.toString());
   }
   
   @SuppressWarnings("unused")
-  private static class Hash extends Hashtable {
+  private static class Hash extends Hashtable<Object, Object> {
     
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect4.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect4.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect4.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect4.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,7 +15,7 @@
 public class Reflect4 {
 
   public static void main(String[] args) throws IllegalAccessException, InstantiationException, ClassNotFoundException {
-    Class c = Class.forName("java.io.FilePermission");
+    Class<?> c = Class.forName("java.io.FilePermission");
     FilePermission h = (FilePermission) c.newInstance();
     System.out.println(h.toString());
   }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect5.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect5.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect5.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect5.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,7 +14,7 @@
 public class Reflect5 {
 
 	public static void main(String[] args) throws IllegalAccessException, InstantiationException, ClassNotFoundException {
-		Class c = Class.forName("reflection.Reflect5$A");
+		Class<?> c = Class.forName("reflection.Reflect5$A");
 		A h = (A) c.newInstance();
 		System.out.println(h.toString());
 	}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect6.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect6.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect6.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect6.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,7 +14,7 @@
 public class Reflect6 {
 
 	public static void main(String[] args) throws IllegalAccessException, InstantiationException, ClassNotFoundException {
-		Class c = Class.forName("reflection.Reflect6$A");
+		Class<?> c = Class.forName("reflection.Reflect6$A");
 		A h = (A) c.newInstance();
 		System.out.println(h.toString());
 	}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect7.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect7.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect7.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect7.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,11 +20,10 @@
  * 
  */
 public class Reflect7 {
-  @SuppressWarnings("unchecked")
   public static void main(String[] args) throws ClassNotFoundException, NoSuchMethodException,
       IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException {
-    Class c = Class.forName("java.io.FilePermission");
-    Class[] paramTypes = new Class[] { "".getClass(), "".getClass() };
+    Class<FilePermission> c = (Class<FilePermission>) Class.forName("java.io.FilePermission");
+    Class<?>[] paramTypes = new Class[] { "".getClass(), "".getClass() };
     Constructor<FilePermission> constr = c.getConstructor(paramTypes);
     Object[] params = new String[] { "log.txt", "read" };
     FilePermission fp = constr.newInstance(params);
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect8.java wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect8.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/reflection/Reflect8.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/reflection/Reflect8.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,8 +19,8 @@
 public class Reflect8 {
   public static void main(String[] args) throws ClassNotFoundException, IllegalArgumentException, InstantiationException,
       IllegalAccessException, InvocationTargetException {
-    Class c = Class.forName("java.lang.Integer");
-    Constructor[] ctors = c.getConstructors();
+    Class<?> c = Class.forName("java.lang.Integer");
+    Constructor<?>[] ctors = c.getConstructors();
     Integer i = (Integer) ctors[0].newInstance(new Integer(1));
     i.toString();
   }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/JustThrow.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/JustThrow.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/JustThrow.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/JustThrow.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,4 +15,4 @@
 
     }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/Slice1.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/Slice1.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/Slice1.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/Slice1.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,9 +11,6 @@
 package slice;
 
 public class Slice1 {
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     int x = foo(1);
     int y = bar(2);
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/Slice3.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/Slice3.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/Slice3.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/Slice3.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,9 +14,6 @@
   static void doNothing(Object o) {
   }
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     Object o1 = new Object();
     Object o2 = new Object();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/Slice4.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/Slice4.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/Slice4.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/Slice4.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,9 +11,6 @@
 package slice;
 
 public class Slice4 {
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     int x = foo(1);
     bar(x);
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/Slice6.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/Slice6.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/Slice6.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/Slice6.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,7 @@
     messages = new Vector<Integer>();
     messages.add(5);
 
-    int message = (Integer) messages.elementAt(0);
+    int message = messages.elementAt(0);
 
     sendMessage(message);
   }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/Slice7.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/Slice7.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/Slice7.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/Slice7.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,6 +15,6 @@
 public class Slice7 {
   public static void main(String args[]) {
     @SuppressWarnings("unused")
-    Hashtable abc = new Hashtable(3, 0.75f);
+    Hashtable<Object, Object> abc = new Hashtable<Object, Object>(3, 0.75f);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/Slice9.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/Slice9.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/Slice9.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/Slice9.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package slice;
+
+import java.util.Random;
+
+public class Slice9 {
+
+  public static void main(String[] args) {
+    Random r = null;
+    r = new Random();
+    int i = 42;
+    i = r.nextInt();
+    int j;
+    j = 42*i;
+    doNothing(j);
+  }
+  
+  static void doNothing(int x) {}
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestArrays.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestArrays.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestArrays.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestArrays.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,7 +16,6 @@
   /**
    * slice should include statements involving arr2 and i,
    * exclude statements with arr1 and j
-   * @param args
    */
   public static void main(String[] args) {
     Object[] arr1 = new Object[10], arr2 = new Object[10];
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestCD1.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestCD1.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestCD1.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestCD1.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,10 +15,6 @@
   static void doNothing(Object o) {
   }
 
-  /**
-   * 
-   * @param args
-   */
   public static void main(String[] args) {
     Integer I = (Integer) new A().foo();
     int i = I.intValue();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestCD2.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestCD2.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestCD2.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestCD2.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,10 +15,6 @@
   static void doNothing(Object o) {
   }
 
-  /**
-   * 
-   * @param args
-   */
   public static void main(String[] args) {
     Integer I = (Integer) new A().foo();
     int i = I.intValue();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestCD3.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestCD3.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestCD3.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestCD3.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,10 +15,6 @@
   static void doNothing(Object o) {
   }
 
-  /**
-   * 
-   * @param args
-   */
   public static void main(String[] args) {
     Integer I = (Integer) new A().foo();
     int i = I.intValue();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestCD4.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestCD4.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestCD4.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestCD4.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,10 +16,6 @@
 	
   }
 
-  /**
-   * 
-   * @param args
-   */
   public static void main(String[] args) {
     int i = 3;
     int j = 4;
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestCD5.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestCD5.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestCD5.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestCD5.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,10 +12,6 @@
 
 public class TestCD5 {
 
-  /**
-   * 
-   * @param args
-   */
   public static void main(String[] args) {
     int i = 0;
     while (someBool()) {
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestCD6.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestCD6.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestCD6.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestCD6.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,10 +12,6 @@
 
 public class TestCD6 {
 
-  /**
-   * 
-   * @param args
-   */
   public static void main(String[] args) {
     int i = 0;
     if (someBool()) {
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestFields.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestFields.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestFields.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestFields.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,6 @@
   /**
    * slice should include a1 and o1, exclude
    * a2 and o2
-   * @param args
    */
   public static void main(String[] args) {
     Object o1 = new Object();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestGlobal.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestGlobal.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestGlobal.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestGlobal.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,7 +25,6 @@
 
   /**
    * make sure global variables are being properly handled
-   * @param args
    */
   public static void main(String[] args) {
     global1 = new Object();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestId.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestId.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestId.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestId.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,8 +22,6 @@
   /**
    * check for context-sensitive handling of the identity function.
    * o2 should be excluded
-   * 
-   * @param args
    */
   public static void main(String[] args) {
     Object o1 = new Object(), o2 = new Object();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestMultiTarget.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestMultiTarget.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestMultiTarget.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestMultiTarget.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,8 +18,6 @@
   /**
    * test a virtual call with multiple targets. slice should include statements
    * assigning to a
-   * 
-   * @param args
    */
   public static void main(String[] args) {
     A a = null;
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestPrimGetterSetter2.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestPrimGetterSetter2.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestPrimGetterSetter2.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestPrimGetterSetter2.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,9 +23,6 @@
   }
  
   public static void doNothing(int i) {}
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     IntWrapper w1 = new IntWrapper();
     w1.setI(4);
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestPrimGetterSetter.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestPrimGetterSetter.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestPrimGetterSetter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestPrimGetterSetter.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,9 +23,6 @@
   }
  
   public static void doNothing(int i) {}
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     IntWrapper w = new IntWrapper();
     test(w);
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestRecursion.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestRecursion.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestRecursion.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestRecursion.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,7 +26,6 @@
   /**
    * test of recursion.  Everything for a1, a2, and a3 should
    * be included
-   * @param args
    */
   public static void main(String[] args) {
     A a1 = new A(), a2 = new A(), a3 = new A();
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestThrowCatch.java wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestThrowCatch.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/slice/TestThrowCatch.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/slice/TestThrowCatch.java	2019-01-29 17:08:39.000000000 +0000
@@ -41,4 +41,4 @@
       doNothing(x);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/special/A.java wala-1.5.1/com.ibm.wala.core.testdata/src/special/A.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/special/A.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/special/A.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,30 @@
+package special;
+
+class A {
+  String name;
+  
+  A() {
+    setX("silly");
+  }
+  
+  public void setX(String name) {
+    this.name = name;
+  }
+  
+  @Override
+  public
+  String toString() {
+    return name;
+  }
+  
+  interface Ctor<T> {
+    T make();
+  }
+  
+  public static void main(String[] args) {
+    Ctor<A> o = A::new;
+    Object a = o.make();
+    a.toString();
+  }
+  
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/staticInit/TestStaticInitOrder.java wala-1.5.1/com.ibm.wala.core.testdata/src/staticInit/TestStaticInitOrder.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/staticInit/TestStaticInitOrder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/staticInit/TestStaticInitOrder.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,6 +14,7 @@
 
   private static class A {
 
+    @SuppressWarnings("unused")
     static int f;
     
     static {
@@ -26,6 +27,7 @@
   }
 
   private static class B {
+    @SuppressWarnings("unused")
     static int b;
     
     static {
@@ -39,6 +41,7 @@
   
   private static class C extends B {
     
+    @SuppressWarnings("unused")
     static int c = 5;
     
     public static void dostuff() {
diff -Nru wala-1.3.9/com.ibm.wala.core.testdata/src/string/SimpleStringOps.java wala-1.5.1/com.ibm.wala.core.testdata/src/string/SimpleStringOps.java
--- wala-1.3.9/com.ibm.wala.core.testdata/src/string/SimpleStringOps.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.testdata/src/string/SimpleStringOps.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,16 +13,15 @@
 public class SimpleStringOps {
 
   private static void whatever(String s) {
-    StringBuffer sb = new StringBuffer();
-    sb.append(s.substring(5));
-    sb.append(" and other garbage");
-    System.out.println(sb.toString());
+    System.out.println(s.substring(5) + " and other garbage");
   }
   
   public static void main(String[] args) {
     if (args.length > 0) {
+      @SuppressWarnings("NonConstantStringShouldBeStringBuffer")
       String s = args[0];
       for(int i = 1; i < args.length; i++) {
+        //noinspection StringConcatenationInLoop
         s = s + args[i];
       }
       
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/build.gradle wala-1.5.1/com.ibm.wala.core.tests/build.gradle
--- wala-1.3.9/com.ibm.wala.core.tests/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,58 @@
+plugins {
+	id 'com.github.hauner.jarTest'
+	id 'eclipse'
+}
+
+eclipse.project.natures 'org.eclipse.pde.PluginNature'
+
+sourceSets.test {
+	java.srcDirs = ['src']
+	resources.srcDirs = ['dat']
+}
+
+publishing.publications {
+	mavenJava(MavenPublication) {
+		artifact jarTest
+	}
+}
+
+dependencies {
+	testCompile(
+		'eclipse-deps:org.eclipse.core.runtime:+',
+		'junit:junit:4.12',
+		'org.apache.ant:ant:1.8.2',
+		'org.hamcrest:hamcrest-core:1.3',
+		'org.osgi:org.osgi.core:4.2.0',
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.shrike'),
+		project(':com.ibm.wala.util'),
+		)
+}
+
+processTestResources {
+	def testdata = project(':com.ibm.wala.core.testdata')
+	dependsOn testdata.compileTestJava
+	dependsOn testdata.extractBcel
+
+	from testdata.collectJLex
+	from testdata.collectTestData
+	from testdata.downloadJavaCup
+	from files(testdata.extractBcel)[0]
+	from testdata.generateHelloHashJar
+	from testdata.extractKawa
+	from testdata.buildChessJar
+	from testdata.buildKawaTestJar
+}
+
+test {
+	maxHeapSize = '1500M'
+	systemProperty 'com.ibm.wala.junit.analyzingJar', 'true'
+	systemProperty 'com.ibm.wala.junit.profile', 'short'
+	classpath += files project(':com.ibm.wala.core.testdata').sourceSets.test.java.outputDir
+}
+
+task cleanTestExtras(type: Delete) {
+	delete 'report'
+}
+
+cleanTest.dependsOn cleanTestExtras
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/build.properties wala-1.5.1/com.ibm.wala.core.tests/build.properties
--- wala-1.3.9/com.ibm.wala.core.tests/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,7 +1,7 @@
 source.. = src/,\
            dat/
-output.. = bin/
+output.. = bin/test
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
-               plugin.properties
+                plugin.properties
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/build.xml wala-1.5.1/com.ibm.wala.core.tests/build.xml
--- wala-1.3.9/com.ibm.wala.core.tests/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/build.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.ibm.wala.core.tests" default="build.jars" basedir=".">
-
-	<property name="basews" value="${ws}" />
-	<property name="baseos" value="${os}" />
-	<property name="basearch" value="${arch}" />
-	<property name="basenl" value="${nl}" />
-	<property name="bundleId" value="com.ibm.wala.core.tests" />
-	<property name="bundleVersion" value="1.1.3.200805291132" />
-
-
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="true" />
-	<property name="javacDebugInfo" value="on" />
-	<property name="javacVerbose" value="false" />
-	<property name="logExtension" value=".log" />
-	<property name="compilerArg" value="" />
-	<property name="javacSource" value="1.5" />
-	<property name="javacTarget" value="1.5" />
-<!-- <condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac" />
-	</condition> -->
-	<property name="dir_bootclasspath" value="${java.home}/lib" />
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath" />
-	<property name="bundleJavacSource" value="${javacSource}" />
-	<property name="bundleJavacTarget" value="${javacTarget}" />
-	<property name="bundleBootClasspath" value="${bootclasspath}" />
-
-	<!-- SJF modifications to support junit -->
-	<path id="@dot.classpath">
-		<pathelement path="../com.ibm.wala.core/bin/" />
-		<pathelement path="../com.ibm.wala.core/@dot" />
-		<pathelement path="../com.ibm.wala.shrike/bin/" />
-		<pathelement path="../com.ibm.wala.shrike/@dot" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.resources_3.3.1.R33x_v20080205.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.resources.compatibility_3.2.100.v20070502.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.ant.core_3.1.200.v20070522.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.variables_3.2.0.v20070426.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime_3.3.100.v20070530.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.osgi_3.3.2.R33x_v20080105.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.common_3.3.0.v20070426.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.jobs_3.3.1.R33x_v20070709.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/runtime_registry_compatibility.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.registry_3.3.1.R33x_v20070802.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.preferences_3.2.101.R33x_v20080117.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/@dot" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.contenttype_3.2.100.v20070319.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.100.v20070502.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.app_1.0.1.R33x_v20070828.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.osgi.services_3.1.200.v20070605.jar" />
-		<pathelement path="../../../eclipse/plugins/javax.servlet_2.4.0.v200706111738.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.expressions_3.3.0.v20070606-0010.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.filesystem_1.1.0.v20070606.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.jface_3.3.2.M20080207-0800.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.swt_3.3.2.v3349d.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.swt.gtk.linux.x86_3.3.2.v3349.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.commands_3.3.0.I20070605-0010.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.jdt.core_3.3.3.v_793_R33x.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.jdt.compiler.tool_1.0.1.v_793_R33x.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20071002-2100.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.text_3.3.0.v20070606-0010.jar" />
-		<pathelement path="../../../eclipse/plugins/com.ibm.icu_3.6.1.v20070906.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.team.core_3.3.1.r33x_20080128.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.ui_3.3.1.M20071128-0800.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.ui.workbench_3.3.2.M20080207-0800.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20070319-0010/@dot" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20070319-0010/compatibility.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.help_3.3.2.v20071126_33x.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.jface.databinding_1.1.1.M20080207-0800.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.databinding_1.0.1.M20070822-0800.jar" />
-		<pathelement path="../com.ibm.wala.core.testdata/bin/" />
-		<pathelement path="../com.ibm.wala.core.testdata/@dot" />
-		<pathelement path="../../../eclipse/plugins/org.junit_3.8.2.v200706111738/junit.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.ui.ide_3.3.2.M20080207-0800.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.ui.views_3.2.101.M20080207-0800.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.update.configurator_3.2.101.R33x_v20070810.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.update.core_3.2.101.R33x_v20070911.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.update.core.linux_3.2.0.v20070615.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.core.net_1.0.1.r33x_20070709.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.update.ui_3.2.100.v20070615.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.ui.forms_3.3.0.v20070511.jar" />
-		<pathelement path="../../../eclipse/plugins/org.eclipse.jface.text_3.3.2.r332_20071017-0800.jar" />
-	</path>
-
-	<property name="junit.dir" value="junit-results" />
-
-	<target name="runtests" depends="clean,build.update.jar" description="run junit tests for com.ibm.wala.core.tests">
-		<delete dir="${junit.dir}" />
-		<mkdir dir="${junit.dir}" />
-		<junit fork="yes" errorProperty="test.failed" failureProperty="test.failed">
-			<jvmarg value="-Xmx800M" />
-			<jvmarg value="-ea" />
-			<jvmarg value="-Dcom.ibm.wala.junit.profile=short" />
-			<classpath>
-				<path refid="@dot.classpath" />
-				<pathelement path="@dot" />
-				<pathelement path="../com.ibm.wala.core/dat" />
-				<pathelement path="../com.ibm.wala.core.testdata/bin" />
-				<pathelement path="../com.ibm.wala.core.testdata/src" />
-				<pathelement path="../com.ibm.wala.core.testdata/@dot" />
-			</classpath>
-
-			<batchtest todir="${junit.dir}">
-				<!-- zipfileset src="com.ibm.wala.core.tests_1.1.3.200805291132.jar" -->
-				<fileset dir="@dot">
-					<include name="**/*Test*.class" />
-					<exclude name="**/*$*.class" />
-					<exclude name="**/*TestUtil.class" />
-					<exclude name="**/*TestInfo.class" />
-					<exclude name="**/*TestConstants.class" />
-					<exclude name="**/*WalaTestCase.class" />
-					<exclude name="**/*AbstractPtrTest.class" />
-					<exclude name="**/*TestAgainstSimpleDriver.class" />
-				</fileset>
-			</batchtest>
-
-			<formatter type="plain" />
-			<formatter type="xml" />
-		</junit>
-		<fail message="Tests failed: check test reports." if="test.failed" />
-	</target>
-
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
-			<isset property="buildTempFolder" />
-		</condition>
-		<property name="pluginTemp" value="${basedir}" />
-		<condition property="build.result.folder" value="${pluginTemp}/com.ibm.wala.core.tests_1.1.3.200805291132">
-			<isset property="buildTempFolder" />
-		</condition>
-		<property name="build.result.folder" value="${basedir}" />
-		<property name="temp.folder" value="${basedir}/temp.folder" />
-		<property name="plugin.destination" value="${basedir}" />
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: com.ibm.wala.core.tests for an update site.">
-		<delete dir="${temp.folder}" />
-		<mkdir dir="${temp.folder}" />
-		<antcall target="build.jars" />
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/" />
-		</antcall>
-		<jar destfile="${plugin.destination}/com.ibm.wala.core.tests_1.1.3.200805291132.jar" basedir="${temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" filesetmanifest="merge" />
-		<delete dir="${temp.folder}" />
-	</target>
-
-	<target name="@dot" depends="init" unless="@dot" description="Create jar: com.ibm.wala.core.tests @dot.">
-		<delete dir="${temp.folder}/@dot.bin" />
-		<mkdir dir="${temp.folder}/@dot.bin" />
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}">
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}" />
-			<classpath refid="@dot.classpath" />
-			<src path="src/" />
-			<src path="dat/" />
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
-			<compilerarg line="-log '${temp.folder}/@dot.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
-		</javac>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/@dot.bin" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java" />
-				<exclude name="**/package.htm*" />
-			</fileset>
-			<fileset dir="dat/">
-				<exclude name="**/*.java" />
-				<exclude name="**/package.htm*" />
-			</fileset>
-		</copy>
-		<mkdir dir="${build.result.folder}" />
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="${temp.folder}/@dot.bin">
-			</fileset>
-		</copy>
-		<delete dir="${temp.folder}/@dot.bin" />
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}" />
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java" />
-			</fileset>
-			<fileset dir="dat/">
-				<include name="**/*.java" />
-			</fileset>
-		</zip>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: com.ibm.wala.core.tests.">
-		<available property="@dot" file="${build.result.folder}/@dot" />
-		<antcall target="@dot" />
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip" />
-		<antcall target="src.zip" />
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" />
-		<copy todir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="META-INF/" />
-				<include name="plugin.xml" />
-				<include name="plugin.properties" />
-			</fileset>
-		</copy>
-		<!-- eclipse.versionReplacer path="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" version="1.1.3.200805291132" -->
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" />
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" failonerror="false" overwrite="false" />
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" />
-		<copy todir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" failonerror="false" overwrite="false">
-			<fileset dir="${temp.folder}">
-				<include name="@dot.bin${logExtension}" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: com.ibm.wala.core.tests of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot" />
-		<delete file="${build.result.folder}/src.zip" />
-		<delete file="${plugin.destination}/com.ibm.wala.core.tests_1.1.3.200805291132.jar" />
-		<delete file="${plugin.destination}/com.ibm.wala.core.tests_1.1.3.200805291132.zip" />
-		<delete dir="${temp.folder}" />
-		<delete dir="${junit.dir}" />
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/snugglebug/sjf/workspace/com.ibm.wala.core.tests" property="resourcePath" />
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite" />
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: com.ibm.wala.core.tests.">
-		<delete dir="${temp.folder}" />
-		<mkdir dir="${temp.folder}" />
-		<antcall target="build.jars" />
-		<antcall target="build.sources" />
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/" />
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/" />
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}" />
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/com.ibm.wala.core.tests_1.1.3.200805291132.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false" />
-		<delete dir="${temp.folder}" />
-	</target>
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/.classpath wala-1.5.1/com.ibm.wala.core.tests/.classpath
--- wala-1.3.9/com.ibm.wala.core.tests/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="dat"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/dat/Java60RegressionExclusionsForGUI.txt wala-1.5.1/com.ibm.wala.core.tests/dat/Java60RegressionExclusionsForGUI.txt
--- wala-1.3.9/com.ibm.wala.core.tests/dat/Java60RegressionExclusionsForGUI.txt	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/dat/Java60RegressionExclusionsForGUI.txt	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,14 @@
+com\/sun\/.*
+sun\/.*
+org\/netbeans\/.*
+org\/openide\/.*
+com\/ibm\/crypto\/.*
+com\/ibm\/security\/.*
+org\/apache\/xerces\/.*
+dalvik\/.*
+java\/io\/ObjectStreamClass*
+apple\/.*
+com\/apple\/.*
+jdk\/.*
+org\/omg\/.*
+org\/w3c\/.*
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/launchers/ConstructAllIRs.launch wala-1.5.1/com.ibm.wala.core.tests/launchers/ConstructAllIRs.launch
--- wala-1.3.9/com.ibm.wala.core.tests/launchers/ConstructAllIRs.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/launchers/ConstructAllIRs.launch	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/ConstructAllIRs.java"/>
@@ -6,6 +6,7 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5&quot; javaProject=&quot;com.ibm.wala.core.tests&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;com.ibm.wala.core.tests&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
@@ -13,9 +14,10 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/bin&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.analysis.ConstructAllIRs"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="/Users/manu/Documents/workspaces/34workspace/com.ibm.wala.core.tests/dat/bcel.txt"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="&quot;${resource_loc:/WALA/com.ibm.wala.core.tests/dat/bcel.txt}&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx400M"/>
 </launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/launchers/CountParameters.launch wala-1.5.1/com.ibm.wala.core.tests/launchers/CountParameters.launch
--- wala-1.3.9/com.ibm.wala.core.tests/launchers/CountParameters.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/launchers/CountParameters.launch	2019-01-29 17:08:39.000000000 +0000
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/CountParameters.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.analysis.CountParameters"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-classpath c:/temp/testdata/JLex.jar"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx500M"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/CountParameters.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.analysis.CountParameters"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx500M"/>
+</launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/launchers/ExportTypeHierarchyToXML.launch wala-1.5.1/com.ibm.wala.core.tests/launchers/ExportTypeHierarchyToXML.launch
--- wala-1.3.9/com.ibm.wala.core.tests/launchers/ExportTypeHierarchyToXML.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/launchers/ExportTypeHierarchyToXML.launch	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.ibm.wala.core.tests"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.ExportTypeHierarchyToXML"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-classpath c:/temp/testdata/JLex.jar"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx500M"/>
-</launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/launchers/GetEnv.launch wala-1.5.1/com.ibm.wala.core.tests/launchers/GetEnv.launch
--- wala-1.3.9/com.ibm.wala.core.tests/launchers/GetEnv.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/launchers/GetEnv.launch	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.GetEnv"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.ibm.wala.core.tests"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-</launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/launchers/GetLoadedFields.launch wala-1.5.1/com.ibm.wala.core.tests/launchers/GetLoadedFields.launch
--- wala-1.3.9/com.ibm.wala.core.tests/launchers/GetLoadedFields.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/launchers/GetLoadedFields.launch	2019-01-29 17:08:39.000000000 +0000
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/GetLoadedFields.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.analysis.GetLoadedFields"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-classpath c:/temp/testdata/JLex.jar"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx500M"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/GetLoadedFields.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.analysis.GetLoadedFields"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx500M"/>
+</launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/launchers/JavaViewerDriver.launch wala-1.5.1/com.ibm.wala.core.tests/launchers/JavaViewerDriver.launch
--- wala-1.3.9/com.ibm.wala.core.tests/launchers/JavaViewerDriver.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/launchers/JavaViewerDriver.launch	2019-01-29 17:08:39.000000000 +0000
@@ -1,13 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/JavaViewerDriver.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.JavaViewerDriver"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appClassPath ${workspace_loc}/com.ibm.wala.core.testdata/bin/JLex.jar"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx800M"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/JavaViewerDriver.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.JavaViewerDriver"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appClassPath &quot;${resource_loc:/com.ibm.wala.core.testdata/JLex.jar}&quot;"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Xmx800M"/>
+</launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/launchers/PDFCallGraph.launch wala-1.5.1/com.ibm.wala.core.tests/launchers/PDFCallGraph.launch
--- wala-1.3.9/com.ibm.wala.core.tests/launchers/PDFCallGraph.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/launchers/PDFCallGraph.launch	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java"/>
@@ -7,8 +7,9 @@
 <listEntry value="1"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.PDFCallGraph"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar ${workspace_loc}/JLex.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar &quot;${resource_loc:/com.ibm.wala.core.testdata/JLex.jar}&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx500M"/>
 </launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/launchers/PDFControlDependenceGraph.launch wala-1.5.1/com.ibm.wala.core.tests/launchers/PDFControlDependenceGraph.launch
--- wala-1.3.9/com.ibm.wala.core.tests/launchers/PDFControlDependenceGraph.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/launchers/PDFControlDependenceGraph.launch	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFControlDependenceGraph.java"/>
@@ -7,8 +7,9 @@
 <listEntry value="1"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.PDFControlDependenceGraph"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar ${workspace_loc}/JLex.jar -sig java.lang.StringBuffer.append(Ljava/lang/String;)Ljava/lang/StringBuffer;"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar &quot;${resource_loc:/com.ibm.wala.core.testdata/JLex.jar}&quot; -sig java.lang.StringBuffer.append(Ljava/lang/String;)Ljava/lang/StringBuffer;"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx200M -verbose:gc"/>
 </launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/launchers/PDFSDG.launch wala-1.5.1/com.ibm.wala.core.tests/launchers/PDFSDG.launch
--- wala-1.3.9/com.ibm.wala.core.tests/launchers/PDFSDG.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/launchers/PDFSDG.launch	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSDG.java"/>
@@ -7,8 +7,9 @@
 <listEntry value="1"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.PDFSDG"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar ${workspace_loc}/com.ibm.wala.core.testdata/bin/com.ibm.wala.core.testdata_1.0.0.jar -mainClass &quot;Lslice/Slice4&quot; -srcCaller &quot;main&quot; -srcCallee &quot;foo&quot; -dd &quot;no_base_no_heap&quot; -cd &quot;none&quot; -dir &quot;forward&quot;"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar &quot;${resource_loc:/com.ibm.wala.core.testdata/com.ibm.wala.core.testdata_1.0.0.jar}&quot; -mainClass &quot;Lslice/Slice4&quot; -srcCaller &quot;main&quot; -srcCallee &quot;foo&quot; -dd &quot;no_base_no_heap&quot; -cd &quot;none&quot; -dir &quot;forward&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx500M"/>
 </launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/launchers/PDFSlice.launch wala-1.5.1/com.ibm.wala.core.tests/launchers/PDFSlice.launch
--- wala-1.3.9/com.ibm.wala.core.tests/launchers/PDFSlice.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/launchers/PDFSlice.launch	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSlice.java"/>
@@ -7,8 +7,9 @@
 <listEntry value="1"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.PDFSlice"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar ${workspace_loc}/com.ibm.wala.core.testdata/bin/com.ibm.wala.core.testdata_1.0.0.jar -mainClass &quot;Lslice/Slice4&quot; -srcCaller &quot;main&quot; -srcCallee &quot;foo&quot; -dd &quot;no_base_no_heap&quot; -cd &quot;none&quot; -dir &quot;forward&quot;"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar &quot;${resource_loc:/com.ibm.wala.core.testdata/com.ibm.wala.core.testdata_1.0.0.jar}&quot; -mainClass &quot;Lslice/Slice4&quot; -srcCaller &quot;main&quot; -srcCallee &quot;foo&quot; -dd &quot;no_base_no_heap&quot; -cd &quot;none&quot; -dir &quot;forward&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx500M -ea"/>
 </launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/launchers/PDFTypeHierarchy.launch wala-1.5.1/com.ibm.wala.core.tests/launchers/PDFTypeHierarchy.launch
--- wala-1.3.9/com.ibm.wala.core.tests/launchers/PDFTypeHierarchy.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/launchers/PDFTypeHierarchy.launch	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFTypeHierarchy.java"/>
@@ -7,9 +7,10 @@
 <listEntry value="1"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.PDFTypeHierarchy"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-classpath ${workspace_loc}/JLex.jar"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-classpath &quot;${resource_loc:/com.ibm.wala.core.testdata/JLex.jar}&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx800M"/>
 </launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/launchers/PDFWalaIR.launch wala-1.5.1/com.ibm.wala.core.tests/launchers/PDFWalaIR.launch
--- wala-1.3.9/com.ibm.wala.core.tests/launchers/PDFWalaIR.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/launchers/PDFWalaIR.launch	2019-01-29 17:08:39.000000000 +0000
@@ -7,9 +7,10 @@
 <listEntry value="1"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.PDFWalaIR"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar ${workspace_loc}/JLex.jar -sig java.lang.StringBuffer.append(Ljava/lang/String;)Ljava/lang/StringBuffer;"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar &quot;${resource_loc:/com.ibm.wala.core.testdata/JLex.jar}&quot; -sig java.lang.StringBuffer.append(Ljava/lang/String;)Ljava/lang/StringBuffer;"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx200M -verbose:gc"/>
 </launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/launchers/wala.core.launch wala-1.5.1/com.ibm.wala.core.tests/launchers/wala.core.launch
--- wala-1.3.9/com.ibm.wala.core.tests/launchers/wala.core.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/launchers/wala.core.launch	2019-01-29 17:08:39.000000000 +0000
@@ -15,17 +15,17 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="false"/>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;com.ibm.wala.core.tests&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;com.ibm.wala.core.tests&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/bin&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/@dot&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;com.ibm.wala.core.testdata&quot; type=&quot;1&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;com.ibm.wala.core.tests&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;com.ibm.wala.core.tests&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/bin&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;com.ibm.wala.core.testdata&quot; type=&quot;1&quot;/&gt;&#10;"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/1.7.0 25/"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/ikvm-8.1.5717.0"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx800M -verbose:gc -Dcom.ibm.wala.util.fixedpoint.impl.verbose=true"/>
 </launchConfiguration>
diff -Nru "/tmp/tmpdO65hx/hoNCbJkA_9/wala-1.3.9/com.ibm.wala.core.tests/launchers/wala.core short profile.launch" "/tmp/tmpdO65hx/vj4dUdzt1P/wala-1.5.1/com.ibm.wala.core.tests/launchers/wala.core short profile.launch"
--- "/tmp/tmpdO65hx/hoNCbJkA_9/wala-1.3.9/com.ibm.wala.core.tests/launchers/wala.core short profile.launch"	2016-05-10 12:59:26.000000000 +0000
+++ "/tmp/tmpdO65hx/vj4dUdzt1P/wala-1.5.1/com.ibm.wala.core.tests/launchers/wala.core short profile.launch"	2019-01-29 17:08:39.000000000 +0000
@@ -1,26 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.ibm.wala.core.tests"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="c:/temp/console"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=com.ibm.wala.core.tests"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;com.ibm.wala.core.tests&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;com.ibm.wala.core.tests&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;com.ibm.wala.core.testdata&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/bin&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx800M -Dcom.ibm.wala.junit.profile=short -ea -Dcom.ibm.wala.fixedpoint.impl.verbose=true"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/com.ibm.wala.core.tests"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.debug.ui.ATTR_CAPTURE_IN_FILE" value="c:/temp/console"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=com.ibm.wala.core.tests"/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;com.ibm.wala.core.tests&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;com.ibm.wala.core.tests&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;com.ibm.wala.core.testdata&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/bin&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx800M -Dcom.ibm.wala.junit.profile=short -ea -Dcom.ibm.wala.fixedpoint.impl.verbose=true"/>
+</launchConfiguration>
diff -Nru "/tmp/tmpdO65hx/hoNCbJkA_9/wala-1.3.9/com.ibm.wala.core.tests/launchers/wala.core short profile (non-windows).launch" "/tmp/tmpdO65hx/vj4dUdzt1P/wala-1.5.1/com.ibm.wala.core.tests/launchers/wala.core short profile (non-windows).launch"
--- "/tmp/tmpdO65hx/hoNCbJkA_9/wala-1.3.9/com.ibm.wala.core.tests/launchers/wala.core short profile (non-windows).launch"	2016-05-10 12:59:26.000000000 +0000
+++ "/tmp/tmpdO65hx/vj4dUdzt1P/wala-1.5.1/com.ibm.wala.core.tests/launchers/wala.core short profile (non-windows).launch"	2019-01-29 17:08:39.000000000 +0000
@@ -20,8 +20,9 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/bin&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.core.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx800M -Dcom.ibm.wala.junit.profile=short -ea -Dcom.ibm.wala.fixedpoint.impl.verbose=true"/>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.core.tests/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.core.tests/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -2,20 +2,26 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.ibm.wala.core.tests;singleton:=true
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Bundle-Vendor: %providerName
 Require-Bundle: com.ibm.wala.shrike,
  com.ibm.wala.core,
+ com.ibm.wala.ide.jdt;bundle-version="1.5.1",
  org.eclipse.core.runtime,
  com.ibm.wala.core.testdata,
  org.junit;bundle-version="4.0.0",
- org.apache.ant
+ org.apache.ant,
+ org.hamcrest.core;bundle-version="1.3.0"
 Bundle-Localization: plugin
-Export-Package: com.ibm.wala.core.tests.basic,
+Export-Package: com.ibm.wala.core.tests.arraybounds,
+ com.ibm.wala.core.tests.basic,
  com.ibm.wala.core.tests.callGraph,
+ com.ibm.wala.core.tests.cfg.exc.inter,
+ com.ibm.wala.core.tests.cfg.exc.intra,
  com.ibm.wala.core.tests.cha,
  com.ibm.wala.core.tests.collections,
  com.ibm.wala.core.tests.demandpa,
+ com.ibm.wala.core.tests.exceptionpruning,
  com.ibm.wala.core.tests.ir,
  com.ibm.wala.core.tests.plugin,
  com.ibm.wala.core.tests.ptrs,
@@ -29,7 +35,8 @@
  com.ibm.wala.examples.drivers,
  com.ibm.wala.examples.properties,
  com.ibm.wala.util.io
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: com.ibm.wala.core.tests.plugin.CoreTestsPlugin
 Eclipse-RegisterBuddy: com.ibm.wala.core, com.ibm.wala.core.testdata
+Automatic-Module-Name: com.ibm.wala.core.tests
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/plugin.xml wala-1.5.1/com.ibm.wala.core.tests/plugin.xml
--- wala-1.3.9/com.ibm.wala.core.tests/plugin.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/plugin.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension id="HeadlessWALA"
-         point="org.eclipse.core.runtime.applications">
-      <application> 
-         <run class="com.ibm.wala.eclipse.headless.Main"/>
-      </application>
-   </extension>
-</plugin>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/pom.xml wala-1.5.1/com.ibm.wala.core.tests/pom.xml
--- wala-1.3.9/com.ibm.wala.core.tests/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
   <parent>
       <groupId>com.ibm.wala</groupId>
       <artifactId>WALA</artifactId>
-      <version>1.3.9</version>
+      <version>1.5.1</version>
   </parent>
   <artifactId>com.ibm.wala.core.tests</artifactId>
   <packaging>eclipse-plugin</packaging>
@@ -20,8 +20,10 @@
             <phase>test</phase>
             <configuration>
               <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
-              <argLine>-Xmx800M -Dcom.ibm.wala.junit.profile=short -Dcom.ibm.wala.junit.analyzingJar=true -ea</argLine>
+              <argLine>-Xmx1500M -Dcom.ibm.wala.junit.profile=short -Dcom.ibm.wala.junit.analyzingJar=true -ea</argLine>
               <redirectTestOutputToFile>true</redirectTestOutputToFile>
+	      <forkCount>2</forkCount>
+	      <reuseForks>false</reuseForks>
             </configuration>
             <goals>
               <goal>test</goal>
@@ -35,7 +37,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
   </dependencies> 
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/.project wala-1.5.1/com.ibm.wala.core.tests/.project
--- wala-1.3.9/com.ibm.wala.core.tests/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.core.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.core.tests/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.core.tests/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,78 +1,126 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.core.tests/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.core.tests/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.core.tests/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.core.tests/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude08113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T02111contentType133org.eclipse.jdt.junit.JUnitResultF04file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/arraybounds/ArrayboundsAnalysisTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/arraybounds/ArrayboundsAnalysisTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/arraybounds/ArrayboundsAnalysisTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/arraybounds/ArrayboundsAnalysisTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,153 @@
+package com.ibm.wala.core.tests.arraybounds;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
+
+import java.io.IOException;
+
+import org.hamcrest.Matcher;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ErrorCollector;
+
+import com.ibm.wala.analysis.arraybounds.ArrayOutOfBoundsAnalysis;
+import com.ibm.wala.analysis.arraybounds.ArrayOutOfBoundsAnalysis.UnnecessaryCheck;
+import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.core.tests.util.TestConstants;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.impl.Everywhere;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.ssa.AllIntegerDueToBranchePiPolicy;
+import com.ibm.wala.ssa.DefaultIRFactory;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRFactory;
+import com.ibm.wala.ssa.ISSABasicBlock;
+import com.ibm.wala.ssa.SSAArrayReferenceInstruction;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.config.AnalysisScopeReader;
+
+/**
+ * The test data should be grouped, according to the behavior of the analysis.
+ * All array accesses of a class are to be detected as "in bound" or all are to
+ * be detected as "not in bound".
+ * 
+ * This test will only check if all found accesses behave accordingly and if the
+ * number of array accesses is as expected.
+ * 
+ * So there is no explicit check for specific lines.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class ArrayboundsAnalysisTest {
+  private static ClassLoader CLASS_LOADER = ArrayboundsAnalysisTest.class.getClassLoader();
+
+  private static final String DETECTABLE_TESTDATA = "Larraybounds/Detectable";
+  private static final int DETECTABLE_NUMBER_OF_ARRAY_ACCESS = 34;
+
+  private static final String NOT_DETECTABLE_TESTDATA = "Larraybounds/NotDetectable";
+  private static final int NOT_DETECTABLE_NUMBER_OF_ARRAY_ACCESS = 10;
+
+  private static final String NOT_IN_BOUND_TESTDATA = "Larraybounds/NotInBound";
+  private static final int NOT_IN_BOUND_TESTDATA_NUMBER_OF_ARRAY_ACCESS = 8;
+
+  private static IRFactory<IMethod> irFactory;
+  private static AnalysisOptions options;
+  private static AnalysisScope scope;
+  private static ClassHierarchy cha;
+
+  @Rule
+  public ErrorCollector collector = new ErrorCollector();
+
+  @BeforeClass
+  public static void init() throws IOException, ClassHierarchyException {
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, null, CLASS_LOADER);
+    cha = ClassHierarchyFactory.make(scope);
+
+    irFactory = new DefaultIRFactory();
+    options = new AnalysisOptions();
+    options.getSSAOptions().setPiNodePolicy(new AllIntegerDueToBranchePiPolicy());
+  }
+
+  public static IR getIr(IMethod method) {
+    return irFactory.makeIR(method, Everywhere.EVERYWHERE, options.getSSAOptions());
+  }
+
+  public static IClass getIClass(String name) {
+    final TypeReference typeRef = TypeReference.findOrCreate(scope.getApplicationLoader(), name);
+    return cha.lookupClass(typeRef);
+  }
+
+  @Test
+  public void detectable() {
+    IClass iClass = getIClass(DETECTABLE_TESTDATA);
+    assertAllSameNecessity(iClass, DETECTABLE_NUMBER_OF_ARRAY_ACCESS, equalTo(UnnecessaryCheck.BOTH));
+  }
+
+  @Test
+  public void notDetectable() {
+    IClass iClass = getIClass(NOT_DETECTABLE_TESTDATA);
+    assertAllSameNecessity(iClass, NOT_DETECTABLE_NUMBER_OF_ARRAY_ACCESS, not(equalTo(UnnecessaryCheck.BOTH)));
+  }
+
+  @Test
+  public void notInBound() {
+    IClass iClass = getIClass(NOT_IN_BOUND_TESTDATA);
+    assertAllSameNecessity(iClass, NOT_IN_BOUND_TESTDATA_NUMBER_OF_ARRAY_ACCESS, not(equalTo(UnnecessaryCheck.BOTH)));
+  }
+
+  public void assertAllSameNecessity(IClass iClass, int expectedNumberOfArrayAccesses, Matcher<UnnecessaryCheck> matcher) {
+    int numberOfArrayAccesses = 0;
+    for (IMethod method : iClass.getAllMethods()) {
+      if (method.getDeclaringClass().equals(iClass)) {
+        IR ir = getIr(method);
+        StringBuilder builder = new StringBuilder();
+        for (ISSABasicBlock block : ir.getControlFlowGraph()) {
+          for (SSAInstruction instruction : block) {
+            builder.append(instruction);
+            builder.append('\n');
+          }
+        }
+
+        String identifyer = method.getDeclaringClass().getName().toString() + "#" + method.getName().toString();
+
+        ArrayOutOfBoundsAnalysis analysis = new ArrayOutOfBoundsAnalysis(ir);
+        for (SSAArrayReferenceInstruction key : analysis.getBoundsCheckNecessary().keySet()) {
+          numberOfArrayAccesses++;
+          UnnecessaryCheck unnecessary = analysis.getBoundsCheckNecessary().get(key);
+          collector.checkThat("Unexpected necessity for bounds check in " + identifyer + ":" + method.getLineNumber(key.iindex),
+              unnecessary, matcher);
+        }
+      }
+    }
+
+    /*
+     * Possible reasons for this to fail are:
+     * 
+     * 
+     * *_NUMBER_OF_ARRAY_ACCESS is not set to the correct value (maybe the test
+     * data has changed).
+     * 
+     * Not all methods of the class analyzed.
+     * 
+     * There is a bug, so not all array accesses are found.
+     */
+    collector.checkThat("Number of found array accesses is not as expected for " + iClass.getName().toString(),
+        numberOfArrayAccesses, equalTo(expectedNumberOfArrayAccesses));
+  }
+
+  @AfterClass
+  public static void free() {
+    scope = null;
+    cha = null;
+    irFactory = null;
+    options = null;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/arraybounds/PruneArrayOutOfBoundExceptionEdge.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/arraybounds/PruneArrayOutOfBoundExceptionEdge.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/arraybounds/PruneArrayOutOfBoundExceptionEdge.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/arraybounds/PruneArrayOutOfBoundExceptionEdge.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,240 @@
+package com.ibm.wala.core.tests.arraybounds;
+
+import static org.hamcrest.CoreMatchers.anyOf;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.everyItem;
+import static org.hamcrest.CoreMatchers.hasItem;
+
+import java.io.IOException;
+import java.util.LinkedHashSet;
+
+import org.hamcrest.Matcher;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ErrorCollector;
+
+import com.ibm.wala.analysis.arraybounds.ArrayOutOfBoundsAnalysis;
+import com.ibm.wala.analysis.nullpointer.IntraproceduralNullPointerAnalysis;
+import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.core.tests.util.TestConstants;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.impl.Everywhere;
+import com.ibm.wala.ipa.cfg.PrunedCFG;
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter2EdgeFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.filter.ArrayOutOfBoundFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.filter.CombinedExceptionFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.filter.NullPointerExceptionFilter;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.ssa.AllIntegerDueToBranchePiPolicy;
+import com.ibm.wala.ssa.DefaultIRFactory;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRFactory;
+import com.ibm.wala.ssa.ISSABasicBlock;
+import com.ibm.wala.ssa.SSACFG;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.collections.Pair;
+import com.ibm.wala.util.config.AnalysisScopeReader;
+
+/**
+ * This test will check that:
+ * <ul>
+ * <li>no normal edge is removed
+ * <li>in case of an exceptional edge being removed, the instruction causing the
+ * edge is an instruction that is able to throw a NullpointerException or an
+ * ArrayIndexOutOfBoundException and no other exception may be thrown by this
+ * instruction.
+ * <li>the number of removed edges is as expected
+ * </ul>
+ * 
+ * So there is no explicit check for specific lines.
+ * 
+ * For an example how to use the exception pruning see
+ * {@link PruneArrayOutOfBoundExceptionEdge#computeCfgAndPrunedCFG(IMethod)}
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class PruneArrayOutOfBoundExceptionEdge {
+  private static ClassLoader CLASS_LOADER = PruneArrayOutOfBoundExceptionEdge.class.getClassLoader();
+
+  private static final String DETECTABLE_TESTDATA = "Larraybounds/Detectable";
+  /**
+   * The number of Basic Blocks, which have an exception edge, that should be
+   * removed. (#[array access] + #[other])
+   */
+  private static final int DETECTABLE_EXPECTED_COUNT = 34 + 2;
+
+  private static final String NOT_DETECTABLE_TESTDATA = "Larraybounds/NotDetectable";
+  /**
+   * The number of Basic Blocks, which have an exception edge, that should be
+   * removed. (#[array access] + #[other])
+   */
+  private static final int NOT_DETECTABLE_EXPECTED_COUNT = 0 + 3;
+
+  private static final String NOT_IN_BOUND_TESTDATA = "Larraybounds/NotInBound";
+  /**
+   * The number of Basic Blocks, which have an exception edge, that should be
+   * removed. (#[array access] + #[other])
+   */
+  private static final int NOT_IN_BOUND_EXPECTED_COUNT = 0 + 1;
+
+  private static IRFactory<IMethod> irFactory;
+  private static AnalysisOptions options;
+  private static AnalysisScope scope;
+  private static ClassHierarchy cha;
+
+  @Rule
+  public ErrorCollector collector = new ErrorCollector();
+
+  @BeforeClass
+  public static void init() throws IOException, ClassHierarchyException {
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, null, CLASS_LOADER);
+    cha = ClassHierarchyFactory.make(scope);
+
+    irFactory = new DefaultIRFactory();
+    options = new AnalysisOptions();
+    options.getSSAOptions().setPiNodePolicy(new AllIntegerDueToBranchePiPolicy());
+  }
+
+  private static IR getIr(IMethod method) {
+    return irFactory.makeIR(method, Everywhere.EVERYWHERE, options.getSSAOptions());
+  }
+
+  public static Pair<SSACFG, PrunedCFG<SSAInstruction, ISSABasicBlock>> computeCfgAndPrunedCFG(IMethod method) {
+    IR ir = getIr(method);
+    SSACFG cfg = ir.getControlFlowGraph();
+
+    ArrayOutOfBoundsAnalysis arrayBoundsAnalysis = new ArrayOutOfBoundsAnalysis(ir);
+    IntraproceduralNullPointerAnalysis nullPointerAnalysis = new IntraproceduralNullPointerAnalysis(ir);
+
+    CombinedExceptionFilter<SSAInstruction> filter = new CombinedExceptionFilter<>();
+    filter.add(new ArrayOutOfBoundFilter(arrayBoundsAnalysis));
+    filter.add(new NullPointerExceptionFilter(nullPointerAnalysis));
+
+    ExceptionFilter2EdgeFilter<ISSABasicBlock> edgeFilter = new ExceptionFilter2EdgeFilter<>(filter, cha, cfg);
+    PrunedCFG<SSAInstruction, ISSABasicBlock> prunedCfg = PrunedCFG.make(cfg, edgeFilter);
+
+    return Pair.make(cfg, prunedCfg);
+  }
+
+  private static IClass getIClass(String name) {
+    final TypeReference typeRef = TypeReference.findOrCreate(scope.getApplicationLoader(), name);
+    return cha.lookupClass(typeRef);
+  }
+
+  @Test
+  public void detectable() {
+    IClass iClass = getIClass(DETECTABLE_TESTDATA);
+    checkRemovedEdges(iClass, DETECTABLE_EXPECTED_COUNT);
+  }
+
+  @Test
+  public void notDetectable() {
+    IClass iClass = getIClass(NOT_DETECTABLE_TESTDATA);
+    checkRemovedEdges(iClass, NOT_DETECTABLE_EXPECTED_COUNT);
+  }
+
+  @Test
+  public void notInBound() {
+    IClass iClass = getIClass(NOT_IN_BOUND_TESTDATA);
+    checkRemovedEdges(iClass, NOT_IN_BOUND_EXPECTED_COUNT);
+  }
+
+  private void checkRemovedEdges(IClass iClass, int expectedNumberOfArrayAccesses) {
+    int numberOfDeletedExceptionEdges = 0;
+    for (IMethod method : iClass.getAllMethods()) {
+      if (method.getDeclaringClass().equals(iClass)) {
+        String identifyer = method.getDeclaringClass().getName().toString() + "#" + method.getName().toString();
+        Pair<SSACFG, PrunedCFG<SSAInstruction, ISSABasicBlock>> cfgs = computeCfgAndPrunedCFG(method);
+        SSACFG cfg = cfgs.fst;
+        PrunedCFG<SSAInstruction, ISSABasicBlock> prunedCfg = cfgs.snd;
+
+        for (ISSABasicBlock block : cfg) {
+          checkNormalSuccessors(cfg, prunedCfg, block);
+          boolean isEdgeRemoved = checkExceptionalSuccessors(block, cfg, prunedCfg, method, identifyer);
+          numberOfDeletedExceptionEdges += isEdgeRemoved ? 1 : 0;
+        }
+      }
+    }
+
+    /*
+     * Possible reasons for this to fail are:
+     * 
+     * 
+     * *_NUMBER_OF_BB_WITHOUT_EXCEPTION is not set to the correct value (maybe
+     * the test data has changed).
+     * 
+     * Not all methods of the class analyzed.
+     * 
+     * There is a bug, so not all edges are deleted.
+     */
+    collector.checkThat("Number of deleted edges is not as expected for " + iClass.getName().toString(),
+        numberOfDeletedExceptionEdges, equalTo(expectedNumberOfArrayAccesses));
+  }
+
+  /**
+   * Check in case of an exceptional edge being removed, the instruction causing
+   * the edge is an instruction that is able to throw a NullpointerException or
+   * an ArrayIndexOutOfBoundException and no other exception may be thrown by
+   * this instruction.
+   * 
+   * @return if an edge of block was removed
+   */
+  private boolean checkExceptionalSuccessors(ISSABasicBlock block, SSACFG cfg, PrunedCFG<SSAInstruction, ISSABasicBlock> prunedCfg,
+      IMethod method, String identifyer) {
+    boolean isEdgeRemoved = false;
+    LinkedHashSet<ISSABasicBlock> exceptionalSuccessorCfg = new LinkedHashSet<>(cfg.getExceptionalSuccessors(block));
+    LinkedHashSet<ISSABasicBlock> exceptionalSuccessorPruned = new LinkedHashSet<>(
+        prunedCfg.getExceptionalSuccessors(block));
+
+    if (!exceptionalSuccessorCfg.equals(exceptionalSuccessorPruned)) {
+      isEdgeRemoved = true;
+
+      if (block.getLastInstructionIndex() >= 0) {
+        SSAInstruction lastInstruction = block.getLastInstruction();
+        lastInstruction.getExceptionTypes();
+
+        final Matcher<Iterable<? super TypeReference>> isJLNPE = hasItem(equalTo(TypeReference.JavaLangNullPointerException));
+        final Matcher<Iterable<? super TypeReference>> isJLAIOOBE = hasItem(equalTo(TypeReference.JavaLangArrayIndexOutOfBoundsException));
+        final Matcher<Iterable<? super TypeReference>> matcher1 = anyOf(isJLNPE, isJLAIOOBE);
+
+        collector.checkThat("Edge deleted but cause instruction can't throw NullPointerException"
+            + "nor ArrayIndexOutOfBoundsException: " + identifyer + ":" + method.getLineNumber(lastInstruction.iindex),
+            lastInstruction.getExceptionTypes(), matcher1);
+
+        Matcher<Iterable<TypeReference>> matcher2 = everyItem(anyOf(equalTo(TypeReference.JavaLangNullPointerException),
+            equalTo(TypeReference.JavaLangArrayIndexOutOfBoundsException)));
+
+        collector.checkThat("Edge deleted but cause instruction throws other exceptions as NullPointerException"
+            + "and ArrayIndexOutOfBoundsException: " + identifyer + ":" + method.getLineNumber(lastInstruction.iindex),
+            lastInstruction.getExceptionTypes(), matcher2);
+
+      } else {
+        collector.addError(new Throwable("Exceptional edge deleted, but no instruction as cause. - No last instruction."));
+      }
+
+    }
+    return isEdgeRemoved;
+  }
+
+  private void checkNormalSuccessors(SSACFG cfg, PrunedCFG<SSAInstruction, ISSABasicBlock> prunedCfg, ISSABasicBlock block) {
+    LinkedHashSet<ISSABasicBlock> normalSuccessorCfg = new LinkedHashSet<>(cfg.getNormalSuccessors(block));
+    LinkedHashSet<ISSABasicBlock> normalSuccessorPruned = new LinkedHashSet<>(prunedCfg.getNormalSuccessors(block));
+    collector.checkThat("", normalSuccessorPruned, equalTo(normalSuccessorCfg));
+  }
+
+  @AfterClass
+  public static void free() {
+    scope = null;
+    cha = null;
+    irFactory = null;
+    options = null;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/ExtensionGraphTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/ExtensionGraphTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/ExtensionGraphTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/ExtensionGraphTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -69,24 +69,24 @@
   @Test
   public void testAugment() {
     NumberedGraph<String> base = makeBaseGraph();
-    Assert.assertEquals("base has 8 SCCs", 8, IteratorUtil.count(new SCCIterator<String>(base)));
+    Assert.assertEquals("base has 8 SCCs", 8, IteratorUtil.count(new SCCIterator<>(base)));
 
-    NumberedGraph<String> x = new ExtensionGraph<String>(base);
+    NumberedGraph<String> x = new ExtensionGraph<>(base);
     augmentA(x);
-    Assert.assertEquals("base+A has 5 SCCs", 5, IteratorUtil.count(new SCCIterator<String>(x)));
-    Assert.assertEquals("base has 8 SCCs", 8, IteratorUtil.count(new SCCIterator<String>(base)));
+    Assert.assertEquals("base+A has 5 SCCs", 5, IteratorUtil.count(new SCCIterator<>(x)));
+    Assert.assertEquals("base has 8 SCCs", 8, IteratorUtil.count(new SCCIterator<>(base)));
 
-    NumberedGraph<String> y = new ExtensionGraph<String>(x);
+    NumberedGraph<String> y = new ExtensionGraph<>(x);
     augmentB(y);
-    Assert.assertEquals("base+A+B has 7 SCCs", 7, IteratorUtil.count(new SCCIterator<String>(y)));
-    Assert.assertEquals("base+A has 5 SCCs", 5, IteratorUtil.count(new SCCIterator<String>(x)));
-    Assert.assertEquals("base has 8 SCCs", 8, IteratorUtil.count(new SCCIterator<String>(base)));
+    Assert.assertEquals("base+A+B has 7 SCCs", 7, IteratorUtil.count(new SCCIterator<>(y)));
+    Assert.assertEquals("base+A has 5 SCCs", 5, IteratorUtil.count(new SCCIterator<>(x)));
+    Assert.assertEquals("base has 8 SCCs", 8, IteratorUtil.count(new SCCIterator<>(base)));
 
-    NumberedGraph<String> z = new ExtensionGraph<String>(y);
+    NumberedGraph<String> z = new ExtensionGraph<>(y);
     augmentC(z);
-    Assert.assertEquals("base+A+B+C has 3 SCCs", 3, IteratorUtil.count(new SCCIterator<String>(z)));
-    Assert.assertEquals("base+A+B has 7 SCCs", 7, IteratorUtil.count(new SCCIterator<String>(y)));
-    Assert.assertEquals("base+A has 5 SCCs", 5, IteratorUtil.count(new SCCIterator<String>(x)));
-    Assert.assertEquals("base has 8 SCCs", 8, IteratorUtil.count(new SCCIterator<String>(base)));
+    Assert.assertEquals("base+A+B+C has 3 SCCs", 3, IteratorUtil.count(new SCCIterator<>(z)));
+    Assert.assertEquals("base+A+B has 7 SCCs", 7, IteratorUtil.count(new SCCIterator<>(y)));
+    Assert.assertEquals("base+A has 5 SCCs", 5, IteratorUtil.count(new SCCIterator<>(x)));
+    Assert.assertEquals("base has 8 SCCs", 8, IteratorUtil.count(new SCCIterator<>(base)));
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/FloydWarshallTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/FloydWarshallTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/FloydWarshallTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/FloydWarshallTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,12 +13,14 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.ibm.wala.core.tests.util.WalaTestCase;
 import com.ibm.wala.util.graph.INodeWithNumberedEdges;
 import com.ibm.wala.util.graph.NumberedGraph;
 import com.ibm.wala.util.graph.impl.DelegatingNumberedGraph;
@@ -29,7 +31,7 @@
 import com.ibm.wala.util.intset.IntSetUtil;
 import com.ibm.wala.util.intset.MutableIntSet;
 
-public class FloydWarshallTest {
+public class FloydWarshallTest extends WalaTestCase {
 
   public static class Node implements INodeWithNumberedEdges {
     private final int number;
@@ -87,12 +89,17 @@
     
     @Override
     public String toString() {
-      return "["+number+"]";
+      return "<"+number+">";
+    }
+    
+    @Override
+    public boolean equals(Object o) {
+      return this == o;
     }
   }
   
-  private static NumberedGraph<Node> makeGraph() {
-    NumberedGraph<Node> G = new DelegatingNumberedGraph<Node>();
+  public static NumberedGraph<Node> makeGraph() {
+    NumberedGraph<Node> G = new DelegatingNumberedGraph<>();
   
     for(int i = 0; i <= 8; i++) {
       G.addNode(new Node(i));
@@ -142,19 +149,29 @@
   @Test
   public void TestShortestPath() {
     GetPath<Node> result = FloydWarshall.allPairsShortestPath(G);
-    Assert.assertEquals(result.getPath(G.getNode(1), G.getNode(3)), Collections.singletonList(G.getNode(2)));
-    Assert.assertEquals(result.getPath(G.getNode(5), G.getNode(8)), Collections.singletonList(G.getNode(7)));
-    Assert.assertEquals(result.getPath(G.getNode(1), G.getNode(7)), Arrays.asList(G.getNode(2),G.getNode(3),G.getNode(5)));
-    Assert.assertEquals(result.getPath(G.getNode(1), G.getNode(6)), Arrays.asList(G.getNode(2),G.getNode(3),G.getNode(4)));
+    assertEquals(result.getPath(G.getNode(1), G.getNode(3)), Collections.singletonList(G.getNode(2)));
+    assertEquals(result.getPath(G.getNode(5), G.getNode(8)), Collections.singletonList(G.getNode(7)));
+    assertEquals(result.getPath(G.getNode(1), G.getNode(7)), Arrays.asList(G.getNode(2),G.getNode(3),G.getNode(5)));
+    assertEquals(result.getPath(G.getNode(1), G.getNode(6)), Arrays.asList(G.getNode(2),G.getNode(3),G.getNode(4)));
   }
 
   @Test
   public void TestShortestPaths() {
     GetPaths<Node> result = FloydWarshall.allPairsShortestPaths(G);
     
-    Set<List<Node>> paths = new HashSet<List<Node>>();
-    paths.add(Arrays.asList(G.getNode(2),G.getNode(3),G.getNode(4),G.getNode(6)));
-    paths.add(Arrays.asList(G.getNode(2),G.getNode(3),G.getNode(5),G.getNode(7)));    
-    Assert.assertEquals(result.getPaths(G.getNode(1), G.getNode(8)), paths);
+    Set<List<Node>> expectedPaths = expectedPaths(G); 
+    Set<List<Node>> resultPaths = result.getPaths(G.getNode(1), G.getNode(8));
+
+    assertEquals(resultPaths.size(), expectedPaths.size());
+    for(List<Node> rp : resultPaths) {
+      Assert.assertTrue(expectedPaths.contains(rp));
+    }
+  }
+
+  public static Set<List<Node>> expectedPaths(NumberedGraph<Node> G) {
+    Set<List<Node>> paths = new HashSet<>();
+    paths.add(new LinkedList<>(Arrays.asList(G.getNode(2),G.getNode(3),G.getNode(4),G.getNode(6))));
+    paths.add(new LinkedList<>(Arrays.asList(G.getNode(2),G.getNode(3),G.getNode(5),G.getNode(7))));
+    return paths;
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/GraphDataflowTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/GraphDataflowTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/GraphDataflowTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/GraphDataflowTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -54,7 +54,6 @@
 
   /**
    * A simple test of the GraphBitVectorDataflow system
-   * @throws CancelException 
    */
   @Test public void testSolverNodeEdge() throws CancelException {
     Graph<String> G = buildGraph();
@@ -78,35 +77,31 @@
    * @return the expected dataflow result as a String
    */
   public static String expectedStringNodeOnly() {
-    StringBuffer result = new StringBuffer("------\n");
-    result.append("Node A(0) = { 0 }\n");
-    result.append("Node B(1) = { 0 1 }\n");
-    result.append("Node C(2) = { 0 1 2 }\n");
-    result.append("Node D(3) = { 0 1 3 }\n");
-    result.append("Node E(4) = { 0 1 2 3 4 }\n");
-    result.append("Node F(5) = { 0 1 2 3 4 5 }\n");
-    result.append("Node G(6) = { 6 }\n");
-    result.append("Node H(7) = { 7 }\n");
-    return result.toString();
+    return "------\n" + "Node A(0) = { 0 }\n" +
+            "Node B(1) = { 0 1 }\n" +
+            "Node C(2) = { 0 1 2 }\n" +
+            "Node D(3) = { 0 1 3 }\n" +
+            "Node E(4) = { 0 1 2 3 4 }\n" +
+            "Node F(5) = { 0 1 2 3 4 5 }\n" +
+            "Node G(6) = { 6 }\n" +
+            "Node H(7) = { 7 }\n";
   }
 
   public static String expectedStringNodeEdge() {
-    StringBuffer result = new StringBuffer("------\n");
-    result.append("Node A(0) = { 0 }\n");
-    result.append("Node B(1) = { 0 1 }\n");
-    result.append("Node C(2) = { 0 2 }\n");
-    result.append("Node D(3) = { 1 3 }\n");
-    result.append("Node E(4) = { 0 1 2 3 4 }\n");
-    result.append("Node F(5) = { 0 1 2 3 4 5 }\n");
-    result.append("Node G(6) = { 6 }\n");
-    result.append("Node H(7) = { 7 }\n");
-    return result.toString();
+    return "------\n" + "Node A(0) = { 0 }\n" +
+            "Node B(1) = { 0 1 }\n" +
+            "Node C(2) = { 0 2 }\n" +
+            "Node D(3) = { 1 3 }\n" +
+            "Node E(4) = { 0 1 2 3 4 }\n" +
+            "Node F(5) = { 0 1 2 3 4 5 }\n" +
+            "Node G(6) = { 6 }\n" +
+            "Node H(7) = { 7 }\n";
   }
 
   /**
    * @return a graph with the expected structure
    */
-  private static Graph<String> buildGraph() {
+  public static Graph<String> buildGraph() {
     Graph<String> G = SlowSparseNumberedGraph.make();
     for (int i = 0; i < nodeNames.length(); i++) {
       String n = nodeNames.substring(i, i + 1);
@@ -124,12 +119,11 @@
 
   /**
    * Solve the dataflow system and return the result as a string
-   * @throws CancelException 
    */
-  private static String solveNodeOnly(Graph<String> G) throws CancelException {
-    final OrdinalSetMapping<String> values = new MutableMapping<String>(nodes);
+  public static String solveNodeOnly(Graph<String> G) throws CancelException {
+    final OrdinalSetMapping<String> values = new MutableMapping<>(nodes);
     ITransferFunctionProvider<String, BitVectorVariable> functions = new ITransferFunctionProvider<String, BitVectorVariable>() {
-
+      
       @Override
       public UnaryOperator<BitVectorVariable> getNodeTransferFunction(String node) {
         return new BitVectorUnionConstant(values.getMappedIndex(node));
@@ -158,14 +152,14 @@
 
     };
 
-    BitVectorFramework<String,String> F = new BitVectorFramework<String,String>(G, functions, values);
-    BitVectorSolver<String> s = new BitVectorSolver<String>(F);
+    BitVectorFramework<String,String> F = new BitVectorFramework<>(G, functions, values);
+    BitVectorSolver<String> s = new BitVectorSolver<>(F);
     s.solve(null);
     return result2String(s);
   }
 
-  private static String solveNodeEdge(Graph<String> G) throws CancelException {
-    final OrdinalSetMapping<String> values = new MutableMapping<String>(nodes);
+  public static String solveNodeEdge(Graph<String> G) throws CancelException {
+    final OrdinalSetMapping<String> values = new MutableMapping<>(nodes);
     ITransferFunctionProvider<String, BitVectorVariable> functions = new ITransferFunctionProvider<String, BitVectorVariable>() {
 
       @Override
@@ -201,20 +195,20 @@
 
     };
 
-    BitVectorFramework<String,String> F = new BitVectorFramework<String,String>(G, functions, values);
-    BitVectorSolver<String> s = new BitVectorSolver<String>(F);
+    BitVectorFramework<String,String> F = new BitVectorFramework<>(G, functions, values);
+    BitVectorSolver<String> s = new BitVectorSolver<>(F);
     s.solve(null);
     return result2String(s);
   }
 
   public static String result2String(BitVectorSolver<String> solver) {
-    StringBuffer result = new StringBuffer("------\n");
+    StringBuilder result = new StringBuilder("------\n");
     for (int i = 0; i < nodes.length; i++) {
       String n = nodes[i];
       BitVectorVariable varI = solver.getOut(n);
       String s = varI.toString();
-      result.append("Node " + n + "(" + i + ") = " + s + "\n");
+      result.append("Node ").append(n).append('(').append(i).append(") = ").append(s).append('\n');
     }
     return result.toString();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PathFinderTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PathFinderTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PathFinderTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PathFinderTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,7 +15,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.impl.SlowSparseNumberedGraph;
 import com.ibm.wala.util.graph.traverse.DFSAllPathsFinder;
@@ -41,11 +40,7 @@
   }
 
   private static DFSAllPathsFinder<String> makeFinder(Graph<String> g, String start, final String end) {
-    return new DFSAllPathsFinder<String>(g, start, new Predicate<String>() {
-      @Override public boolean test(String o) {
-        return end.equals(o);
-      }
-    });
+    return new DFSAllPathsFinder<>(g, start, end::equals);
   }
 
   private static void checkPaths(DFSAllPathsFinder<String> paths, int expectedCount) {
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PrimitivesTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PrimitivesTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PrimitivesTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/PrimitivesTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,6 @@
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -23,6 +22,7 @@
 import com.ibm.wala.util.collections.BimodalMap;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.SmallMap;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.NumberedGraph;
@@ -64,7 +64,7 @@
   /**
    * Test the MutableSparseIntSet implementation
    */
-  private void doMutableIntSet(MutableIntSetFactory factory) {
+  private static void doMutableIntSet(MutableIntSetFactory<?> factory) {
     MutableIntSet v = factory.parse("{9,17}");
     MutableIntSet w = factory.make(new int[] {});
     MutableIntSet x = factory.make(new int[] { 7, 4, 2, 4, 2, 2 });
@@ -351,7 +351,7 @@
   /**
    * Test the MutableSparseIntSet implementation
    */
-  private void doMutableLongSet(MutableLongSetFactory factory) {
+  private static void doMutableLongSet(MutableLongSetFactory factory) {
     MutableLongSet v = factory.parse("{9,17}");
     MutableLongSet w = factory.make(new long[] {});
     MutableLongSet x = factory.make(new long[] { 7, 4, 2, 4, 2, 2 });
@@ -600,47 +600,47 @@
   }
 
   @Test public void testSmallMap() {
-    SmallMap<Integer, Integer> M = new SmallMap<Integer, Integer>();
-    Integer I1 = new Integer(1);
-    Integer I2 = new Integer(2);
-    Integer I3 = new Integer(3);
+    SmallMap<Integer, Integer> M = new SmallMap<>();
+    Integer I1 = Integer.valueOf(1);
+    Integer I2 = Integer.valueOf(2);
+    Integer I3 = Integer.valueOf(3);
     M.put(I1, I1);
     M.put(I2, I2);
     M.put(I3, I3);
 
-    Integer I = M.get(new Integer(2));
+    Integer I = M.get(Integer.valueOf(2));
     Assert.assertTrue(I != null);
     Assert.assertTrue(I.equals(I2));
 
-    I = M.get(new Integer(4));
+    I = M.get(Integer.valueOf(4));
     Assert.assertTrue(I == null);
 
-    I = M.put(new Integer(2), new Integer(3));
+    I = M.put(Integer.valueOf(2), Integer.valueOf(3));
     Assert.assertTrue(I.equals(I2));
     I = M.get(I2);
     Assert.assertTrue(I.equals(I3));
   }
 
   @Test public void testBimodalMap() {
-    Map<Integer, Integer> M = new BimodalMap<Integer, Integer>(3);
-    Integer I1 = new Integer(1);
-    Integer I2 = new Integer(2);
-    Integer I3 = new Integer(3);
-    Integer I4 = new Integer(4);
-    Integer I5 = new Integer(5);
-    Integer I6 = new Integer(6);
+    Map<Integer, Integer> M = new BimodalMap<>(3);
+    Integer I1 = Integer.valueOf(1);
+    Integer I2 = Integer.valueOf(2);
+    Integer I3 = Integer.valueOf(3);
+    Integer I4 = Integer.valueOf(4);
+    Integer I5 = Integer.valueOf(5);
+    Integer I6 = Integer.valueOf(6);
     M.put(I1, I1);
     M.put(I2, I2);
     M.put(I3, I3);
 
-    Integer I = M.get(new Integer(2));
+    Integer I = M.get(Integer.valueOf(2));
     Assert.assertTrue(I != null);
     Assert.assertTrue(I.equals(I2));
 
-    I = M.get(new Integer(4));
+    I = M.get(Integer.valueOf(4));
     Assert.assertTrue(I == null);
 
-    I = M.put(new Integer(2), new Integer(3));
+    I = M.put(Integer.valueOf(2), Integer.valueOf(3));
     Assert.assertTrue(I.equals(I2));
     I = M.get(I2);
     Assert.assertTrue(I.equals(I3));
@@ -648,14 +648,14 @@
     M.put(I4, I4);
     M.put(I5, I5);
     M.put(I6, I6);
-    I = M.get(new Integer(4));
+    I = M.get(Integer.valueOf(4));
     Assert.assertTrue(I != null);
     Assert.assertTrue(I.equals(I4));
 
-    I = M.get(new Integer(7));
+    I = M.get(Integer.valueOf(7));
     Assert.assertTrue(I == null);
 
-    I = M.put(new Integer(2), new Integer(6));
+    I = M.put(Integer.valueOf(2), Integer.valueOf(6));
     Assert.assertTrue(I.equals(I3));
     I = M.get(I2);
     Assert.assertTrue(I.equals(I6));
@@ -665,7 +665,7 @@
     NumberedGraph<Integer> G = makeBFSTestGraph();
 
     // path from 0 to 8
-    BFSPathFinder<Integer> pf = new BFSPathFinder<Integer>(G, G.getNode(0), G.getNode(8));
+    BFSPathFinder<Integer> pf = new BFSPathFinder<>(G, G.getNode(0), G.getNode(8));
     List<Integer> p = pf.find();
 
     // path should be 8, 6, 4, 2, 0
@@ -678,43 +678,43 @@
   @Test public void testBoundedBFS() {
     NumberedGraph<Integer> G = makeBFSTestGraph();
 
-    BoundedBFSIterator<Integer> bfs = new BoundedBFSIterator<Integer>(G, G.getNode(0), 0);
+    BoundedBFSIterator<Integer> bfs = new BoundedBFSIterator<>(G, G.getNode(0), 0);
     Collection<Integer> c = Iterator2Collection.toSet(bfs);
     Assert.assertTrue(c.size() == 1);
 
-    bfs = new BoundedBFSIterator<Integer>(G, G.getNode(0), 1);
+    bfs = new BoundedBFSIterator<>(G, G.getNode(0), 1);
     c = Iterator2Collection.toSet(bfs);
     Assert.assertTrue(c.size() == 3);
 
-    bfs = new BoundedBFSIterator<Integer>(G, G.getNode(0), 2);
+    bfs = new BoundedBFSIterator<>(G, G.getNode(0), 2);
     c = Iterator2Collection.toSet(bfs);
     Assert.assertTrue(c.size() == 5);
 
-    bfs = new BoundedBFSIterator<Integer>(G, G.getNode(0), 3);
+    bfs = new BoundedBFSIterator<>(G, G.getNode(0), 3);
     c = Iterator2Collection.toSet(bfs);
     Assert.assertTrue(c.size() == 7);
 
-    bfs = new BoundedBFSIterator<Integer>(G, G.getNode(0), 4);
+    bfs = new BoundedBFSIterator<>(G, G.getNode(0), 4);
     c = Iterator2Collection.toSet(bfs);
     Assert.assertTrue(c.size() == 9);
 
-    bfs = new BoundedBFSIterator<Integer>(G, G.getNode(0), 5);
+    bfs = new BoundedBFSIterator<>(G, G.getNode(0), 5);
     c = Iterator2Collection.toSet(bfs);
     Assert.assertTrue(c.size() == 10);
 
-    bfs = new BoundedBFSIterator<Integer>(G, G.getNode(0), 500);
+    bfs = new BoundedBFSIterator<>(G, G.getNode(0), 500);
     c = Iterator2Collection.toSet(bfs);
     Assert.assertTrue(c.size() == 10);
   }
 
-  private NumberedGraph<Integer> makeBFSTestGraph() {
+  private static NumberedGraph<Integer> makeBFSTestGraph() {
     // test graph
     NumberedGraph<Integer> G = SlowSparseNumberedGraph.make();
 
     // add 10 nodes
     Integer[] nodes = new Integer[10];
     for (int i = 0; i < nodes.length; i++)
-      G.addNode(nodes[i] = new Integer(i));
+      G.addNode(nodes[i] = Integer.valueOf(i));
 
     // edges to i-1, i+1, i+2
     for (int i = 0; i < nodes.length; i++) {
@@ -738,7 +738,7 @@
     // add nodes
     Object[] nodes = new Object[11];
     for (int i = 0; i < nodes.length; i++)
-      G.addNode(nodes[i] = new Integer(i));
+      G.addNode(nodes[i] = Integer.valueOf(i));
 
     // add edges
     G.addEdge(nodes[10], nodes[0]);
@@ -761,13 +761,12 @@
     // Assert.assertions
     int i = 0;
     Object[] desired4 = new Object[] { nodes[4], nodes[7], nodes[8], nodes[5], nodes[10] };
-    for (Iterator<Object> d4 = D.dominators(nodes[4]); d4.hasNext();)
-      Assert.assertTrue(d4.next() == desired4[i++]);
+    for (Object d4 : Iterator2Iterable.make(D.dominators(nodes[4])))
+      Assert.assertTrue(d4 == desired4[i++]);
 
     int j = 0;
     Object[] desired5 = new Object[] { nodes[8] };
-    for (Iterator<? extends Object> t4 = D.dominatorTree().getSuccNodes(nodes[5]); t4.hasNext();) {
-      Object o4 = t4.next();
+    for (Object o4 : Iterator2Iterable.make(D.dominatorTree().getSuccNodes(nodes[5]))) {
       Object d = desired5[j++];
       boolean ok = (o4.equals(d));
       if (!ok) {
@@ -790,8 +789,8 @@
     R.add(3, 11);
     R.add(5, 1);
     int count = 0;
-    for (Iterator<IntPair> it = R.iterator(); it.hasNext();) {
-      System.err.println(it.next());
+    for (IntPair intPair : R) {
+      System.err.println(intPair);
       count++;
     }
     Assert.assertTrue(count == 5);
@@ -859,10 +858,10 @@
     Assert.assertTrue("Got count " + count, count == 2);
   }
 
-  private int countEquivalenceClasses(IntegerUnionFind uf) {
+  private static int countEquivalenceClasses(IntegerUnionFind uf) {
     HashSet<Integer> s = HashSetFactory.make();
     for (int i = 0; i < uf.size(); i++) {
-      s.add(new Integer(uf.find(i)));
+      s.add(Integer.valueOf(uf.find(i)));
     }
     return s.size();
   }
@@ -891,7 +890,7 @@
     testSingleBitVector(new OffsetBitVector(100, 10));
   }
 
-  private void testSingleBitVector(BitVectorBase bv) {
+  private static void testSingleBitVector(BitVectorBase<?> bv) {
     // does the following not automatically scale the bitvector to
     // a reasonable size?
     bv.set(55);
@@ -959,8 +958,7 @@
     testBitVectors(new OffsetBitVector(35, 20), new OffsetBitVector(25, 10));
   }
 
-  @SuppressWarnings("unchecked")
-  private <T extends BitVectorBase> void testBitVectors(T v1, T v2) {
+  private static <T extends BitVectorBase<T>> void testBitVectors(T v1, T v2) {
     v1.set(100);
     v1.set(101);
     v1.set(102);
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/WelshPowellTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/WelshPowellTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/WelshPowellTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/basic/WelshPowellTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,13 +10,13 @@
  *******************************************************************************/
 package com.ibm.wala.core.tests.basic;
 
-import java.util.Iterator;
 import java.util.Map;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.NumberedGraph;
 import com.ibm.wala.util.graph.impl.DelegatingNumberedGraph;
@@ -28,15 +28,13 @@
 
   public static <T> void assertColoring(Graph<T> G, Map<T,Integer> colors, boolean fullColor) {
     for(T n : G) {
-      for(Iterator<T> ss = G.getSuccNodes(n); ss.hasNext(); ) {
-        T succ = ss.next();
+      for(T succ : Iterator2Iterable.make(G.getSuccNodes(n))) {
         if (!fullColor &&  (!colors.containsKey(n) || !colors.containsKey(succ)) ) {
           continue;
         }
         Assert.assertTrue(n + " and succ: " + succ + " have same color: " + colors.get(n).intValue(), colors.get(n).intValue() != colors.get(succ).intValue()); 
       }
-      for(Iterator<T> ps = G.getPredNodes(n); ps.hasNext(); ) {
-        T pred = ps.next();
+      for(T pred : Iterator2Iterable.make(G.getPredNodes(n))) {
         if (!fullColor && (!colors.containsKey(n) || !colors.containsKey(pred)) ) {
           continue;
         }
@@ -59,16 +57,16 @@
   }
     
   private <T> NumberedGraph<TypedNode<T>> buildGraph(T[][] data) {
-    DelegatingNumberedGraph<TypedNode<T>> G = new DelegatingNumberedGraph<TypedNode<T>>();
+    DelegatingNumberedGraph<TypedNode<T>> G = new DelegatingNumberedGraph<>();
     Map<T,TypedNode<T>> nodes = HashMapFactory.make();
-    for(int i = 0; i < data.length; i++) {
-      TypedNode<T> n = new TypedNode<T>(data[i][0]);
-      nodes.put(data[i][0], n);
+    for (T[] element : data) {
+      TypedNode<T> n = new TypedNode<>(element[0]);
+      nodes.put(element[0], n);
       G.addNode(n);
     }
-    for(int i = 0; i < data.length; i++) {
-      for(int j = 1; j < data[i].length; j++) {
-        G.addEdge(nodes.get(data[i][0]), nodes.get(data[i][j]));
+    for (T[] element : data) {
+      for(int j = 1; j < element.length; j++) {
+        G.addEdge(nodes.get(element[0]), nodes.get(element[j]));
       }
     }
     
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/AcyclicCallGraphTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/AcyclicCallGraphTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/AcyclicCallGraphTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/AcyclicCallGraphTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,60 @@
+package com.ibm.wala.core.tests.callGraph;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.ibm.wala.core.tests.util.TestConstants;
+import com.ibm.wala.core.tests.util.WalaTestCase;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.pruned.PrunedCallGraph;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.graph.Acyclic;
+import com.ibm.wala.util.intset.IBinaryNaturalRelation;
+import com.ibm.wala.util.intset.IntPair;
+
+public class AcyclicCallGraphTest extends WalaTestCase {
+
+  @Test public void testNList() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+    AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
+        CallGraphTestUtil.REGRESSION_EXCLUSIONS);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
+    Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
+        "Lrecurse/NList");
+    AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
+  
+    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
+
+    IBinaryNaturalRelation backEdges = Acyclic.computeBackEdges(cg, cg.getFakeRootNode());
+    
+    Assert.assertTrue("NList should have cycles", backEdges.iterator().hasNext()); 
+    
+    Map<CGNode, Set<CGNode>> cgBackEdges = HashMapFactory.make();
+    for (IntPair p : backEdges) {
+      CGNode src = cg.getNode(p.getX());
+      if (!cgBackEdges.containsKey(src)) {
+        cgBackEdges.put(src, HashSetFactory.<CGNode>make());
+      }
+      cgBackEdges.get(src).add(cg.getNode(p.getY()));
+    }
+    
+    PrunedCallGraph pcg = new PrunedCallGraph(cg, Iterator2Collection.toSet(cg.iterator()), cgBackEdges);
+    
+    Assert.assertTrue("cycles should be gone", !Acyclic.computeBackEdges(pcg, pcg.getFakeRootNode()).iterator().hasNext());
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,17 +20,20 @@
 
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.demandpa.AbstractPtrTest;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions.ReflectionOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.CallGraphStats;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.AllApplicationEntrypoints;
 import com.ibm.wala.ipa.callgraph.impl.DefaultEntrypoint;
 import com.ibm.wala.ipa.callgraph.impl.Util;
@@ -42,6 +45,7 @@
 import com.ibm.wala.ipa.cfg.InterproceduralCFG;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.types.Descriptor;
@@ -49,6 +53,7 @@
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Iterable;
+import com.ibm.wala.util.collections.IteratorUtil;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.GraphIntegrity;
@@ -70,42 +75,46 @@
 
   @Test public void testJava_cup() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.JAVA_CUP, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.JAVA_CUP_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    doCallGraphs(options, new AnalysisCache(), cha, scope, useShortProfile());
+    doCallGraphs(options, new AnalysisCacheImpl(), cha, scope, useShortProfile());
   }
 
   @Test public void testBcelVerifier() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.BCEL, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.BCEL_VERIFIER_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
+    // this speeds up the test
+    options.setReflectionOptions(ReflectionOptions.NONE);
 
-    doCallGraphs(options, new AnalysisCache(), cha, scope);
+    doCallGraphs(options, new AnalysisCacheImpl(), cha, scope);
   }
 
   @Test public void testJLex() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.JLEX, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util
         .makeMainEntrypoints(scope, cha, TestConstants.JLEX_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    doCallGraphs(options, new AnalysisCache(), cha, scope);
+    doCallGraphs(options, new AnalysisCacheImpl(), cha, scope);
   }
 
   @Test public void testCornerCases() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
         CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = new AllApplicationEntrypoints(scope, cha);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
+    // this speeds up the test
+    options.setReflectionOptions(ReflectionOptions.NONE);
 
-    doCallGraphs(options, new AnalysisCache(), cha, scope);
+    doCallGraphs(options, new AnalysisCacheImpl(), cha, scope);
 
     // we expect a warning or two about class Abstract1, which has no concrete
     // subclasses
@@ -120,22 +129,22 @@
   @Test public void testHello() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     if (analyzingJar()) return;
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.HELLO, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.HELLO_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    doCallGraphs(options, new AnalysisCache(), cha, scope);
+    doCallGraphs(options, new AnalysisCacheImpl(), cha, scope);
   }
 
   @Test public void testStaticInit() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
         CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         "LstaticInit/TestStaticInit");
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     boolean foundDoNothing = false;
     for (CGNode n : cg) {
       if (n.toString().contains("doNothing")) {
@@ -145,7 +154,7 @@
     }
     Assert.assertTrue(foundDoNothing);
     options.setHandleStaticInit(false);
-    cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false);
+    cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     for (CGNode n : cg) {
       Assert.assertTrue(!n.toString().contains("doNothing"));
     }
@@ -154,11 +163,11 @@
   @Test public void testJava8Smoke() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
         CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         "Llambda/SortingExample");
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     boolean foundSortForward = false;
     for (CGNode n : cg) {
       if (n.toString().contains("sortForward")) {
@@ -171,11 +180,11 @@
   @Test public void testSystemProperties() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
         CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         "LstaticInit/TestSystemProperties");
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    SSAPropagationCallGraphBuilder builder = Util.makeZeroCFABuilder(options, new AnalysisCache(), cha, scope);    
+    SSAPropagationCallGraphBuilder builder = Util.makeZeroCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);    
     CallGraph cg = builder.makeCallGraph(options);
     for (CGNode n : cg) {
       if (n.toString().equals("Node: < Application, LstaticInit/TestSystemProperties, main([Ljava/lang/String;)V > Context: Everywhere")) {
@@ -195,34 +204,34 @@
   @Test public void testRecursion() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
         CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.RECURSE_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    doCallGraphs(options, new AnalysisCache(), cha, scope);
+    doCallGraphs(options, new AnalysisCacheImpl(), cha, scope);
   }
 
   @Test public void testHelloAllEntrypoints() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     if (analyzingJar()) return;    
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.HELLO, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = new AllApplicationEntrypoints(scope, cha);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    doCallGraphs(options, new AnalysisCache(), cha, scope);
+    doCallGraphs(options, new AnalysisCacheImpl(), cha, scope);
   }
 
   @Test public void testIO() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope("primordial.txt", CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
-    Iterable<Entrypoint> entrypoints = makePrimordialPublicEntrypoints(scope, cha, "java/io");
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
+    Iterable<Entrypoint> entrypoints = makePrimordialPublicEntrypoints(cha, "java/io");
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
   }
 
-  public static Iterable<Entrypoint> makePrimordialPublicEntrypoints(AnalysisScope scope, ClassHierarchy cha, String pkg) {
+  public static Iterable<Entrypoint> makePrimordialPublicEntrypoints(ClassHierarchy cha, String pkg) {
     final HashSet<Entrypoint> result = HashSetFactory.make();
     for (IClass clazz : cha) {
 
@@ -235,12 +244,7 @@
         }
       }
     }
-    return new Iterable<Entrypoint>() {
-      @Override
-      public Iterator<Entrypoint> iterator() {
-        return result.iterator();
-      }
-    };
+    return result::iterator;
   }
   
   @Test public void testPrimordial() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
@@ -254,22 +258,22 @@
           (System.getProperty("os.name").equals("Mac OS X"))?
           "Java60RegressionExclusions.txt":
           "GUIExclusions.txt");
-    ClassHierarchy cha = ClassHierarchy.make(scope);
-    Iterable<Entrypoint> entrypoints = makePrimordialMainEntrypoints(scope, cha);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
+    Iterable<Entrypoint> entrypoints = makePrimordialMainEntrypoints(cha);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
   }
 
   @Test
   public void testZeroOneContainerCopyOf() throws IOException, ClassHierarchyException, IllegalArgumentException, CancelException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
         CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = Util.makeMainEntrypoints(scope, cha, "Ldemandpa/TestArraysCopyOf");
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    AnalysisCache cache = new AnalysisCache();
-    CallGraphBuilder builder = Util.makeZeroOneContainerCFABuilder(options, cache, cha, scope);
+    IAnalysisCacheView cache = new AnalysisCacheImpl();
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneContainerCFABuilder(options, cache, cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
     PointerAnalysis<InstanceKey> pa = builder.getPointerAnalysis();
     CGNode mainMethod = AbstractPtrTest.findMainMethod(cg);
@@ -281,7 +285,7 @@
   /**
    * make main entrypoints, even in the primordial loader.
    */
-  public static Iterable<Entrypoint> makePrimordialMainEntrypoints(AnalysisScope scope, ClassHierarchy cha) {
+  public static Iterable<Entrypoint> makePrimordialMainEntrypoints(ClassHierarchy cha) {
     final Atom mainMethod = Atom.findOrCreateAsciiAtom("main");
     final HashSet<Entrypoint> result = HashSetFactory.make();
     for (IClass klass : cha) {
@@ -292,26 +296,18 @@
         result.add(new DefaultEntrypoint(m, cha));
       }
     }
-    return new Iterable<Entrypoint>() {
-      @Override
-      public Iterator<Entrypoint> iterator() {
-        return result.iterator();
-      }
-    };
+    return result::iterator;
   }
 
-  public static void doCallGraphs(AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha, AnalysisScope scope)
+  public static void doCallGraphs(AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha, AnalysisScope scope)
       throws IllegalArgumentException, CancelException {
     doCallGraphs(options, cache, cha, scope, false);
   }
 
   /**
    * TODO: refactor this to avoid excessive code bloat.
-   * 
-   * @throws CancelException
-   * @throws IllegalArgumentException
    */
-  public static void doCallGraphs(AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha, AnalysisScope scope,
+  public static void doCallGraphs(AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha, AnalysisScope scope,
       boolean testPAToString) throws IllegalArgumentException, CancelException {
 
     // ///////////////
@@ -338,7 +334,7 @@
     // FIXME: annoying special cases caused by clone2assign mean using
     // the rta graph for proper graph subset checking does not work.
     // (note that all the other such checks do use proper graph subset)
-    Graph<MethodReference> squashZero = checkCallGraph(cg, null, rtaMethods, "0-CFA");
+    Graph<MethodReference> squashZero = checkCallGraph(cg, null, "0-CFA");
 
     // test Pretransitive 0-CFA
     // not currently supported
@@ -355,20 +351,20 @@
     // // 0-1-CFA ///
     // ///////////////
     cg = CallGraphTestUtil.buildZeroOneCFA(options, cache, cha, scope, testPAToString);
-    Graph<MethodReference> squashZeroOne = checkCallGraph(cg, squashZero, null, "0-1-CFA");
+    Graph<MethodReference> squashZeroOne = checkCallGraph(cg, squashZero, "0-1-CFA");
 
     // ///////////////////////////////////////////////////
     // // 0-CFA augmented to disambiguate containers ///
     // ///////////////////////////////////////////////////
     cg = CallGraphTestUtil.buildZeroContainerCFA(options, cache, cha, scope);
-    Graph<MethodReference> squashZeroContainer = checkCallGraph(cg, squashZero, null, "0-Container-CFA");
+    Graph<MethodReference> squashZeroContainer = checkCallGraph(cg, squashZero, "0-Container-CFA");
 
     // ///////////////////////////////////////////////////
     // // 0-1-CFA augmented to disambiguate containers ///
     // ///////////////////////////////////////////////////
     cg = CallGraphTestUtil.buildZeroOneContainerCFA(options, cache, cha, scope);
-    checkCallGraph(cg, squashZeroContainer, null, "0-1-Container-CFA");
-    checkCallGraph(cg, squashZeroOne, null, "0-1-Container-CFA");
+    checkCallGraph(cg, squashZeroContainer, "0-1-Container-CFA");
+    checkCallGraph(cg, squashZeroOne, "0-1-Container-CFA");
 
     // test ICFG
     checkICFG(cg);
@@ -383,8 +379,6 @@
 
   /**
    * Check properties of the InterproceduralCFG
-   * 
-   * @param cg
    */
   private static void checkICFG(CallGraph cg) {
     InterproceduralCFG icfg = new InterproceduralCFG(cg);
@@ -397,9 +391,9 @@
     }
 
     // perform a little icfg exercise
+    @SuppressWarnings("unused")
     int count = 0;
-    for (Iterator<BasicBlockInContext<ISSABasicBlock>> it = icfg.iterator(); it.hasNext();) {
-      BasicBlockInContext<ISSABasicBlock> bb = it.next();
+    for (BasicBlockInContext<ISSABasicBlock> bb : icfg) {
       if (icfg.hasCall(bb)) {
         count++;
       }
@@ -408,16 +402,11 @@
 
   /**
    * Check consistency of a callgraph, and check that this call graph is a subset of a super-graph
-   * 
-   * @param warnings object to track warnings
-   * @param cg
-   * @param superCG
-   * @param superMethods
-   * @param thisAlgorithm
+   *
    * @return a squashed version of cg
    */
   private static Graph<MethodReference> checkCallGraph(CallGraph cg, Graph<MethodReference> superCG,
-      Set<MethodReference> superMethods, String thisAlgorithm) {
+      String thisAlgorithm) {
     try {
       GraphIntegrity.check(cg);
     } catch (UnsoundGraphException e1) {
@@ -450,8 +439,6 @@
   }
 
   /**
-   * @param name
-   * @param cg
    * @return a graph whose nodes are MethodReferences, and whose edges represent calls between MethodReferences
    * @throws IllegalArgumentException if cg is null
    */
@@ -460,18 +447,14 @@
       throw new IllegalArgumentException("cg is null");
     }
     final Set<MethodReference> nodes = HashSetFactory.make();
-    for (Iterator<CGNode> nodesI = cg.iterator(); nodesI.hasNext();) {
-      nodes.add((nodesI.next()).getMethod().getReference());
+    for (CGNode cgNode : cg) {
+      nodes.add((cgNode).getMethod().getReference());
     }
 
     return new Graph<MethodReference>() {
       @Override
       public String toString() {
-        StringBuffer result = new StringBuffer();
-        result.append("squashed " + name + " call graph\n");
-        result.append("Original graph:");
-        result.append(cg.toString());
-        return result.toString();
+        return "squashed " + name + " call graph\n" + "Original graph:" + cg;
       }
 
       /*
@@ -505,9 +488,9 @@
       public Iterator<MethodReference> getPredNodes(MethodReference N) {
         Set<MethodReference> pred = HashSetFactory.make(10);
         MethodReference methodReference = N;
-        for (Iterator<CGNode> i = cg.getNodes(methodReference).iterator(); i.hasNext();)
-          for (Iterator<? extends CGNode> ps = cg.getPredNodes(i.next()); ps.hasNext();)
-            pred.add(((CGNode) ps.next()).getMethod().getReference());
+        for (CGNode cgNode : cg.getNodes(methodReference))
+          for (CGNode p : Iterator2Iterable.make(cg.getPredNodes(cgNode)))
+            pred.add(p.getMethod().getReference());
 
         return pred.iterator();
       }
@@ -517,10 +500,7 @@
        */
       @Override
       public int getPredNodeCount(MethodReference N) {
-        int count = 0;
-        for (Iterator<? extends MethodReference> ps = getPredNodes(N); ps.hasNext(); count++, ps.next())
-          ;
-        return count;
+        return IteratorUtil.count(getPredNodes(N));
       }
 
       /*
@@ -530,9 +510,9 @@
       public Iterator<MethodReference> getSuccNodes(MethodReference N) {
         Set<MethodReference> succ = HashSetFactory.make(10);
         MethodReference methodReference = N;
-        for (Iterator<? extends CGNode> i = cg.getNodes(methodReference).iterator(); i.hasNext();)
-          for (Iterator<? extends CGNode> ps = cg.getSuccNodes(i.next()); ps.hasNext();)
-            succ.add(((CGNode) ps.next()).getMethod().getReference());
+        for (CGNode node : cg.getNodes(methodReference))
+          for (CGNode p : Iterator2Iterable.make(cg.getSuccNodes(node)))
+            succ.add(p.getMethod().getReference());
 
         return succ.iterator();
       }
@@ -542,10 +522,7 @@
        */
       @Override
       public int getSuccNodeCount(MethodReference N) {
-        int count = 0;
-        for (Iterator<MethodReference> ps = getSuccNodes(N); ps.hasNext(); count++, ps.next())
-          ;
-        return count;
+        return IteratorUtil.count(getSuccNodes(N));
       }
 
       /*
@@ -609,8 +586,8 @@
 
       @Override
       public boolean hasEdge(MethodReference src, MethodReference dst) {
-        for (Iterator<MethodReference> succNodes = getSuccNodes(src); succNodes.hasNext();) {
-          if (dst.equals(succNodes.next())) {
+        for (MethodReference succ : Iterator2Iterable.make(getSuccNodes(src))) {
+          if (dst.equals(succ)) {
             return true;
           }
         }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTestUtil.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTestUtil.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTestUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CallGraphTestUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,13 +12,15 @@
 
 import java.io.IOException;
 
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.util.CancelException;
@@ -40,17 +42,23 @@
 
   public static String REGRESSION_EXCLUSIONS = "Java60RegressionExclusions.txt";
 
+  public static String REGRESSION_EXCLUSIONS_FOR_GUI = "Java60RegressionExclusionsForGUI.txt";
+
   /**
    * should we check the heap footprint before and after CG construction?
    */
   private static final boolean CHECK_FOOTPRINT = false;
 
   public static AnalysisScope makeJ2SEAnalysisScope(String scopeFile, String exclusionsFile) throws IOException {
-    AnalysisScope scope = AnalysisScopeReader.readJavaScope(scopeFile, (new FileProvider()).getFile(exclusionsFile), MY_CLASSLOADER);
+    return makeJ2SEAnalysisScope(scopeFile, exclusionsFile, MY_CLASSLOADER);
+  }
+  
+  public static AnalysisScope makeJ2SEAnalysisScope(String scopeFile, String exclusionsFile, ClassLoader myClassLoader) throws IOException {
+    AnalysisScope scope = AnalysisScopeReader.readJavaScope(scopeFile, (new FileProvider()).getFile(exclusionsFile), myClassLoader);
     return scope;
   }
 
-  public static CallGraph buildRTA(AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha, AnalysisScope scope)
+  public static CallGraph buildRTA(AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha, AnalysisScope scope)
       throws IllegalArgumentException, CancelException {
     StopwatchGC S = null;
     if (CHECK_FOOTPRINT) {
@@ -58,7 +66,7 @@
       S.start();
     }
 
-    CallGraphBuilder builder = Util.makeRTABuilder(options, cache, cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeRTABuilder(options, cache, cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     if (CHECK_FOOTPRINT) {
@@ -68,7 +76,7 @@
     return cg;
   }
 
-  public static CallGraph buildZeroCFA(AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha, AnalysisScope scope,
+  public static CallGraph buildZeroCFA(AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha, AnalysisScope scope,
       boolean testPAtoString) throws IllegalArgumentException, CancelException {
     StopwatchGC S = null;
     if (CHECK_FOOTPRINT) {
@@ -76,7 +84,7 @@
       S.start();
     }
 
-    SSAPropagationCallGraphBuilder builder = Util.makeZeroCFABuilder(options, cache, cha, scope);
+    SSAPropagationCallGraphBuilder builder = Util.makeZeroCFABuilder(Language.JAVA, options, cache, cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
     if (testPAtoString) {
       builder.getPointerAnalysis().toString();
@@ -89,7 +97,7 @@
     return cg;
   }
 
-  public static CallGraph buildVanillaZeroOneCFA(AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha,
+  public static CallGraph buildVanillaZeroOneCFA(AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha,
       AnalysisScope scope) throws IllegalArgumentException, CancelException {
     StopwatchGC S = null;
     if (CHECK_FOOTPRINT) {
@@ -97,7 +105,7 @@
       S.start();
     }
 
-    CallGraphBuilder builder = Util.makeVanillaZeroOneCFABuilder(options, cache, cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeVanillaZeroOneCFABuilder(Language.JAVA, options, cache, cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     if (CHECK_FOOTPRINT) {
@@ -107,7 +115,7 @@
     return cg;
   }
 
-  public static CallGraph buildZeroOneCFA(AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha, AnalysisScope scope,
+  public static CallGraph buildZeroOneCFA(AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha, AnalysisScope scope,
       boolean testPAtoString) throws IllegalArgumentException, CancelException {
     StopwatchGC S = null;
     if (CHECK_FOOTPRINT) {
@@ -115,7 +123,7 @@
       S.start();
     }
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, cache, cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, cache, cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
     if (testPAtoString) {
       builder.getPointerAnalysis().toString();
@@ -128,7 +136,7 @@
     return cg;
   }
 
-  public static CallGraph buildZeroContainerCFA(AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha,
+  public static CallGraph buildZeroContainerCFA(AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha,
       AnalysisScope scope) throws IllegalArgumentException, CancelException {
     StopwatchGC S = null;
     if (CHECK_FOOTPRINT) {
@@ -136,7 +144,7 @@
       S.start();
     }
 
-    CallGraphBuilder builder = Util.makeZeroContainerCFABuilder(options, cache, cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroContainerCFABuilder(options, cache, cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     if (CHECK_FOOTPRINT) {
@@ -146,7 +154,7 @@
     return cg;
   }
 
-  public static CallGraph buildZeroOneContainerCFA(AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha,
+  public static CallGraph buildZeroOneContainerCFA(AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha,
       AnalysisScope scope) throws IllegalArgumentException, CancelException {
     StopwatchGC S = null;
     if (CHECK_FOOTPRINT) {
@@ -154,7 +162,7 @@
       S.start();
     }
 
-    CallGraphBuilder builder = Util.makeZeroOneContainerCFABuilder(options, cache, cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneContainerCFABuilder(options, cache, cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     if (CHECK_FOOTPRINT) {
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CHACallGraphTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CHACallGraphTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CHACallGraphTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CHACallGraphTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.core.tests.callGraph;
 
 import java.io.IOException;
+import java.util.function.Function;
 
 import org.junit.Test;
 
@@ -20,11 +21,10 @@
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 import com.ibm.wala.ipa.callgraph.cha.CHACallGraph;
 import com.ibm.wala.ipa.callgraph.impl.Util;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.util.CancelException;
-import com.ibm.wala.util.functions.Function;
 
 public class CHACallGraphTest {
   
@@ -33,12 +33,7 @@
   }
     
   public static CallGraph testCHA(String scopeFile, final String mainClass, final String exclusionsFile) throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
-    return testCHA(scopeFile, exclusionsFile, new Function<IClassHierarchy, Iterable<Entrypoint>>() {
-        @Override
-        public Iterable<Entrypoint> apply(IClassHierarchy cha) {
-          return Util.makeMainEntrypoints(cha.getScope(), cha, mainClass);
-        }
-    });
+    return testCHA(scopeFile, exclusionsFile, cha -> Util.makeMainEntrypoints(cha.getScope(), cha, mainClass));
   }
   
   public static CallGraph testCHA(String scopeFile, 
@@ -47,7 +42,7 @@
     throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException
   {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(scopeFile, exclusionsFile);
-    IClassHierarchy cha = ClassHierarchy.make(scope);
+    IClassHierarchy cha = ClassHierarchyFactory.make(scope);
     
     CHACallGraph CG = new CHACallGraph(cha);
     CG.init(makeEntrypoints.apply(cha));
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/ClassConstantTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/ClassConstantTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/ClassConstantTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/ClassConstantTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,7 +18,7 @@
 
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -27,6 +27,7 @@
 import com.ibm.wala.ipa.callgraph.impl.Util;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
@@ -41,7 +42,7 @@
 
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
         CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
 
     // make sure we have the test class
     TypeReference mainClassRef = TypeReference.findOrCreate(ClassLoaderReference.Application, TestConstants.CLASSCONSTANT_MAIN);
@@ -50,7 +51,7 @@
     // make call graph
     Iterable<Entrypoint> entrypoints = Util.makeMainEntrypoints(scope, cha, TestConstants.CLASSCONSTANT_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     // System.out.println("\nCall graph:");
     // Trace.println(cg);
 
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CloneTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CloneTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CloneTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CloneTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,6 @@
 package com.ibm.wala.core.tests.callGraph;
 
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.Set;
 
 import org.junit.Assert;
@@ -20,7 +19,7 @@
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -29,10 +28,12 @@
 import com.ibm.wala.ipa.callgraph.impl.AllApplicationEntrypoints;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 /**
  * Check properties of a call to clone() in RTA
@@ -42,11 +43,11 @@
   @Test public void testClone() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
 
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = new AllApplicationEntrypoints(scope, cha);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraph cg = CallGraphTestUtil.buildRTA(options, new AnalysisCache(),cha, scope);
+    CallGraph cg = CallGraphTestUtil.buildRTA(options, new AnalysisCacheImpl(),cha, scope);
 
     // Find node corresponding to java.text.MessageFormat.clone()
     TypeReference t = TypeReference.findOrCreate(ClassLoaderReference.Primordial, "Ljava/text/MessageFormat");
@@ -55,15 +56,14 @@
 
     // Check there's exactly one target for each super call in
     // MessageFormat.clone()
-    for (Iterator<CallSiteReference> i = node.iterateCallSites(); i.hasNext();) {
-      CallSiteReference site = i.next();
+    for (CallSiteReference site : Iterator2Iterable.make(node.iterateCallSites())) {
       if (site.isSpecial()) {
         if (site.getDeclaredTarget().getDeclaringClass().equals(TypeReference.JavaLangObject)) {
           Set<CGNode> targets = cg.getPossibleTargets(node, site);
           if (targets.size() != 1) {
             System.err.println(targets.size() + " targets found for " + site);
-            for (Iterator<CGNode> k = targets.iterator(); k.hasNext();) {
-              System.err.println("  " + k.next());
+            for (CGNode cgNode : targets) {
+              System.err.println("  " + cgNode);
             }
             Assert.fail("found " + targets.size() + " targets for " + site + " in " + node);
           }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CPATest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CPATest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CPATest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/CPATest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.core.tests.callGraph;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.ibm.wala.classLoader.Language;
+import com.ibm.wala.core.tests.util.TestConstants;
+import com.ibm.wala.core.tests.util.WalaTestCase;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.CPAContextSelector;
+import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.types.Descriptor;
+import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.strings.Atom;
+
+/**
+ * Check properties of a call to clone() in RTA
+ */
+public class CPATest extends WalaTestCase {
+
+  @Test public void cpaTest1() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+    doCPATest("Lcpa/CPATest1", "(Lcpa/CPATest1$N;)Lcpa/CPATest1$N;");
+  }
+  
+  @Test public void cpaTest2() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+    doCPATest("Lcpa/CPATest2", "(Lcpa/CPATest2$N;I)Lcpa/CPATest2$N;");
+  }
+
+  private static void doCPATest(String testClass, String testIdSignature) throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+
+    AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
+    Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha, testClass);
+    AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
+
+    SSAPropagationCallGraphBuilder builder = Util.makeZeroCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
+    builder.setContextSelector(new CPAContextSelector(builder.getContextSelector()));
+    CallGraph cg = builder.makeCallGraph(options, null);
+    
+    // Find id
+    TypeReference str = TypeReference.findOrCreate(ClassLoaderReference.Application, testClass);
+    MethodReference ct = MethodReference.findOrCreate(str, Atom.findOrCreateUnicodeAtom("id"), Descriptor.findOrCreateUTF8(testIdSignature));
+    Set<CGNode> idNodes = cg.getNodes(ct);
+  
+    System.err.println(cg);
+
+    Assert.assertEquals(2, idNodes.size());
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/DebuggingBitsetCallGraphTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/DebuggingBitsetCallGraphTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/DebuggingBitsetCallGraphTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/DebuggingBitsetCallGraphTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -41,8 +41,8 @@
     graphTest = new CallGraphTest();
   }
 
-  private void runBitsetTest(MutableIntSetFactory p, MutableIntSetFactory s) throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
-    MutableIntSetFactory save = IntSetUtil.getDefaultIntSetFactory();
+  private void runBitsetTest(MutableIntSetFactory<?> p, MutableIntSetFactory<?> s) throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+    MutableIntSetFactory<?> save = IntSetUtil.getDefaultIntSetFactory();
     try {
       IntSetUtil.setDefaultIntSetFactory(new DebuggingMutableIntSetFactory(p, s));
       graphTest.testJLex();
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/DefaultMethodsTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/DefaultMethodsTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/DefaultMethodsTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/DefaultMethodsTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,13 +11,16 @@
 package com.ibm.wala.core.tests.callGraph;
 
 import java.io.IOException;
+import java.util.Collection;
 
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -25,6 +28,7 @@
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
@@ -38,12 +42,12 @@
   @Test public void testDefaultMethods() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
 
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         "LdefaultMethods/DefaultMethods");
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
 
     // Find node corresponding to main
     TypeReference tm = TypeReference.findOrCreate(ClassLoaderReference.Application, "LdefaultMethods/DefaultMethods");
@@ -77,5 +81,13 @@
 
     // Check call from main to Test3.silly
     Assert.assertTrue("should have call site from main to Test3.silly", cg.getPossibleSites(mnode, ttnode).hasNext());
+    
+    // Check that IClass.getAllMethods() returns default methods #219.
+    TypeReference test1Type = TypeReference.findOrCreate(ClassLoaderReference.Application, "LdefaultMethods/DefaultMethods$Test1");
+    IClass test1Class = cha.lookupClass(test1Type);
+
+    Collection<? extends IMethod> allMethods = test1Class.getAllMethods();
+    IMethod defaultMethod = test1Class.getMethod(t1m.getSelector());
+    Assert.assertTrue("Expecting default methods to show up in IClass.allMethods()", allMethods.contains(defaultMethod));
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/FinalizerTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/FinalizerTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/FinalizerTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/FinalizerTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,24 +11,21 @@
 package com.ibm.wala.core.tests.callGraph;
 
 import java.io.IOException;
-import java.util.Iterator;
-import java.util.Set;
 
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
-import com.ibm.wala.ipa.callgraph.impl.AllApplicationEntrypoints;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
@@ -42,12 +39,12 @@
   @Test public void testFinalize() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
 
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         "Lfinalizers/Finalizers");
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
 
     // Find node corresponding to finalize
     TypeReference t = TypeReference.findOrCreate(ClassLoaderReference.Application, "Lfinalizers/Finalizers");
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/Java7CallGraphTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/Java7CallGraphTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/Java7CallGraphTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/Java7CallGraphTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,65 +13,65 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.util.jar.JarFile;
 
 import org.junit.Test;
 
 import com.ibm.wala.analysis.reflection.java7.MethodHandles;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.shrike.DynamicCallGraphTestBase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Util;
 import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
-import com.ibm.wala.ipa.callgraph.propagation.cfa.DelegatingSSAContextInterpreter;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.shrikeBT.analysis.Analyzer.FailureException;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.util.CancelException;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.io.TemporaryFile;
 
 public class Java7CallGraphTest extends DynamicCallGraphTestBase {
 
-  @Test public void testOcamlHelloHash() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException, ClassNotFoundException, InvalidClassFileException, FailureException, SecurityException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InterruptedException {
-    testOCamlJar("hello_hash.jar");
+  @Test public void testOcamlHelloHash() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException, ClassNotFoundException, InvalidClassFileException, FailureException, SecurityException, InterruptedException {
+    if (!"True".equals(System.getenv("APPVEYOR"))) {
+      testOCamlJar("hello_hash.jar");
+    }
   }
 
-  private void testOCamlJar(String jarFile, String... args) throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException, ClassNotFoundException, InvalidClassFileException, FailureException, SecurityException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InterruptedException {   
+  private void testOCamlJar(String jarFile, String... args) throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException, ClassNotFoundException, InvalidClassFileException, FailureException, SecurityException, InterruptedException {   
     File F = TemporaryFile.urlToFile(jarFile.replace('.',  '_') + ".jar", getClass().getClassLoader().getResource(jarFile));
     F.deleteOnExit();
 
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope("base.txt", CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    scope.addToScope(ClassLoaderReference.Application, new JarFile(F));
+    scope.addToScope(ClassLoaderReference.Application, new JarFile(F, false));
     
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha, "Lpack/ocamljavaMain");
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    AnalysisCache cache = new AnalysisCache();
+    options.setUseConstantSpecificKeys(true);
+    IAnalysisCacheView cache = new AnalysisCacheImpl();
     
-    SSAPropagationCallGraphBuilder builder = Util.makeZeroOneContainerCFABuilder(options, cache, cha, scope);
-    
-    builder.setContextSelector(new MethodHandles.ContextSelectorImpl(builder.getContextSelector()));
-    builder.setContextInterpreter(new DelegatingSSAContextInterpreter(new MethodHandles.ContextInterpreterImpl(), builder.getCFAContextInterpreter()));
+    SSAPropagationCallGraphBuilder builder = Util.makeZeroCFABuilder(Language.JAVA, options, cache, cha, scope);
+
+    MethodHandles.analyzeMethodHandles(options, builder);
     
     CallGraph cg = builder.makeCallGraph(options, null); 
     
+    System.err.println(cg);
+
     instrument(F.getAbsolutePath());
     run("pack.ocamljavaMain", null, args);
     
-    checkNodes(cg, new Predicate<MethodReference>() {
-      @Override
-      public boolean test(MethodReference t) {
-        String s = t.toString();
-        return s.contains("Lpack/") || s.contains("Locaml/stdlib/");
-      }
+    checkNodes(cg, t -> {
+      String s = t.toString();
+      return s.contains("Lpack/") || s.contains("Locaml/stdlib/");
     });
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/KawaCallGraphTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/KawaCallGraphTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/KawaCallGraphTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/KawaCallGraphTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,158 @@
+/******************************************************************************
+ * Copyright (c) 2002 - 2014 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *****************************************************************************/
+
+package com.ibm.wala.core.tests.callGraph;
+
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assume.assumeThat;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.junit.Test;
+
+import com.ibm.wala.analysis.reflection.java7.MethodHandles;
+import com.ibm.wala.classLoader.Language;
+import com.ibm.wala.classLoader.Module;
+import com.ibm.wala.classLoader.ResourceJarFileModule;
+import com.ibm.wala.core.tests.shrike.DynamicCallGraphTestBase;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions.ReflectionOptions;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.types.Descriptor;
+import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
+import com.ibm.wala.util.strings.Atom;
+
+public class KawaCallGraphTest extends DynamicCallGraphTestBase {
+
+  @Test
+  public void testKawaChess() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException, SecurityException {   
+    assumeThat("not running on Travis CI", System.getenv("TRAVIS"), nullValue());
+    
+    CallGraph CG = testKawa(new ResourceJarFileModule(getClass().getClassLoader().getResource("kawachess.jar")), "main");
+    
+    Set<CGNode> status = getNodes(CG, "Lchess", "startingStatus", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+    assert ! status.isEmpty();
+    
+    Set<CGNode> color = getNodes(CG, "Lchess", "startingColor", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
+    assert ! color.isEmpty();
+
+    Set<CGNode> loadImage = getNodes(CG, "Limg", "loadImage", "(Ljava/lang/CharSequence;)Ljava/awt/image/BufferedImage;");
+    assert ! loadImage.isEmpty();
+
+    Set<CGNode> append$v = getNodes(CG, "Lkawa/lang/Quote", "append$V", "([Ljava/lang/Object;)Ljava/lang/Object;");
+    assert ! append$v.isEmpty();
+
+    Set<CGNode> clinit = getNodes(CG, "Lkawa/lib/kawa/base", "<clinit>", "()V");
+    assert ! clinit.isEmpty();
+  }
+
+  @Test
+  public void testKawaTest() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException, SecurityException {   
+    assumeThat("not running on Travis CI", System.getenv("TRAVIS"), nullValue());
+
+    CallGraph CG = testKawa(new ResourceJarFileModule(getClass().getClassLoader().getResource("kawatest.jar")), "test");
+    
+    Set<CGNode> nodes = getNodes(CG, "Ltest", "plusish$V", "(Lgnu/lists/LList;)Ljava/lang/Object;");
+    assert ! nodes.isEmpty();
+  }
+
+  private static Set<CGNode> getNodes(CallGraph CG, String cls, String method, String descr) {
+    Set<CGNode> nodes = CG.getNodes(MethodReference.findOrCreate(TypeReference.find(ClassLoaderReference.Application, cls), Atom.findOrCreateUnicodeAtom(method), Descriptor.findOrCreateUTF8(descr)));
+    return nodes;
+  }
+
+  public CallGraph testKawa(Module code, String main) throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException, SecurityException {   
+    AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope("base.txt", CallGraphTestUtil.REGRESSION_EXCLUSIONS_FOR_GUI);
+    scope.addToScope(ClassLoaderReference.Application, new ResourceJarFileModule(getClass().getClassLoader().getResource("kawa.jar")));
+    scope.addToScope(ClassLoaderReference.Application, code);
+    
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
+    Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha, 'L' + main);
+    AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
+    IAnalysisCacheView cache = new AnalysisCacheImpl();
+    
+    options.setReflectionOptions(ReflectionOptions.STRING_ONLY);
+    options.setTraceStringConstants(true);
+    options.setUseConstantSpecificKeys(true);
+    
+    SSAPropagationCallGraphBuilder builder = Util.makeZeroCFABuilder(Language.JAVA, options, cache, cha, scope);
+
+    MethodHandles.analyzeMethodHandles(options, builder);
+
+    CallGraph cg = builder.makeCallGraph(options, new IProgressMonitor() {
+      private long time = System.currentTimeMillis();
+      
+      @Override
+      public void beginTask(String task, int totalWork) {
+        noteElapsedTime(); 
+      }
+
+      private void noteElapsedTime() {
+        long now = System.currentTimeMillis();
+        if (now - time >= 10000) {
+          System.out.println("worked " + (now - time));
+          System.out.flush();
+          time = now;
+        }
+      }
+
+      @Override
+      public void subTask(String subTask) {
+        noteElapsedTime(); 
+      }
+
+      @Override
+      public void cancel() {
+        assert false;
+      }
+
+      @Override
+      public boolean isCanceled() {
+         return false;
+      }
+
+      @Override
+      public void done() {
+        noteElapsedTime(); 
+      }
+
+      @Override
+      public void worked(int units) {
+        noteElapsedTime(); 
+      }
+
+      @Override
+      public String getCancelMessage() {
+        assert false : "should not cancel";
+        return null;
+      }
+      
+    });
+    
+    return cg; 
+   }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/LambdaTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/LambdaTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/LambdaTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/LambdaTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,6 @@
 package com.ibm.wala.core.tests.callGraph;
 
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.Set;
 
 import org.junit.Assert;
@@ -20,7 +19,7 @@
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -28,11 +27,13 @@
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.Descriptor;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.strings.Atom;
 
 /**
@@ -40,15 +41,46 @@
  */
 public class LambdaTest extends WalaTestCase {
 
+  @Test public void testBug144() throws IOException, ClassHierarchyException, IllegalArgumentException, CancelException {
+    AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
+    Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
+        "Lbug144/A");
+    AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
+
+    @SuppressWarnings("unused")
+    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
+  }
+  
+  @Test public void testBug137() throws IOException, ClassHierarchyException, IllegalArgumentException, CancelException {
+    AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
+    Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
+        "Lspecial/A");
+    AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
+
+    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
+ 
+    TypeReference A = TypeReference.findOrCreate(ClassLoaderReference.Application, "Lspecial/A");
+
+    MethodReference ct = MethodReference.findOrCreate(A, Atom.findOrCreateUnicodeAtom("<init>"), Descriptor.findOrCreateUTF8("()V"));
+    Set<CGNode> ctnodes = cg.getNodes(ct);    
+    Assert.assertEquals(1, ctnodes.size());
+
+    MethodReference ts = MethodReference.findOrCreate(A, Atom.findOrCreateUnicodeAtom("toString"), Descriptor.findOrCreateUTF8("()Ljava/lang/String;"));
+    Set<CGNode> tsnodes = cg.getNodes(ts);    
+    Assert.assertEquals(1, tsnodes.size());
+}
+  
   @Test public void testSortingExample() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
 
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         "Llambda/SortingExample");
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     
     // Find compareTo
     TypeReference str = TypeReference.findOrCreate(ClassLoaderReference.Primordial, "Ljava/lang/String");
@@ -71,8 +103,8 @@
     // caller of id1 is dynamic from sortForward, and has 1 compareTo
     CGNode sfnode = cg.getPredNodes(id1node).next();
     int count = 0;
-    for(Iterator<CallSiteReference> sites = sfnode.iterateCallSites(); sites.hasNext(); ) {
-     if (ctnodes.containsAll(cg.getPossibleTargets(sfnode, sites.next()))) {
+    for(CallSiteReference site : Iterator2Iterable.make(sfnode.iterateCallSites())) {
+     if (ctnodes.containsAll(cg.getPossibleTargets(sfnode, site))) {
        count++;
      }
     }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/LibModelsTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/LibModelsTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/LibModelsTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/LibModelsTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.core.tests.callGraph;
+
+import com.ibm.wala.core.tests.util.TestConstants;
+import com.ibm.wala.core.tests.util.WalaTestCase;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.CancelException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+
+/**
+ * Check properties of a call to clone() in RTA
+ */
+public class LibModelsTest extends WalaTestCase {
+
+  @Test public void testLibModels() throws ClassHierarchyException, IllegalArgumentException,
+      CancelException, IOException {
+
+    AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
+    String libModelsTestClass = "Llibmodels/LibModels";
+    Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
+        libModelsTestClass);
+    AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
+
+    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
+
+    //System.err.println(cg);
+
+    // Find node corresponding to finalize
+    TypeReference t = TypeReference.findOrCreate(ClassLoaderReference.Application, libModelsTestClass);
+    MethodReference m = MethodReference.findOrCreate(t, "reachable1", "()V");
+    Assert.assertTrue("expect reachable1 from addShutdownHook",
+        cg.getNodes(m).iterator().hasNext());
+    MethodReference m2 = MethodReference.findOrCreate(t, "reachable2", "()V");
+    Assert.assertTrue("expect reachable2 from uncaught exception handler",
+        cg.getNodes(m2).iterator().hasNext());
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/PiNodeCallGraphTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/PiNodeCallGraphTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/PiNodeCallGraphTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/PiNodeCallGraphTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,6 @@
 package com.ibm.wala.core.tests.callGraph;
 
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.Set;
 
 import org.junit.Assert;
@@ -20,7 +19,7 @@
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -28,6 +27,8 @@
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.ssa.DefaultIRFactory;
 import com.ibm.wala.ssa.SSAOptions;
 import com.ibm.wala.ssa.SSAPiNodePolicy;
 import com.ibm.wala.types.ClassLoaderReference;
@@ -38,6 +39,7 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.strings.Atom;
 
 /**
@@ -72,19 +74,19 @@
   private static final MemberReference unary2Ref = MethodReference.findOrCreate(whateverRef,
       Atom.findOrCreateUnicodeAtom("unary2"), Descriptor.findOrCreateUTF8("()V"));
 
-  private CallGraph doGraph(boolean usePiNodes) throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+  private static CallGraph doGraph(boolean usePiNodes) throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.PI_TEST_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
     SSAPiNodePolicy policy = usePiNodes ? SSAOptions.getAllBuiltInPiNodes() : null;
     options.getSSAOptions().setPiNodePolicy(policy);
 
-    return CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false);
+    return CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(new DefaultIRFactory(), options.getSSAOptions()), cha, scope, false);
   }
 
-  private void checkCallAssertions(CallGraph cg, int desiredNumberOfTargets, int desiredNumberOfCalls, int numLocalCastCallees) {
+  private static void checkCallAssertions(CallGraph cg, int desiredNumberOfTargets, int desiredNumberOfCalls, int numLocalCastCallees) {
   
     int numberOfCalls = 0;
     Set<CGNode> callerNodes = HashSetFactory.make();
@@ -93,8 +95,7 @@
     assert callerNodes.size() == 2;
 
     for (CGNode n : callerNodes) {
-      for (Iterator<CallSiteReference> sites = n.iterateCallSites(); sites.hasNext();) {
-        CallSiteReference csRef = sites.next();
+      for (CallSiteReference csRef : Iterator2Iterable.make(n.iterateCallSites())) {
         if (csRef.getDeclaredTarget().equals(unary2Ref)) {
           numberOfCalls++;
           assert cg.getNumberOfTargets(n, csRef) == desiredNumberOfTargets;
@@ -118,4 +119,4 @@
     checkCallAssertions(doGraph(true), 1, 2, 1);
   } 
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/ReflectionTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/ReflectionTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/ReflectionTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/ReflectionTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,18 +23,19 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.ContextKey;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.callgraph.propagation.ConstantKey;
 import com.ibm.wala.ipa.callgraph.propagation.ReceiverInstanceContext;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.MethodReference;
@@ -43,6 +44,7 @@
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.warnings.Warning;
 import com.ibm.wala.util.warnings.Warnings;
 
@@ -69,7 +71,7 @@
 
   private static IClassHierarchy findOrCreateCHA(AnalysisScope scope) throws ClassHierarchyException {
     if (cachedCHA == null) {
-      cachedCHA = ClassHierarchy.make(scope);
+      cachedCHA = ClassHierarchyFactory.make(scope);
     }
     return cachedCHA;
   }
@@ -93,9 +95,8 @@
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
     Warnings.clear();
-    CallGraphTest.doCallGraphs(options, new AnalysisCache(), cha, scope);
-    for (Iterator<Warning> it = Warnings.iterator(); it.hasNext();) {
-      Warning w = it.next();
+    CallGraphTest.doCallGraphs(options, new AnalysisCacheImpl(), cha, scope);
+    for (Warning w : Iterator2Iterable.make(Warnings.iterator())) {
       if (w.toString().indexOf("com/ibm/jvm") > 0) {
         continue;
       }
@@ -117,7 +118,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT2_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
 
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Ljava/lang/Integer");
     MethodReference mr = MethodReference.findOrCreate(tr, "<clinit>", "()V");
@@ -136,7 +137,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT3_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
 
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Ljava/lang/Class");
     MethodReference mr = MethodReference.findOrCreate(tr, "newInstance", "()Ljava/lang/Object;");
@@ -168,7 +169,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT4_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
 
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Ljava/lang/Class");
     MethodReference mr = MethodReference.findOrCreate(tr, "newInstance", "()Ljava/lang/Object;");
@@ -198,7 +199,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT5_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
 
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Ljava/lang/Class");
     MethodReference mr = MethodReference.findOrCreate(tr, "newInstance", "()Ljava/lang/Object;");
@@ -228,7 +229,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT6_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
 
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Ljava/lang/Class");
     MethodReference mr = MethodReference.findOrCreate(tr, "newInstance", "()Ljava/lang/Object;");
@@ -247,7 +248,6 @@
     Assert.assertTrue(succNodes.isEmpty());
   }
 
-  @SuppressWarnings("unchecked")
   @Test
   public void testReflect7() throws Exception {
     AnalysisScope scope = findOrCreateAnalysisScope();
@@ -255,7 +255,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT7_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
 
     final String mainClass = "Lreflection/Reflect7";
     TypeReference mainTr = TypeReference.findOrCreate(ClassLoaderReference.Application, mainClass);
@@ -279,9 +279,8 @@
 
     for (CGNode node : mainChildren) {
       Context context = node.getContext();
-      if (context instanceof ReceiverInstanceContext && node.getMethod().getReference().equals(newInstanceMr)) {
-        ReceiverInstanceContext r = (ReceiverInstanceContext) context;
-        ConstantKey<IMethod> c = (ConstantKey<IMethod>) r.getReceiver();
+      if (context.isA(ReceiverInstanceContext.class) && node.getMethod().getReference().equals(newInstanceMr)) {
+        ConstantKey<IMethod> c = (ConstantKey<IMethod>) context.get(ContextKey.RECEIVER);
         IMethod ctor = c.getValue();
         if (ctor.getSignature().equals(fpInitSig)) {
           filePermConstrNewInstanceNode = node;
@@ -316,7 +315,7 @@
     Assert.assertTrue(filePermToStringNode != null);
   }
 
-  private Collection<CGNode> getSuccNodes(CallGraph cg, Collection<CGNode> nodes) {
+  private static Collection<CGNode> getSuccNodes(CallGraph cg, Collection<CGNode> nodes) {
     Set<CGNode> succNodes = HashSetFactory.make();
     for (CGNode newInstanceNode : nodes) {
       Iterator<? extends CGNode> succNodesIter = cg.getSuccNodes(newInstanceNode);
@@ -338,7 +337,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT8_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Primordial, "Ljava/lang/Integer");
     MethodReference mr = MethodReference.findOrCreate(tr, "toString", "()Ljava/lang/String;");
     Set<CGNode> nodes = cg.getNodes(mr);
@@ -356,7 +355,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT9_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Primordial, "Ljava/lang/Integer");
     MethodReference mr = MethodReference.findOrCreate(tr, "toString", "()Ljava/lang/String;");
     Set<CGNode> nodes = cg.getNodes(mr);
@@ -374,10 +373,11 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT10_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Primordial, "Ljava/lang/Integer");
     MethodReference mr = MethodReference.findOrCreate(tr, "toString", "()Ljava/lang/String;");
     Set<CGNode> nodes = cg.getNodes(mr);
+    System.err.println(cg);
     Assert.assertFalse(nodes.isEmpty());
   }
 
@@ -392,7 +392,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT11_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Primordial, "Ljava/lang/Object");
     MethodReference mr = MethodReference.findOrCreate(tr, "wait", "()V");
     Set<CGNode> nodes = cg.getNodes(mr);
@@ -410,7 +410,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT12_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Lreflection/Helper");
     MethodReference mr = MethodReference.findOrCreate(tr, "m", "(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V");
     Set<CGNode> nodes = cg.getNodes(mr);
@@ -431,7 +431,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT13_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Lreflection/Helper");
     MethodReference mr = MethodReference.findOrCreate(tr, "m", "(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V");
     Set<CGNode> nodes = cg.getNodes(mr);
@@ -452,7 +452,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT14_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Lreflection/Helper");
     MethodReference mr = MethodReference.findOrCreate(tr, "s", "(Ljava/lang/Object;Ljava/lang/Object;)V");
     Set<CGNode> nodes = cg.getNodes(mr);
@@ -474,7 +474,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT15_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Lreflection/Helper");
     MethodReference mr = MethodReference.findOrCreate(tr, "<init>", "(Ljava/lang/Object;Ljava/lang/Object;)V");
     Set<CGNode> nodes = cg.getNodes(mr);
@@ -501,7 +501,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT16_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Primordial, "Ljava/lang/Integer");
     MethodReference mr = MethodReference.findOrCreate(tr, "toString", "()Ljava/lang/String;");
     Set<CGNode> nodes = cg.getNodes(mr);
@@ -519,7 +519,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT17_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Lreflection/Helper");
     MethodReference mr = MethodReference.findOrCreate(tr, "t", "(Ljava/lang/Integer;)V");
     CGNode node = cg.getNode(cg.getClassHierarchy().resolveMethod(mr), Everywhere.EVERYWHERE);
@@ -537,7 +537,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT18_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Lreflection/Helper");
     MethodReference mr = MethodReference.findOrCreate(tr, "t", "(Ljava/lang/Integer;)V");
     CGNode node = cg.getNode(cg.getClassHierarchy().resolveMethod(mr), Everywhere.EVERYWHERE);
@@ -558,7 +558,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT19_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Primordial, "Ljava/lang/Integer");
     MethodReference mr = MethodReference.findOrCreate(tr, "toString", "()Ljava/lang/String;");
     Set<CGNode> nodes = cg.getNodes(mr);
@@ -576,7 +576,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT20_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Lreflection/Helper");
     MethodReference mr = MethodReference.findOrCreate(tr, "o", "(Ljava/lang/Object;Ljava/lang/Object;)V");
     Set<CGNode> nodes = cg.getNodes(mr);
@@ -585,7 +585,7 @@
 
   /**
    * Test that when analyzing Reflect21, the call graph includes a node for the
-   * constructor of {@link Helper} that takes two {@link Object} parameters.
+   * constructor of {@code Helper} that takes two {@link Object} parameters.
    * This is to test the support for Class.getDeclaredConstructor.
    */
   @Test
@@ -595,7 +595,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT21_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Lreflection/Helper");
     MethodReference mr = MethodReference.findOrCreate(tr, "<init>", "(Ljava/lang/Object;Ljava/lang/Object;)V");
     Set<CGNode> nodes = cg.getNodes(mr);
@@ -604,7 +604,7 @@
 
   /**
    * Test that when analyzing Reflect22, the call graph includes a node for the
-   * constructor of {@link Helper} that takes one {@link Integer} parameters.
+   * constructor of {@code Helper} that takes one {@link Integer} parameters.
    * This is to test the support for Class.getDeclaredConstructors.
    */
   @Test
@@ -614,7 +614,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT22_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Lreflection/Helper");
     MethodReference mr = MethodReference.findOrCreate(tr, "<init>", "(Ljava/lang/Integer;)V");
     Set<CGNode> nodes = cg.getNodes(mr);
@@ -623,7 +623,7 @@
 
   /**
    * Test that when analyzing Reflect22, the call graph includes a node for the
-   * constructor of {@link Helper} that takes one {@link Integer} parameters.
+   * constructor of {@code Helper} that takes one {@link Integer} parameters.
    * This is to test the support for Class.getDeclaredConstructors.
    */
   @Test
@@ -633,7 +633,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECT23_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     TypeReference tr = TypeReference.findOrCreate(ClassLoaderReference.Application, "Lreflection/Helper");
     MethodReference mr = MethodReference.findOrCreate(tr, "u", "(Ljava/lang/Integer;)V");
     Set<CGNode> nodes = cg.getNodes(mr);
@@ -679,7 +679,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.REFLECTGETMETHODCONTEXT_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     Set<CGNode> cgn;
     cgn = cg.getNodes(mabar); Assert.assertTrue(cgn.isEmpty());
     cgn = cg.getNodes(mabaz); Assert.assertTrue(cgn.isEmpty());
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/SyntheticTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/SyntheticTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/SyntheticTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/callGraph/SyntheticTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,7 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -28,6 +28,7 @@
 import com.ibm.wala.ipa.callgraph.impl.SubtypesEntrypoint;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.MethodReference;
@@ -42,7 +43,7 @@
   @Test public void testMultiSubtypes() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
         CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     TypeReference t = TypeReference.findOrCreate(ClassLoaderReference.Application, "LmultiTypes/Foo");
     MethodReference mref = MethodReference.findOrCreate(t, "foo", "(LmultiTypes/Foo$A;)V");
     IMethod m = cha.resolveMethod(mref);
@@ -50,7 +51,7 @@
     SubtypesEntrypoint e = new SubtypesEntrypoint(m, cha);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, Collections.<Entrypoint>singleton(e));
 
-    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCache(), cha, scope, false);
+    CallGraph cg = CallGraphTestUtil.buildZeroCFA(options, new AnalysisCacheImpl(), cha, scope, false);
     
     TypeReference tA = TypeReference.findOrCreate(ClassLoaderReference.Application, "LmultiTypes/Foo$A");
     MethodReference barA = MethodReference.findOrCreate(tA, "bar", "()V");
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cfg/exc/inter/NullPointerExceptionInterTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cfg/exc/inter/NullPointerExceptionInterTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cfg/exc/inter/NullPointerExceptionInterTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cfg/exc/inter/NullPointerExceptionInterTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,249 @@
+/*******************************************************************************
+ * Copyright (c) 2002 - 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.core.tests.cfg.exc.inter;
+
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.ibm.wala.cfg.exc.ExceptionPruningAnalysis;
+import com.ibm.wala.cfg.exc.InterprocAnalysisResult;
+import com.ibm.wala.cfg.exc.NullPointerAnalysis;
+import com.ibm.wala.cfg.exc.intra.IntraprocNullPointerAnalysis;
+import com.ibm.wala.classLoader.ClassLoaderFactory;
+import com.ibm.wala.classLoader.ClassLoaderFactoryImpl;
+import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
+import com.ibm.wala.core.tests.util.TestConstants;
+import com.ibm.wala.core.tests.util.WalaTestCase;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.analysis.IExplodedBasicBlock;
+import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.NullProgressMonitor;
+import com.ibm.wala.util.WalaException;
+import com.ibm.wala.util.config.AnalysisScopeReader;
+import com.ibm.wala.util.graph.GraphIntegrity.UnsoundGraphException;
+import com.ibm.wala.util.io.FileProvider;
+import com.ibm.wala.util.strings.StringStuff;
+import com.ibm.wala.util.warnings.Warnings;
+
+/**
+ * Test validity and precision of inter-procedural NullpointerException-Analysis {@link IntraprocNullPointerAnalysis}
+ * 
+ */
+public class NullPointerExceptionInterTest extends WalaTestCase {
+
+  private static AnalysisScope scope;
+
+  private static ClassHierarchy cha;
+  
+  private static CallGraph cg;
+  
+  private static IAnalysisCacheView cache;
+
+  @BeforeClass
+  public static void beforeClass() throws Exception {
+    cache = new AnalysisCacheImpl();
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA,
+        (new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS), NullPointerExceptionInterTest.class.getClassLoader());
+    ClassLoaderFactory factory = new ClassLoaderFactoryImpl(scope.getExclusions());
+    try {
+      cha = ClassHierarchyFactory.make(scope, factory);
+      Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha, "Lcfg/exc/inter/CallFieldAccess");
+      AnalysisOptions options = new AnalysisOptions(scope, entrypoints);
+      
+      CallGraphBuilder<InstanceKey> builder = Util.makeNCFABuilder(1, options, cache, cha, scope);
+      cg = builder.makeCallGraph(options, null);
+    } catch (ClassHierarchyException e) {
+      throw new Exception(e);
+    }
+  }
+
+  @AfterClass
+  public static void afterClass() throws Exception {
+    Warnings.clear();
+    scope = null;
+    cha = null;
+    cg = null;
+    cache = null;
+  }
+
+  public static void main(String[] args) {
+    justThisTest(NullPointerExceptionInterTest.class);
+  }
+
+  @Test
+  public void testIfException() throws UnsoundGraphException, CancelException, WalaException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.inter.CallFieldAccess.callIfException()Lcfg/exc/intra/B");
+
+    InterprocAnalysisResult<SSAInstruction, IExplodedBasicBlock> interExplodedCFG = 
+        NullPointerAnalysis.computeInterprocAnalysis(cg, new NullProgressMonitor());
+
+    Assert.assertEquals(1, cg.getNodes(mr).size());
+    final CGNode callNode = cg.getNodes(mr).iterator().next();
+
+    ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG = interExplodedCFG.getResult(callNode);
+
+    Assert.assertTrue(intraExplodedCFG.hasExceptions());
+  }
+  
+  @Test
+  public void testDynamicIfException() throws UnsoundGraphException, CancelException, WalaException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.inter.CallFieldAccess.callDynamicIfException()Lcfg/exc/intra/B");
+
+    Assert.assertEquals(1, cg.getNodes(mr).size());
+    final CGNode callNode = cg.getNodes(mr).iterator().next();
+
+    InterprocAnalysisResult<SSAInstruction, IExplodedBasicBlock> interExplodedCFG = 
+        NullPointerAnalysis.computeInterprocAnalysis(cg, new NullProgressMonitor());
+
+
+    ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG = interExplodedCFG.getResult(callNode);
+
+    Assert.assertTrue(intraExplodedCFG.hasExceptions());
+  }
+
+  
+  @Test
+  public void testIfNoException() throws UnsoundGraphException, CancelException, WalaException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.inter.CallFieldAccess.callIfNoException()Lcfg/exc/intra/B");
+
+    InterprocAnalysisResult<SSAInstruction, IExplodedBasicBlock> interExplodedCFG = 
+        NullPointerAnalysis.computeInterprocAnalysis(cg, new NullProgressMonitor());
+
+    Assert.assertEquals(1, cg.getNodes(mr).size());
+    final CGNode callNode = cg.getNodes(mr).iterator().next();
+
+    ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG = interExplodedCFG.getResult(callNode);
+    Assert.assertFalse(intraExplodedCFG.hasExceptions());
+  }
+  
+  @Test
+  public void testDynamicIfNoException() throws UnsoundGraphException, CancelException, WalaException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.inter.CallFieldAccess.callDynamicIfNoException()Lcfg/exc/intra/B");
+
+    InterprocAnalysisResult<SSAInstruction, IExplodedBasicBlock> interExplodedCFG = 
+        NullPointerAnalysis.computeInterprocAnalysis(cg, new NullProgressMonitor());
+
+    Assert.assertEquals(1, cg.getNodes(mr).size());
+    final CGNode callNode = cg.getNodes(mr).iterator().next();
+
+    ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG = interExplodedCFG.getResult(callNode);
+    Assert.assertFalse(intraExplodedCFG.hasExceptions());
+  }
+  
+  @Test
+  public void testIf2Exception() throws UnsoundGraphException, CancelException, WalaException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.inter.CallFieldAccess.callIf2Exception()Lcfg/exc/intra/B");
+
+    InterprocAnalysisResult<SSAInstruction, IExplodedBasicBlock> interExplodedCFG = 
+        NullPointerAnalysis.computeInterprocAnalysis(cg, new NullProgressMonitor());
+
+    Assert.assertEquals(1, cg.getNodes(mr).size());
+    final CGNode callNode = cg.getNodes(mr).iterator().next();
+
+    ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG = interExplodedCFG.getResult(callNode);
+
+    Assert.assertTrue(intraExplodedCFG.hasExceptions());
+  }
+  
+  @Test
+  public void testDynamicIf2Exception() throws UnsoundGraphException, CancelException, WalaException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.inter.CallFieldAccess.callDynamicIf2Exception()Lcfg/exc/intra/B");
+
+    Assert.assertEquals(1, cg.getNodes(mr).size());
+    final CGNode callNode = cg.getNodes(mr).iterator().next();
+
+    InterprocAnalysisResult<SSAInstruction, IExplodedBasicBlock> interExplodedCFG = 
+        NullPointerAnalysis.computeInterprocAnalysis(cg, new NullProgressMonitor());
+
+
+    ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG = interExplodedCFG.getResult(callNode);
+
+    Assert.assertTrue(intraExplodedCFG.hasExceptions());
+  }
+
+  
+  @Test
+  public void testIf2NoException() throws UnsoundGraphException, CancelException, WalaException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.inter.CallFieldAccess.callIf2NoException()Lcfg/exc/intra/B");
+
+    InterprocAnalysisResult<SSAInstruction, IExplodedBasicBlock> interExplodedCFG = 
+        NullPointerAnalysis.computeInterprocAnalysis(cg, new NullProgressMonitor());
+
+    Assert.assertEquals(1, cg.getNodes(mr).size());
+    final CGNode callNode = cg.getNodes(mr).iterator().next();
+
+    ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG = interExplodedCFG.getResult(callNode);
+    Assert.assertFalse(intraExplodedCFG.hasExceptions());
+  }
+  
+  @Test
+  public void testDynamicIf2NoException() throws UnsoundGraphException, CancelException, WalaException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.inter.CallFieldAccess.callDynamicIf2NoException()Lcfg/exc/intra/B");
+
+    InterprocAnalysisResult<SSAInstruction, IExplodedBasicBlock> interExplodedCFG = 
+        NullPointerAnalysis.computeInterprocAnalysis(cg, new NullProgressMonitor());
+
+    Assert.assertEquals(1, cg.getNodes(mr).size());
+    final CGNode callNode = cg.getNodes(mr).iterator().next();
+
+    ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG = interExplodedCFG.getResult(callNode);
+    Assert.assertFalse(intraExplodedCFG.hasExceptions());
+  }
+  
+
+  @Test
+  public void testGetException() throws UnsoundGraphException, CancelException, WalaException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.inter.CallFieldAccess.callGetException()Lcfg/exc/intra/B");
+
+    InterprocAnalysisResult<SSAInstruction, IExplodedBasicBlock> interExplodedCFG = 
+        NullPointerAnalysis.computeInterprocAnalysis(cg, new NullProgressMonitor());
+
+    Assert.assertEquals(1, cg.getNodes(mr).size());
+    final CGNode callNode = cg.getNodes(mr).iterator().next();
+
+    ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG = interExplodedCFG.getResult(callNode);
+
+    Assert.assertTrue(intraExplodedCFG.hasExceptions());
+  }
+  
+  @Test
+  public void testDynamicGetException() throws UnsoundGraphException, CancelException, WalaException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.inter.CallFieldAccess.callDynamicGetException()Lcfg/exc/intra/B");
+
+    Assert.assertEquals(1, cg.getNodes(mr).size());
+    final CGNode callNode = cg.getNodes(mr).iterator().next();
+
+    InterprocAnalysisResult<SSAInstruction, IExplodedBasicBlock> interExplodedCFG = 
+        NullPointerAnalysis.computeInterprocAnalysis(cg, new NullProgressMonitor());
+
+
+    ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG = interExplodedCFG.getResult(callNode);
+
+    Assert.assertTrue(intraExplodedCFG.hasExceptions());
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cfg/exc/intra/NullPointerExceptionIntraTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cfg/exc/intra/NullPointerExceptionIntraTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cfg/exc/intra/NullPointerExceptionIntraTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cfg/exc/intra/NullPointerExceptionIntraTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,742 @@
+/*******************************************************************************
+ * Copyright (c) 2002 - 2006 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.core.tests.cfg.exc.intra;
+
+import java.util.Collection;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.ibm.wala.cfg.ControlFlowGraph;
+import com.ibm.wala.cfg.exc.ExceptionPruningAnalysis;
+import com.ibm.wala.cfg.exc.NullPointerAnalysis;
+import com.ibm.wala.cfg.exc.intra.IntraprocNullPointerAnalysis;
+import com.ibm.wala.cfg.exc.intra.NullPointerState;
+import com.ibm.wala.cfg.exc.intra.NullPointerState.State;
+import com.ibm.wala.classLoader.ClassLoaderFactory;
+import com.ibm.wala.classLoader.ClassLoaderFactoryImpl;
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.core.tests.util.TestConstants;
+import com.ibm.wala.core.tests.util.WalaTestCase;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.ISSABasicBlock;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.SSAReturnInstruction;
+import com.ibm.wala.ssa.analysis.IExplodedBasicBlock;
+import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.NullProgressMonitor;
+import com.ibm.wala.util.collections.Iterator2Iterable;
+import com.ibm.wala.util.config.AnalysisScopeReader;
+import com.ibm.wala.util.graph.GraphIntegrity.UnsoundGraphException;
+import com.ibm.wala.util.io.FileProvider;
+import com.ibm.wala.util.strings.StringStuff;
+import com.ibm.wala.util.warnings.Warnings;
+
+/**
+ * Test validity and precision of intra-procedurel NullpointerException-Analysis {@link IntraprocNullPointerAnalysis}
+ * 
+ */
+public class NullPointerExceptionIntraTest extends WalaTestCase {
+
+  private static AnalysisScope scope;
+
+  private static ClassHierarchy cha;
+
+  @BeforeClass
+  public static void beforeClass() throws Exception {
+
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA,
+        (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), NullPointerExceptionIntraTest.class.getClassLoader());
+    ClassLoaderFactory factory = new ClassLoaderFactoryImpl(scope.getExclusions());
+
+    try {
+      cha = ClassHierarchyFactory.make(scope, factory);
+    } catch (ClassHierarchyException e) {
+      throw new Exception(e);
+    }
+  }
+
+  @AfterClass
+  public static void afterClass() throws Exception {
+    Warnings.clear();
+    scope = null;
+    cha = null;
+  }
+
+  public static void main(String[] args) {
+    justThisTest(NullPointerExceptionIntraTest.class);
+  }
+
+  @Test
+  public void testParam() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccess.testParam(ZLcfg/exc/intra/B;Lcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertEquals(State.NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertEquals(State.NULL, returnState.getState(returnVal));
+    }    
+  }
+  
+  @Test
+  public void testDynamicParam() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccessDynamic.testParam(ZLcfg/exc/intra/B;Lcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertEquals(State.NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertEquals(State.NULL, returnState.getState(returnVal));
+    }    
+  }
+  
+  @Test
+  public void testParam2() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccess.testParam2(ZLcfg/exc/intra/B;Lcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertEquals(State.NOT_NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertEquals(State.NOT_NULL, returnState.getState(returnVal));
+    }    
+  }
+  
+  public void testDynamicParam2() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccess.testDynamicParam2(ZLcfg/exc/intra/B;Lcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertEquals(State.NOT_NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertEquals(State.NOT_NULL, returnState.getState(returnVal));
+    }    
+  }
+  
+  
+  @Test
+  public void testIf() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccess.testIf(ZLcfg/exc/intra/B;Lcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertEquals(State.NOT_NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertEquals(State.NOT_NULL, returnState.getState(returnVal));
+    }    
+  }
+  
+  @Test
+  public void testDynamicIf() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccessDynamic.testIf(ZLcfg/exc/intra/B;Lcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertEquals(State.NOT_NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertEquals(State.NOT_NULL, returnState.getState(returnVal));
+    }    
+  }
+  
+  @Test
+  public void testIf2() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccess.testIf2(ZLcfg/exc/intra/B;Lcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }    
+  }
+  
+  @Test
+  public void testDynamicIf2() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccessDynamic.testIf2(ZLcfg/exc/intra/B;Lcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }    
+  }
+
+  
+  @Test
+  public void testIfContinued() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccess.testIfContinued(ZLcfg/exc/intra/B;Lcfg/exc/intra/B;Lcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }    
+  }
+  
+  @Test
+  public void testDynamicIfContinued() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccessDynamic.testIfContinued(ZLcfg/exc/intra/B;Lcfg/exc/intra/B;Lcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }    
+  }
+
+  @Test
+  public void testIf3() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccess.testIf3(ZLcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }    
+  }
+
+  
+  @Test
+  public void testDynamicIf3() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccessDynamic.testIf3(ZLcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }    
+  }
+  
+  
+  @Test
+  public void testWhile() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccess.testWhile(ZLcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }    
+  }
+  
+  @Test
+  public void testWhileDynamic() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccessDynamic.testWhile(ZLcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }    
+  }
+  
+  @Test
+  public void testWhile2() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccess.testWhile2(ZLcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertEquals(State.NOT_NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertEquals(State.NOT_NULL, returnState.getState(returnVal));
+    }    
+  }
+  
+  @Test
+  public void testDynamicWhile2() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccessDynamic.testWhile2(ZLcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertEquals(State.NOT_NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertEquals(State.NOT_NULL, returnState.getState(returnVal));
+    }    
+  }
+
+  @Test
+  public void testGet() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccess.testGet(ZLcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }    
+  }
+  
+  @Test
+  public void testDynamicGet() throws UnsoundGraphException, CancelException {
+    MethodReference mr = StringStuff.makeMethodReference("cfg.exc.intra.FieldAccessDynamic.testGet(ZLcfg/exc/intra/B;)Lcfg/exc/intra/B");
+
+    IMethod m = cha.resolveMethod(mr);
+    AnalysisCacheImpl cache = new AnalysisCacheImpl();
+    IR ir = cache.getIR(m);
+    final ISSABasicBlock returnNode = returnNode(ir.getControlFlowGraph());
+    final int returnVal = returnVal(returnNode);
+
+    {
+      ExceptionPruningAnalysis<SSAInstruction, IExplodedBasicBlock> intraExplodedCFG =
+          NullPointerAnalysis.createIntraproceduralExplodedCFGAnalysis(ir);
+      intraExplodedCFG.compute(new NullProgressMonitor());
+        
+      final IExplodedBasicBlock returnNodeExploded = returnNodeExploded(returnNode, intraExplodedCFG.getCFG());
+      final NullPointerState returnState = intraExplodedCFG.getState(returnNodeExploded);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }
+    {
+      ExceptionPruningAnalysis<SSAInstruction, ISSABasicBlock> intraSSACFG =
+          NullPointerAnalysis.createIntraproceduralSSACFGAnalyis(ir);
+      intraSSACFG.compute(new NullProgressMonitor());
+      
+      Assert.assertEquals(ir.getControlFlowGraph().exit(), intraSSACFG.getCFG().exit());
+      Assert.assertEquals(returnNode,           returnNode(intraSSACFG.getCFG()));
+        
+      final NullPointerState returnState = intraSSACFG.getState(returnNode);
+
+      Assert.assertNotEquals(State.NOT_NULL, returnState.getState(returnVal));
+      Assert.assertNotEquals(State.NULL, returnState.getState(returnVal));
+    }    
+  }
+
+  public static ISSABasicBlock returnNode(ControlFlowGraph<SSAInstruction, ISSABasicBlock> cfg) {
+      Collection<ISSABasicBlock> returnNodes = cfg.getNormalPredecessors(cfg.exit());
+      Assert.assertEquals(1, returnNodes.size());
+      return (ISSABasicBlock) returnNodes.toArray()[0];
+  }
+  
+  public static int returnVal(ISSABasicBlock returnNode) {
+    final SSAReturnInstruction returnInst = (SSAReturnInstruction) returnNode.getLastInstruction();
+    Assert.assertEquals(1, returnInst.getNumberOfUses());
+    return returnInst.getUse(0);
+  }
+  
+  public static IExplodedBasicBlock returnNodeExploded(ISSABasicBlock returnNode, ControlFlowGraph<SSAInstruction, IExplodedBasicBlock> explodedCfg) {
+    final IExplodedBasicBlock exit = explodedCfg.exit();
+    for (IExplodedBasicBlock candidate : Iterator2Iterable.make(explodedCfg.getPredNodes(exit))) {
+      if (candidate.getInstruction() == returnNode.getLastInstruction()) {
+        return candidate;
+      }
+    }
+    Assert.assertTrue(false);
+    return null;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/AnalysisScopeTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/AnalysisScopeTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/AnalysisScopeTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/AnalysisScopeTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,42 @@
+package com.ibm.wala.core.tests.cha;
+
+import com.ibm.wala.core.tests.util.TestConstants;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.config.AnalysisScopeReader;
+import com.ibm.wala.util.io.FileProvider;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class AnalysisScopeTest {
+
+  @Test
+  public void testJarInputStream() throws IOException, ClassHierarchyException {
+    AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA,
+        (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"),
+        AnalysisScopeTest.class.getClassLoader());
+    // assumes com.ibm.wala.core.tests is the current working directory
+    Path bcelJarPath = Paths.get(
+        System.getProperty("user.dir"),
+        "..",
+        "com.ibm.wala.core.testdata",
+        "bcel-5.2.jar"
+    );
+    scope.addInputStreamForJarToScope(ClassLoaderReference.Application, new FileInputStream
+        (bcelJarPath.toString()));
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
+    Assert.assertNotNull("couldn't find expected class", cha.lookupClass(
+        TypeReference.findOrCreate(ClassLoaderReference.Application,
+            "Lorg/apache/bcel/verifier/Verifier")));
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/CodeDeletedTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/CodeDeletedTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/CodeDeletedTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/CodeDeletedTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,10 +18,12 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.WalaRuntimeException;
@@ -33,19 +35,16 @@
   /**
    * Test handling of an invalid class where a non-abstract method has no code.
    * We want to throw an exception rather than crash.
-   * 
-   * @throws IOException
-   * @throws ClassHierarchyException
    */
   @Test(expected = WalaRuntimeException.class)
   public void testDeletedCode() throws IOException, ClassHierarchyException {
     AnalysisScope scope = null;
     scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA,
         (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), DupFieldsTest.class.getClassLoader());
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     TypeReference ref = TypeReference.findOrCreate(ClassLoaderReference.Application, "LCodeDeleted");
     IClass klass = cha.lookupClass(ref);
-    AnalysisCache cache = new AnalysisCache();
+    IAnalysisCacheView cache = new AnalysisCacheImpl();
     for (IMethod m : klass.getDeclaredMethods()) {
       if (m.toString().contains("foo")) {
         // should throw WalaRuntimeException
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/DupFieldsTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,6 +22,7 @@
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.FieldReference;
 import com.ibm.wala.types.TypeReference;
@@ -34,7 +35,7 @@
   @Test public void testDupFieldNames() throws IOException, ClassHierarchyException {
     AnalysisScope scope = null;
     scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), DupFieldsTest.class.getClassLoader());
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     TypeReference ref = TypeReference.findOrCreate(ClassLoaderReference.Application, "LDupFieldName");
     IClass klass = cha.lookupClass(ref);
     boolean threwException = false;
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/ExclusionsTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/ExclusionsTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/ExclusionsTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/ExclusionsTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,8 +12,7 @@
 
 import java.io.IOException;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.ibm.wala.core.tests.util.TestConstants;
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/GetTargetsTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/GetTargetsTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/GetTargetsTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/GetTargetsTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,14 +19,17 @@
 
 import com.ibm.wala.classLoader.ClassLoaderFactory;
 import com.ibm.wala.classLoader.ClassLoaderFactoryImpl;
+import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.config.AnalysisScopeReader;
 import com.ibm.wala.util.io.FileProvider;
@@ -53,9 +56,9 @@
     ClassLoaderFactory factory = new ClassLoaderFactoryImpl(scope.getExclusions() );
 
     try {
-      cha = ClassHierarchy.make(scope, factory);
+      cha = ClassHierarchyFactory.make(scope, factory);
     } catch (ClassHierarchyException e) {
-      throw new Exception();
+      throw new Exception(e);
     }
   }
 
@@ -85,7 +88,7 @@
   }
 
   /**
-   * test that calls to <init> methods are treated specially 
+   * test that calls to &lt;init&gt; methods are treated specially
    */
   @Test public void testObjInit() {
     MethodReference m = MethodReference.findOrCreate(TypeReference.JavaLangObject, MethodReference.initSelector);
@@ -95,4 +98,12 @@
     }
     Assert.assertEquals(1, c.size());
   }
+  
+  @Test
+  public void testConstructorLookup() {
+    IClass testKlass = cha.lookupClass(TypeReference.findOrCreate(ClassLoaderReference.Application, 
+        "LmethodLookup/MethodLookupStuff$B"));
+    IMethod m = testKlass.getMethod(Selector.make("<init>(I)V"));
+    Assert.assertNull(m);
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InnerClassesTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InnerClassesTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InnerClassesTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InnerClassesTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -24,6 +24,7 @@
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeName;
@@ -54,9 +55,9 @@
     ClassLoaderFactory factory = new ClassLoaderFactoryImpl(scope.getExclusions());
 
     try {
-      cha = ClassHierarchy.make(scope, factory);
+      cha = ClassHierarchyFactory.make(scope, factory);
     } catch (ClassHierarchyException e) {
-      throw new Exception();
+      throw new Exception(e);
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InterfaceTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InterfaceTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InterfaceTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/InterfaceTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,6 +23,7 @@
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
@@ -50,9 +51,9 @@
     ClassLoaderFactory factory = new ClassLoaderFactoryImpl(scope.getExclusions() );
 
     try {
-      cha = ClassHierarchy.make(scope, factory);
+      cha = ClassHierarchyFactory.make(scope, factory);
     } catch (ClassHierarchyException e) {
-      throw new Exception();
+      throw new Exception(e);
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/MissingSuperTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/MissingSuperTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/MissingSuperTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/MissingSuperTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.core.tests.cha;
+
+import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.classLoader.PhantomClass;
+import com.ibm.wala.core.tests.util.TestConstants;
+import com.ibm.wala.core.tests.util.WalaTestCase;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.config.AnalysisScopeReader;
+import com.ibm.wala.util.io.FileProvider;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Collection;
+
+public class MissingSuperTest extends WalaTestCase {
+
+  /**
+   * Test handling of an invalid class where a non-abstract method has no code.
+   * We want to throw an exception rather than crash.
+   */
+  @Test
+  public void testMissingSuper() throws IOException, ClassHierarchyException {
+    AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA,
+        (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"),
+        MissingSuperTest.class.getClassLoader());
+
+    TypeReference ref = TypeReference.findOrCreate(ClassLoaderReference.Application,
+        "Lmissingsuper/MissingSuper");
+
+    // without phantom classes, won't be able to resolve
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
+    Assert.assertNull("lookup should not work", cha.lookupClass(ref));
+
+    // with makeWithRoot lookup should succeed and
+    // unresolvable super class "Super" should be replaced by hierarchy root
+    cha = ClassHierarchyFactory.makeWithRoot(scope);
+    IClass klass = cha.lookupClass(ref);
+    Assert.assertNotNull("expected class MissingSuper to load", klass);
+    Assert.assertEquals(cha.getRootClass(), klass.getSuperclass());
+
+    // with phantom classes, lookup and IR construction should work
+    cha = ClassHierarchyFactory.makeWithPhantom(scope);
+    klass = cha.lookupClass(ref);
+    Assert.assertNotNull("expected class MissingSuper to load", klass);
+    IAnalysisCacheView cache = new AnalysisCacheImpl();
+    Collection<? extends IMethod> declaredMethods = klass.getDeclaredMethods();
+    Assert.assertEquals(declaredMethods.toString(), 2, declaredMethods.size());
+    for (IMethod m : declaredMethods) {
+      // should succeed
+      cache.getIR(m);
+    }
+    // there should be one PhantomClass in the Application class loader
+    boolean found = false;
+    for (IClass klass2: cha) {
+      if (klass2 instanceof PhantomClass && klass2.getReference().getClassLoader().equals
+          (ClassLoaderReference.Application)) {
+        Assert.assertEquals("Lmissingsuper/Super", klass2.getReference().getName().toString());
+        found = true;
+      }
+    }
+    Assert.assertTrue(found);
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/SourceMapTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/SourceMapTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/SourceMapTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/SourceMapTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,6 +23,7 @@
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.config.AnalysisScopeReader;
 
@@ -40,7 +41,7 @@
     scope = AnalysisScopeReader.readJavaScope(TestConstants.HELLO, null, MY_CLASSLOADER);
     // TODO: it's annoying to have to build a class hierarchy here.
     // see feature 38676
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     TypeReference t = TypeReference.findOrCreate(scope.getApplicationLoader(), TestConstants.HELLO_MAIN);
     IClass klass = cha.lookupClass(t);
     Assert.assertTrue("failed to load " + t, klass != null);
@@ -55,15 +56,15 @@
     scope = AnalysisScopeReader.readJavaScope(TestConstants.HELLO, null, MY_CLASSLOADER);
     // TODO: it's annoying to have to build a class hierarchy here.
     // open a feature to fix this
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     TypeReference t = TypeReference.findOrCreate(scope.getPrimordialLoader(), CLASS_IN_PRIMORDIAL_JAR);
     IClass klass = cha.lookupClass(t);
     Assert.assertTrue(klass != null);
     String sourceFile = klass.getSourceFileName();
     Assert.assertTrue(sourceFile != null);
     System.err.println("Source file: " + sourceFile);
-    Module container = ((BytecodeClass)klass).getContainer();
+    Module container = ((BytecodeClass<?>)klass).getContainer();
     Assert.assertTrue(container != null);
     System.err.println("container: " + container);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/collections/TwoLevelVectorTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/collections/TwoLevelVectorTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/collections/TwoLevelVectorTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/collections/TwoLevelVectorTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -38,7 +38,7 @@
   // --- Test cases
   
   @Test public void testCase1() {
-    final TwoLevelVector<Integer> tlVector = new TwoLevelVector<Integer>();
+    final TwoLevelVector<Integer> tlVector = new TwoLevelVector<>();
     tlVector.iterator();
     tlVector.set(2147483647, 56);
     Assert.assertNotNull(tlVector.iterator());
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/demandpa/AbstractPtrTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/demandpa/AbstractPtrTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/demandpa/AbstractPtrTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/demandpa/AbstractPtrTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -39,12 +39,11 @@
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Iterator;
-
 import org.junit.AfterClass;
 import org.junit.Assert;
 
 import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.demandpa.alg.DemandRefinementPointsTo;
@@ -56,20 +55,21 @@
 import com.ibm.wala.demandpa.flowgraph.IFlowLabel;
 import com.ibm.wala.demandpa.util.MemoryAccessMap;
 import com.ibm.wala.demandpa.util.PABasedMemoryAccessMap;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Util;
 import com.ibm.wala.ipa.callgraph.propagation.HeapModel;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAInstruction;
@@ -104,8 +104,7 @@
   public static CGNode findMainMethod(CallGraph cg) {
     Descriptor d = Descriptor.findOrCreateUTF8("([Ljava/lang/String;)V");
     Atom name = Atom.findOrCreateUnicodeAtom("main");
-    for (Iterator<? extends CGNode> it = cg.getSuccNodes(cg.getFakeRootNode()); it.hasNext();) {
-      CGNode n = it.next();
+    for (CGNode n : Iterator2Iterable.make(cg.getSuccNodes(cg.getFakeRootNode()))) {
       if (n.getMethod().getName().equals(name) && n.getMethod().getDescriptor().equals(d)) {
         return n;
       }
@@ -115,8 +114,7 @@
   }
 
   public static CGNode findStaticMethod(CallGraph cg, Atom name, Descriptor args) {
-    for (Iterator<? extends CGNode> it = cg.iterator(); it.hasNext();) {
-      CGNode n = it.next();
+    for (CGNode n : cg) {
       // System.err.println(n.getMethod().getName() + " " +
       // n.getMethod().getDescriptor());
       if (n.getMethod().getName().equals(name) && n.getMethod().getDescriptor().equals(args)) {
@@ -128,8 +126,7 @@
   }
 
   public static CGNode findInstanceMethod(CallGraph cg, IClass declaringClass, Atom name, Descriptor args) {
-    for (Iterator<? extends CGNode> it = cg.iterator(); it.hasNext();) {
-      CGNode n = it.next();
+    for (CGNode n : cg) {
       // System.err.println(n.getMethod().getDeclaringClass() + " " +
       // n.getMethod().getName() + " " + n.getMethod().getDescriptor());
       if (n.getMethod().getDeclaringClass().equals(declaringClass) && n.getMethod().getName().equals(name)
@@ -143,8 +140,7 @@
 
   public static PointerKey getParam(CGNode n, String methodName, HeapModel heapModel) {
     IR ir = n.getIR();
-    for (Iterator<SSAInstruction> it = ir.iterateAllInstructions(); it.hasNext();) {
-      SSAInstruction s = it.next();
+    for (SSAInstruction s : Iterator2Iterable.make(ir.iterateAllInstructions())) {
       if (s instanceof SSAInvokeInstruction) {
         SSAInvokeInstruction call = (SSAInvokeInstruction) s;
         if (call.getCallSite().getDeclaredTarget().getName().toString().equals(methodName)) {
@@ -234,15 +230,15 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha, mainClass);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    final AnalysisCache analysisCache = new AnalysisCache();
-    CallGraphBuilder cgBuilder = Util.makeZeroCFABuilder(options, analysisCache, cha, scope);
+    final IAnalysisCacheView analysisCache = new AnalysisCacheImpl();
+    CallGraphBuilder<InstanceKey> cgBuilder = Util.makeZeroCFABuilder(Language.JAVA, options, analysisCache, cha, scope);
     final CallGraph cg = cgBuilder.makeCallGraph(options, null);
     // System.err.println(cg.toString());
 
     // MemoryAccessMap mam = new SimpleMemoryAccessMap(cg,
     // cgBuilder.getPointerAnalysis().getHeapModel(), false);
     MemoryAccessMap mam = new PABasedMemoryAccessMap(cg, cgBuilder.getPointerAnalysis());
-    SSAPropagationCallGraphBuilder builder = Util.makeVanillaZeroOneCFABuilder(options, analysisCache, cha, scope);
+    SSAPropagationCallGraphBuilder builder = Util.makeVanillaZeroOneCFABuilder(Language.JAVA, options, analysisCache, cha, scope);
     DemandRefinementPointsTo fullDemandPointsTo = DemandRefinementPointsTo.makeWithDefaultFlowGraph(cg, builder, mam, cha, options,
         getStateMachineFactory());
 
@@ -252,23 +248,13 @@
     return fullDemandPointsTo;
   }
 
-  /**
-   * @param scope
-   * @return
-   * @throws ClassHierarchyException
-   */
-  private IClassHierarchy findOrCreateCHA(AnalysisScope scope) throws ClassHierarchyException {
+  private static IClassHierarchy findOrCreateCHA(AnalysisScope scope) throws ClassHierarchyException {
     if (cachedCHA == null) {
-      cachedCHA = ClassHierarchy.make(scope);
+      cachedCHA = ClassHierarchyFactory.make(scope);
     }
     return cachedCHA;
   }
 
-  /**
-   * @param scopeFile
-   * @return
-   * @throws IOException
-   */
   private AnalysisScope findOrCreateAnalysisScope() throws IOException {
     if (cachedScope == null) {
       cachedScope = CallGraphTestUtil.makeJ2SEAnalysisScope(scopeFile, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
@@ -283,7 +269,7 @@
   }
 
   protected StateMachineFactory<IFlowLabel> getStateMachineFactory() {
-    return new DummyStateMachine.Factory<IFlowLabel>();
+    return new DummyStateMachine.Factory<>();
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/exceptionpruning/ExceptionAnalysis2EdgeFilterTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/exceptionpruning/ExceptionAnalysis2EdgeFilterTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/exceptionpruning/ExceptionAnalysis2EdgeFilterTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/exceptionpruning/ExceptionAnalysis2EdgeFilterTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,220 @@
+package com.ibm.wala.core.tests.exceptionpruning;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ErrorCollector;
+
+import com.ibm.wala.analysis.exceptionanalysis.ExceptionAnalysis;
+import com.ibm.wala.analysis.exceptionanalysis.ExceptionAnalysis2EdgeFilter;
+import com.ibm.wala.cfg.ControlFlowGraph;
+import com.ibm.wala.classLoader.Language;
+import com.ibm.wala.core.tests.util.TestConstants;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
+import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.ipa.cfg.EdgeFilter;
+import com.ibm.wala.ipa.cfg.PrunedCFG;
+import com.ibm.wala.ipa.cfg.exceptionpruning.ExceptionFilter2EdgeFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.filter.IgnoreExceptionsFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural.CombinedInterproceduralExceptionFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural.IgnoreExceptionsInterFilter;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.ssa.AllIntegerDueToBranchePiPolicy;
+import com.ibm.wala.ssa.ISSABasicBlock;
+import com.ibm.wala.ssa.SSACFG;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.ssa.SSAInvokeInstruction;
+import com.ibm.wala.ssa.SSAThrowInstruction;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.config.AnalysisScopeReader;
+import com.ibm.wala.util.ref.ReferenceCleanser;
+
+/**
+ * This Test checks, if the number of deleted edges is correct for TestPruning,
+ * it is also doing a plausibility check for deleted edges (only edges after
+ * exceptional instructions should be deleted) and that no new edges are
+ * inserted.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class ExceptionAnalysis2EdgeFilterTest {
+  private static ClassLoader CLASS_LOADER = ExceptionAnalysis2EdgeFilterTest.class.getClassLoader();
+  public static String REGRESSION_EXCLUSIONS = "Java60RegressionExclusions.txt";
+
+  private static ClassHierarchy cha;
+  private static CallGraph cg;
+  private static PointerAnalysis<InstanceKey> pointerAnalysis;
+  private static CombinedInterproceduralExceptionFilter<SSAInstruction> filter;
+
+  @Rule
+  public ErrorCollector collector = new ErrorCollector();
+
+  @BeforeClass
+  public static void init() throws IOException, ClassHierarchyException, IllegalArgumentException, CallGraphBuilderCancelException {
+    AnalysisOptions options;
+    AnalysisScope scope;
+
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, new File(REGRESSION_EXCLUSIONS), CLASS_LOADER);
+    cha = ClassHierarchyFactory.make(scope);
+
+    Iterable<Entrypoint> entrypoints = Util.makeMainEntrypoints(scope, cha, "Lexceptionpruning/TestPruning");
+    options = new AnalysisOptions(scope, entrypoints);
+    options.getSSAOptions().setPiNodePolicy(new AllIntegerDueToBranchePiPolicy());
+
+    ReferenceCleanser.registerClassHierarchy(cha);
+    IAnalysisCacheView cache = new AnalysisCacheImpl();
+    ReferenceCleanser.registerCache(cache);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroCFABuilder(Language.JAVA, options, cache, cha, scope);
+    cg = builder.makeCallGraph(options, null);
+    pointerAnalysis = builder.getPointerAnalysis();
+
+    /*
+     * We will ignore some exceptions to focus on the exceptions we want to
+     * raise (OwnException, ArrayIndexOutOfBoundException)
+     */
+    filter = new CombinedInterproceduralExceptionFilter<>();
+    filter.add(new IgnoreExceptionsInterFilter<>(new IgnoreExceptionsFilter(TypeReference.JavaLangOutOfMemoryError)));
+    filter.add(new IgnoreExceptionsInterFilter<>(new IgnoreExceptionsFilter(
+        TypeReference.JavaLangNullPointerException)));
+    filter.add(new IgnoreExceptionsInterFilter<>(new IgnoreExceptionsFilter(
+        TypeReference.JavaLangExceptionInInitializerError)));
+    filter.add(new IgnoreExceptionsInterFilter<>(new IgnoreExceptionsFilter(
+        TypeReference.JavaLangNegativeArraySizeException)));
+  }
+
+  @Test
+  public void test() {
+    HashMap<String, Integer> deletedExceptional = new HashMap<>();
+    int deletedNormal = 0;
+
+    ExceptionAnalysis analysis = new ExceptionAnalysis(cg, pointerAnalysis, cha, filter);
+    analysis.solve();
+
+    for (CGNode node : cg) {
+      if (node.getIR() != null && !node.getIR().isEmptyIR()) {
+        EdgeFilter<ISSABasicBlock> exceptionAnalysedEdgeFilter = new ExceptionAnalysis2EdgeFilter(analysis, node);
+
+        SSACFG cfg_orig = node.getIR().getControlFlowGraph();
+        ExceptionFilter2EdgeFilter<ISSABasicBlock> filterOnlyEdgeFilter = new ExceptionFilter2EdgeFilter<>(
+            filter.getFilter(node), cha, cfg_orig);
+        ControlFlowGraph<SSAInstruction, ISSABasicBlock> cfg = PrunedCFG.make(cfg_orig, filterOnlyEdgeFilter);
+        ControlFlowGraph<SSAInstruction, ISSABasicBlock> exceptionPruned = PrunedCFG.make(cfg_orig, exceptionAnalysedEdgeFilter);
+
+        for (ISSABasicBlock block : cfg) {
+          if (exceptionPruned.containsNode(block)) {
+            for (ISSABasicBlock normalSucc : cfg.getNormalSuccessors(block)) {
+              if (!exceptionPruned.getNormalSuccessors(block).contains(normalSucc)) {
+                checkRemovingNormalOk(node, cfg, block, normalSucc);
+                if (node.getMethod().getDeclaringClass().getName().getClassName().toString().equals("TestPruning")) {
+                  deletedNormal += 1;
+                }
+              }
+            }
+
+            for (ISSABasicBlock exceptionalSucc : cfg.getExceptionalSuccessors(block)) {
+              if (!exceptionPruned.getExceptionalSuccessors(block).contains(exceptionalSucc)) {
+                if (node.getMethod().getDeclaringClass().getName().getClassName().toString().equals("TestPruning")) {
+                  boolean count = true;
+                  SSAInstruction instruction = block.getLastInstruction();
+                  if (instruction instanceof SSAInvokeInstruction && ((SSAInvokeInstruction) instruction).isSpecial()) {
+                    count = false;
+                  }
+
+                  if (count) {
+                    Integer value = 0;
+                    String key = node.getMethod().getName().toString();
+                    if (deletedExceptional.containsKey(key)) {
+                      value = deletedExceptional.get(key);
+                    }
+                    deletedExceptional.put(key, value + 1);
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        checkNoNewEdges(cfg, exceptionPruned);
+      }
+    }
+
+    assertEquals("Number of normal edges deleted wrong:", 0, deletedNormal);
+    for (Map.Entry<String, Integer> entry : deletedExceptional.entrySet()) {
+      final String key = entry.getKey();
+      final int value = entry.getValue();
+      String text = "Number of exceptional edges deleted wrong for " + key + ":";
+      if (key.equals("testTryCatchMultipleExceptions")) {
+        assertEquals(text, 12, value);
+      } else if (key.equals("testTryCatchOwnException")) {
+        assertEquals(text, 5, value);
+      } else if (key.equals("testTryCatchSuper")) {
+        assertEquals(text, 3, value);
+      } else if (key.equals("testTryCatchImplicitException")) {
+        assertEquals(text, 5, value);
+      } else if (key.equals("main")) {
+        assertEquals(text, 4, value);
+      } else {
+        assertEquals(text, 0, value);
+      }
+    }
+  }
+
+  private static void checkRemovingNormalOk(CGNode node, ControlFlowGraph<SSAInstruction, ISSABasicBlock> cfg, ISSABasicBlock block,
+      ISSABasicBlock normalSucc) {
+    if (!block.getLastInstruction().isPEI() || !filter.getFilter(node).alwaysThrowsException(block.getLastInstruction())) {
+      specialCaseThrowFiltered(cfg, normalSucc);
+    } else {
+      assertTrue(block.getLastInstruction().isPEI());
+      assertTrue(filter.getFilter(node).alwaysThrowsException(block.getLastInstruction()));
+    }
+  }
+
+  /**
+   * If a filtered exception is thrown explicit with a throw command, all
+   * previous nodes, which only have normal edges to the throw statement will be
+   * deleted. They don't have a connection to the exit node anymore.
+   * 
+   * So, if there is a throw statement as normal successor, evrything is fine.
+   */
+  private static void specialCaseThrowFiltered(ControlFlowGraph<SSAInstruction, ISSABasicBlock> cfg, ISSABasicBlock normalSucc) {
+    ISSABasicBlock next = normalSucc;
+    while (!(next.getLastInstruction() instanceof SSAThrowInstruction)) {
+      assertTrue(cfg.getNormalSuccessors(next).iterator().hasNext());
+      next = cfg.getNormalSuccessors(next).iterator().next();
+    }
+  }
+
+  private static void checkNoNewEdges(ControlFlowGraph<SSAInstruction, ISSABasicBlock> original,
+      ControlFlowGraph<SSAInstruction, ISSABasicBlock> filtered) {
+    for (ISSABasicBlock block : filtered) {
+      for (ISSABasicBlock normalSucc : filtered.getNormalSuccessors(block)) {
+        assertTrue(original.getNormalSuccessors(block).contains(normalSucc));
+      }
+
+      for (ISSABasicBlock exceptionalSucc : filtered.getExceptionalSuccessors(block)) {
+        assertTrue(original.getExceptionalSuccessors(block).contains(exceptionalSucc));
+      }
+    }
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/exceptionpruning/ExceptionAnalysisTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/exceptionpruning/ExceptionAnalysisTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/exceptionpruning/ExceptionAnalysisTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/exceptionpruning/ExceptionAnalysisTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,176 @@
+package com.ibm.wala.core.tests.exceptionpruning;
+
+import static org.hamcrest.CoreMatchers.anyOf;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ErrorCollector;
+
+import com.ibm.wala.analysis.exceptionanalysis.ExceptionAnalysis;
+import com.ibm.wala.analysis.exceptionanalysis.IntraproceduralExceptionAnalysis;
+import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.classLoader.Language;
+import com.ibm.wala.core.tests.util.TestConstants;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
+import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.ipa.cfg.exceptionpruning.filter.IgnoreExceptionsFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural.CombinedInterproceduralExceptionFilter;
+import com.ibm.wala.ipa.cfg.exceptionpruning.interprocedural.IgnoreExceptionsInterFilter;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.ssa.AllIntegerDueToBranchePiPolicy;
+import com.ibm.wala.ssa.SSAInstruction;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.config.AnalysisScopeReader;
+import com.ibm.wala.util.ref.ReferenceCleanser;
+
+/**
+ * This class checks, if the number of exceptions which might occur intra and
+ * interprocedural is right. As well as the number of caught exceptions for each
+ * call site.
+ * 
+ * @author Stephan Gocht {@code <stephan@gobro.de>}
+ *
+ */
+public class ExceptionAnalysisTest {
+  private static ClassLoader CLASS_LOADER = ExceptionAnalysisTest.class.getClassLoader();
+  public static String REGRESSION_EXCLUSIONS = "Java60RegressionExclusions.txt";
+
+  private static ClassHierarchy cha;
+  private static CallGraph cg;
+  private static PointerAnalysis<InstanceKey> pointerAnalysis;
+  private static CombinedInterproceduralExceptionFilter<SSAInstruction> filter;
+
+  @Rule
+  public ErrorCollector collector = new ErrorCollector();
+
+  @BeforeClass
+  public static void init() throws IOException, ClassHierarchyException, IllegalArgumentException, CallGraphBuilderCancelException {
+    AnalysisOptions options;
+    AnalysisScope scope;
+
+    scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, new File(REGRESSION_EXCLUSIONS), CLASS_LOADER);
+    cha = ClassHierarchyFactory.make(scope);
+
+    Iterable<Entrypoint> entrypoints = Util.makeMainEntrypoints(scope, cha, "Lexceptionpruning/TestPruning");
+    options = new AnalysisOptions(scope, entrypoints);
+    options.getSSAOptions().setPiNodePolicy(new AllIntegerDueToBranchePiPolicy());
+
+    ReferenceCleanser.registerClassHierarchy(cha);
+    IAnalysisCacheView cache = new AnalysisCacheImpl();
+    ReferenceCleanser.registerCache(cache);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroCFABuilder(Language.JAVA, options, cache, cha, scope);
+    cg = builder.makeCallGraph(options, null);
+    pointerAnalysis = builder.getPointerAnalysis();
+
+    /*
+     * We will ignore some exceptions to focus on the exceptions we want to
+     * raise (OwnException, ArrayIndexOutOfBoundException)
+     */
+    filter = new CombinedInterproceduralExceptionFilter<>();
+    filter.add(new IgnoreExceptionsInterFilter<>(new IgnoreExceptionsFilter(TypeReference.JavaLangOutOfMemoryError)));
+    filter.add(new IgnoreExceptionsInterFilter<>(new IgnoreExceptionsFilter(
+        TypeReference.JavaLangNullPointerException)));
+    filter.add(new IgnoreExceptionsInterFilter<>(new IgnoreExceptionsFilter(
+        TypeReference.JavaLangExceptionInInitializerError)));
+    filter.add(new IgnoreExceptionsInterFilter<>(new IgnoreExceptionsFilter(
+        TypeReference.JavaLangExceptionInInitializerError)));
+    filter.add(new IgnoreExceptionsInterFilter<>(new IgnoreExceptionsFilter(
+        TypeReference.JavaLangNegativeArraySizeException)));
+  }
+
+  @Test
+  public void testIntra() {
+    for (CGNode node : cg) {
+      IntraproceduralExceptionAnalysis analysis = new IntraproceduralExceptionAnalysis(node, filter.getFilter(node), cha,
+          pointerAnalysis);
+
+      if (node.getMethod().getDeclaringClass().getName().getClassName().toString().equals("TestPruning")) {
+        checkThrownExceptions(node, analysis);
+        checkCaughtExceptions(node, analysis);
+      }
+    }
+  }
+
+  private void checkCaughtExceptions(CGNode node, IntraproceduralExceptionAnalysis analysis) {
+    String text = "Number of caught exceptions did not match in " + node.getMethod().getName().toString()
+        + ". The follwoing exceptions were caught: ";
+    Iterator<CallSiteReference> it = node.iterateCallSites();
+    while (it.hasNext()) {
+      Set<TypeReference> caught = analysis.getCaughtExceptions(it.next());
+      if (node.getMethod().getName().toString().matches("testTryCatch.*")) {
+        if (node.getMethod().getName().toString().equals("testTryCatchMultipleExceptions")) {
+          collector.checkThat(text + caught.toString(), caught.size(), equalTo(2));
+        } else if (node.getMethod().getName().toString().equals("testTryCatchSuper")) {
+          collector.checkThat(text + caught.toString(), caught.size(), not(anyOf(equalTo(0), equalTo(1), equalTo(2), equalTo(3))));
+        } else {
+          collector.checkThat(text + caught.toString(), caught.size(), equalTo(1));
+        }
+      } else {
+        collector.checkThat(text + caught.toString(), caught.size(), equalTo(0));
+      }
+    }
+  }
+
+  private void checkThrownExceptions(CGNode node, IntraproceduralExceptionAnalysis analysis) {
+    Set<TypeReference> exceptions = analysis.getExceptions();
+    String text = "Number of thrown exceptions did not match in " + node.getMethod().getName().toString()
+        + ". The follwoing exceptions were thrown: " + exceptions.toString();
+
+    if (node.getMethod().getName().toString().matches("invokeSingle.*")
+        && (!node.getMethod().getName().toString().equals("invokeSingleRecursive2Helper"))
+        && (!node.getMethod().getName().toString().equals("invokeSinglePassThrough"))) {
+      collector.checkThat(text, exceptions.size(), equalTo(1));
+    } else {
+      collector.checkThat(text, exceptions.size(), equalTo(0));
+    }
+  }
+
+  @Test
+  public void testInterprocedural() {
+    ExceptionAnalysis analysis = new ExceptionAnalysis(cg, pointerAnalysis, cha, filter);
+    analysis.solve();
+
+    for (CGNode node : cg) {
+      if (node.getMethod().getDeclaringClass().getName().getClassName().toString().equals("TestPruning")) {
+        Set<TypeReference> exceptions = analysis.getCGNodeExceptions(node);
+        String text = "Number of thrown exceptions did not match in " + node.getMethod().getName().toString()
+            + ". The follwoing exceptions were thrown: " + exceptions.toString();
+        if (node.getMethod().getName().toString().matches("invokeSingle.*")) {
+          collector.checkThat(text, exceptions.size(), equalTo(1));
+        } else if (node.getMethod().getName().toString().matches("testTryCatch.*")) {
+          collector.checkThat(text, exceptions.size(), equalTo(0));
+        } else if (node.getMethod().getName().toString().matches("invokeAll.*")) {
+          collector.checkThat(text, exceptions.size(), equalTo(2));
+        } else if (node.getMethod().getName().toString().equals("main")) {
+          collector.checkThat(text, exceptions.size(), equalTo(0));
+        } else {
+          String text2 = "Found method, i didn't know the expected number of exceptions for: "
+              + node.getMethod().getName().toString();
+          collector.checkThat(text2, node.getMethod().getName().toString(), anyOf(equalTo("main"), equalTo("<init>")));
+        }
+
+        analysis.getCGNodeExceptions(node);
+      }
+    }
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/AnnotationTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/AnnotationTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/AnnotationTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/AnnotationTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.core.tests.ir;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Set;
 
@@ -26,6 +27,7 @@
 import com.ibm.wala.core.tests.util.WalaTestCase;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.shrikeBT.IInstruction;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.FieldReference;
@@ -89,22 +91,20 @@
   }
 
   private void testClassAnnotations(TypeReference typeUnderTest, Collection<Annotation> expectedRuntimeInvisibleAnnotations,
-      Collection<Annotation> expectedRuntimeVisibleAnnotations) throws IOException, ClassHierarchyException,
-      InvalidClassFileException {
+      Collection<Annotation> expectedRuntimeVisibleAnnotations) throws InvalidClassFileException {
     IClass classUnderTest = cha.lookupClass(typeUnderTest);
     harness.assertNotNull(typeUnderTest.toString() + " not found", classUnderTest);
     harness.assertTrue(classUnderTest + " must be BytecodeClass", classUnderTest instanceof BytecodeClass);
     BytecodeClass<?> bcClassUnderTest = (BytecodeClass<?>) classUnderTest;
 
     Collection<Annotation> runtimeInvisibleAnnotations = bcClassUnderTest.getAnnotations(true);
-    harness.assertEqualCollections(expectedRuntimeInvisibleAnnotations, runtimeInvisibleAnnotations);
-
     Collection<Annotation> runtimeVisibleAnnotations = bcClassUnderTest.getAnnotations(false);
+ 
+    harness.assertEqualCollections(expectedRuntimeInvisibleAnnotations, runtimeInvisibleAnnotations);
     harness.assertEqualCollections(expectedRuntimeVisibleAnnotations, runtimeVisibleAnnotations);
   }
 
 
-  @SuppressWarnings("unchecked")
   @Test
   public void testClassAnnotations3() throws Exception {
 
@@ -121,7 +121,7 @@
     IMethod methodUnderTest = cha.resolveMethod(methodRefUnderTest);
     harness.assertNotNull(methodRefUnderTest.toString() + " not found", methodUnderTest);
     harness.assertTrue(methodUnderTest + " must be IBytecodeMethod", methodUnderTest instanceof IBytecodeMethod);
-    IBytecodeMethod bcMethodUnderTest = (IBytecodeMethod) methodUnderTest;
+    IBytecodeMethod<IInstruction> bcMethodUnderTest = (IBytecodeMethod<IInstruction>) methodUnderTest;
 
     Collection<Annotation> runtimeInvisibleAnnotations = bcMethodUnderTest.getAnnotations(true);
     harness.assertEquals(1, runtimeInvisibleAnnotations.size());
@@ -183,15 +183,13 @@
     IMethod methodUnderTest = cha.resolveMethod(methodRefUnderTest);
     harness.assertTrue(methodRefUnderTest.toString() + " not found", methodUnderTest != null);
     harness.assertTrue(methodUnderTest + " must be bytecode method", methodUnderTest instanceof IBytecodeMethod);
-    IBytecodeMethod IBytecodeMethodUnderTest = (IBytecodeMethod) methodUnderTest;
+    IBytecodeMethod<?> IBytecodeMethodUnderTest = (IBytecodeMethod<?>) methodUnderTest;
 
     Collection<Annotation>[] parameterAnnotations = IBytecodeMethodUnderTest.getParameterAnnotations();
     harness.assertEquals(expected.length, parameterAnnotations.length);
     for (int i = 0; i < expected.length; i++) {
       Set<String> e = HashSetFactory.make();
-      for(String s : expected[i]) {
-        e.add(s);
-      }
+      e.addAll(Arrays.asList(expected[i]));
       
       Set<String> a = HashSetFactory.make();
       if (parameterAnnotations[i] != null) {
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGSanitizerTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGSanitizerTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGSanitizerTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGSanitizerTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,8 +14,7 @@
 import java.io.InputStream;
 import java.util.Map;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.ibm.wala.cfg.CFGSanitizer;
@@ -26,6 +25,7 @@
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.summaries.MethodSummary;
 import com.ibm.wala.ipa.summaries.SummarizedMethod;
 import com.ibm.wala.ipa.summaries.XMLMethodSummaryReader;
@@ -46,28 +46,27 @@
   /**
    * check that for all synthetic methods coming from the native specifications, the exit block is not disconnected from the rest of
    * the sanitized graph
-   * 
-   * @throws IOException
-   * @throws IllegalArgumentException
-   * @throws WalaException
    */
   @Test
   public void testSyntheticEdgeToExit() throws IOException, IllegalArgumentException, WalaException {
     AnalysisScope scope = AnalysisScopeReader.makePrimordialScope((new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     ClassLoader cl = CFGSanitizerTest.class.getClassLoader();
-    InputStream s = cl.getResourceAsStream("natives.xml");
-    XMLMethodSummaryReader summary = new XMLMethodSummaryReader(s, scope);
+    XMLMethodSummaryReader summary;
+    try (final InputStream s = cl.getResourceAsStream("natives.xml")) {
+      summary = new XMLMethodSummaryReader(s, scope);
+    }
     AnalysisOptions options = new AnalysisOptions(scope, null);
     Map<MethodReference, MethodSummary> summaries = summary.getSummaries();
-    for (MethodReference mr : summaries.keySet()) {
+    for (Map.Entry<MethodReference, MethodSummary> entry : summaries.entrySet()) {
+      final MethodReference mr = entry.getKey();
       IMethod m = cha.resolveMethod(mr);
       if (m == null) {
         continue;
       }
       System.out.println(m.getSignature());
-      MethodSummary methodSummary = summaries.get(mr);
+      MethodSummary methodSummary = entry.getValue();
       SummarizedMethod summMethod = new SummarizedMethod(mr, methodSummary, m.getDeclaringClass());
       IR ir = summMethod.makeIR(Everywhere.EVERYWHERE, options.getSSAOptions());
       System.out.println(ir);
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CFGTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,8 +19,8 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
@@ -67,9 +67,9 @@
         Assertions.UNREACHABLE("could not resolve " + mr);
       }
       AnalysisOptions options = new AnalysisOptions();
-      AnalysisCache cache = makeAnalysisCache();
       options.getSSAOptions().setPiNodePolicy(SSAOptions.getAllBuiltInPiNodes());
-      IR ir = cache.getSSACache().findOrCreateIR(m, Everywhere.EVERYWHERE, options.getSSAOptions());
+      IAnalysisCacheView cache = makeAnalysisCache(options.getSSAOptions());
+      IR ir = cache.getIR(m, Everywhere.EVERYWHERE);
 
       ControlFlowGraph<SSAInstruction, ISSABasicBlock> cfg = ir.getControlFlowGraph();
       try {
@@ -111,9 +111,9 @@
     MethodReference mr = StringStuff.makeMethodReference("hello.Hello.main([Ljava/lang/String;)V");
 
     IMethod m = cha.resolveMethod(mr);
-    AnalysisCache cache = makeAnalysisCache();
+    IAnalysisCacheView cache = makeAnalysisCache();
     IR irBefore = cache.getIR(m);
-    cache.getSSACache().wipe();
+    cache.clear(); 
     IR irAfter = cache.getIR(m);
     for (int i = 0; i < irBefore.getInstructions().length; i++) {
       System.out.println(irBefore.getInstructions()[i]);
@@ -127,7 +127,7 @@
     MethodReference mr = StringStuff.makeMethodReference("cfg.MonitorTest.sync1()V");
 
     IMethod m = cha.resolveMethod(mr);
-    AnalysisCache cache = makeAnalysisCache();
+    IAnalysisCacheView cache = makeAnalysisCache();
     IR ir = cache.getIR(m);
     System.out.println(ir);
     SSACFG controlFlowGraph = ir.getControlFlowGraph();
@@ -139,7 +139,7 @@
     MethodReference mr = StringStuff.makeMethodReference("cfg.MonitorTest.sync2()V");
 
     IMethod m = cha.resolveMethod(mr);
-    AnalysisCache cache = makeAnalysisCache();
+    IAnalysisCacheView cache = makeAnalysisCache();
     IR ir = cache.getIR(m);
     System.out.println(ir);
     SSACFG controlFlowGraph = ir.getControlFlowGraph();
@@ -154,7 +154,7 @@
     MethodReference mr = StringStuff.makeMethodReference("cfg.MonitorTest.sync3()V");
 
     IMethod m = cha.resolveMethod(mr);
-    AnalysisCache cache = makeAnalysisCache();
+    IAnalysisCacheView cache = makeAnalysisCache();
     IR ir = cache.getIR(m);
     SSACFG controlFlowGraph = ir.getControlFlowGraph();
     Assert.assertEquals(1, controlFlowGraph.getSuccNodeCount(controlFlowGraph.getBlockForInstruction(33)));
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CornerCasesTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CornerCasesTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CornerCasesTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/CornerCasesTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,12 +21,13 @@
 import com.ibm.wala.classLoader.ShrikeCTMethod;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.types.Descriptor;
 import com.ibm.wala.types.Selector;
@@ -47,14 +48,11 @@
   /**
    * test that getMethod() works even if a declared ancestor interface doesn't
    * exist
-   * 
-   * @throws ClassHierarchyException
-   * @throws IOException 
    */
   @Test public void testBug38484() throws ClassHierarchyException, IOException {
     AnalysisScope scope = null;
     scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     TypeReference t = TypeReference.findOrCreateClass(scope.getApplicationLoader(), "cornerCases", "YuckyInterface");
     IClass klass = cha.lookupClass(t);
     Assert.assertTrue(klass != null);
@@ -65,22 +63,19 @@
   /**
    * test that type inference works in the presence of a getfield where the
    * field's declared type cannot be loaded
-   * 
-   * @throws ClassHierarchyException
-   * @throws IOException 
    */
   @Test public void testBug38540() throws ClassHierarchyException, IOException {
     AnalysisScope scope = null;
     scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
     AnalysisOptions options = new AnalysisOptions();
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     TypeReference t = TypeReference.findOrCreateClass(scope.getApplicationLoader(), "cornerCases", "Main");
     IClass klass = cha.lookupClass(t);
     Assert.assertTrue(klass != null);
     ShrikeCTMethod m = (ShrikeCTMethod) klass.getMethod(new Selector(Atom.findOrCreateAsciiAtom("foo"), Descriptor
         .findOrCreateUTF8("()Ljava/lang/Object;")));
     Assert.assertTrue(m != null);
-    IR ir = new AnalysisCache().getSSACache().findOrCreateIR(m, Everywhere.EVERYWHERE, options.getSSAOptions());
+    IR ir = new AnalysisCacheImpl().getSSACache().findOrCreateIR(m, Everywhere.EVERYWHERE, options.getSSAOptions());
     TypeInference.make(ir, false);
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/DeterministicIRTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/DeterministicIRTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/DeterministicIRTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/DeterministicIRTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,9 +18,9 @@
 
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
@@ -57,16 +57,13 @@
     justThisTest(DeterministicIRTest.class);
   }
 
-   /**
-   * @param method
-   */
   private IR doMethod(MethodReference method) {
-    AnalysisCache cache = makeAnalysisCache();
+    IAnalysisCacheView cache = makeAnalysisCache();
     Assert.assertNotNull("method not found", method);
     IMethod imethod = cha.resolveMethod(method);
     Assert.assertNotNull("imethod not found", imethod);
     IR ir1 = cache.getIRFactory().makeIR(imethod, Everywhere.EVERYWHERE, options.getSSAOptions());
-    cache.getSSACache().wipe();
+    cache.clear();
 
     checkNotAllNull(ir1.getInstructions());
     checkNoneNull(ir1.iterateAllInstructions());
@@ -79,7 +76,7 @@
     }
 
     IR ir2 = cache.getIRFactory().makeIR(imethod, Everywhere.EVERYWHERE, options.getSSAOptions());
-    cache.getSSACache().wipe();
+    cache.clear();
 
     try {
       GraphIntegrity.check(ir2.getControlFlowGraph());
@@ -95,22 +92,16 @@
 
   // The Tests ///////////////////////////////////////////////////////
 
-  /**
-   * @param iterator
-   */
-  private void checkNoneNull(Iterator<?> iterator) {
+  private static void checkNoneNull(Iterator<?> iterator) {
     while (iterator.hasNext()) {
       Assert.assertTrue(iterator.next() != null);
     }
 
   }
 
-  /**
-   * @param instructions
-   */
   private static void checkNotAllNull(SSAInstruction[] instructions) {
-    for (int i = 0; i < instructions.length; i++) {
-      if (instructions[i] != null) {
+    for (SSAInstruction instruction : instructions) {
+      if (instruction != null) {
         return;
       }
     }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/LocalNamesTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/LocalNamesTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/LocalNamesTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/LocalNamesTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,12 +21,14 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAOptions;
@@ -55,8 +57,6 @@
 
   private static AnalysisOptions options;
 
-  private static AnalysisCache cache;
-
   public static void main(String[] args) {
     justThisTest(LocalNamesTest.class);
   }
@@ -71,13 +71,12 @@
         (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
 
     options = new AnalysisOptions(scope, null);
-    cache = new AnalysisCache();
     ClassLoaderFactory factory = new ClassLoaderFactoryImpl(scope.getExclusions());
 
     try {
-      cha = ClassHierarchy.make(scope, factory);
+      cha = ClassHierarchyFactory.make(scope, factory);
     } catch (ClassHierarchyException e) {
-      throw new Exception();
+      throw new Exception(e);
     }
   }
 
@@ -91,7 +90,6 @@
     scope = null;
     cha = null;
     options = null;
-    cache = null;
   }
 
   /**
@@ -102,7 +100,7 @@
     try {
       AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider())
           .getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
-      ClassHierarchy cha = ClassHierarchy.make(scope);
+      ClassHierarchy cha = ClassHierarchyFactory.make(scope);
       TypeReference t = TypeReference.findOrCreateClass(scope.getApplicationLoader(), "cornerCases", "AliasNames");
       IClass klass = cha.lookupClass(t);
       Assert.assertTrue(klass != null);
@@ -111,7 +109,10 @@
 
       AnalysisOptions options = new AnalysisOptions();
       options.getSSAOptions().setPiNodePolicy(SSAOptions.getAllBuiltInPiNodes());
-      IR ir = cache.getSSACache().findOrCreateIR(m, Everywhere.EVERYWHERE, options.getSSAOptions());
+      
+      IAnalysisCacheView cache = new AnalysisCacheImpl(options.getSSAOptions());
+
+      IR ir = cache.getIR(m, Everywhere.EVERYWHERE);
 
       for (int offsetIndex = 0; offsetIndex < ir.getInstructions().length; offsetIndex++) {
         SSAInstruction instr = ir.getInstructions()[offsetIndex];
@@ -139,6 +140,7 @@
     Assert.assertNotNull("method not found", mref);
     IMethod imethod = cha.resolveMethod(mref);
     Assert.assertNotNull("imethod not found", imethod);
+    IAnalysisCacheView cache = new AnalysisCacheImpl(options.getSSAOptions());
     IR ir = cache.getIRFactory().makeIR(imethod, Everywhere.EVERYWHERE, options.getSSAOptions());
     options.getSSAOptions().setPiNodePolicy(save);
 
@@ -168,6 +170,7 @@
     Assert.assertNotNull("method not found", mref);
     IMethod imethod = cha.resolveMethod(mref);
     Assert.assertNotNull("imethod not found", imethod);
+    IAnalysisCacheView cache = new AnalysisCacheImpl(options.getSSAOptions());
     IR ir = cache.getIRFactory().makeIR(imethod, Everywhere.EVERYWHERE, options.getSSAOptions());
     options.getSSAOptions().setPiNodePolicy(save);
 
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/MultiNewArrayTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/MultiNewArrayTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/MultiNewArrayTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/MultiNewArrayTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,11 +20,13 @@
 import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSANewInstruction;
@@ -42,12 +44,12 @@
   @Test public void testMultiNewArray1() throws IOException, ClassHierarchyException {
     AnalysisScope scope = null;
     scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     IClass klass = cha.lookupClass(TypeReference.findOrCreate(ClassLoaderReference.Application, TestConstants.MULTI_DIM_MAIN));
     Assert.assertTrue(klass != null);
     IMethod m = klass.getMethod(Selector.make(Language.JAVA, "testNewMultiArray()V"));
     Assert.assertTrue(m != null);
-    AnalysisCache cache = new AnalysisCache();
+    IAnalysisCacheView cache = new AnalysisCacheImpl();
     IR ir = cache.getIRFactory().makeIR(m, Everywhere.EVERYWHERE, new SSAOptions());
     Assert.assertTrue(ir != null);
     SSAInstruction[] instructions = ir.getInstructions();
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/TypeAnnotationTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/TypeAnnotationTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/TypeAnnotationTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ir/TypeAnnotationTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,298 @@
+/*******************************************************************************
+ * Copyright (c) 2013,2016 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *     Martin Hecker, KIT - adaptation to type annotations
+ *******************************************************************************/
+package com.ibm.wala.core.tests.ir;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+
+import com.ibm.wala.classLoader.FieldImpl;
+import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.classLoader.ShrikeCTMethod;
+import com.ibm.wala.classLoader.ShrikeClass;
+import com.ibm.wala.core.tests.util.JVMLTestAssertions;
+import com.ibm.wala.core.tests.util.TestAssertions;
+import com.ibm.wala.core.tests.util.WalaTestCase;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.shrikeCT.AnnotationsReader.ConstantElementValue;
+import com.ibm.wala.shrikeCT.AnnotationsReader.ElementValue;
+import com.ibm.wala.shrikeCT.InvalidClassFileException;
+import com.ibm.wala.shrikeCT.TypeAnnotationsReader;
+import com.ibm.wala.shrikeCT.TypeAnnotationsReader.TargetType;
+import com.ibm.wala.shrikeCT.TypeAnnotationsReader.TypePathKind;
+import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.types.Selector;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.types.annotations.Annotation;
+import com.ibm.wala.types.annotations.TypeAnnotation;
+import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Pair;
+import com.ibm.wala.util.strings.Atom;
+
+public class TypeAnnotationTest extends WalaTestCase {
+
+  private final IClassHierarchy cha;
+  
+  private final TestAssertions harness;
+  
+  protected TypeAnnotationTest(TestAssertions harness, IClassHierarchy cha) {
+    this.cha = cha;
+    this.harness = harness;
+  }
+
+  public TypeAnnotationTest() throws ClassHierarchyException, IOException {
+    this(new JVMLTestAssertions(), WalaTestCase.makeCHA());
+  }
+
+  private final String typeAnnotatedClass1 = "Lannotations/TypeAnnotatedClass1";
+  private final String typeAnnotatedClass2 = "Lannotations/TypeAnnotatedClass2";
+  
+  @Test
+  public void testClassAnnotations5() throws Exception {
+    TypeReference typeUnderTest = TypeReference.findOrCreate(ClassLoaderReference.Application, typeAnnotatedClass1);
+
+    Collection<TypeAnnotation> expectedRuntimeInvisibleAnnotations = HashSetFactory.make();
+    expectedRuntimeInvisibleAnnotations.add(
+        TypeAnnotation.make(
+            Annotation.make(TypeReference.findOrCreate(ClassLoaderReference.Application, "Lannotations/TypeAnnotationTypeUse")),
+            // TODO: currently, annotations will reference class loaders from which they were loaded, even if the type
+            // comes from, e.g., primordial (e.g.: Application instead of Primordial).
+            // See {@link TypeAnnotation#fromString(ClassLoaderReference, String)}
+            new TypeAnnotation.SuperTypeTarget(TypeReference.findOrCreate(ClassLoaderReference.Application, "Ljava/lang/Object")),
+            TargetType.CLASS_EXTENDS
+        )
+    );
+
+    Collection<TypeAnnotation> expectedRuntimeVisibleAnnotations = HashSetFactory.make();
+
+    testClassAnnotations(typeUnderTest, expectedRuntimeInvisibleAnnotations, expectedRuntimeVisibleAnnotations);
+  }
+  
+  @Test
+  public void testClassAnnotations5Foo() throws Exception {
+    // TODO: the catchIIndex is obviously somewhat unstable wrt change in generated bytecode (and changes in Decoder).
+    // Just change it whenever a test starts to fail
+    final int catchIIndex = 16;
+
+    // TODO: the instanceOfIIndex is obviously somewhat unstable wrt change in generated bytecode (and changes in Decoder).
+    // This is even more so true since apparently, some compilers generate (for an instanceof test) the bytecode index
+    // not of the instanceof instruction (as required per spec:
+    //   "The value of the offset item specifies the code array offset of either the instanceof bytecode instruction 
+    //    corresponding to the instanceof expression, ..."
+    // ), but instead of the preceding aload instruction.
+    //
+    // Just change it whenever a test starts to fail
+    final int instanceOfIIndex = 6;
+    
+    TypeReference typeUnderTest = TypeReference.findOrCreate(ClassLoaderReference.Application, typeAnnotatedClass1);
+
+    MethodReference methodRefUnderTest = MethodReference.findOrCreate(typeUnderTest, Selector.make("foo(ILjava/lang/Object;)Ljava/lang/Integer;"));
+    
+    Collection<TypeAnnotation> expectedRuntimeInvisibleAnnotations = HashSetFactory.make();
+
+    expectedRuntimeInvisibleAnnotations.add(
+        TypeAnnotation.make(
+            Annotation.make(TypeReference.findOrCreate(ClassLoaderReference.Application, "Lannotations/TypeAnnotationTypeUse")),
+            new TypeAnnotation.LocalVarTarget(3, "x"),
+            TargetType.LOCAL_VARIABLE
+        )
+    );
+
+    expectedRuntimeInvisibleAnnotations.add(
+        TypeAnnotation.make(
+            Annotation.make(TypeReference.findOrCreate(ClassLoaderReference.Application, "Lannotations/TypeAnnotationTypeUse")),
+            new TypeAnnotation.LocalVarTarget(4, "y"),
+            TargetType.LOCAL_VARIABLE
+        )
+    );
+
+    // TODO: comment wrt. ClassLoaderReference in testClassAnnotations5() also applies here
+    final TypeReference runtimeExceptionRef = TypeReference.findOrCreate(ClassLoaderReference.Application, "Ljava/lang/RuntimeException");
+    expectedRuntimeInvisibleAnnotations.add(
+        TypeAnnotation.make(
+            Annotation.make(TypeReference.findOrCreate(ClassLoaderReference.Application, "Lannotations/TypeAnnotationTypeUse")),
+            new TypeAnnotation.CatchTarget(catchIIndex, runtimeExceptionRef),
+            TargetType.EXCEPTION_PARAMETER
+        )
+    );
+    
+    
+    final Map<String,ElementValue> values = HashMapFactory.make();
+    values.put("someKey", new ConstantElementValue("lul"));
+    // TODO: comment wrt. ClassLoaderReference in testClassAnnotations5() also applies here
+    expectedRuntimeInvisibleAnnotations.add(
+        TypeAnnotation.make(
+            Annotation.makeWithNamed(
+                TypeReference.findOrCreate(ClassLoaderReference.Application, "Lannotations/TypeAnnotationTypeUse"),
+                values
+            ),
+            new TypeAnnotation.OffsetTarget(instanceOfIIndex),
+            TargetType.INSTANCEOF
+        )
+    );
+    
+    expectedRuntimeInvisibleAnnotations.add(
+        TypeAnnotation.make(
+            Annotation.make(TypeReference.findOrCreate(ClassLoaderReference.Application, "Lannotations/TypeAnnotationTypeUse")),
+            new TypeAnnotation.EmptyTarget(),
+            TargetType.METHOD_RETURN
+        )
+    );
+    
+    expectedRuntimeInvisibleAnnotations.add(
+        TypeAnnotation.make(
+            Annotation.make(TypeReference.findOrCreate(ClassLoaderReference.Application, "Lannotations/TypeAnnotationTypeUse")),
+            new TypeAnnotation.FormalParameterTarget(0),
+            TargetType.METHOD_FORMAL_PARAMETER
+        )
+    );
+    
+    expectedRuntimeInvisibleAnnotations.add(
+        TypeAnnotation.make(
+            Annotation.make(TypeReference.findOrCreate(ClassLoaderReference.Application, "Lannotations/TypeAnnotationTypeUse")),
+            new TypeAnnotation.FormalParameterTarget(1),
+            TargetType.METHOD_FORMAL_PARAMETER
+        )
+    );
+
+    Collection<TypeAnnotation> expectedRuntimeVisibleAnnotations = HashSetFactory.make();
+
+    testMethodAnnotations(methodRefUnderTest, expectedRuntimeInvisibleAnnotations, expectedRuntimeVisibleAnnotations);
+  }
+  
+  @Test
+  public void testClassAnnotations5field() throws Exception {
+    TypeReference typeUnderTest = TypeReference.findOrCreate(ClassLoaderReference.Application, typeAnnotatedClass1);
+
+    
+    Collection<TypeAnnotation> expectedAnnotations = HashSetFactory.make();
+    expectedAnnotations.add(
+        TypeAnnotation.make(
+            Annotation.make(TypeReference.findOrCreate(ClassLoaderReference.Application, "Lannotations/TypeAnnotationTypeUse")),
+            TypeAnnotationsReader.TYPEPATH_EMPTY,
+            new TypeAnnotation.EmptyTarget(),
+            TargetType.FIELD
+        )
+    );
+    
+    final List<Pair<TypePathKind, Integer>> path = new LinkedList<>();
+    path.add(Pair.make(TypeAnnotationsReader.TypePathKind.TYPE_ARGUMENT, 0));
+    path.add(Pair.make(TypeAnnotationsReader.TypePathKind.TYPE_ARGUMENT, 0));
+    
+    expectedAnnotations.add(
+        TypeAnnotation.make(
+            Annotation.make(TypeReference.findOrCreate(ClassLoaderReference.Application, "Lannotations/TypeAnnotationTypeUse")),
+            path,
+            new TypeAnnotation.EmptyTarget(),
+            TargetType.FIELD
+        )
+    );
+
+    testFieldAnnotations("field", typeUnderTest, expectedAnnotations);
+  }
+  
+  private TypeAnnotation makeForAnnotations6(String annotation, List<Pair<TypePathKind, Integer>> path) {
+    return TypeAnnotation.make(
+        Annotation.make(TypeReference.findOrCreate(ClassLoaderReference.Application, typeAnnotatedClass2 + "$" + annotation)),
+        path,
+        new TypeAnnotation.EmptyTarget(),
+        TargetType.FIELD
+    );
+  }
+  
+  @Test
+  public void testClassAnnotations6field1() throws Exception {
+    TypeReference typeUnderTest = TypeReference.findOrCreate(ClassLoaderReference.Application, typeAnnotatedClass2);
+
+    Collection<TypeAnnotation> expectedAnnotations = HashSetFactory.make();
+    {
+      final List<Pair<TypePathKind, Integer>> pathA = new LinkedList<>();
+      expectedAnnotations.add(makeForAnnotations6("A", pathA));
+    }
+    {  
+      final List<Pair<TypePathKind, Integer>> pathB = new LinkedList<>();
+      pathB.add(Pair.make(TypeAnnotationsReader.TypePathKind.TYPE_ARGUMENT, 0));
+      expectedAnnotations.add(makeForAnnotations6("B", pathB));
+    }
+    {
+      final List<Pair<TypePathKind, Integer>> pathC = new LinkedList<>();
+      pathC.add(Pair.make(TypeAnnotationsReader.TypePathKind.TYPE_ARGUMENT, 0));
+      pathC.add(Pair.make(TypeAnnotationsReader.TypePathKind.WILDCARD_BOUND, 0));
+      expectedAnnotations.add(makeForAnnotations6("C", pathC));
+    }
+    {
+      final List<Pair<TypePathKind, Integer>> pathD = new LinkedList<>();
+      pathD.add(Pair.make(TypeAnnotationsReader.TypePathKind.TYPE_ARGUMENT, 1));
+      expectedAnnotations.add(makeForAnnotations6("D", pathD));
+    }
+    {
+      final List<Pair<TypePathKind, Integer>> pathE = new LinkedList<>();
+      pathE.add(Pair.make(TypeAnnotationsReader.TypePathKind.TYPE_ARGUMENT, 1));
+      pathE.add(Pair.make(TypeAnnotationsReader.TypePathKind.TYPE_ARGUMENT, 0));
+      expectedAnnotations.add(makeForAnnotations6("E", pathE));
+    }
+    testFieldAnnotations("field1", typeUnderTest, expectedAnnotations);
+  }
+
+  private void testClassAnnotations(TypeReference typeUnderTest, Collection<TypeAnnotation> expectedRuntimeInvisibleAnnotations,
+      Collection<TypeAnnotation> expectedRuntimeVisibleAnnotations) throws InvalidClassFileException {
+    IClass classUnderTest = cha.lookupClass(typeUnderTest);
+    harness.assertNotNull(typeUnderTest.toString() + " not found", classUnderTest);
+    harness.assertTrue(classUnderTest + " must be BytecodeClass", classUnderTest instanceof ShrikeClass);
+    ShrikeClass bcClassUnderTest = (ShrikeClass) classUnderTest;
+
+    Collection<TypeAnnotation> runtimeInvisibleAnnotations = bcClassUnderTest.getTypeAnnotations(true);
+    harness.assertEqualCollections(expectedRuntimeInvisibleAnnotations, runtimeInvisibleAnnotations);
+
+    Collection<TypeAnnotation> runtimeVisibleAnnotations = bcClassUnderTest.getTypeAnnotations(false);
+    harness.assertEqualCollections(expectedRuntimeVisibleAnnotations, runtimeVisibleAnnotations);
+  }
+  
+  private void testMethodAnnotations(MethodReference methodRefUnderTest, Collection<TypeAnnotation> expectedRuntimeInvisibleAnnotations,
+      Collection<TypeAnnotation> expectedRuntimeVisibleAnnotations) throws InvalidClassFileException {
+    IMethod methodUnderTest = cha.resolveMethod(methodRefUnderTest);
+    harness.assertNotNull(methodRefUnderTest.toString() + " not found", methodUnderTest);
+    harness.assertTrue(methodUnderTest + " must be ShrikeCTMethod", methodUnderTest instanceof ShrikeCTMethod);
+    ShrikeCTMethod bcMethodUnderTest = (ShrikeCTMethod) methodUnderTest;
+
+    Collection<TypeAnnotation> runtimeInvisibleAnnotations = HashSetFactory.make();
+    runtimeInvisibleAnnotations.addAll(bcMethodUnderTest.getTypeAnnotationsAtCode(true));
+    runtimeInvisibleAnnotations.addAll(bcMethodUnderTest.getTypeAnnotationsAtMethodInfo(true));
+    harness.assertEqualCollections(expectedRuntimeInvisibleAnnotations, runtimeInvisibleAnnotations);
+
+    Collection<TypeAnnotation> runtimeVisibleAnnotations = HashSetFactory.make();
+    runtimeVisibleAnnotations.addAll(bcMethodUnderTest.getTypeAnnotationsAtCode(false));
+    runtimeVisibleAnnotations.addAll(bcMethodUnderTest.getTypeAnnotationsAtMethodInfo(false));
+    harness.assertEqualCollections(expectedRuntimeVisibleAnnotations, runtimeVisibleAnnotations);
+  }
+  
+  
+  private void testFieldAnnotations(String fieldNameStr, TypeReference typeUnderTest, Collection<TypeAnnotation> expectedAnnotations) {
+    IClass classUnderTest = cha.lookupClass(typeUnderTest);
+    harness.assertNotNull(typeUnderTest.toString() + " not found", classUnderTest);
+    harness.assertTrue(classUnderTest + " must be BytecodeClass", classUnderTest instanceof ShrikeClass);
+    ShrikeClass bcClassUnderTest = (ShrikeClass) classUnderTest;
+
+    final Atom fieldName = Atom.findOrCreateUnicodeAtom(fieldNameStr);
+    FieldImpl field = (FieldImpl) bcClassUnderTest.getField(fieldName);
+    Collection<TypeAnnotation> annotations = field.getTypeAnnotations();
+    harness.assertEqualCollections(expectedAnnotations, annotations);
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/MultiDimArrayTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/MultiDimArrayTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/MultiDimArrayTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/MultiDimArrayTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,15 +11,14 @@
 package com.ibm.wala.core.tests.ptrs;
 
 import java.io.IOException;
-import java.util.Iterator;
-
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -32,6 +31,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.intset.OrdinalSet;
@@ -58,12 +58,12 @@
 
   @Test public void testMultiDim() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util
         .makeMainEntrypoints(scope, cha, TestConstants.MULTI_DIM_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeVanillaZeroOneCFABuilder(options, new AnalysisCache(),cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeVanillaZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(),cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
     PointerAnalysis<InstanceKey> pa = builder.getPointerAnalysis();
     
@@ -74,8 +74,7 @@
   }
   
   private final static CGNode findDoNothingNode(CallGraph cg) {
-    for (Iterator<? extends CGNode> it = cg.iterator(); it.hasNext(); ) {
-      CGNode n = it.next();
+    for (CGNode n : cg) {
       if (n.getMethod().getName().toString().equals("doNothing")) {
         return n;
       }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/TypeBasedArrayAliasTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/TypeBasedArrayAliasTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/TypeBasedArrayAliasTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/TypeBasedArrayAliasTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,15 +11,13 @@
 package com.ibm.wala.core.tests.ptrs;
 
 import java.io.IOException;
-import java.util.Iterator;
-
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -32,6 +30,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.intset.OrdinalSet;
@@ -40,13 +39,13 @@
 
   @Test public void testTypeBasedArrayAlias() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util
         .makeMainEntrypoints(scope, cha, TestConstants.ARRAY_ALIAS_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
     // RTA yields a TypeBasedPointerAnalysis
-    CallGraphBuilder builder = Util.makeRTABuilder(options, new AnalysisCache(),cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeRTABuilder(options, new AnalysisCacheImpl(),cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
     PointerAnalysis<InstanceKey> pa = builder.getPointerAnalysis();
     
@@ -67,8 +66,7 @@
   }
 
   private final static CGNode findNode(CallGraph cg, String methodName) {
-    for (Iterator<? extends CGNode> it = cg.iterator(); it.hasNext(); ) {
-      CGNode n = it.next();
+    for (CGNode n : cg) {
       if (n.getMethod().getName().toString().equals(methodName)) {
         return n;
       }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/ZeroLengthArrayTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/ZeroLengthArrayTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/ZeroLengthArrayTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/ptrs/ZeroLengthArrayTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,13 +12,13 @@
 
 import java.io.IOException;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.util.TestConstants;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -32,6 +32,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.Selector;
@@ -45,12 +46,12 @@
   public void testZeroLengthArray() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA,
         CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         TestConstants.ZERO_LENGTH_ARRAY_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeVanillaZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeVanillaZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
     PointerAnalysis<InstanceKey> pa = builder.getPointerAnalysis();
 //    System.err.println(pa);
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTestBase.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTestBase.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTestBase.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTestBase.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,12 +13,15 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Set;
 import java.util.StringTokenizer;
+import java.util.function.Predicate;
 import java.util.zip.GZIPInputStream;
 
 import org.apache.tools.ant.Project;
@@ -37,61 +40,62 @@
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.io.TemporaryFile;
 
 public abstract class DynamicCallGraphTestBase extends WalaTestCase {
   
-  protected static String getClasspathEntry(String elt) {
-    for (String s : System.getProperty("java.class.path").split(File.pathSeparator)) {
-      if (s.indexOf(elt) >= 0) {
-        File e = new File(s);
-         Assert.assertTrue(elt + " expected to exist", e.exists());
-        if (e.isDirectory() && !s.endsWith("/")) {
-          s = s + "/";
-        }
-        return s;
-      }
-    }
-    Assert.assertFalse("cannot find " + elt, true);
-    return null;
-  }
+  protected boolean testPatchCalls = false;
   
   private boolean instrumentedJarBuilt = false;
   
-  private String instrumentedJarLocation = System.getProperty("java.io.tmpdir") + File.separator + "test.jar";
+  private java.nio.file.Path instrumentedJarLocation;
 
-  private String cgLocation = System.getProperty("java.io.tmpdir") + File.separator + "cg.txt";
+  private java.nio.file.Path cgLocation;
+
+  protected DynamicCallGraphTestBase() {
+      try {
+          instrumentedJarLocation = Files.createTempFile("wala-test", ".jar");
+	  instrumentedJarLocation.toFile().deleteOnExit();
+          cgLocation = Files.createTempFile("cg", ".txt");
+	  cgLocation.toFile().deleteOnExit();
+      } catch (IOException problem) {
+          throw new RuntimeException(problem);
+      }
+  }
 
   protected void instrument(String testJarLocation) throws IOException, ClassNotFoundException, InvalidClassFileException, FailureException {
     if (! instrumentedJarBuilt) {
       System.err.println("core data jar to instrument: " + testJarLocation);
       
-      if (new File(instrumentedJarLocation).exists()) {
-        assert new File(instrumentedJarLocation).delete();
-      }
+      Files.deleteIfExists(instrumentedJarLocation);
       
       String rtJar = null;
       for(String jar : WalaProperties.getJ2SEJarFiles()) {
-        if (jar.endsWith("rt.jar") || jar.endsWith("classes.jar")) {
+        if (jar.endsWith(File.separator + "rt.jar") || jar.endsWith(File.separator + "classes.jar")) {
           rtJar = jar;
         }
       }
-      
-      OfflineDynamicCallGraph.main(
-          rtJar == null?
-            new String[]{testJarLocation, "-o", instrumentedJarLocation}:
-            new String[]{testJarLocation, "-o", instrumentedJarLocation, "--rt-jar", rtJar});
-      Assert.assertTrue("expected to create /tmp/test.jar", new File(instrumentedJarLocation).exists());   
+
+      List<String> args = new ArrayList<>(Arrays.asList(testJarLocation, "-o", instrumentedJarLocation.toString()));
+      if (rtJar != null) {
+        args.addAll(Arrays.asList("--rt-jar", rtJar));
+      }
+      if (testPatchCalls) {
+        args.add("--patch-calls");
+      }
+      OfflineDynamicCallGraph.main(args.toArray(new String[0]));
+      Assert.assertTrue("expected to create " + instrumentedJarLocation, Files.exists(instrumentedJarLocation));
       instrumentedJarBuilt = true;
     }
   }
   
-  protected void run(String mainClass, String exclusionsFile, String... args) throws IOException, ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException, InterruptedException {
+  protected void run(String mainClass, String exclusionsFile, String... args) throws IOException, SecurityException, IllegalArgumentException, InterruptedException {
     Project p = new Project();
-    p.setBaseDir(new File(System.getProperty("java.io.tmpdir")));
+    final File projectDir = Files.createTempDirectory("wala-test").toFile();
+    projectDir.deleteOnExit();
+    p.setBaseDir(projectDir);
     p.init();
     p.fireBuildStarted();
 
@@ -107,18 +111,16 @@
     }
     childJvm.setJvmargs(jvmArgs);
     
-    StringBuffer argsStr = new StringBuffer();
+    StringBuilder argsStr = new StringBuilder();
     for(String a : args) {
-      argsStr.append(a).append(" ");
+      argsStr.append(a).append(' ');
     }
     childJvm.setArgs(argsStr.toString());
     
     childJvm.setFailonerror(true);
     childJvm.setFork(true);
     
-    if (new File(cgLocation).exists()) {
-      new File(cgLocation).delete();
-    }
+    Files.deleteIfExists(cgLocation);
     
     childJvm.init();
     String commandLine = childJvm.getCommandLine().toString();
@@ -126,55 +128,48 @@
     Process x = Runtime.getRuntime().exec(commandLine);
     x.waitFor();
     
-    Assert.assertTrue("expected to create call graph", new File(cgLocation).exists());
+    Assert.assertTrue("expected to create call graph", Files.exists(cgLocation));
   }
    
   interface EdgesTest {
     void edgesTest(CallGraph staticCG, CGNode caller, MethodReference callee);
   }
  
-  private MethodReference callee(String calleeClass, String calleeMethod) {
-      return MethodReference.findOrCreate(TypeReference.findOrCreate(ClassLoaderReference.Application, "L" + calleeClass), Selector.make(calleeMethod));
+  private static MethodReference callee(String calleeClass, String calleeMethod) {
+      return MethodReference.findOrCreate(TypeReference.findOrCreate(ClassLoaderReference.Application, 'L' + calleeClass), Selector.make(calleeMethod));
   }
 
   protected void checkEdges(CallGraph staticCG) throws IOException {
-    checkEdges(staticCG, Predicate.<MethodReference>truePred());
+    checkEdges(staticCG, x -> true);
   }
   
   protected void checkEdges(CallGraph staticCG, Predicate<MethodReference> filter) throws IOException {
     final Set<Pair<CGNode,CGNode>> edges = HashSetFactory.make();
-    check(staticCG, new EdgesTest() {
-      @Override
-      public void edgesTest(CallGraph staticCG, CGNode caller, MethodReference calleeRef) {
-          Set<CGNode> nodes = staticCG.getNodes(calleeRef);
-          Assert.assertEquals("expected one node for " + calleeRef, 1, nodes.size());
-          CGNode callee = nodes.iterator().next();
-        
-          Assert.assertTrue("no edge for " + caller + " --> " + callee, staticCG.getPossibleSites(caller, callee).hasNext());
-          Pair<CGNode,CGNode> x = Pair.make(caller, callee);
-          if (! edges.contains(x)) {
-            edges.add(x);
-            System.err.println("found expected edge " + caller + " --> " + callee);
-          }
-      }
+    check(staticCG, (staticCG1, caller, calleeRef) -> {
+        Set<CGNode> nodes = staticCG1.getNodes(calleeRef);
+        Assert.assertEquals("expected one node for " + calleeRef, 1, nodes.size());
+        CGNode callee = nodes.iterator().next();
+      
+        Assert.assertTrue("no edge for " + caller + " --> " + callee, staticCG1.getPossibleSites(caller, callee).hasNext());
+        Pair<CGNode,CGNode> x = Pair.make(caller, callee);
+        if (edges.add(x)) {
+          System.err.println("found expected edge " + caller + " --> " + callee);
+        }
     }, filter);
   }
  
   protected void checkNodes(CallGraph staticCG) throws IOException {
-    checkNodes(staticCG, Predicate.<MethodReference>truePred());
+    checkNodes(staticCG, x -> true);
   }
 
   protected void checkNodes(CallGraph staticCG, Predicate<MethodReference> filter) throws IOException {
     final Set<MethodReference> notFound = HashSetFactory.make();
-    check(staticCG, new EdgesTest() {
-      @Override
-      public void edgesTest(CallGraph staticCG, CGNode caller, MethodReference callee) {
-        boolean checkForCallee = !staticCG.getNodes(callee).isEmpty();
-        if (!checkForCallee) {
-          notFound.add(callee);
-        } else {
-          System.err.println("found expected node " + callee);
-        }
+    check(staticCG, (staticCG1, caller, callee) -> {
+      boolean checkForCallee = !staticCG1.getNodes(callee).isEmpty();
+      if (!checkForCallee) {
+        notFound.add(callee);
+      } else {
+        System.err.println("found expected node " + callee);
       }
     }, filter);
     
@@ -182,43 +177,49 @@
   }
  
   protected void check(CallGraph staticCG, EdgesTest test, Predicate<MethodReference> filter) throws IOException {
-    BufferedReader dynamicEdgesFile = new BufferedReader(new InputStreamReader(new GZIPInputStream(new FileInputStream(cgLocation))));
-    String line;
     int lines = 0;
-    loop: while ((line = dynamicEdgesFile.readLine()) != null) {
-      lines++;
-      StringTokenizer edge = new StringTokenizer(line, "\t");
-      
-      CGNode caller;
-      String callerClass = edge.nextToken();
-      if ("root".equals(callerClass)) {
-        caller = staticCG.getFakeRootNode();
-      } else if ("clinit".equals(callerClass)) {
-          caller = staticCG.getFakeWorldClinitNode();
-      } else if ("callbacks".equals(callerClass)) {
-          continue loop;
-      } else {
-        String callerMethod = edge.nextToken();
-        MethodReference callerRef = MethodReference.findOrCreate(TypeReference.findOrCreate(ClassLoaderReference.Application, "L" + callerClass), Selector.make(callerMethod));
-        Set<CGNode> nodes = staticCG.getNodes(callerRef);
-        if (! filter.test(callerRef)) {
+    try (final BufferedReader dynamicEdgesFile = new BufferedReader(new InputStreamReader(new GZIPInputStream(Files.newInputStream(cgLocation))))) {
+      String line;
+      loop: while ((line = dynamicEdgesFile.readLine()) != null) {
+        if (line.startsWith("call to") || line.startsWith("return from")) {
+          continue;
+        }
+        
+        lines++;
+        StringTokenizer edge = new StringTokenizer(line, "\t");
+        
+        CGNode caller;
+        String callerClass = edge.nextToken();
+        if ("root".equals(callerClass)) {
+          caller = staticCG.getFakeRootNode();
+        } else if ("clinit".equals(callerClass)) {
+            caller = staticCG.getFakeWorldClinitNode();
+        } else if ("callbacks".equals(callerClass)) {
+            continue loop;
+        } else {
+          String callerMethod = edge.nextToken();
+          if (callerMethod.startsWith("lambda$")) {
+            continue loop;
+          }
+          MethodReference callerRef = MethodReference.findOrCreate(TypeReference.findOrCreate(ClassLoaderReference.Application, 'L' + callerClass), Selector.make(callerMethod));
+          Set<CGNode> nodes = staticCG.getNodes(callerRef);
+          if (! filter.test(callerRef)) {
+            continue loop;
+          }
+          Assert.assertEquals(callerRef.toString(), 1, nodes.size());
+          caller = nodes.iterator().next();
+        }
+        
+        String calleeClass = edge.nextToken();
+        String calleeMethod = edge.nextToken();
+        MethodReference callee = callee(calleeClass, calleeMethod);
+        if (! filter.test(callee)) {
           continue loop;
         }
-        Assert.assertEquals(1, nodes.size());
-        caller = nodes.iterator().next();
-      }
-      
-      String calleeClass = edge.nextToken();
-      String calleeMethod = edge.nextToken();
-      MethodReference callee = callee(calleeClass, calleeMethod);
-      if (! filter.test(callee)) {
-        continue loop;
+        test.edgesTest(staticCG, caller, callee);
       }
-      test.edgesTest(staticCG, caller, callee);
     }
     
-    dynamicEdgesFile.close();
-    
     Assert.assertTrue("more than one edge", lines > 0);
   }
   
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/shrike/DynamicCallGraphTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,37 +12,45 @@
 package com.ibm.wala.core.tests.shrike;
 
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 
 import org.junit.Test;
 
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.util.TestConstants;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.shrikeBT.analysis.Analyzer.FailureException;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.util.CancelException;
 
 public class DynamicCallGraphTest extends DynamicCallGraphTestBase {
 
-  private static String testJarLocation = getClasspathEntry("com.ibm.wala.core.testdata");
+  protected final String testJarLocation;
+  
+  protected DynamicCallGraphTest(String testJarLocation) {
+    this.testJarLocation = testJarLocation;
+  }
     
-  private CallGraph staticCG(String mainClass, String exclusionsFile) throws IOException, ClassHierarchyException, IllegalArgumentException, CancelException {
+  public DynamicCallGraphTest() {
+    this(getClasspathEntry("com.ibm.wala.core.testdata"));
+  }
+  
+  private static CallGraph staticCG(String mainClass, String exclusionsFile) throws IOException, ClassHierarchyException, IllegalArgumentException, CancelException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, exclusionsFile != null? exclusionsFile: CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha, mainClass);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    return CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCache(), cha, scope, false);
+    return CallGraphTestUtil.buildZeroOneCFA(options, new AnalysisCacheImpl(), cha, scope, false);
   }
 
   @Test
-  public void testGraph() throws IOException, ClassNotFoundException, InvalidClassFileException, FailureException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException, ClassHierarchyException, CancelException, InterruptedException  {
+  public void testGraph() throws IOException, ClassNotFoundException, InvalidClassFileException, FailureException, SecurityException, IllegalArgumentException, ClassHierarchyException, CancelException, InterruptedException  {
     instrument(testJarLocation);
     run("dynamicCG.MainClass", null);
     CallGraph staticCG = staticCG("LdynamicCG/MainClass", null);
@@ -50,7 +58,7 @@
   }
 
   @Test
-  public void testCallbacks() throws IOException, ClassNotFoundException, InvalidClassFileException, FailureException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException, ClassHierarchyException, CancelException, InterruptedException  {
+  public void testCallbacks() throws IOException, ClassNotFoundException, InvalidClassFileException, FailureException, SecurityException, IllegalArgumentException, ClassHierarchyException, CancelException, InterruptedException  {
     instrument(testJarLocation);
     run("dynamicCG.CallbacksMainClass", null);
     CallGraph staticCG = staticCG("LdynamicCG/CallbacksMainClass", null);
@@ -58,11 +66,19 @@
   }
 
   @Test
-  public void testExclusions() throws IOException, ClassNotFoundException, InvalidClassFileException, FailureException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException, ClassHierarchyException, CancelException, InterruptedException  {
+  public void testExclusions() throws IOException, ClassNotFoundException, InvalidClassFileException, FailureException, SecurityException, IllegalArgumentException, ClassHierarchyException, CancelException, InterruptedException  {
     instrument(testJarLocation);
     run("dynamicCG.MainClass", "ShrikeTestExclusions.txt");
     CallGraph staticCG = staticCG("LdynamicCG/MainClass", "ShrikeTestExclusions.txt");
     checkEdges(staticCG);
   }
 
+  @Test
+  public void testLambdas() throws IOException, ClassNotFoundException, InvalidClassFileException, FailureException, SecurityException, IllegalArgumentException, ClassHierarchyException, CancelException, InterruptedException  {
+    instrument(testJarLocation);
+    run("lambda.SortingExample", null);
+    CallGraph staticCG = staticCG("Llambda/SortingExample", null);
+    checkEdges(staticCG);
+  }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/slicer/SlicerTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/slicer/SlicerTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/slicer/SlicerTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/slicer/SlicerTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.core.tests.slicer;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -17,16 +18,16 @@
 import java.io.PrintWriter;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.examples.drivers.PDFSlice;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -34,14 +35,17 @@
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.PartialCallGraph;
 import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.nCFABuilder;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.slicer.MethodEntryStatement;
 import com.ibm.wala.ipa.slicer.NormalStatement;
@@ -61,9 +65,13 @@
 import com.ibm.wala.ssa.SSAInvokeInstruction;
 import com.ibm.wala.ssa.SSANewInstruction;
 import com.ibm.wala.ssa.SSAPutInstruction;
+import com.ibm.wala.ssa.SSAReturnInstruction;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.Descriptor;
 import com.ibm.wala.util.CancelException;
+import com.ibm.wala.util.collections.Iterator2Iterable;
+import com.ibm.wala.util.config.AnalysisScopeReader;
+import com.ibm.wala.util.config.FileOfClasses;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.GraphIntegrity;
 import com.ibm.wala.util.graph.GraphIntegrity.UnsoundGraphException;
@@ -74,9 +82,27 @@
 
   private static AnalysisScope cachedScope;
 
+  // more aggressive exclusions to avoid library blowup
+  // in interprocedural tests
+  private static final String EXCLUSIONS = "java\\/awt\\/.*\n" +
+      "javax\\/swing\\/.*\n" +
+      "sun\\/awt\\/.*\n" +
+      "sun\\/swing\\/.*\n" +
+      "com\\/sun\\/.*\n" +
+      "sun\\/.*\n" +
+      "org\\/netbeans\\/.*\n" +
+      "org\\/openide\\/.*\n" +
+      "com\\/ibm\\/crypto\\/.*\n" +
+      "com\\/ibm\\/security\\/.*\n" +
+      "org\\/apache\\/xerces\\/.*\n" +
+      "java\\/security\\/.*\n" +
+      "";
+
   private static AnalysisScope findOrCreateAnalysisScope() throws IOException {
     if (cachedScope == null) {
-      cachedScope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, "Java60RegressionExclusions.txt");
+      cachedScope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, null, SlicerTest.class.getClassLoader());
+      cachedScope.setExclusions(new FileOfClasses(new ByteArrayInputStream(EXCLUSIONS.getBytes("UTF-8"))));
+
     }
     return cachedScope;
   }
@@ -85,7 +111,7 @@
 
   private static IClassHierarchy findOrCreateCHA(AnalysisScope scope) throws ClassHierarchyException {
     if (cachedCHA == null) {
-      cachedCHA = ClassHierarchy.make(scope);
+      cachedCHA = ClassHierarchyFactory.make(scope);
     }
     return cachedCHA;
   }
@@ -104,7 +130,7 @@
         TestConstants.SLICE1_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -112,7 +138,8 @@
     Statement s = findCallTo(main, "println");
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> computeBackwardSlice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(),
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> computeBackwardSlice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis,
         DataDependenceOptions.FULL, ControlDependenceOptions.NONE);
     Collection<Statement> slice = computeBackwardSlice;
     dumpSlice(slice);
@@ -134,7 +161,7 @@
         TestConstants.SLICE2_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMethod(cg, "baz");
@@ -142,7 +169,8 @@
     Statement s = findCallTo(main, "println");
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> computeBackwardSlice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(),
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> computeBackwardSlice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis,
         DataDependenceOptions.FULL, ControlDependenceOptions.NONE);
     Collection<Statement> slice = computeBackwardSlice;
     dumpSlice(slice);
@@ -158,7 +186,7 @@
         TestConstants.SLICE3_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMethod(cg, "main");
@@ -166,7 +194,8 @@
     Statement s = findCallTo(main, "doNothing");
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
         ControlDependenceOptions.NONE);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 1, countAllocations(slice));
@@ -181,7 +210,7 @@
         TestConstants.SLICE4_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -189,7 +218,8 @@
     s = PDFSlice.getReturnStatementForCall(s);
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeForwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeForwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
         ControlDependenceOptions.NONE);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 4, slice.size());
@@ -204,7 +234,7 @@
         TestConstants.SLICE5_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode n = findMethod(cg, "baz");
@@ -212,18 +242,15 @@
     s = PDFSlice.getReturnStatementForCall(s);
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeForwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
-        ControlDependenceOptions.NONE);
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeForwardSlice(s, cg, pointerAnalysis,
+        DataDependenceOptions.FULL, ControlDependenceOptions.NONE);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 7, slice.size());
   }
 
   /**
    * test unreproduced bug reported on mailing list by Sameer Madan, 7/3/2007
-   * 
-   * @throws CancelException
-   * @throws IllegalArgumentException
-   * @throws IOException
    */
   @Test
   public void testSlice7() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
@@ -234,24 +261,21 @@
         TestConstants.SLICE7_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneContainerCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneContainerCFABuilder(options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
     Statement s = findFirstAllocation(main);
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeForwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
-        ControlDependenceOptions.NONE);
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeForwardSlice(s, cg, pointerAnalysis,
+        DataDependenceOptions.FULL, ControlDependenceOptions.NONE);
     dumpSlice(slice);
   }
 
   /**
    * test bug reported on mailing list by Ravi Chandhran, 4/16/2010
-   * 
-   * @throws CancelException
-   * @throws IllegalArgumentException
-   * @throws IOException
    */
   @Test
   public void testSlice8() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
@@ -262,24 +286,48 @@
         TestConstants.SLICE8_MAIN);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode process = findMethod(cg, Descriptor.findOrCreateUTF8("()V"), Atom.findOrCreateUnicodeAtom("process"));
     Statement s = findCallToDoNothing(process);
     System.err.println("Statement: " + s);
     // compute a backward slice, with data dependence and no exceptional control dependence
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
         ControlDependenceOptions.NO_EXCEPTIONAL_EDGES);
     dumpSlice(slice);
     Assert.assertEquals(4, countInvokes(slice));
     // should only get 4 statements total when ignoring control dependences completely
-    slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
+    slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
         ControlDependenceOptions.NONE);
     Assert.assertEquals(slice.toString(), 4, slice.size());
   }
 
   @Test
+  public void testSlice9() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+    AnalysisScope scope = findOrCreateAnalysisScope();
+
+    IClassHierarchy cha = findOrCreateCHA(scope);
+    Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
+        TestConstants.SLICE9_MAIN);
+    AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
+
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
+    CallGraph cg = builder.makeCallGraph(options, null);
+
+    CGNode main = findMainMethod(cg);
+    Statement s = findCallToDoNothing(main);
+    System.err.println("Statement: " + s);
+    // compute a backward slice, with data dependence and no exceptional control dependence
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
+        ControlDependenceOptions.NO_EXCEPTIONAL_EDGES);
+    //dumpSlice(slice);
+    Assert.assertEquals(/*slice.toString(), */5, countApplicationNormals(slice));
+  }
+
+  @Test
   public void testTestCD1() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = findOrCreateAnalysisScope();
 
@@ -288,7 +336,7 @@
         TestConstants.SLICE_TESTCD1);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -296,7 +344,8 @@
     Statement s = findCallToDoNothing(main);
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.NONE,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.NONE,
         ControlDependenceOptions.FULL);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 2, countConditionals(slice));
@@ -311,7 +360,7 @@
         TestConstants.SLICE_TESTCD2);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -319,7 +368,8 @@
     Statement s = findCallToDoNothing(main);
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.NONE,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.NONE,
         ControlDependenceOptions.FULL);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 1, countConditionals(slice));
@@ -334,7 +384,7 @@
         TestConstants.SLICE_TESTCD3);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -342,7 +392,8 @@
     Statement s = findCallToDoNothing(main);
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.NONE,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.NONE,
         ControlDependenceOptions.FULL);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 0, countConditionals(slice));
@@ -357,7 +408,7 @@
         TestConstants.SLICE_TESTCD4);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -366,18 +417,19 @@
     System.err.println("Statement: " + s);
 
     // compute a no-data slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.NONE,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.NONE,
         ControlDependenceOptions.FULL);
     dumpSlice(slice);
     Assert.assertEquals(0, countConditionals(slice));
 
     // compute a full slice
-    slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
-        ControlDependenceOptions.FULL);
+    slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis,
+        DataDependenceOptions.FULL, ControlDependenceOptions.FULL);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 1, countConditionals(slice));
   }
-  
+
   @Test
   public void testTestCD5() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = findOrCreateAnalysisScope();
@@ -387,7 +439,7 @@
         TestConstants.SLICE_TESTCD5);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -396,10 +448,38 @@
     System.err.println("Statement: " + s);
 
     // compute a no-data slice
-    Collection<Statement> slice = Slicer.computeForwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.NONE,
-        ControlDependenceOptions.NO_EXCEPTIONAL_EDGES);
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeForwardSlice(s, cg, pointerAnalysis,
+        DataDependenceOptions.NONE, ControlDependenceOptions.NO_EXCEPTIONAL_EDGES);
     dumpSlice(slice);
-    Assert.assertTrue(slice.toString(), slice.size() > 1);
+    Assert.assertEquals(10, slice.size());
+    Assert.assertEquals(3, countReturns(slice));
+  }
+
+  @Test
+  public void testTestCD5NoInterproc() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
+    AnalysisScope scope = findOrCreateAnalysisScope();
+
+    IClassHierarchy cha = findOrCreateCHA(scope);
+    Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
+        TestConstants.SLICE_TESTCD5);
+    AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
+
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
+    CallGraph cg = builder.makeCallGraph(options, null);
+
+    CGNode main = findMainMethod(cg);
+
+    Statement s = new MethodEntryStatement(main);
+    System.err.println("Statement: " + s);
+
+    // compute a no-data slice
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeForwardSlice(s, cg, pointerAnalysis,
+        DataDependenceOptions.NONE, ControlDependenceOptions.NO_INTERPROC_NO_EXCEPTION);
+    dumpSlice(slice);
+    Assert.assertEquals(8, slice.size());
+    Assert.assertEquals(2, countReturns(slice));
   }
 
   @Test
@@ -411,7 +491,7 @@
         TestConstants.SLICE_TESTCD6);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -420,8 +500,9 @@
     System.err.println("Statement: " + s);
 
     // compute a no-data slice
-    Collection<Statement> slice = Slicer.computeForwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.NONE,
-        ControlDependenceOptions.NO_EXCEPTIONAL_EDGES);
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeForwardSlice(s, cg, pointerAnalysis,
+        DataDependenceOptions.NONE, ControlDependenceOptions.NO_EXCEPTIONAL_EDGES);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 2, countInvokes(slice));
   }
@@ -435,7 +516,7 @@
         TestConstants.SLICE_TESTID);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -443,7 +524,8 @@
     Statement s = findCallToDoNothing(main);
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
         ControlDependenceOptions.NONE);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 1, countAllocations(slice));
@@ -458,7 +540,7 @@
         TestConstants.SLICE_TESTARRAYS);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -466,7 +548,8 @@
     Statement s = findCallToDoNothing(main);
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
         ControlDependenceOptions.NONE);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 2, countAllocations(slice));
@@ -482,7 +565,7 @@
         TestConstants.SLICE_TESTFIELDS);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -490,7 +573,8 @@
     Statement s = findCallToDoNothing(main);
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
         ControlDependenceOptions.NONE);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 2, countAllocations(slice));
@@ -506,7 +590,7 @@
         TestConstants.SLICE_TESTTHIN1);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -516,14 +600,15 @@
 
     // compute normal data slice
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
         ControlDependenceOptions.NONE);
     dumpSlice(slice);
     Assert.assertEquals(3, countAllocations(slice));
     Assert.assertEquals(2, countPutfields(slice));
 
     // compute thin slice .. ignore base pointers
-    Collection<Statement> computeBackwardSlice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(),
+    Collection<Statement> computeBackwardSlice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis,
         DataDependenceOptions.NO_BASE_PTRS, ControlDependenceOptions.NONE);
     slice = computeBackwardSlice;
     dumpSlice(slice);
@@ -540,7 +625,7 @@
         TestConstants.SLICE_TESTGLOBAL);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -548,7 +633,8 @@
     Statement s = findCallToDoNothing(main);
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
         ControlDependenceOptions.NONE);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 1, countAllocations(slice));
@@ -565,7 +651,7 @@
         TestConstants.SLICE_TESTMULTITARGET);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -573,7 +659,8 @@
     Statement s = findCallToDoNothing(main);
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
         ControlDependenceOptions.NONE);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 2, countAllocations(slice));
@@ -588,7 +675,7 @@
         TestConstants.SLICE_TESTRECURSION);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -597,7 +684,8 @@
     System.err.println("Statement: " + s);
 
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
         ControlDependenceOptions.NONE);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 3, countAllocations(slice));
@@ -613,7 +701,7 @@
         TestConstants.SLICE_TEST_PRIM_GETTER_SETTER);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode test = findMethod(cg, "test");
@@ -624,8 +712,9 @@
     System.err.println("Statement: " + s);
 
     // compute full slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, pcg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
-        ControlDependenceOptions.FULL);
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, pcg, pointerAnalysis,
+        DataDependenceOptions.FULL, ControlDependenceOptions.FULL);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 0, countAllocations(slice));
     Assert.assertEquals(slice.toString(), 1, countPutfields(slice));
@@ -648,7 +737,8 @@
     Util.addDefaultBypassLogic(options, scope, Util.class.getClassLoader(), cha);
     ContextSelector appSelector = null;
     SSAContextInterpreter appInterpreter = null;
-    SSAPropagationCallGraphBuilder builder = new nCFABuilder(1, cha, options, new AnalysisCache(), appSelector, appInterpreter);
+    IAnalysisCacheView cache = new AnalysisCacheImpl();
+    SSAPropagationCallGraphBuilder builder = new nCFABuilder(1, Language.JAVA.getFakeRootMethod(cha, options, cache), options, cache, appSelector, appInterpreter);
     // nCFABuilder uses type-based heap abstraction by default, but we want allocation sites
     // NOTE: we disable ZeroXInstanceKeys.SMUSH_PRIMITIVE_HOLDERS for this test, since IntWrapper
     // is a primitive holder
@@ -665,8 +755,9 @@
     Statement s = findCallToDoNothing(test);
     System.err.println("Statement: " + s);
 
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, pcg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
-        ControlDependenceOptions.NONE);
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, pcg, pointerAnalysis,
+        DataDependenceOptions.FULL, ControlDependenceOptions.NONE);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 1, countAllocations(slice));
     Assert.assertEquals(slice.toString(), 1, countPutfields(slice));
@@ -680,7 +771,7 @@
         TestConstants.SLICE_TESTTHROWCATCH);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -688,7 +779,8 @@
     Statement s = findCallToDoNothing(main);
     System.err.println("Statement: " + s);
     // compute a data slice
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
         ControlDependenceOptions.NONE);
     dumpSlice(slice);
     Assert.assertEquals(slice.toString(), 1, countApplicationAllocations(slice));
@@ -705,7 +797,7 @@
         TestConstants.SLICE_TESTMESSAGEFORMAT);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -731,14 +823,14 @@
         TestConstants.SLICE_TESTINETADDR);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
-    SDG sdg = new SDG(cg, builder.getPointerAnalysis(), DataDependenceOptions.NO_BASE_NO_HEAP, ControlDependenceOptions.FULL);
+    SDG<?> sdg = new SDG<>(cg, builder.getPointerAnalysis(), DataDependenceOptions.NO_BASE_NO_HEAP, ControlDependenceOptions.FULL);
     GraphIntegrity.check(sdg);
   }
 
   @Test
-  public void testJustThrow() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException, UnsoundGraphException {
+  public void testJustThrow() throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = findOrCreateAnalysisScope();
 
     IClassHierarchy cha = findOrCreateCHA(scope);
@@ -746,7 +838,7 @@
         TestConstants.SLICE_JUSTTHROW);
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     CGNode main = findMainMethod(cg);
@@ -754,7 +846,8 @@
     Statement s = findCallToDoNothing(main);
     System.err.println("Statement: " + s);
 
-    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), DataDependenceOptions.FULL,
+    final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+    Collection<Statement> slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, DataDependenceOptions.FULL,
         ControlDependenceOptions.NO_EXCEPTIONAL_EDGES);
     dumpSlice(slice);
   }
@@ -824,6 +917,18 @@
     return count;
   }
 
+  public static int countApplicationNormals(Collection<Statement> slice) {
+    int count = 0;
+    for (Statement s : slice) {
+      if (s.getKind().equals(Statement.Kind.NORMAL)) {
+        AnalysisScope scope = s.getNode().getClassHierarchy().getScope();
+        if (scope.isApplicationLoader(s.getNode().getMethod().getDeclaringClass().getClassLoader())) {
+          count++;
+        }
+      }
+    }
+    return count;
+  }
   public static int countConditionals(Collection<Statement> slice) {
     int count = 0;
     for (Statement s : slice) {
@@ -866,6 +971,19 @@
     return count;
   }
 
+  public static int countReturns(Collection<Statement> slice) {
+    int count = 0;
+    for (Statement s: slice) {
+      if (s.getKind().equals(Statement.Kind.NORMAL)) {
+        NormalStatement ns = (NormalStatement) s;
+        if (ns.getInstruction() instanceof SSAReturnInstruction) {
+          count++;
+        }
+      }
+    }
+    return count;
+  }
+
   public static int countGetfields(Collection<Statement> slice) {
     int count = 0;
     for (Statement s : slice) {
@@ -931,8 +1049,9 @@
   public static void dumpSliceToFile(Collection<Statement> slice, String fileName) throws FileNotFoundException {
     File f = new File(fileName);
     FileOutputStream fo = new FileOutputStream(f);
-    PrintWriter w = new PrintWriter(fo);
-    dumpSlice(slice, w);
+    try (final PrintWriter w = new PrintWriter(fo)) {
+      dumpSlice(slice, w);
+    }
   }
 
   public static CGNode findMainMethod(CallGraph cg) {
@@ -941,15 +1060,8 @@
     return findMethod(cg, d, name);
   }
 
-  /**
-   * @param cg
-   * @param d
-   * @param name
-   * @return
-   */
   private static CGNode findMethod(CallGraph cg, Descriptor d, Atom name) {
-    for (Iterator<? extends CGNode> it = cg.getSuccNodes(cg.getFakeRootNode()); it.hasNext();) {
-      CGNode n = it.next();
+    for (CGNode n : Iterator2Iterable.make(cg.getSuccNodes(cg.getFakeRootNode()))) {
       if (n.getMethod().getName().equals(name) && n.getMethod().getDescriptor().equals(d)) {
         return n;
       }
@@ -966,8 +1078,7 @@
 
   public static CGNode findMethod(CallGraph cg, String name) {
     Atom a = Atom.findOrCreateUnicodeAtom(name);
-    for (Iterator<? extends CGNode> it = cg.iterator(); it.hasNext();) {
-      CGNode n = it.next();
+    for (CGNode n : cg) {
       if (n.getMethod().getName().equals(a)) {
         return n;
       }
@@ -979,8 +1090,7 @@
 
   public static Statement findCallTo(CGNode n, String methodName) {
     IR ir = n.getIR();
-    for (Iterator<SSAInstruction> it = ir.iterateAllInstructions(); it.hasNext();) {
-      SSAInstruction s = it.next();
+    for (SSAInstruction s : Iterator2Iterable.make(ir.iterateAllInstructions())) {
       if (s instanceof SSAInvokeInstruction) {
         SSAInvokeInstruction call = (SSAInvokeInstruction) s;
         if (call.getCallSite().getDeclaredTarget().getName().toString().equals(methodName)) {
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/typeargument/TypeArgumentTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/typeargument/TypeArgumentTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/typeargument/TypeArgumentTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/typeargument/TypeArgumentTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,25 @@
+package com.ibm.wala.core.tests.typeargument;
+
+import org.junit.AfterClass;
+import org.junit.Test;
+
+import com.ibm.wala.core.tests.util.WalaTestCase;
+import com.ibm.wala.types.generics.TypeArgument;
+import com.ibm.wala.util.warnings.Warnings;
+
+public class TypeArgumentTest extends WalaTestCase {
+    public static void main(String[] args) {
+      justThisTest(TypeArgumentTest.class);
+    }
+
+    @AfterClass
+    public static void afterClass() throws Exception {
+      Warnings.clear();
+    }
+    @Test public void test() {
+      //Test for StringIndexOutOfBoundsException
+      TypeArgument.make("<Lorg/apache/hadoop/io/Text;[B>");
+      //Test for "bad type argument list"
+      TypeArgument.make("<[TP_OUT;>");
+    }
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/typeInference/TypeInferenceTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/typeInference/TypeInferenceTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/typeInference/TypeInferenceTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/typeInference/TypeInferenceTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,12 +23,14 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.util.config.AnalysisScopeReader;
@@ -55,7 +57,7 @@
 
   private static AnalysisOptions options;
 
-  private static AnalysisCache cache;
+  private static IAnalysisCacheView cache;
 
   public static void main(String[] args) {
     justThisTest(TypeInferenceTest.class);
@@ -67,13 +69,13 @@
     scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
 
     options = new AnalysisOptions(scope, null);
-    cache = new AnalysisCache();
+    cache = new AnalysisCacheImpl();
     ClassLoaderFactory factory = new ClassLoaderFactoryImpl(scope.getExclusions());
 
     try {
-      cha = ClassHierarchy.make(scope, factory);
+      cha = ClassHierarchyFactory.make(scope, factory);
     } catch (ClassHierarchyException e) {
-      throw new Exception();
+      throw new Exception(e);
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/TestConstants.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/TestConstants.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/TestConstants.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/TestConstants.java	2019-01-29 17:08:39.000000000 +0000
@@ -104,6 +104,7 @@
 
   public final static String SLICE8_MAIN = "Lslice/Slice8";
 
+  public final static String SLICE9_MAIN = "Lslice/Slice9";
 
   public final static String SLICE_TESTCD1 = "Lslice/TestCD1";
 
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/WalaTestCase.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/WalaTestCase.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/WalaTestCase.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/util/WalaTestCase.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,19 +10,23 @@
  *******************************************************************************/
 package com.ibm.wala.core.tests.util;
 
+import java.io.File;
 import java.io.IOException;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.runner.JUnitCore;
 
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.ir.AnnotationTest;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.ssa.SSAOptions;
 import com.ibm.wala.util.config.AnalysisScopeReader;
 import com.ibm.wala.util.heapTrace.HeapTracer;
 import com.ibm.wala.util.io.FileProvider;
@@ -65,14 +69,18 @@
     }
   }
 
-  protected AnalysisCache makeAnalysisCache() {
-    return new AnalysisCache();
+  protected IAnalysisCacheView makeAnalysisCache() {
+    return makeAnalysisCache(SSAOptions.defaultOptions());
+  }
+  
+  protected IAnalysisCacheView makeAnalysisCache(SSAOptions ssaOptions) {
+    return new AnalysisCacheImpl(ssaOptions);
   }
 
   public static IClassHierarchy makeCHA() throws IOException, ClassHierarchyException {
     AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA,
         (new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS), AnnotationTest.class.getClassLoader());
-    return ClassHierarchy.make(scope);    
+    return ClassHierarchyFactory.make(scope);    
   }
 
   /**
@@ -83,4 +91,27 @@
     JUnitCore.runClasses(testClass);
   }
 
+  protected static String getClasspathEntry(String elt) {
+    StringBuilder result = null;
+    for (String s : System.getProperty("java.class.path").split(File.pathSeparator)) {
+      if (s.indexOf(elt) >= 0) {
+        File e = new File(s);
+         Assert.assertTrue(elt + " expected to exist", e.exists());
+        if (e.isDirectory() && !s.endsWith("/")) {
+          s += '/';
+        }
+        if (result == null) {
+          result = new StringBuilder(s);
+        } else {
+          result.append(File.pathSeparator).append(s);
+        }
+      }
+    }
+    Assert.assertFalse("cannot find " + elt, result == null);
+    return result.toString();
+  }
+
+  protected <T> void assertEquals(T x, T y) {
+    Assert.assertEquals("Expecting " + x + ", but got " + y, x, y);
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/CompareToZeroOneCFADriver.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/CompareToZeroOneCFADriver.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/CompareToZeroOneCFADriver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/CompareToZeroOneCFADriver.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,11 +43,10 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Iterator;
-
 import com.ibm.wala.analysis.reflection.InstanceKeyWithNode;
 import com.ibm.wala.analysis.typeInference.TypeAbstraction;
 import com.ibm.wala.analysis.typeInference.TypeInference;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.demandpa.TestInfo;
 import com.ibm.wala.demandpa.alg.DemandRefinementPointsTo;
@@ -57,7 +56,7 @@
 import com.ibm.wala.demandpa.util.CallGraphMapUtil;
 import com.ibm.wala.demandpa.util.MemoryAccessMap;
 import com.ibm.wala.demandpa.util.SimpleMemoryAccessMap;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -72,6 +71,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.util.CancelException;
@@ -87,9 +87,6 @@
  */
 public class CompareToZeroOneCFADriver {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     // for (String testCase : TestInfo.ALL_TEST_CASES) {
     // runUnitTestCase(testCase);
@@ -109,7 +106,7 @@
     // build a type hierarchy
     ClassHierarchy cha = null;
     try {
-      cha = ClassHierarchy.make(scope);
+      cha = ClassHierarchyFactory.make(scope);
     } catch (ClassHierarchyException e) {
       // TODO Auto-generated catch block
       e.printStackTrace();
@@ -137,7 +134,7 @@
     Object warnings = new Object();
     ClassHierarchy cha = null;
     try {
-      cha = ClassHierarchy.make(scope);
+      cha = ClassHierarchyFactory.make(scope);
     } catch (ClassHierarchyException e) {
       // TODO Auto-generated catch block
       e.printStackTrace();
@@ -150,13 +147,13 @@
   }
 
   private static void doTests(AnalysisScope scope, final ClassHierarchy cha, AnalysisOptions options) throws IllegalArgumentException, CancelException {
-    final SSAPropagationCallGraphBuilder builder = Util.makeVanillaZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    final SSAPropagationCallGraphBuilder builder = Util.makeVanillaZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     final CallGraph oldCG = builder.makeCallGraph(options,null);
     final PointerAnalysis<InstanceKey> pa = builder.getPointerAnalysis();
 
     // now, run our analysis
     // build an RTA call graph
-    CallGraphBuilder rtaBuilder = Util.makeRTABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> rtaBuilder = Util.makeRTABuilder(options, new AnalysisCacheImpl(), cha, scope);
     final CallGraph cg = rtaBuilder.makeCallGraph(options, null);
     // System.err.println(cg.toString());
 
@@ -205,8 +202,7 @@
 
     }
     Helper h = new Helper();
-    for (Iterator<? extends CGNode> nodeIter = cg.iterator(); nodeIter.hasNext();) {
-      CGNode node = nodeIter.next();
+    for (CGNode node : cg) {
       h.checkPointersInMethod(node);
     }
   }
@@ -227,7 +223,7 @@
 
   private static IDemandPointerAnalysis makeDemandPointerAnalysis(AnalysisOptions options, ClassHierarchy cha, AnalysisScope scope,
       CallGraph cg, MemoryAccessMap fam) {
-    SSAPropagationCallGraphBuilder builder = Util.makeVanillaZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    SSAPropagationCallGraphBuilder builder = Util.makeVanillaZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     // return new TestNewGraphPointsTo(cg, builder, fam, cha, warnings);
     DemandRefinementPointsTo fullDemandPointsTo = DemandRefinementPointsTo.makeWithDefaultFlowGraph(cg, builder, fam, cha, options, new DummyStateMachine.Factory<IFlowLabel>());
     // fullDemandPointsTo.setOnTheFly(true);
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/TestAgainstSimpleDriver.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/TestAgainstSimpleDriver.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/TestAgainstSimpleDriver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/TestAgainstSimpleDriver.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,10 +42,9 @@
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Iterator;
-
 import com.ibm.wala.analysis.typeInference.TypeAbstraction;
 import com.ibm.wala.analysis.typeInference.TypeInference;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.demandpa.TestInfo;
 import com.ibm.wala.demandpa.alg.DemandRefinementPointsTo;
@@ -58,7 +57,7 @@
 import com.ibm.wala.demandpa.flowgraph.IFlowLabel;
 import com.ibm.wala.demandpa.util.MemoryAccessMap;
 import com.ibm.wala.demandpa.util.SimpleMemoryAccessMap;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -72,6 +71,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.util.CancelException;
 
@@ -104,7 +104,7 @@
     // build a type hierarchy
     ClassHierarchy cha = null;
     try {
-      cha = ClassHierarchy.make(scope);
+      cha = ClassHierarchyFactory.make(scope);
     } catch (ClassHierarchyException e) {
       // TODO Auto-generated catch block
       e.printStackTrace();
@@ -116,7 +116,7 @@
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
     // build an RTA call graph
-    CallGraphBuilder rtaBuilder = Util.makeRTABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> rtaBuilder = Util.makeRTABuilder(options, new AnalysisCacheImpl(), cha, scope);
     final CallGraph cg = rtaBuilder.makeCallGraph(options, null);
     // System.err.println(cg.toString());
 
@@ -155,15 +155,15 @@
       if (result.isEmpty()) {
         System.err.println("  EMPTY!");
       }
-      for (Iterator<InstanceKey> it = result.iterator(); it.hasNext();) {
-        System.err.println("  " + it.next());
+      for (InstanceKey instanceKey : result) {
+        System.err.println("  " + instanceKey);
       }
     }
   }
 
   private static IDemandPointerAnalysis makeDemandPointerAnalysis(AnalysisOptions options, ClassHierarchy cha, AnalysisScope scope,
       CallGraph cg, MemoryAccessMap fam) {
-    SSAPropagationCallGraphBuilder builder = Util.makeVanillaZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    SSAPropagationCallGraphBuilder builder = Util.makeVanillaZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     // return new TestNewGraphPointsTo(cg, builder, fam, cha, warnings);
     DemandRefinementPointsTo fullDemandPointsTo = DemandRefinementPointsTo.makeWithDefaultFlowGraph(cg, builder, fam, cha, options, new DummyStateMachine.Factory<IFlowLabel>());
     // fullDemandPointsTo.setCGRefinePolicy(new AlwaysRefineCGPolicy());
@@ -173,4 +173,4 @@
     return fullDemandPointsTo;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/WalaUtil.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/WalaUtil.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/WalaUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/demandpa/driver/WalaUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,7 +42,6 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Iterator;
 import java.util.Properties;
 
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -67,10 +66,8 @@
     }
     System.err.print("dumping ir...");
     String irFile = p.getProperty(WalaProperties.OUTPUT_DIR) + File.separatorChar + benchName + "-ir.txt";
-    try {
-      PrintWriter writer = new PrintWriter(new BufferedWriter(new FileWriter(irFile)));
-      for (Iterator<? extends CGNode> iter = cg.iterator(); iter.hasNext();) {
-        CGNode node = iter.next();
+    try (final PrintWriter writer = new PrintWriter(new BufferedWriter(new FileWriter(irFile)))) {
+      for (CGNode node : cg) {
         IR ir = node.getIR();
         if (ir == null)
           continue;
@@ -79,7 +76,6 @@
         writer.println(ir);
         writer.println("");
       }
-      writer.close();
     } catch (IOException e) {
       // TODO Auto-generated catch block
       e.printStackTrace();
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/ConstructAllIRs.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/ConstructAllIRs.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/ConstructAllIRs.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/ConstructAllIRs.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,12 +14,14 @@
 
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.util.config.AnalysisScopeReader;
 import com.ibm.wala.util.perf.Stopwatch;
 import com.ibm.wala.util.ref.ReferenceCleanser;
@@ -47,9 +49,6 @@
 
   /**
    * First command-line argument should be location of scope file for application to analyze
-   * 
-   * @throws IOException
-   * @throws ClassHierarchyException
    */
   public static void main(String[] args) throws IOException, ClassHierarchyException {
     String scopeFile = args[0];
@@ -61,21 +60,21 @@
 
     // build a type hierarchy
     System.out.print("building class hierarchy...");
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
     System.out.println("done");
 
     // register class hierarchy and AnalysisCache with the reference cleanser, so that their soft references are appropriately wiped
     ReferenceCleanser.registerClassHierarchy(cha);
-    AnalysisCache cache = new AnalysisCache();
-    ReferenceCleanser.registerCache(cache);
     AnalysisOptions options = new AnalysisOptions();
+    IAnalysisCacheView cache = new AnalysisCacheImpl(options.getSSAOptions());
+    ReferenceCleanser.registerCache(cache);
 
     System.out.print("building IRs...");
     for (IClass klass : cha) {
       for (IMethod method : klass.getDeclaredMethods()) {
         wipeSoftCaches();
         // construct an IR; it will be cached
-        cache.getSSACache().findOrCreateIR(method, Everywhere.EVERYWHERE, options.getSSAOptions());
+        cache.getIR(method, Everywhere.EVERYWHERE);
       }
     }
     System.out.println("done");
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/CountParameters.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/CountParameters.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/CountParameters.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/CountParameters.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,8 +15,8 @@
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.util.config.AnalysisScopeReader;
 
@@ -41,7 +41,7 @@
     
     // build a class hierarchy
     System.err.print("Build class hierarchy...");
-    IClassHierarchy cha = ClassHierarchy.make(scope);
+    IClassHierarchy cha = ClassHierarchyFactory.make(scope);
     System.err.println("Done");
     
     int nClasses = 0;
@@ -61,4 +61,4 @@
     System.out.println((float)nParameters/(float)nMethods + " parameters per method");
     
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextInsensitiveReachingDefs.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextInsensitiveReachingDefs.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextInsensitiveReachingDefs.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextInsensitiveReachingDefs.java	2019-01-29 17:08:39.000000000 +0000
@@ -77,9 +77,8 @@
   /**
    * generate a numbering of the putstatic instructions
    */
-  @SuppressWarnings("unchecked")
   private OrdinalSetMapping<Pair<CGNode, Integer>> numberPutStatics() {
-    ArrayList<Pair<CGNode, Integer>> putInstrs = new ArrayList<Pair<CGNode, Integer>>();
+    ArrayList<Pair<CGNode, Integer>> putInstrs = new ArrayList<>();
     for (CGNode node : icfg.getCallGraph()) {
       IR ir = node.getIR();
       if (ir == null) {
@@ -105,7 +104,7 @@
         }
       }
     }
-    return new ObjectArrayMapping<Pair<CGNode, Integer>>(putInstrs.toArray(new Pair[putInstrs.size()]));
+    return new ObjectArrayMapping<>(putInstrs.toArray(new Pair[0]));
   }
 
   private class TransferFunctions implements ITransferFunctionProvider<BasicBlockInContext<IExplodedBasicBlock>, BitVectorVariable> {
@@ -181,9 +180,9 @@
    */
   public BitVectorSolver<BasicBlockInContext<IExplodedBasicBlock>> analyze() {
     // the framework describes the dataflow problem, in particular the underlying graph and the transfer functions
-    BitVectorFramework<BasicBlockInContext<IExplodedBasicBlock>, Pair<CGNode, Integer>> framework = new BitVectorFramework<BasicBlockInContext<IExplodedBasicBlock>, Pair<CGNode, Integer>>(
+    BitVectorFramework<BasicBlockInContext<IExplodedBasicBlock>, Pair<CGNode, Integer>> framework = new BitVectorFramework<>(
         icfg, new TransferFunctions(), putInstrNumbering);
-    BitVectorSolver<BasicBlockInContext<IExplodedBasicBlock>> solver = new BitVectorSolver<BasicBlockInContext<IExplodedBasicBlock>>(
+    BitVectorSolver<BasicBlockInContext<IExplodedBasicBlock>> solver = new BitVectorSolver<>(
         framework);
     try {
       solver.solve(null);
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextSensitiveReachingDefs.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextSensitiveReachingDefs.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextSensitiveReachingDefs.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextSensitiveReachingDefs.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,7 +27,6 @@
 import com.ibm.wala.dataflow.IFDS.TabulationDomain;
 import com.ibm.wala.dataflow.IFDS.TabulationResult;
 import com.ibm.wala.dataflow.IFDS.TabulationSolver;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.cfg.BasicBlockInContext;
@@ -63,10 +62,10 @@
    */
   private final ReachingDefsDomain domain = new ReachingDefsDomain();
 
-  public ContextSensitiveReachingDefs(CallGraph cg, AnalysisCache cache) {
+  public ContextSensitiveReachingDefs(CallGraph cg) {
     this.cha = cg.getClassHierarchy();
     // we use an ICFGSupergraph, which basically adapts ExplodedInterproceduralCFG to the ISupergraph interface
-    this.supergraph = ICFGSupergraph.make(cg, cache);
+    this.supergraph = ICFGSupergraph.make(cg);
   }
 
   /**
@@ -75,6 +74,8 @@
   private class ReachingDefsDomain extends MutableMapping<Pair<CGNode, Integer>> implements
       TabulationDomain<Pair<CGNode, Integer>, BasicBlockInContext<IExplodedBasicBlock>> {
 
+    private static final long serialVersionUID = 4014252274660361965L;
+
     @Override
     public boolean hasPriorityOver(PathEdge<BasicBlockInContext<IExplodedBasicBlock>> p1,
         PathEdge<BasicBlockInContext<IExplodedBasicBlock>> p2) {
@@ -194,7 +195,7 @@
    * balanced since a definition in a callee used as a seed for the analysis may then reach a caller, yielding a "return" without a
    * corresponding "call." An alternative to this approach, used in the Reps-Horwitz-Sagiv POPL95 paper, would be to "lift" the
    * domain of putstatic instructions with a 0 (bottom) element, have a 0->0 transition in all transfer functions, and then seed the
-   * analysis with the path edge (main_entry, 0) -> (main_entry, 0). We choose the partially-balanced approach to avoid pollution of
+   * analysis with the path edge (main_entry, 0) -&gt; (main_entry, 0). We choose the partially-balanced approach to avoid pollution of
    * the flow functions.
    * 
    */
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/DataflowTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/DataflowTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/DataflowTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/DataflowTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,20 +14,20 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.ibm.wala.classLoader.IMethod;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.core.tests.util.WalaTestCase;
 import com.ibm.wala.dataflow.IFDS.ISupergraph;
 import com.ibm.wala.dataflow.IFDS.TabulationResult;
 import com.ibm.wala.dataflow.graph.BitVectorSolver;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -35,12 +35,14 @@
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.cfg.BasicBlockInContext;
 import com.ibm.wala.ipa.cfg.ExplodedInterproceduralCFG;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAOptions;
@@ -88,9 +90,9 @@
 
     scope.setExclusions(new FileOfClasses(new ByteArrayInputStream(EXCLUSIONS.getBytes("UTF-8"))));
     try {
-      cha = ClassHierarchy.make(scope);
+      cha = ClassHierarchyFactory.make(scope);
     } catch (ClassHierarchyException e) {
-      throw new Exception();
+      throw new Exception(e);
     }
   }
 
@@ -107,7 +109,7 @@
 
   @Test
   public void testIntraproc1() {
-    AnalysisCache cache = new AnalysisCache();
+    IAnalysisCacheView cache = new AnalysisCacheImpl();
     final MethodReference ref = MethodReference.findOrCreate(ClassLoaderReference.Application, "Ldataflow/StaticDataflow", "test1",
         "()V");
     IMethod method = cha.resolveMethod(ref);
@@ -126,7 +128,7 @@
 
   @Test
   public void testIntraproc2() {
-    AnalysisCache cache = new AnalysisCache();
+    IAnalysisCacheView cache = new AnalysisCacheImpl();
     final MethodReference ref = MethodReference.findOrCreate(ClassLoaderReference.Application, "Ldataflow/StaticDataflow", "test2",
         "()V");
     IMethod method = cha.resolveMethod(ref);
@@ -150,7 +152,7 @@
         "Ldataflow/StaticDataflow");
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
     ExplodedInterproceduralCFG icfg = ExplodedInterproceduralCFG.make(cg);
     ContextInsensitiveReachingDefs reachingDefs = new ContextInsensitiveReachingDefs(icfg, cha);
@@ -161,7 +163,7 @@
         if (delegate.getNumber() == 4) {
           IntSet solution = solver.getOut(bb).getValue();
           IntIterator intIterator = solution.intIterator();
-          List<Pair<CGNode, Integer>> applicationDefs = new ArrayList<Pair<CGNode,Integer>>();
+          List<Pair<CGNode, Integer>> applicationDefs = new ArrayList<>();
           while (intIterator.hasNext()) {
             int next = intIterator.next();
             final Pair<CGNode, Integer> def = reachingDefs.getNodeAndInstrForNumber(next);
@@ -182,10 +184,9 @@
         "Ldataflow/StaticDataflow");
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
-    AnalysisCache cache = new AnalysisCache();
-    ContextSensitiveReachingDefs reachingDefs = new ContextSensitiveReachingDefs(cg, cache);
+    ContextSensitiveReachingDefs reachingDefs = new ContextSensitiveReachingDefs(cg);
     TabulationResult<BasicBlockInContext<IExplodedBasicBlock>, CGNode, Pair<CGNode, Integer>> result = reachingDefs.analyze();
     ISupergraph<BasicBlockInContext<IExplodedBasicBlock>, CGNode> supergraph = reachingDefs.getSupergraph();
     for (BasicBlockInContext<IExplodedBasicBlock> bb : supergraph) {
@@ -194,7 +195,7 @@
         if (delegate.getNumber() == 4) {
           IntSet solution = result.getResult(bb);
           IntIterator intIterator = solution.intIterator();
-          List<Pair<CGNode, Integer>> applicationDefs = new ArrayList<Pair<CGNode,Integer>>();
+          List<Pair<CGNode, Integer>> applicationDefs = new ArrayList<>();
           while (intIterator.hasNext()) {
             int next = intIterator.next();
             final Pair<CGNode, Integer> def = reachingDefs.getDomain().getMappedObject(next);
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/InitializerTest.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/InitializerTest.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/InitializerTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/InitializerTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,14 +13,15 @@
 
 import java.io.IOException;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.dataflow.IFDS.ISupergraph;
 import com.ibm.wala.dataflow.IFDS.TabulationResult;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -29,12 +30,12 @@
 import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.cfg.BasicBlockInContext;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.analysis.IExplodedBasicBlock;
-import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.config.AnalysisScopeReader;
 import com.ibm.wala.util.intset.IntIterator;
 import com.ibm.wala.util.intset.IntSet;
@@ -42,9 +43,6 @@
 
 public class InitializerTest {
 
-  /**
-   * @param args
-   */
   public static void main(String[] args) {
     
     AnalysisScope scope = null;
@@ -59,7 +57,7 @@
     IClassHierarchy cha = null;
     
     try {
-      cha = ClassHierarchy.make(scope);
+      cha = ClassHierarchyFactory.make(scope);
     } catch (ClassHierarchyException e) {
       e.printStackTrace();
     }
@@ -69,7 +67,7 @@
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha, "LstaticInit/TestStaticInit");
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = null;
     try {
       cg = builder.makeCallGraph(options, null);
@@ -83,8 +81,7 @@
     
     System.out.println("Start");
     
-    AnalysisCache cache = new AnalysisCache();
-    StaticInitializer reachingDefs = new StaticInitializer(cg, cache);
+    StaticInitializer reachingDefs = new StaticInitializer(cg);
     TabulationResult<BasicBlockInContext<IExplodedBasicBlock>, CGNode, IClass> result = reachingDefs.analyze();
     ISupergraph<BasicBlockInContext<IExplodedBasicBlock>, CGNode> supergraph = reachingDefs.getSupergraph();
     for (BasicBlockInContext<IExplodedBasicBlock> bb : supergraph) {
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/IntraprocReachingDefs.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/IntraprocReachingDefs.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/IntraprocReachingDefs.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/IntraprocReachingDefs.java	2019-01-29 17:08:39.000000000 +0000
@@ -77,7 +77,7 @@
    * generate a numbering of the putstatic instructions
    */
   private OrdinalSetMapping<Integer> numberPutStatics() {
-    ArrayList<Integer> putInstrs = new ArrayList<Integer>();
+    ArrayList<Integer> putInstrs = new ArrayList<>();
     IR ir = ecfg.getIR();
     SSAInstruction[] instructions = ir.getInstructions();
     for (int i = 0; i < instructions.length; i++) {
@@ -98,7 +98,7 @@
         bv.set(instrNum);
       }
     }
-    return new ObjectArrayMapping<Integer>(putInstrs.toArray(new Integer[putInstrs.size()]));
+    return new ObjectArrayMapping<>(putInstrs.toArray(new Integer[0]));
   }
 
   private class TransferFunctions implements ITransferFunctionProvider<IExplodedBasicBlock, BitVectorVariable> {
@@ -155,9 +155,9 @@
    */
   public BitVectorSolver<IExplodedBasicBlock> analyze() {
     // the framework describes the dataflow problem, in particular the underlying graph and the transfer functions
-    BitVectorFramework<IExplodedBasicBlock, Integer> framework = new BitVectorFramework<IExplodedBasicBlock, Integer>(ecfg,
+    BitVectorFramework<IExplodedBasicBlock, Integer> framework = new BitVectorFramework<>(ecfg,
         new TransferFunctions(), putInstrNumbering);
-    BitVectorSolver<IExplodedBasicBlock> solver = new BitVectorSolver<IExplodedBasicBlock>(framework);
+    BitVectorSolver<IExplodedBasicBlock> solver = new BitVectorSolver<>(framework);
     try {
       solver.solve(null);
     } catch (CancelException e) {
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/StaticInitializer.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/StaticInitializer.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/StaticInitializer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/StaticInitializer.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,13 +12,10 @@
 package com.ibm.wala.examples.analysis.dataflow;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import com.ibm.wala.classLoader.IClass;
-import com.ibm.wala.classLoader.IField;
-import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.dataflow.IFDS.ICFGSupergraph;
 import com.ibm.wala.dataflow.IFDS.IFlowFunction;
 import com.ibm.wala.dataflow.IFDS.IMergeFunction;
@@ -32,7 +29,6 @@
 import com.ibm.wala.dataflow.IFDS.PathEdge;
 import com.ibm.wala.dataflow.IFDS.TabulationDomain;
 import com.ibm.wala.dataflow.IFDS.TabulationResult;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.cfg.BasicBlockInContext;
@@ -45,7 +41,6 @@
 import com.ibm.wala.ssa.analysis.IExplodedBasicBlock;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.intset.IntSet;
 import com.ibm.wala.util.intset.MutableMapping;
 import com.ibm.wala.util.intset.MutableSparseIntSet;
@@ -72,9 +67,9 @@
     return initialized;
   }
 
-  public StaticInitializer(CallGraph cg, AnalysisCache cache) {
+  public StaticInitializer(CallGraph cg) {
     cha = cg.getClassHierarchy();
-    supergraph = ICFGSupergraph.make(cg, cache);
+    supergraph = ICFGSupergraph.make(cg);
   }
   
   /**
@@ -83,6 +78,9 @@
   private class InitializerDomain extends MutableMapping<IClass> implements
       TabulationDomain<IClass, BasicBlockInContext<IExplodedBasicBlock>> {
 
+    private static final long serialVersionUID = -1897766113586243833L;
+
+    @Override
     public boolean hasPriorityOver(PathEdge<BasicBlockInContext<IExplodedBasicBlock>> p1,
         PathEdge<BasicBlockInContext<IExplodedBasicBlock>> p2) {
       // don't worry about worklist priorities
@@ -104,6 +102,7 @@
      * 
      * @see ReachingDefsProblem
      */
+    @Override
     public IFlowFunction getUnbalancedReturnFlowFunction(BasicBlockInContext<IExplodedBasicBlock> src,
         BasicBlockInContext<IExplodedBasicBlock> dest) {
       return IdentityFlowFunction.identity();
@@ -112,6 +111,7 @@
     /**
      * flow function from caller to callee; just the identity function
      */
+    @Override
     public IUnaryFlowFunction getCallFlowFunction(BasicBlockInContext<IExplodedBasicBlock> src,
         BasicBlockInContext<IExplodedBasicBlock> dest, BasicBlockInContext<IExplodedBasicBlock> ret) {
       return IdentityFlowFunction.identity();
@@ -120,6 +120,7 @@
     /**
      * flow function from call node to return node when there are no targets for the call site; not a case we are expecting
      */
+    @Override
     public IUnaryFlowFunction getCallNoneToReturnFlowFunction(BasicBlockInContext<IExplodedBasicBlock> src,
         BasicBlockInContext<IExplodedBasicBlock> dest) {
       // if we're missing callees, just keep what information we have
@@ -130,6 +131,7 @@
      * flow function from call node to return node at a call site when callees exist. We kill everything; surviving facts should
      * flow out of the callee
      */
+    @Override
     public IUnaryFlowFunction getCallToReturnFlowFunction(BasicBlockInContext<IExplodedBasicBlock> src,
         BasicBlockInContext<IExplodedBasicBlock> dest) {
       return KillEverything.singleton();
@@ -138,6 +140,7 @@
     /**
      * flow function for normal intraprocedural edges
      */
+    @Override
     public IUnaryFlowFunction getNormalFlowFunction(final BasicBlockInContext<IExplodedBasicBlock> src,
         BasicBlockInContext<IExplodedBasicBlock> dest) {
       final IExplodedBasicBlock ebb = src.getDelegate();
@@ -147,6 +150,7 @@
         if (putInstr.isStatic()) {
           return new IUnaryFlowFunction() {
 
+            @Override
             public IntSet getTargets(int d1) {
               System.out.println(ebb.toString());
               System.out.println(d1);
@@ -163,6 +167,7 @@
               return result;
             }
 
+            @Override
             public String toString() {
               return "Initializer Normal Flow";
             }
@@ -170,9 +175,10 @@
         }
       } else if(instruction instanceof SSAGetInstruction) {
         final SSAGetInstruction getInstr = (SSAGetInstruction) instruction;
-        if (getInstr.isStatic()) { //Auf konstante �berpr�fen
+        if (getInstr.isStatic()) { //Auf konstante �berpr�fen
           return new IUnaryFlowFunction() {
 
+            @Override
             public IntSet getTargets(int d1) {
               // first, gen this statement
               int factNum = domain.getMappedIndex(cha.lookupClass(getInstr.getDeclaredField().getDeclaringClass()));
@@ -186,6 +192,7 @@
               return result;
             }
 
+            @Override
             public String toString() {
               return "Initializer Normal Flow";
             }
@@ -195,6 +202,7 @@
         final SSANewInstruction newInstr = (SSANewInstruction) instruction;
         return new IUnaryFlowFunction() {
 
+          @Override
           public IntSet getTargets(int d1) {
             // first, gen this statement
             int factNum = domain.getMappedIndex(cha.lookupClass(newInstr.getConcreteType()));
@@ -208,6 +216,7 @@
             return result;
           }
 
+          @Override
           public String toString() {
             return "Initializer Normal Flow";
           }
@@ -218,6 +227,7 @@
         if (invInstr.isStatic()) {
           return new IUnaryFlowFunction() {
 
+            @Override
             public IntSet getTargets(int d1) {
               System.out.println("Invoke!");
               // first, gen this statement
@@ -232,6 +242,7 @@
               return result;
             }
 
+            @Override
             public String toString() {
               return "Initializer Normal Flow";
             }
@@ -246,6 +257,7 @@
     /**
      * standard flow function from callee to caller; just identity
      */
+    @Override
     public IFlowFunction getReturnFlowFunction(BasicBlockInContext<IExplodedBasicBlock> call,
         BasicBlockInContext<IExplodedBasicBlock> src, BasicBlockInContext<IExplodedBasicBlock> dest) {
       return IdentityFlowFunction.identity();
@@ -266,6 +278,7 @@
     /**
      * we use the entry block of the CGNode as the fake entry when propagating from callee to caller with unbalanced parens
      */
+    @Override
     public BasicBlockInContext<IExplodedBasicBlock> getFakeEntry(BasicBlockInContext<IExplodedBasicBlock> node) {
       final CGNode cgNode = node.getNode();
       return getFakeEntry(cgNode);
@@ -333,10 +346,12 @@
       return result;
     }
     
+    @Override
     public IPartiallyBalancedFlowFunctions<BasicBlockInContext<IExplodedBasicBlock>> getFunctionMap() {
       return flowFunctions;
     }
     
+    @Override
     public TabulationDomain<IClass, BasicBlockInContext<IExplodedBasicBlock>> getDomain() {
       return domain;
     }
@@ -344,14 +359,17 @@
     /**
      * we don't need a merge function; the default unioning of tabulation works fine
      */
+    @Override
     public IMergeFunction getMergeFunction() {
       return null;
     }
     
+    @Override
     public ISupergraph<BasicBlockInContext<IExplodedBasicBlock>, CGNode> getSupergraph() {
       return supergraph;
     }
     
+    @Override
     public Collection<PathEdge<BasicBlockInContext<IExplodedBasicBlock>>> initialSeeds() {
       return initialSeeds;
     }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/GetLoadedFields.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/GetLoadedFields.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/GetLoadedFields.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/GetLoadedFields.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,8 +18,8 @@
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.types.FieldReference;
@@ -39,7 +39,6 @@
 
   /**
    * Use the 'GetLoadedFields' launcher to run this program with the appropriate classpath
-   * @throws InvalidClassFileException
    */
   public static void main(String[] args) throws IOException, ClassHierarchyException, InvalidClassFileException {
     // build an analysis scope representing the standard libraries, excluding no classes
@@ -47,7 +46,7 @@
 
     // build a class hierarchy
     System.err.print("Build class hierarchy...");
-    IClassHierarchy cha = ClassHierarchy.make(scope);
+    IClassHierarchy cha = ClassHierarchyFactory.make(scope);
     System.err.println("Done");
 
     int nMethods = 0;
@@ -66,4 +65,4 @@
     System.out.println(nMethods + " methods");
     System.out.println((float)nFields/(float)nMethods + " fields read per method");
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/SimpleThreadEscapeAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,7 +13,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 import java.util.jar.JarFile;
@@ -23,19 +22,19 @@
 import com.ibm.wala.classLoader.IField;
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.classLoader.JarFileModule;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.client.AbstractAnalysisEngine;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Util;
 import com.ibm.wala.ipa.callgraph.propagation.HeapModel;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
-import com.ibm.wala.ipa.cha.ClassHierarchyException;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.properties.WalaProperties;
 import com.ibm.wala.types.TypeReference;
@@ -53,15 +52,16 @@
  * <P>
  * The algorithm is not very bright; it is based on the observation that there are only three ways for an object to pass
  * from one thread to another.
+ * </P>
  * <UL>
  * <LI> The object is stored into a static variable.
  * <LI> The object is stored into an instance field of a Thread
  * <LI> The object is reachable from a field of another escaping object.
  * </UL>
- * </P>
- * 
+ *
  * <P>
  * This observation is implemented in the obvious way:
+ * </P>
  * <OL>
  * <LI> All static fields are collected
  * <LI> All Thread constructor parameters are collected
@@ -71,11 +71,10 @@
  * <LI> The abstract objects in the points-to sets are converted to types
  * <LI> This set of types is returned
  * </OL>
- * </P>
- * 
+ *
  * @author Julian Dolby
  */
-public class SimpleThreadEscapeAnalysis extends AbstractAnalysisEngine {
+public class SimpleThreadEscapeAnalysis extends AbstractAnalysisEngine<InstanceKey, CallGraphBuilder<InstanceKey>, Void> {
 
   private final Set<JarFile> applicationJarFiles;
 
@@ -90,8 +89,8 @@
   }
 
   @Override
-  protected CallGraphBuilder getCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-    return Util.makeZeroCFABuilder(options, cache, cha, scope);
+  protected CallGraphBuilder<InstanceKey> getCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
+    return Util.makeZeroCFABuilder(Language.JAVA, options, cache, cha, scope);
   }
 
   /**
@@ -100,11 +99,13 @@
   private void collectJars(File f, Set<JarFile> result) throws IOException {
     if (f.isDirectory()) {
       File[] files = f.listFiles();
-      for (int i = 0; i < files.length; i++) {
-        collectJars(files[i], result);
+      for (File file : files) {
+        collectJars(file, result);
       }
     } else if (f.getAbsolutePath().endsWith(".jar")) {
-      result.add(new JarFile(f));
+      try (final JarFile jar = new JarFile(f, false)) {
+        result.add(jar);
+      }
     }
   }
 
@@ -138,7 +139,7 @@
     // find jars from chosen JRE lib path
     collectJars(new File(javaHomePath), jarFiles);
 
-    return jarFiles.toArray(new JarFile[jarFiles.size()]);
+    return jarFiles.toArray(new JarFile[0]);
   }
 
   /**
@@ -147,8 +148,8 @@
    */
   private Set<JarFileModule> getModuleFiles() {
     Set<JarFileModule> result = HashSetFactory.make();
-    for (Iterator<JarFile> jars = applicationJarFiles.iterator(); jars.hasNext();) {
-      result.add(new JarFileModule(jars.next()));
+    for (JarFile jarFile : applicationJarFiles) {
+      result.add(new JarFileModule(jarFile));
     }
 
     return result;
@@ -156,10 +157,8 @@
 
   /**
    * The heart of the analysis.
-   * @throws CancelException
-   * @throws IllegalArgumentException
    */
-  public Set<IClass> gatherThreadEscapingClasses() throws IOException, ClassHierarchyException, IllegalArgumentException,
+  public Set<IClass> gatherThreadEscapingClasses() throws IOException, IllegalArgumentException,
       CancelException {
 
     //
@@ -204,7 +203,7 @@
     // extract data for analysis
     //
     CallGraph cg = getCallGraph();
-    PointerAnalysis<InstanceKey> pa = getPointerAnalysis();
+    PointerAnalysis<? extends InstanceKey> pa = getPointerAnalysis();
 
     //
     // collect all places where objects can escape their creating thread:
@@ -217,8 +216,7 @@
     // 1) static fields
     for (IClass cls : cha) {
       Collection<IField> staticFields = cls.getDeclaredStaticFields();
-      for (Iterator<IField> sfs = staticFields.iterator(); sfs.hasNext();) {
-        IField sf = sfs.next();
+      for (IField sf : staticFields) {
         if (sf.getFieldTypeReference().isReferenceType()) {
           escapeAnalysisRoots.add(heapModel.getPointerKeyForStaticField(sf));
         }
@@ -231,14 +229,11 @@
     // reachable from fields of types in these pointer keys, and all
     // Thread objects must be constructed somewhere)
     Collection<IClass> threads = cha.computeSubClasses(TypeReference.JavaLangThread);
-    for (Iterator<IClass> clss = threads.iterator(); clss.hasNext();) {
-      IClass cls = clss.next();
-      for (Iterator<IMethod> ms = cls.getDeclaredMethods().iterator(); ms.hasNext();) {
-        IMethod m = ms.next();
+    for (IClass cls : threads) {
+      for (IMethod m : cls.getDeclaredMethods()) {
         if (m.isInit()) {
           Set<CGNode> nodes = cg.getNodes(m.getReference());
-          for (Iterator<CGNode> ns = nodes.iterator(); ns.hasNext();) {
-            CGNode n = ns.next();
+          for (CGNode n : nodes) {
             escapeAnalysisRoots.add(heapModel.getPointerKeyForLocal(n, 1));
           }
         }
@@ -254,11 +249,9 @@
     //
     // pass 1: get abstract objects (instance keys) for escaping locations
     //
-    for (Iterator<PointerKey> rts = escapeAnalysisRoots.iterator(); rts.hasNext();) {
-      PointerKey root = rts.next();
-      OrdinalSet<InstanceKey> objects = pa.getPointsToSet(root);
-      for (Iterator<InstanceKey> objs = objects.iterator(); objs.hasNext();) {
-        InstanceKey obj = objs.next();
+    for (PointerKey root : escapeAnalysisRoots) {
+      OrdinalSet<? extends InstanceKey> objects = pa.getPointsToSet(root);
+      for (InstanceKey obj : objects) {
         escapingInstanceKeys.add(obj);
       }
     }
@@ -269,16 +262,14 @@
     Set<InstanceKey> newKeys = HashSetFactory.make();
     do {
       newKeys.clear();
-      for (Iterator<InstanceKey> keys = escapingInstanceKeys.iterator(); keys.hasNext();) {
-        InstanceKey key = keys.next();
+      for (InstanceKey key : escapingInstanceKeys) {
         IClass type = key.getConcreteType();
         if (type.isReferenceType()) {
           if (type.isArrayClass()) {
             if (((ArrayClass) type).getElementClass() != null) {
               PointerKey fk = heapModel.getPointerKeyForArrayContents(key);
-              OrdinalSet<InstanceKey> fobjects = pa.getPointsToSet(fk);
-              for (Iterator<InstanceKey> fobjs = fobjects.iterator(); fobjs.hasNext();) {
-                InstanceKey fobj = fobjs.next();
+              OrdinalSet<? extends InstanceKey> fobjects = pa.getPointsToSet(fk);
+              for (InstanceKey fobj : fobjects) {
                 if (!escapingInstanceKeys.contains(fobj)) {
                   newKeys.add(fobj);
                 }
@@ -286,13 +277,11 @@
             }
           } else {
             Collection<IField> fields = type.getAllInstanceFields();
-            for (Iterator<IField> fs = fields.iterator(); fs.hasNext();) {
-              IField f = fs.next();
+            for (IField f : fields) {
               if (f.getFieldTypeReference().isReferenceType()) {
                 PointerKey fk = heapModel.getPointerKeyForInstanceField(key, f);
-                OrdinalSet<InstanceKey> fobjects = pa.getPointsToSet(fk);
-                for (Iterator<InstanceKey> fobjs = fobjects.iterator(); fobjs.hasNext();) {
-                  InstanceKey fobj = fobjs.next();
+                OrdinalSet<? extends InstanceKey> fobjects = pa.getPointsToSet(fk);
+                for (InstanceKey fobj : fobjects) {
                   if (!escapingInstanceKeys.contains(fobj)) {
                     newKeys.add(fobj);
                   }
@@ -309,8 +298,7 @@
     // get set of types from set of instance keys
     //
     Set<IClass> escapingTypes = HashSetFactory.make();
-    for (Iterator<InstanceKey> keys = escapingInstanceKeys.iterator(); keys.hasNext();) {
-      InstanceKey key = keys.next();
+    for (InstanceKey key : escapingInstanceKeys) {
       escapingTypes.add(key.getConcreteType());
     }
 
@@ -322,24 +310,20 @@
    * dynamic race detector. The idea is that any field might have a race with two exceptions: final fields do not have
    * races since there are no writes to them, and volatile fields have atomic read and write semantics provided by the
    * VM. Hence, this piece of code produces a list of all other fields.
-   * @throws CancelException
-   * @throws IllegalArgumentException
    */
-  public static void main(String[] args) throws IOException, ClassHierarchyException, IllegalArgumentException, CancelException {
+  public static void main(String[] args) throws IOException, IllegalArgumentException, CancelException {
     String mainClassName = args[0];
 
     Set<JarFile> jars = HashSetFactory.make();
     for (int i = 1; i < args.length; i++) {
-      jars.add(new JarFile(args[i]));
+      jars.add(new JarFile(args[i], false));
     }
 
     Set<IClass> escapingTypes = (new SimpleThreadEscapeAnalysis(jars, mainClassName)).gatherThreadEscapingClasses();
 
-    for (Iterator<IClass> types = escapingTypes.iterator(); types.hasNext();) {
-      IClass cls = types.next();
+    for (IClass cls : escapingTypes) {
       if (!cls.isArrayClass()) {
-        for (Iterator<IField> fs = cls.getAllFields().iterator(); fs.hasNext();) {
-          IField f = fs.next();
+        for (IField f : cls.getAllFields()) {
           if (!f.isVolatile() && !f.isFinal()) {
             System.err.println(f.getReference());
           }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/JavaViewerDriver.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/JavaViewerDriver.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/JavaViewerDriver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/JavaViewerDriver.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,8 +14,9 @@
 import java.io.IOException;
 import java.util.Properties;
 
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraph;
@@ -26,6 +27,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.util.config.AnalysisScopeReader;
 import com.ibm.wala.util.io.CommandLine;
 import com.ibm.wala.util.io.FileProvider;
@@ -55,7 +57,7 @@
     AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(classPath, exclusionFile != null ? exclusionFile
         : new File(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
 
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha);
     AnalysisOptions options = new AnalysisOptions(scope, entrypoints);
@@ -63,11 +65,12 @@
     // //
     // build the call graph
     // //
-    com.ibm.wala.ipa.callgraph.CallGraphBuilder builder = Util.makeZeroCFABuilder(options, new AnalysisCache(), cha, scope);
+    com.ibm.wala.ipa.callgraph.CallGraphBuilder<InstanceKey> builder = Util.makeZeroCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     PointerAnalysis<InstanceKey> pa = builder.getPointerAnalysis();
-    new WalaViewer(cg, pa);
+    @SuppressWarnings("unused")
+    WalaViewer walaViewer = new WalaViewer(cg, pa);
     
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,10 +15,12 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Properties;
+import java.util.function.Predicate;
 
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.examples.properties.WalaExamplesProperties;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -26,13 +28,14 @@
 import com.ibm.wala.ipa.callgraph.CallGraphStats;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.LocalPointerKey;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.properties.WalaProperties;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.WalaException;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.config.AnalysisScopeReader;
 import com.ibm.wala.util.debug.Assertions;
@@ -51,11 +54,10 @@
     return (new File(appJar).isDirectory());
   }
 
-  public static String findJarFiles(String[] directories) throws WalaException {
+  public static String findJarFiles(String[] directories) {
     Collection<String> result = HashSetFactory.make();
-    for (int i = 0; i < directories.length; i++) {
-      for (Iterator<File> it = FileUtil.listFiles(directories[i], ".*\\.jar", true).iterator(); it.hasNext();) {
-        File f = (File) it.next();
+    for (String directorie : directories) {
+      for (File f : FileUtil.listFiles(directorie, ".*\\.jar", true)) {
         result.add(f.getAbsolutePath());
       }
     }
@@ -63,7 +65,7 @@
   }
   
   private static String composeString(Collection<String> s) {
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     Iterator<String> it = s.iterator();
     for (int i = 0; i < s.size() - 1; i++) {
       result.append(it.next());
@@ -80,22 +82,16 @@
   /**
    * Usage: args = "-appJar [jar file name] {-exclusionFile [exclusionFileName]}" The "jar file name" should be something like
    * "c:/temp/testdata/java_cup.jar"
-   * 
-   * @throws CancelException
-   * @throws IllegalArgumentException
    */
-  public static void main(String[] args) throws WalaException, IllegalArgumentException, CancelException {
+  public static void main(String[] args) throws IllegalArgumentException, CancelException {
     run(args);
   }
 
   /**
    * Usage: args = "-appJar [jar file name] {-exclusionFile [exclusionFileName]}" The "jar file name" should be something like
    * "c:/temp/testdata/java_cup.jar"
-   * 
-   * @throws CancelException
-   * @throws IllegalArgumentException
    */
-  public static Process run(String[] args) throws WalaException, IllegalArgumentException, CancelException {
+  public static Process run(String[] args) throws IllegalArgumentException, CancelException {
     Properties p = CommandLine.parse(args);
     validateCommandLine(p);
     return run(p.getProperty("appJar"), p.getProperty("exclusionFile", CallGraphTestUtil.REGRESSION_EXCLUSIONS));
@@ -103,8 +99,6 @@
 
   /**
    * @param appJar something like "c:/temp/testdata/java_cup.jar"
-   * @throws CancelException
-   * @throws IllegalArgumentException
    */
   public static Process run(String appJar, String exclusionFile) throws IllegalArgumentException, CancelException {
     try {
@@ -138,16 +132,13 @@
   /**
    * @param appJar something like "c:/temp/testdata/java_cup.jar"
    * @return a call graph
-   * @throws CancelException
-   * @throws IllegalArgumentException
-   * @throws IOException 
    */
   public static Graph<CGNode> buildPrunedCallGraph(String appJar, File exclusionFile) throws WalaException,
       IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, exclusionFile != null ? exclusionFile : new File(
         CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
 
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha);
     AnalysisOptions options = new AnalysisOptions(scope, entrypoints);
@@ -155,7 +146,7 @@
     // //
     // build the call graph
     // //
-    com.ibm.wala.ipa.callgraph.CallGraphBuilder builder = Util.makeZeroCFABuilder(options, new AnalysisCache(), cha, scope);
+    com.ibm.wala.ipa.callgraph.CallGraphBuilder<InstanceKey> builder = Util.makeZeroCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
     CallGraph cg = builder.makeCallGraph(options, null);
 
     System.err.println(CallGraphStats.getStats(cg));
@@ -165,7 +156,7 @@
     return g;
   }
 
-  public static Graph<CGNode> pruneForAppLoader(CallGraph g) throws WalaException {
+  public static Graph<CGNode> pruneForAppLoader(CallGraph g) {
     return PDFTypeHierarchy.pruneGraph(g, new ApplicationLoaderFilter());
   }
 
@@ -175,7 +166,8 @@
    * Usage:
    * <ul>
    * <li>args[0] : "-appJar"
-   * <li> args[1] : something like "c:/temp/testdata/java_cup.jar" </ul?
+   * <li> args[1] : something like "c:/temp/testdata/java_cup.jar"
+   * </ul>
    * 
    * @throws UnsupportedOperationException if command-line is malformed.
    */
@@ -194,18 +186,12 @@
    * <li> {@link LocalPointerKey}
    * </ul>
    */
-  private static class ApplicationLoaderFilter extends Predicate<CGNode> {
+  private static class ApplicationLoaderFilter implements Predicate<CGNode> {
 
     @Override public boolean test(CGNode o) {
-      if (o instanceof CGNode) {
-        CGNode n = (CGNode) o;
-        return n.getMethod().getDeclaringClass().getClassLoader().getReference().equals(ClassLoaderReference.Application);
-      } else if (o instanceof LocalPointerKey) {
-        LocalPointerKey l = (LocalPointerKey) o;
-        return test(l.getNode());
-      } else {
+      if (o == null)
         return false;
-      }
+      return o.getMethod().getDeclaringClass().getClassLoader().getReference().equals(ClassLoaderReference.Application);
     }
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFControlDependenceGraph.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFControlDependenceGraph.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFControlDependenceGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFControlDependenceGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,15 +18,16 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.examples.properties.WalaExamplesProperties;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.properties.WalaProperties;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.ISSABasicBlock;
-import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSAOptions;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.util.WalaException;
@@ -54,9 +55,6 @@
    * Usage: GVControlDependenceGraph -appJar [jar file name] -sig [method signature] The "jar
    * file name" should be something like "c:/temp/testdata/java_cup.jar" The
    * signature should be something like "java_cup.lexer.advance()V"
-   * 
-   * @param args
-   * @throws IOException 
    */
   public static void main(String[] args) throws IOException {
 
@@ -68,7 +66,6 @@
    *          -appJar [jar file name] -sig [method signature] The "jar file
    *          name" should be something like "c:/temp/testdata/java_cup.jar" The
    *          signature should be something like "java_cup.lexer.advance()V"
-   * @throws IOException 
    */
   public static Process run(String[] args) throws IOException {
     validateCommandLine(args);
@@ -80,7 +77,6 @@
    *          should be something like "c:/temp/testdata/java_cup.jar"
    * @param methodSig
    *          should be something like "java_cup.lexer.advance()V"
-   * @throws IOException 
    */
   public static Process run(String appJar, String methodSig) throws IOException {
     try {
@@ -89,7 +85,7 @@
       }
       AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, (new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
-      ClassHierarchy cha = ClassHierarchy.make(scope);
+      ClassHierarchy cha = ClassHierarchyFactory.make(scope);
 
       MethodReference mr = StringStuff.makeMethodReference(methodSig);
 
@@ -100,15 +96,15 @@
       }
       AnalysisOptions options = new AnalysisOptions();
       options.getSSAOptions().setPiNodePolicy(SSAOptions.getAllBuiltInPiNodes());
-      AnalysisCache cache = new AnalysisCache();
-      IR ir = cache.getSSACache().findOrCreateIR(m, Everywhere.EVERYWHERE, options.getSSAOptions() );
+      IAnalysisCacheView cache = new AnalysisCacheImpl(options.getSSAOptions());
+      IR ir = cache.getIR(m, Everywhere.EVERYWHERE );
 
       if (ir == null) {
         Assertions.UNREACHABLE("Null IR for " + m);
       }
 
       System.err.println(ir.toString());
-      ControlDependenceGraph<SSAInstruction, ISSABasicBlock> cdg = new ControlDependenceGraph<SSAInstruction, ISSABasicBlock>(ir.getControlFlowGraph());
+      ControlDependenceGraph<ISSABasicBlock> cdg = new ControlDependenceGraph<>(ir.getControlFlowGraph());
 
       Properties wp = null;
       try {
@@ -143,9 +139,9 @@
    * <li> args[0] : "-appJar"
    * <li> args[1] : something like "c:/temp/testdata/java_cup.jar"
    * <li> args[2] : "-sig"
-   * <li> args[3] : a method signature like "java_cup.lexer.advance()V" </ul?
+   * <li> args[3] : a method signature like "java_cup.lexer.advance()V"
+   * </ul>
    * 
-   * @param args
    * @throws UnsupportedOperationException
    *           if command-line is malformed.
    */
@@ -160,4 +156,4 @@
       throw new UnsupportedOperationException("invalid command-line, args[2] should be -sig, but is " + args[0]);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSDG.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSDG.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSDG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSDG.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,17 +13,22 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Properties;
+import java.util.function.Predicate;
 
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.examples.properties.WalaExamplesProperties;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.slicer.HeapStatement;
 import com.ibm.wala.ipa.slicer.MethodEntryStatement;
 import com.ibm.wala.ipa.slicer.MethodExitStatement;
@@ -34,7 +39,6 @@
 import com.ibm.wala.properties.WalaProperties;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.WalaException;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.config.AnalysisScopeReader;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.Graph;
@@ -63,24 +67,12 @@
    * 
    * The "jar file name" should be something like
    * "c:/temp/testdata/java_cup.jar"
-   * 
-   * @param args
-   * @throws WalaException
-   * @throws CancelException 
-   * @throws IllegalArgumentException 
-   * @throws IOException 
    */
-  public static void main(String[] args) throws WalaException, IllegalArgumentException, CancelException, IOException {
+  public static void main(String[] args) throws IllegalArgumentException, CancelException, IOException {
     run(args);
   }
 
-  /**
-   * @throws WalaException
-   * @throws CancelException 
-   * @throws IllegalArgumentException 
-   * @throws IOException 
-   */
-  public static Process run(String[] args) throws WalaException, IllegalArgumentException, CancelException, IOException {
+  public static Process run(String[] args) throws IllegalArgumentException, CancelException, IOException {
     Properties p = CommandLine.parse(args);
     validateCommandLine(p);
     return run(p.getProperty("appJar"), p.getProperty("mainClass"), getDataDependenceOptions(p), getControlDependenceOptions(p));
@@ -111,9 +103,6 @@
   /**
    * @param appJar
    *            something like "c:/temp/testdata/java_cup.jar"
-   * @throws CancelException 
-   * @throws IllegalArgumentException 
-   * @throws IOException 
    */
   public static Process run(String appJar, String mainClass, DataDependenceOptions dOptions, ControlDependenceOptions cOptions) throws IllegalArgumentException, CancelException, IOException {
     try {
@@ -121,13 +110,14 @@
 
       // generate a WALA-consumable wrapper around the incoming scope object
       
-      ClassHierarchy cha = ClassHierarchy.make(scope);
+      ClassHierarchy cha = ClassHierarchyFactory.make(scope);
       Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha, mainClass);
       AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
-      CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+      CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
       CallGraph cg = builder.makeCallGraph(options,null);
-      SDG sdg = new SDG(cg, builder.getPointerAnalysis(), dOptions, cOptions);
+      final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+      SDG<?> sdg = new SDG<>(cg, pointerAnalysis, dOptions, cOptions);
       try {
         GraphIntegrity.check(sdg);
       } catch (UnsoundGraphException e1) {
@@ -160,45 +150,39 @@
     }
   }
 
-  private static Graph<Statement> pruneSDG(final SDG sdg) {
-    Predicate<Statement> f = new Predicate<Statement>() {
-      @Override public boolean test(Statement s) {
-        if (s.getNode().equals(sdg.getCallGraph().getFakeRootNode())) {
-          return false;
-        } else if (s instanceof MethodExitStatement || s instanceof MethodEntryStatement) {
-          return false;
-        } else {
-          return true;
-        }
+  private static Graph<Statement> pruneSDG(final SDG<?> sdg) {
+    Predicate<Statement> f = s -> {
+      if (s.getNode().equals(sdg.getCallGraph().getFakeRootNode())) {
+        return false;
+      } else if (s instanceof MethodExitStatement || s instanceof MethodEntryStatement) {
+        return false;
+      } else {
+        return true;
       }
     };
     return GraphSlicer.prune(sdg, f);
   }
 
   private static NodeDecorator<Statement> makeNodeDecorator() {
-    return new NodeDecorator<Statement>() {
-      @Override
-      public String getLabel(Statement s) throws WalaException {
-        switch (s.getKind()) {
-        case HEAP_PARAM_CALLEE:
-        case HEAP_PARAM_CALLER:
-        case HEAP_RET_CALLEE:
-        case HEAP_RET_CALLER:
-          HeapStatement h = (HeapStatement) s;
-          return s.getKind() + "\\n" + h.getNode() + "\\n" + h.getLocation();
-        case EXC_RET_CALLEE:
-        case EXC_RET_CALLER:
-        case NORMAL:
-        case NORMAL_RET_CALLEE:
-        case NORMAL_RET_CALLER:
-        case PARAM_CALLEE:
-        case PARAM_CALLER:
-        case PHI:
-        default:
-          return s.toString();
-        }
+    return s -> {
+      switch (s.getKind()) {
+      case HEAP_PARAM_CALLEE:
+      case HEAP_PARAM_CALLER:
+      case HEAP_RET_CALLEE:
+      case HEAP_RET_CALLER:
+        HeapStatement h = (HeapStatement) s;
+        return s.getKind() + "\\n" + h.getNode() + "\\n" + h.getLocation();
+      case EXC_RET_CALLEE:
+      case EXC_RET_CALLER:
+      case NORMAL:
+      case NORMAL_RET_CALLEE:
+      case NORMAL_RET_CALLER:
+      case PARAM_CALLEE:
+      case PARAM_CALLER:
+      case PHI:
+      default:
+        return s.toString();
       }
-
     };
   }
 
@@ -211,6 +195,7 @@
    * <li> args[1] : something like "c:/temp/testdata/java_cup.jar"
    * <li> args[2] : "-mainClass"
    * <li> args[3] : something like "Lslice/TestRecursion"
+   * </ul>
    * 
    * @throws UnsupportedOperationException
    *             if command-line is malformed.
@@ -223,4 +208,4 @@
       throw new UnsupportedOperationException("expected command-line to include -appJar");
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSlice.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSlice.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSlice.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFSlice.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,10 +15,11 @@
 import java.util.Collection;
 import java.util.Properties;
 
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.slicer.SlicerTest;
 import com.ibm.wala.examples.properties.WalaExamplesProperties;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -26,7 +27,10 @@
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.slicer.HeapStatement;
 import com.ibm.wala.ipa.slicer.NormalReturnCaller;
 import com.ibm.wala.ipa.slicer.NormalStatement;
@@ -45,7 +49,6 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.WalaException;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.config.AnalysisScopeReader;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.Graph;
@@ -87,28 +90,20 @@
    * <li>"method name" should be the name of a method. This takes a slice from the statement that calls "srcCallee" from "srcCaller"
    * <li>"data dependence options" can be one of "-full", "-no_base_ptrs", "-no_base_no_heap", "-no_heap",
    * "-no_base_no_heap_no_cast", or "-none".
+   * <li>"control dependence options" can be "-full" or "-none"
+   * <li>the -dir argument tells whether to compute a forwards or backwards slice.
    * </ul>
    * 
-   * @throws CancelException
-   * @throws IllegalArgumentException
-   * @throws IOException
-   * 
-   * @see com.ibm.wala.ipa.slicer.Slicer.DataDependenceOptions <li>"control dependence options" can be "-full" or "-none" <li>the
-   *      -dir argument tells whether to compute a forwards or backwards slice. </ul>
-   * 
+   * @see com.ibm.wala.ipa.slicer.Slicer.DataDependenceOptions
    */
-  public static void main(String[] args) throws WalaException, IllegalArgumentException, CancelException, IOException {
+  public static void main(String[] args) throws IllegalArgumentException, CancelException, IOException {
     run(args);
   }
 
   /**
    * see {@link #main(String[])} for command-line arguments
-   * 
-   * @throws CancelException
-   * @throws IllegalArgumentException
-   * @throws IOException
    */
-  public static Process run(String[] args) throws WalaException, IllegalArgumentException, CancelException, IOException {
+  public static Process run(String[] args) throws IllegalArgumentException, CancelException, IOException {
     // parse the command-line into a Properties object
     Properties p = CommandLine.parse(args);
     // validate that the command-line has the expected format
@@ -137,8 +132,6 @@
    * @param dOptions options controlling data dependence
    * @param cOptions options controlling control dependence
    * @return a Process running the PDF viewer to visualize the dot'ted representation of the slice
-   * @throws CancelException
-   * @throws IllegalArgumentException
    */
   public static Process run(String appJar, String mainClass, String srcCaller, String srcCallee, boolean goBackward,
       DataDependenceOptions dOptions, ControlDependenceOptions cOptions) throws IllegalArgumentException, CancelException,
@@ -149,14 +142,14 @@
           .getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
       // build a class hierarchy, call graph, and system dependence graph
-      ClassHierarchy cha = ClassHierarchy.make(scope);
+      ClassHierarchy cha = ClassHierarchyFactory.make(scope);
       Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha, mainClass);
       AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-      CallGraphBuilder builder = Util.makeVanillaZeroOneCFABuilder(options, new AnalysisCache(), cha, scope);
+      CallGraphBuilder<InstanceKey> builder = Util.makeVanillaZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
       // CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, new
       // AnalysisCache(), cha, scope);
       CallGraph cg = builder.makeCallGraph(options, null);
-      SDG sdg = new SDG(cg, builder.getPointerAnalysis(), dOptions, cOptions);
+      SDG<InstanceKey> sdg = new SDG<>(cg, builder.getPointerAnalysis(), dOptions, cOptions);
 
       // find the call statement of interest
       CGNode callerNode = SlicerTest.findMethod(cg, srcCaller);
@@ -166,12 +159,14 @@
       // compute the slice as a collection of statements
       Collection<Statement> slice = null;
       if (goBackward) {
-        slice = Slicer.computeBackwardSlice(s, cg, builder.getPointerAnalysis(), dOptions, cOptions);
+        final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+        slice = Slicer.computeBackwardSlice(s, cg, pointerAnalysis, dOptions, cOptions);
       } else {
         // for forward slices ... we actually slice from the return value of
         // calls.
         s = getReturnStatementForCall(s);
-        slice = Slicer.computeForwardSlice(s, cg, builder.getPointerAnalysis(), dOptions, cOptions);
+        final PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
+        slice = Slicer.computeForwardSlice(s, cg, pointerAnalysis, dOptions, cOptions);
       }
       SlicerTest.dumpSlice(slice);
 
@@ -228,7 +223,7 @@
       if (st instanceof SSAInvokeInstruction) {
         SSAAbstractInvokeInstruction call = (SSAAbstractInvokeInstruction) st;
         if (call.getCallSite().getDeclaredTarget().getReturnType().equals(TypeReference.Void)) {
-          throw new IllegalArgumentException("this driver computes forward slices from the return value of calls.\n" + ""
+          throw new IllegalArgumentException("this driver computes forward slices from the return value of calls.\n"
               + "Method " + call.getCallSite().getDeclaredTarget().getSignature() + " returns void.");
         }
         return new NormalReturnCaller(s.getNode(), n.getInstructionIndex());
@@ -243,49 +238,40 @@
   /**
    * return a view of the sdg restricted to the statements in the slice
    */
-  public static Graph<Statement> pruneSDG(SDG sdg, final Collection<Statement> slice) {
-    Predicate<Statement> f = new Predicate<Statement>() {
-      @Override public boolean test(Statement o) {
-        return slice.contains(o);
-      }
-    };
-    return GraphSlicer.prune(sdg, f);
+  public static Graph<Statement> pruneSDG(SDG<InstanceKey> sdg, final Collection<Statement> slice) {
+    return GraphSlicer.prune(sdg, slice::contains);
   }
 
   /**
    * @return a NodeDecorator that decorates statements in a slice for a dot-ted representation
    */
   public static NodeDecorator<Statement> makeNodeDecorator() {
-    return new NodeDecorator<Statement>() {
-      @Override
-      public String getLabel(Statement s) throws WalaException {
-        switch (s.getKind()) {
-        case HEAP_PARAM_CALLEE:
-        case HEAP_PARAM_CALLER:
-        case HEAP_RET_CALLEE:
-        case HEAP_RET_CALLER:
-          HeapStatement h = (HeapStatement) s;
-          return s.getKind() + "\\n" + h.getNode() + "\\n" + h.getLocation();
-        case NORMAL:
-          NormalStatement n = (NormalStatement) s;
-          return n.getInstruction() + "\\n" + n.getNode().getMethod().getSignature();
-        case PARAM_CALLEE:
-          ParamCallee paramCallee = (ParamCallee) s;
-          return s.getKind() + " " + paramCallee.getValueNumber() + "\\n" + s.getNode().getMethod().getName();
-        case PARAM_CALLER:
-          ParamCaller paramCaller = (ParamCaller) s;
-          return s.getKind() + " " + paramCaller.getValueNumber() + "\\n" + s.getNode().getMethod().getName() + "\\n"
-              + paramCaller.getInstruction().getCallSite().getDeclaredTarget().getName();
-        case EXC_RET_CALLEE:
-        case EXC_RET_CALLER:
-        case NORMAL_RET_CALLEE:
-        case NORMAL_RET_CALLER:
-        case PHI:
-        default:
-          return s.toString();
-        }
+    return s -> {
+      switch (s.getKind()) {
+      case HEAP_PARAM_CALLEE:
+      case HEAP_PARAM_CALLER:
+      case HEAP_RET_CALLEE:
+      case HEAP_RET_CALLER:
+        HeapStatement h = (HeapStatement) s;
+        return s.getKind() + "\\n" + h.getNode() + "\\n" + h.getLocation();
+      case NORMAL:
+        NormalStatement n = (NormalStatement) s;
+        return n.getInstruction() + "\\n" + n.getNode().getMethod().getSignature();
+      case PARAM_CALLEE:
+        ParamCallee paramCallee = (ParamCallee) s;
+        return s.getKind() + " " + paramCallee.getValueNumber() + "\\n" + s.getNode().getMethod().getName();
+      case PARAM_CALLER:
+        ParamCaller paramCaller = (ParamCaller) s;
+        return s.getKind() + " " + paramCaller.getValueNumber() + "\\n" + s.getNode().getMethod().getName() + "\\n"
+            + paramCaller.getInstruction().getCallSite().getDeclaredTarget().getName();
+      case EXC_RET_CALLEE:
+      case EXC_RET_CALLER:
+      case NORMAL_RET_CALLEE:
+      case NORMAL_RET_CALLER:
+      case PHI:
+      default:
+        return s.toString();
       }
-
     };
   }
 
@@ -320,4 +306,4 @@
       throw new UnsupportedOperationException("expected command-line to include -srcCaller");
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFTypeHierarchy.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFTypeHierarchy.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFTypeHierarchy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFTypeHierarchy.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,18 +14,19 @@
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Properties;
+import java.util.function.Predicate;
 
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.examples.properties.WalaExamplesProperties;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.properties.WalaProperties;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.CollectionFilter;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.config.AnalysisScopeReader;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.Graph;
@@ -74,7 +75,7 @@
       AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(classpath, (new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
       // invoke WALA to build a class hierarchy
-      ClassHierarchy cha = ClassHierarchy.make(scope);
+      ClassHierarchy cha = ClassHierarchyFactory.make(scope);
 
       Graph<IClass> g = typeHierarchy2Graph(cha);
 
@@ -93,20 +94,16 @@
     }
   }
 
-  public static <T> Graph<T> pruneGraph(Graph<T> g, Predicate<T> f) throws WalaException {
+  public static <T> Graph<T> pruneGraph(Graph<T> g, Predicate<T> f) {
     Collection<T> slice = GraphSlicer.slice(g, f);
-    return GraphSlicer.prune(g, new CollectionFilter<T>(slice));
+    return GraphSlicer.prune(g, new CollectionFilter<>(slice));
   }
   
   /**
    * Restrict g to nodes from the Application loader
    */
-  public static Graph<IClass> pruneForAppLoader(Graph<IClass> g) throws WalaException {
-    Predicate<IClass> f = new Predicate<IClass>() {
-      @Override public boolean test(IClass c) {
-        return (c.getClassLoader().getReference().equals(ClassLoaderReference.Application));
-      }
-    };
+  public static Graph<IClass> pruneForAppLoader(Graph<IClass> g) {
+    Predicate<IClass> f = c -> (c.getClassLoader().getReference().equals(ClassLoaderReference.Application));
     return pruneGraph(g, f);
   }
   
@@ -129,7 +126,7 @@
   /**
    * Return a view of an {@link IClassHierarchy} as a {@link Graph}, with edges from classes to immediate subtypes
    */
-  public static Graph<IClass> typeHierarchy2Graph(IClassHierarchy cha) throws WalaException {
+  public static Graph<IClass> typeHierarchy2Graph(IClassHierarchy cha) {
     Graph<IClass> result = SlowSparseNumberedGraph.make();
     for (IClass c : cha) {
       result.addNode(c);
@@ -146,4 +143,4 @@
     }
     return result;
   }  
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFWalaIR.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFWalaIR.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFWalaIR.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/PDFWalaIR.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,11 +17,13 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.examples.properties.WalaExamplesProperties;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.properties.WalaProperties;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSAOptions;
@@ -62,7 +64,6 @@
   /**
    * @param appJar should be something like "c:/temp/testdata/java_cup.jar"
    * @param methodSig should be something like "java_cup.lexer.advance()V"
-   * @throws IOException
    */
   public static Process run(String appJar, String methodSig) throws IOException {
     try {
@@ -77,7 +78,7 @@
 
       // Build a class hierarchy representing all classes to analyze.  This step will read the class
       // files and organize them into a tree.
-      ClassHierarchy cha = ClassHierarchy.make(scope);
+      ClassHierarchy cha = ClassHierarchyFactory.make(scope);
 
       // Create a name representing the method whose IR we will visualize
       MethodReference mr = StringStuff.makeMethodReference(methodSig);
@@ -94,10 +95,10 @@
       options.getSSAOptions().setPiNodePolicy(SSAOptions.getAllBuiltInPiNodes());
       
       // Create an object which caches IRs and related information, reconstructing them lazily on demand.
-      AnalysisCache cache = new AnalysisCache();
+      IAnalysisCacheView cache = new AnalysisCacheImpl(options.getSSAOptions());
       
       // Build the IR and cache it.
-      IR ir = cache.getSSACache().findOrCreateIR(m, Everywhere.EVERYWHERE, options.getSSAOptions());
+      IR ir = cache.getIR(m, Everywhere.EVERYWHERE);
 
       if (ir == null) {
         Assertions.UNREACHABLE("Null IR for " + m);
@@ -135,9 +136,9 @@
    * <li>args[0] : "-appJar"
    * <li>args[1] : something like "c:/temp/testdata/java_cup.jar"
    * <li>args[2] : "-sig"
-   * <li> args[3] : a method signature like "java_cup.lexer.advance()V" </ul?
+   * <li> args[3] : a method signature like "java_cup.lexer.advance()V"
+   * </ul>
    * 
-   * @param args
    * @throws UnsupportedOperationException if command-line is malformed.
    */
   public static void validateCommandLine(String[] args) {
@@ -151,4 +152,4 @@
       throw new UnsupportedOperationException("invalid command-line, args[2] should be -sig, but is " + args[0]);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/ScopeFileCallGraph.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/ScopeFileCallGraph.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/ScopeFileCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/drivers/ScopeFileCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,18 +18,21 @@
 
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.AnalysisOptions.ReflectionOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
 import com.ibm.wala.ipa.callgraph.CallGraphStats;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.DefaultEntrypoint;
 import com.ibm.wala.ipa.callgraph.impl.Util;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeReference;
@@ -50,11 +53,6 @@
    * 
    * If given -mainClass, uses main() method of class_name as entrypoint. If
    * given -entryClass, uses all public methods of class_name.
-   * 
-   * @throws IOException
-   * @throws ClassHierarchyException
-   * @throws CallGraphBuilderCancelException
-   * @throws IllegalArgumentException
    */
   public static void main(String[] args) throws IOException, ClassHierarchyException, IllegalArgumentException,
       CallGraphBuilderCancelException {
@@ -63,36 +61,40 @@
     String scopeFile = p.getProperty("scopeFile");
     String entryClass = p.getProperty("entryClass");
     String mainClass = p.getProperty("mainClass");
+    String dump = p.getProperty("dump");
     if (mainClass != null && entryClass != null) {
       throw new IllegalArgumentException("only specify one of mainClass or entryClass");
     }
     // use exclusions to eliminate certain library packages
     File exclusionsFile = null;
     AnalysisScope scope = AnalysisScopeReader.readJavaScope(scopeFile, exclusionsFile, ScopeFileCallGraph.class.getClassLoader());
-    IClassHierarchy cha = ClassHierarchy.make(scope);
+    IClassHierarchy cha = ClassHierarchyFactory.make(scope);
     System.out.println(cha.getNumberOfClasses() + " classes");
     System.out.println(Warnings.asString());
     Warnings.clear();
     AnalysisOptions options = new AnalysisOptions();
-    Iterable<Entrypoint> entrypoints = entryClass != null ? makePublicEntrypoints(scope, cha, entryClass) : Util.makeMainEntrypoints(scope, cha, mainClass);
+    Iterable<Entrypoint> entrypoints = entryClass != null ? makePublicEntrypoints(cha, entryClass) : Util.makeMainEntrypoints(scope, cha, mainClass);
     options.setEntrypoints(entrypoints);
     // you can dial down reflection handling if you like
-//    options.setReflectionOptions(ReflectionOptions.NONE);
-    AnalysisCache cache = new AnalysisCache();
+    options.setReflectionOptions(ReflectionOptions.NONE);
+    IAnalysisCacheView cache = new AnalysisCacheImpl();
     // other builders can be constructed with different Util methods
-    CallGraphBuilder builder = Util.makeZeroOneContainerCFABuilder(options, cache, cha, scope);
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneContainerCFABuilder(options, cache, cha, scope);
 //    CallGraphBuilder builder = Util.makeNCFABuilder(2, options, cache, cha, scope);
 //    CallGraphBuilder builder = Util.makeVanillaNCFABuilder(2, options, cache, cha, scope);
     System.out.println("building call graph...");
     CallGraph cg = builder.makeCallGraph(options, null);
     long end = System.currentTimeMillis();
     System.out.println("done");
+    if (dump != null) {
+      System.err.println(cg);
+    }
     System.out.println("took " + (end-start) + "ms");
     System.out.println(CallGraphStats.getStats(cg));
   }
 
-  private static Iterable<Entrypoint> makePublicEntrypoints(AnalysisScope scope, IClassHierarchy cha, String entryClass) {
-    Collection<Entrypoint> result = new ArrayList<Entrypoint>();
+  private static Iterable<Entrypoint> makePublicEntrypoints(IClassHierarchy cha, String entryClass) {
+    Collection<Entrypoint> result = new ArrayList<>();
     IClass klass = cha.lookupClass(TypeReference.findOrCreate(ClassLoaderReference.Application,
         StringStuff.deployment2CanonicalTypeString(entryClass)));
     for (IMethod m : klass.getDeclaredMethods()) {
diff -Nru wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/properties/WalaExamplesProperties.java wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/properties/WalaExamplesProperties.java
--- wala-1.3.9/com.ibm.wala.core.tests/src/com/ibm/wala/examples/properties/WalaExamplesProperties.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.core.tests/src/com/ibm/wala/examples/properties/WalaExamplesProperties.java	2019-01-29 17:08:39.000000000 +0000
@@ -46,4 +46,4 @@
     return new File((new FileProvider()).filePathFromURL(url)).getParentFile().getParentFile().getAbsolutePath();
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/apkCGBuilder.xml wala-1.5.1/com.ibm.wala.dalvik/apkCGBuilder.xml
--- wala-1.3.9/com.ibm.wala.dalvik/apkCGBuilder.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/apkCGBuilder.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE project>
 <project default="create_run_jar" name="Create Runnable Jar for Project com.ibm.wala.dalvik.test">
     <!--this file was created by Eclipse Runnable JAR Export Wizard-->
     <!--ANT 1.7 is required                                        -->
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/build.gradle wala-1.5.1/com.ibm.wala.dalvik/build.gradle
--- wala-1.3.9/com.ibm.wala.dalvik/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,20 @@
+sourceSets.main.java.srcDirs = ['src']
+
+dependencies {
+	compile(
+		'org.slf4j:slf4j-api:1.7.2',
+		'org.smali:dexlib2:2.2.6',
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.shrike'),
+		project(':com.ibm.wala.util'),
+		)
+}
+
+task createPackageList(type: CreatePackageList) {
+	sourceSet sourceSets.main.java
+}
+
+javadoc {
+	dependsOn createPackageList
+	options.linksOffline outputDirectory.path, createPackageList.packageList.parent
+}
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/build.properties wala-1.5.1/com.ibm.wala.dalvik/build.properties
--- wala-1.3.9/com.ibm.wala.dalvik/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,14 +1,17 @@
 bin.includes = META-INF/,\
-	       .,\
-               lib/commons-cli-1.2.jar,\
+               .,\
+               lib/commons-cli-1.4.jar,\
                lib/commons-io-2.4.jar,\
-               lib/dexlib-1.3.4.jar,\
-               lib/guava-13.0.1.jar,\
+               lib/dexlib2-2.2.6.jar,\
+               lib/util-2.2.5.jar,\
                lib/logback-classic-1.0.9.jar,\
                lib/logback-core-1.0.9.jar,\
-               lib/slf4j-api-1.7.2.jar
+               lib/slf4j-api-1.7.2.jar,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/,\
+               lib/guava-22.0.jar
 jars.compile.order = .
 output.. = bin/
-source.. = src/,\
-           lib/
+source.. = src/
+javacProjectSettings = true
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/build.xml wala-1.5.1/com.ibm.wala.dalvik/build.xml
--- wala-1.3.9/com.ibm.wala.dalvik/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/build.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project>
 <project name="com.ibm.wala.dalvik" default="getJars" basedir=".">
 
   <property name="basews" value="${ws}"/>
@@ -12,8 +13,8 @@
   <property name="javacVerbose" value="false"/>
   <property name="logExtension" value=".log"/>
   <property name="compilerArg" value=""/>
-  <property name="javacSource" value="1.5"/>
-  <property name="javacTarget" value="1.5"/>
+  <property name="javacSource" value="1.8"/>
+  <property name="javacTarget" value="1.8"/>
   <property name="dir_bootclasspath" value="${java.home}/lib"/>
   <path id="path_bootclasspath">
     <fileset dir="${dir_bootclasspath}">
@@ -36,12 +37,12 @@
   </target>
   
   <target name="CommonsCliPresent" depends="init">
-    <available file="${plugin.destination}/lib/commons-cli-1.2.jar" property="commons.cli.present"/>
+    <available file="${plugin.destination}/lib/commons-cli-1.4.jar" property="commons.cli.present"/>
   </target>
 
   <target name="fetchCommonsCli" depends="CommonsCliPresent" unless="commons.cli.present">
     <mkdir dir="${plugin.destination}/lib"/>    
-    <get src="http://central.maven.org/maven2/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" dest="${plugin.destination}/lib/commons-cli-1.2.jar" />
+    <get src="http://central.maven.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar" dest="${plugin.destination}/lib/commons-cli-1.4.jar" />
   </target>
   
   <target name="DexlibPresent" depends="init">
@@ -50,14 +51,7 @@
 
   <target name="fetchDexlib" depends="DexlibPresent" unless="dexlib.present">
     <mkdir dir="${plugin.destination}/lib"/>
-
-    <delete dir="${temp.folder}"/>
-    <mkdir dir="${temp.folder}"/>
-    <get src="https://apktool2.googlecode.com/archive/c1659e62c414c96882c49afa72032b504c921b5a.zip" dest="${temp.folder}/dexlib.zip"/>
-    <unzip src="${temp.folder}/dexlib.zip" dest="${temp.folder}"/>
-    <copy file="${temp.folder}/apktool2-c1659e62c414/m2-releases/brut/apktool/smali/dexlib/1.3.4-ibot7/dexlib-1.3.4-ibot7.jar" tofile="${plugin.destination}/lib/dexlib-1.3.4.jar"/>
-    <delete dir="${temp.folder}"/>
-
+    <get src="https://raw.github.com/msridhar/maven-jars/mvn-repo/net/sridharan/dexlib/1.3.4.custom/dexlib-1.3.4.custom.jar" dest="${plugin.destination}/lib/dexlib-1.3.4.jar"/>
   </target>
 
   <target name="GuavaPresent" depends="init">
@@ -85,12 +79,8 @@
 
   <target name="fetchSlf4j" depends="Slf4jPresent" unless="slf4j.present">
     <delete dir="${temp.folder}"/>
-    <mkdir dir="${temp.folder}"/>
     <mkdir dir="${plugin.destination}/lib"/>    
-    <get src="http://www.slf4j.org/dist/slf4j-1.7.2.tar.gz" dest="${temp.folder}/slf4j-1.7.2.tar.gz"/>
-    <untar compression="gzip" src="${temp.folder}/slf4j-1.7.2.tar.gz" dest="${temp.folder}"/>
-    <copy file="${temp.folder}/slf4j-1.7.2/slf4j-api-1.7.2.jar" tofile="${plugin.destination}/lib/slf4j-api-1.7.2.jar" />
-    <delete dir="${temp.folder}"/>
+    <get src="http://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jar" dest="${plugin.destination}/lib/slf4j-api-1.7.2.jar"/>
   </target>
 
   <target name="getJars" depends="fetchCommonsIo,fetchCommonsCli,fetchGuava,fetchDexlib,fetchLogback,fetchSlf4j" />
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/.classpath wala-1.5.1/com.ibm.wala.dalvik/.classpath
--- wala-1.3.9/com.ibm.wala.dalvik/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/dexlib-1.3.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/guava-13.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-cli-1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="lib/logback-classic-1.0.9.jar"/>
-	<classpathentry kind="lib" path="lib/logback-core-1.0.9.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j-api-1.7.2.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.dalvik/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.dalvik/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,27 +1,31 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WALA Dalvik Bytecode Frontend
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.dalvik
-Bundle-Version: 1.3.9
-Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0",
- com.ibm.wala.core;bundle-version="1.1.3",
- com.ibm.wala.ide;bundle-version="1.1.3",
+Bundle-Version: 1.5.1
+Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3",
  com.ibm.wala.shrike;bundle-version="1.3.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy 
 Export-Package: com.google.common.annotations,
  com.google.common.base,
  com.google.common.base.internal,
  com.google.common.cache,
  com.google.common.collect,
+ com.google.common.escape,
  com.google.common.eventbus,
+ com.google.common.graph,
  com.google.common.hash,
+ com.google.common.html,
  com.google.common.io,
  com.google.common.math,
  com.google.common.net,
  com.google.common.primitives,
  com.google.common.reflect,
  com.google.common.util.concurrent,
+ com.google.common.xml,
+ com.google.thirdparty.publicsuffix,
+ com.ibm.wala.dalvik.analysis.typeInference,
  com.ibm.wala.dalvik.classLoader,
  com.ibm.wala.dalvik.dex.instructions,
  com.ibm.wala.dalvik.dex.util.config,
@@ -41,21 +45,53 @@
  org.apache.commons.io.input,
  org.apache.commons.io.monitor,
  org.apache.commons.io.output,
- org.jf.dexlib,
- org.jf.dexlib.Code,
- org.jf.dexlib.Code.Analysis,
- org.jf.dexlib.Code.Format,
- org.jf.dexlib.Debug,
- org.jf.dexlib.EncodedValue,
- org.jf.dexlib.Util
+ org.jf.dexlib2,
+ org.jf.dexlib2.analysis,
+ org.jf.dexlib2.analysis.reflection,
+ org.jf.dexlib2.analysis.reflection.util,
+ org.jf.dexlib2.analysis.util,
+ org.jf.dexlib2.base,
+ org.jf.dexlib2.base.reference,
+ org.jf.dexlib2.base.value,
+ org.jf.dexlib2.builder,
+ org.jf.dexlib2.builder.debug,
+ org.jf.dexlib2.builder.instruction,
+ org.jf.dexlib2.dexbacked,
+ org.jf.dexlib2.dexbacked.instruction,
+ org.jf.dexlib2.dexbacked.raw,
+ org.jf.dexlib2.dexbacked.raw.util,
+ org.jf.dexlib2.dexbacked.reference,
+ org.jf.dexlib2.dexbacked.util,
+ org.jf.dexlib2.dexbacked.value,
+ org.jf.dexlib2.iface,
+ org.jf.dexlib2.iface.debug,
+ org.jf.dexlib2.iface.instruction,
+ org.jf.dexlib2.iface.instruction.formats,
+ org.jf.dexlib2.iface.reference,
+ org.jf.dexlib2.iface.value,
+ org.jf.dexlib2.immutable,
+ org.jf.dexlib2.immutable.debug,
+ org.jf.dexlib2.immutable.instruction,
+ org.jf.dexlib2.immutable.reference,
+ org.jf.dexlib2.immutable.util,
+ org.jf.dexlib2.immutable.value,
+ org.jf.dexlib2.rewriter,
+ org.jf.dexlib2.util,
+ org.jf.dexlib2.writer,
+ org.jf.dexlib2.writer.builder,
+ org.jf.dexlib2.writer.io,
+ org.jf.dexlib2.writer.pool,
+ org.jf.dexlib2.writer.util,
+ org.jf.util,
+ org.jf.util.jcommander
 Bundle-ClassPath: .,
- lib/commons-cli-1.2.jar,
+ lib/commons-cli-1.4.jar,
  lib/commons-io-2.4.jar,
- lib/commons-lang3-3.1.jar,
- lib/dexlib-1.3.4.jar,
- lib/guava-13.0.1.jar,
+ lib/dexlib2-2.2.6.jar,
+ lib/util-2.2.5.jar,
  lib/logback-classic-1.0.9.jar,
  lib/logback-core-1.0.9.jar,
- lib/slf4j-api-1.7.2.jar
+ lib/slf4j-api-1.7.2.jar,
+ lib/guava-22.0.jar
 
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/mvncentral.xml wala-1.5.1/com.ibm.wala.dalvik/mvncentral.xml
--- wala-1.3.9/com.ibm.wala.dalvik/mvncentral.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/mvncentral.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.ibm.wala</groupId>
+  <artifactId>com.ibm.wala.dalvik</artifactId>
+  <version>1.5.1</version>
+  <packaging>jar</packaging>
+  <name>WALA Dalvik</name>
+  <description>WALA Dalvik frontend</description>
+  <url>http://wala.sourceforge.net</url>
+  <licenses>
+    <license>
+      <name>Eclipse Public License, Version 1.0</name>
+      <url>https://www.eclipse.org/legal/epl-v10.html</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>Manu Sridharan</name>
+      <email>m.sridharan@samsung.com</email>
+      <organization>Samsung Research America</organization>
+      <organizationUrl>http://www.sisa.samsung.com/</organizationUrl>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git@github.com:wala/WALA.git</connection>
+    <developerConnection>scm:git:git@github.com:example/example-application.git</developerConnection>
+    <url>git@github.com:example/example-application.git</url>
+  </scm>
+
+  <properties>
+    <src.dir>src</src.dir>
+  </properties>
+
+  <distributionManagement>
+    <snapshotRepository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <dependencies>
+     <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.util</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.core</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.shrike</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+   <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.util</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.smali</groupId>
+      <artifactId>dexlib2</artifactId>
+      <version>2.2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.smali</groupId>
+      <artifactId>util</artifactId>
+      <version>2.2.4</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>22.0</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>1.0.9</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.2</version>
+    </dependency>
+  </dependencies>
+
+  <repositories>
+    <repository>
+      <id>sonatype-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+    <repository>
+        <id>maven-jars-mvn-repo</id>
+        <url>https://raw.github.com/msridhar/maven-jars/mvn-repo/</url>
+    </repository>
+  </repositories>
+
+  <profiles>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
+
+  <build>
+    <sourceDirectory>${src.dir}</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.2</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.3</version>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>ossrh</serverId>
+          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.2.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <additionalparam>${javadoc.options}</additionalparam>
+        </configuration>
+        <version>2.9.1</version>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+    <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-gpg-plugin</artifactId>
+      <version>1.5</version>
+      <executions>
+        <execution>
+          <id>sign-artifacts</id>
+          <phase>verify</phase>
+          <goals>
+            <goal>sign</goal>
+          </goals>
+        </execution>
+      </executions>
+    </plugin>
+
+    </plugins>
+  </build>
+</project>
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.dalvik/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.dalvik/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+#Properties file for com.ibm.wala.dalvik
+Bundle-Name = WALA Dalvik Bytecode Frontend
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/pom.xml wala-1.5.1/com.ibm.wala.dalvik/pom.xml
--- wala-1.3.9/com.ibm.wala.dalvik/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -6,14 +6,51 @@
 	<parent>
 		<artifactId>WALA</artifactId>
 		<groupId>com.ibm.wala</groupId>
-		<version>1.3.9</version>
+		<version>1.5.1</version>
 	</parent>
 	<artifactId>com.ibm.wala.dalvik</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
 	<build>
-		<plugins>
-			<plugin>
+	  <plugins>
+	    <plugin>
+	      <artifactId>maven-dependency-plugin</artifactId>
+              <executions>
+                <execution>
+                  <goals>
+                    <goal>copy</goal>
+                  </goals>
+                  <configuration>
+                    <artifactItems>
+                      <artifactItem>
+    			<groupId>org.smali</groupId>
+    			<artifactId>dexlib2</artifactId>
+    			<version>2.2.6</version>
+                        <type>jar</type>
+                        <overWrite>false</overWrite>
+                      </artifactItem>
+                      <artifactItem>
+    			<groupId>org.smali</groupId>
+    			<artifactId>util</artifactId>
+    			<version>2.2.5</version>
+                        <type>jar</type>
+                        <overWrite>false</overWrite>
+                      </artifactItem>
+                      <artifactItem>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>22.0</version>
+                        <type>jar</type>
+                        <overWrite>false</overWrite>
+		      </artifactItem>
+		    </artifactItems>  
+                    <outputDirectory>${basedir}/lib</outputDirectory>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
+	    
+	    <plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<version>1.7</version>
 				<executions>
@@ -38,8 +75,24 @@
                   <scope>system</scope>
                   <systemPath>${java.home}/../lib/tools.jar</systemPath>
                 </dependency>
+                <dependency>
+    		  <groupId>org.smali</groupId>
+    		  <artifactId>dexlib2</artifactId>
+    		  <version>2.2.6</version>
+                </dependency>
+                <dependency>
+    		  <groupId>org.smali</groupId>
+    		  <artifactId>util</artifactId>
+    		  <version>2.2.5</version>
+                </dependency>
+	      <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+	      <dependency>
+		<groupId>com.google.guava</groupId>
+		<artifactId>guava</artifactId>
+		<version>22.0</version>
+	      </dependency>
               </dependencies>
-			</plugin>
-		</plugins>
+	    </plugin>
+	  </plugins>
 	</build>
 </project>
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/.project wala-1.5.1/com.ibm.wala.dalvik/.project
--- wala-1.3.9/com.ibm.wala.dalvik/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.dalvik</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.dalvik/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.dalvik/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -8,16 +8,120 @@
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=error
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.dalvik/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.dalvik/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=0
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.dalvik/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.dalvik/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude08113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT0304file128target/antrun/build-main.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/analysis/typeInference/DalvikTypeInference.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/analysis/typeInference/DalvikTypeInference.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/analysis/typeInference/DalvikTypeInference.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/analysis/typeInference/DalvikTypeInference.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,130 @@
+package com.ibm.wala.dalvik.analysis.typeInference;
+
+import com.ibm.wala.analysis.typeInference.TypeAbstraction;
+import com.ibm.wala.analysis.typeInference.TypeInference;
+import com.ibm.wala.analysis.typeInference.TypeVariable;
+import com.ibm.wala.fixpoint.AbstractOperator;
+import com.ibm.wala.fixpoint.IVariable;
+import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.SSAPhiInstruction;
+import com.ibm.wala.ssa.SymbolTable;
+
+public class DalvikTypeInference extends TypeInference {
+	@Override
+	protected TypeVariable[] makeStmtRHS(int size) {
+		return new DalvikTypeVariable[size];
+	}
+
+	private static AbstractOperator<TypeVariable> dalvikPhiOp = new DalvikPhiOperator();
+
+	protected DalvikTypeInference(IR ir, boolean doPrimitives) {
+		super(ir, doPrimitives);
+	}
+
+	@Override
+	protected void initialize() {
+		init(ir, this.new DalvikTypeVarFactory(), this.new TypeOperatorFactory());
+	}
+
+	public static DalvikTypeInference make(IR ir, boolean doPrimitives) {
+		return new DalvikTypeInference(ir, doPrimitives);
+	}
+
+	public class DalvikTypeVarFactory extends TypeInference.TypeVarFactory {
+
+		@Override
+		public IVariable makeVariable(int valueNumber) {
+			SymbolTable st = ir.getSymbolTable();
+			if (st.isIntegerConstant(valueNumber) && st.isZero(valueNumber)) {
+				return new DalvikTypeVariable(language.getPrimitive(language.getConstantType(Integer.valueOf(0))), true);
+			} else {
+				if (doPrimitives) {
+					if (st.isConstant(valueNumber)) {
+						if (st.isBooleanConstant(valueNumber)) {
+							return new DalvikTypeVariable(language.getPrimitive(language.getConstantType(Boolean.TRUE)));
+						}
+					}
+				}
+				return new DalvikTypeVariable(TypeAbstraction.TOP);
+			}
+		}
+	}
+
+	protected class TypeOperatorFactory extends TypeInference.TypeOperatorFactory {
+
+		@Override
+		public void visitPhi(SSAPhiInstruction instruction) {
+			assert dalvikPhiOp != null;
+			this.result = dalvikPhiOp;
+		}
+
+	}
+
+	private static final class DalvikPhiOperator extends AbstractOperator<TypeVariable> {
+		private DalvikPhiOperator() {
+		}
+
+		@Override
+		public byte evaluate(TypeVariable _lhs, TypeVariable[] _rhs) {
+			/**
+			 * TODO: Find a better solution than downcasting. Downcasting is
+			 * really ugly, although I can be sure here that it succeeds because
+			 * I control what type the parameters have. There must be a cleaner
+			 * solution which does not cause tons of changes in WALA's code, but
+			 * I don't see it yet...
+			 */
+			assert _lhs instanceof DalvikTypeVariable;
+			assert _rhs instanceof DalvikTypeVariable[];
+			DalvikTypeVariable lhs = (DalvikTypeVariable) _lhs;
+			DalvikTypeVariable[] rhs = (DalvikTypeVariable[]) _rhs;
+			TypeAbstraction lhsType = lhs.getType();
+			TypeAbstraction meet = TypeAbstraction.TOP;
+			boolean ignoreZero = containsNonPrimitiveAndZero(rhs);
+			for (int i = 0; i < rhs.length; i++) {
+				if (rhs[i] != null && rhs[i].getType() != null && !(ignoreZero && rhs[i].isIntZeroConstant())) {
+					TypeVariable r = rhs[i];
+					meet = meet.meet(r.getType());
+				}
+			}
+			if (lhsType.equals(meet)) {
+				return NOT_CHANGED;
+			} else {
+				lhs.setType(meet);
+				return CHANGED;
+			}
+		}
+
+		private static boolean containsNonPrimitiveAndZero(DalvikTypeVariable[] types) {
+			boolean containsNonPrimitive = false;
+			boolean containsZero = false;
+			for (int i = 0; i < types.length; i++) {
+				if (types[i] != null) {
+					if (types[i].getType() != null && types[i].getType().getTypeReference() != null
+							&& !types[i].getType().getTypeReference().isPrimitiveType()) {
+						containsNonPrimitive = true;
+					}
+					if (types[i].isIntZeroConstant()) {
+						containsZero = true;
+					}
+				}
+			}
+			return containsNonPrimitive && containsZero;
+		}
+
+		@Override
+		public String toString() {
+			return "phi meet (dalvik)";
+		}
+
+		@Override
+		public int hashCode() {
+			return 2297;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			return (o instanceof DalvikPhiOperator);
+		}
+	}
+}
+
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/analysis/typeInference/DalvikTypeVariable.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/analysis/typeInference/DalvikTypeVariable.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/analysis/typeInference/DalvikTypeVariable.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/analysis/typeInference/DalvikTypeVariable.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,20 @@
+package com.ibm.wala.dalvik.analysis.typeInference;
+
+import com.ibm.wala.analysis.typeInference.TypeAbstraction;
+import com.ibm.wala.analysis.typeInference.TypeVariable;
+
+public class DalvikTypeVariable extends TypeVariable {
+	private final boolean isIntZeroConstant;
+
+	public DalvikTypeVariable(TypeAbstraction type, boolean isIntZeroConstant) {
+		super(type);
+		this.isIntZeroConstant = isIntZeroConstant;
+	}
+
+	public DalvikTypeVariable(TypeAbstraction type) {
+		this(type, false);
+	}
+	public boolean isIntZeroConstant() {
+		return isIntZeroConstant;
+	}
+}
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/ActivityModelMethod.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/ActivityModelMethod.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/ActivityModelMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/ActivityModelMethod.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,245 +0,0 @@
-/*
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html.
- * 
- * This file is a derivative of code released under the terms listed below.  
- *
- */
-/*
- *
- * Copyright (c) 2009-2012,
- *
- *  Steve Suh           <suhsteve@gmail.com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The names of the contributors may not be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-package com.ibm.wala.dalvik.classLoader;
-
-import static org.jf.dexlib.ItemType.TYPE_CLASS_DEF_ITEM;
-
-import java.io.File;
-
-import org.jf.dexlib.ClassDataItem.EncodedMethod;
-import org.jf.dexlib.ClassDefItem;
-import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Section;
-import org.jf.dexlib.Code.Opcode;
-
-import com.ibm.wala.dalvik.dex.instructions.Invoke;
-import com.ibm.wala.util.io.FileProvider;
-
-/**
- *  @deprecated building the Android-Livecycle is done in the class AndroidModel now
- */
-@Deprecated
-public class ActivityModelMethod extends DexIMethod {
-	private static EncodedMethod ActivityModelM;
-
-	public ActivityModelMethod(EncodedMethod encodedMethod, DexIClass klass) {
-		super(encodedMethod, klass);
-	}
-
-	public static void loadActivityModel() {
-		if (ActivityModelM == null) {
-			DexFile activityModelDF;
-			ClassDefItem activityModelCDI = null;
-			try {
-				FileProvider fp = new FileProvider();
-				File apkFile = fp.getFile("models/ActivityModel.apk", ActivityModelMethod.class.getClassLoader());
-				activityModelDF = new DexFile(apkFile);
-						/* new DexFile(new File(
-						ActivityModelMethod.class.getClassLoader()
-								.getResource("models/ActivityModel.apk")
-								.toURI())); */
-			} catch (Exception e) {
-				throw new IllegalArgumentException(e);
-			}
-			@SuppressWarnings("unchecked")
-			Section<ClassDefItem> cldeff = activityModelDF.getSectionForType(TYPE_CLASS_DEF_ITEM);
-			for (ClassDefItem cdefitems : cldeff.getItems()) {
-				if (cdefitems.getClassType().getTypeDescriptor()
-						.equals("Lactivity/model/ActivityModelActivity;")) {
-					activityModelCDI = cdefitems;
-				}
-			}
-			assert (activityModelCDI != null);
-			// final EncodedMethod[] virtualMethods =
-			// ActivityModelCDI.getClassData().getVirtualMethods();
-			for (EncodedMethod virtualMethod : activityModelCDI.getClassData()
-					.getVirtualMethods()) {
-				if (virtualMethod.method.getMethodName().getStringValue()
-						.equals("ActivityModel"))
-					ActivityModelM = virtualMethod;
-			}
-			assert (ActivityModelM != null);
-		}
-	}
-
-	public static EncodedMethod getActivityModel() {
-		if (ActivityModelM == null) {
-			loadActivityModel();
-		}
-		return ActivityModelM;
-	}
-
-	// @Override
-	// public TypeReference[] getDeclaredExceptions() {
-	// return null;
-	// }
-	//
-	// @Override
-	// public MethodReference getReference() {
-	// if (methodReference == null) {
-	// // Set method name
-	// Atom name = Atom.findOrCreateUnicodeAtom("ActivityModel");
-	//
-	// // Set the descriptor
-	// ImmutableByteArray desc = ImmutableByteArray.make("()V");
-	// Descriptor D =
-	// Descriptor.findOrCreate(myClass.getClassLoader().getLanguage(), desc);
-	// methodReference = MethodReference.findOrCreate(myClass.getReference(),
-	// name, D);
-	// }
-	//
-	// return methodReference;
-	// }
-	//
-	// @Override
-	// public boolean hasExceptionHandler() {
-	// return false;
-	// }
-	//
-	// @Override
-	// public boolean isAbstract() {
-	// return false;
-	// }
-	//
-	// @Override
-	// public boolean isBridge() {
-	// return false;
-	// }
-	//
-	// @Override
-	// public boolean isClinit() {
-	// return false;
-	// }
-	//
-	// @Override
-	// public boolean isFinal() {
-	// return false;
-	// }
-	//
-	// @Override
-	// public boolean isInit() {
-	// return false;
-	// }
-	//
-	// @Override
-	// public boolean isNative() {
-	// return false;
-	// }
-	//
-	// @Override
-	// public boolean isPrivate() {
-	// return false;
-	// }
-	//
-	// @Override
-	// public boolean isProtected() {
-	// return false;
-	// }
-	//
-	// @Override
-	// public boolean isPublic() {
-	// return true;
-	// }
-	//
-	// @Override
-	// public boolean isSynchronized() {
-	// return false;
-	// }
-	//
-	// @Override
-	// public boolean isSynthetic() {
-	// return false;
-	// }
-	//
-	// @Override
-	// public boolean isStatic() {
-	// return false;
-	// }
-	//
-	// @Override
-	// public boolean isVolatile() {
-	// return false;
-	// }
-	//
-	// @Override
-	// public ExceptionHandler[][] getHandlers() throws
-	// InvalidClassFileException {
-	// this.handlers = new ExceptionHandler[instructions().size()][];
-	// return handlers;
-	// }
-	//
-	// @Override
-	// public int getMaxLocals() {
-	// return 12;
-	// }
-	//
-	// @Override
-	// public int getReturnReg() {
-	// return 10;
-	// }
-	//
-	// @Override
-	// public int getExceptionReg() {
-	// return 11;
-	// }
-	//
-	// @Override
-	// public int getNumberOfParameterRegisters() {
-	// return 1;
-	// }
-
-	@Override
-	protected void handleINVOKE_VIRTUAL(int instLoc, String cname,
-			String mname, String pname, int[] args, Opcode opcode) {
-		if (cname.equals("Lactivity/model/ActivityModelActivity")) {
-			cname = myClass.getName().toString();
-		}
-		instructions.add(new Invoke.InvokeVirtual(instLoc, cname, mname, pname,
-				args, opcode, this));
-
-	}
-}
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexCFG.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexCFG.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexCFG.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexCFG.java	2019-01-29 17:08:39.000000000 +0000
@@ -100,8 +100,9 @@
 
     }
 
+    @Override
     public Instruction[] getInstructions() {
-        return (Instruction[])dexMethod.getDexInstructions();
+        return dexMethod.getDexInstructions();
 
     }
 
@@ -110,8 +111,7 @@
      */
     private void computeI2BMapping() {
         instruction2Block = new int[getInstructions().length];
-        for (Iterator<BasicBlock> it = iterator(); it.hasNext();) {
-            final BasicBlock b = it.next();
+        for (BasicBlock b : this) {
             for (int j = b.getFirstInstructionIndex(); j <= b.getLastInstructionIndex(); j++) {
                 instruction2Block[j] = getNumber(b);
             }
@@ -122,8 +122,7 @@
      * Compute outgoing edges in the control flow graph.
      */
     private void computeEdges() {
-        for (Iterator<BasicBlock> it = iterator(); it.hasNext();) {
-            BasicBlock b = it.next();
+        for (BasicBlock b : this) {
             if (b.equals(exit())) {
                 continue;
             } else if (b.equals(entry())) {
@@ -138,13 +137,7 @@
 
     private void makeBasicBlocks() {
         ExceptionHandler[][] handlers;
-        try {
-            handlers = dexMethod.getHandlers();
-        } catch (InvalidClassFileException e) {
-            e.printStackTrace();
-            Assertions.UNREACHABLE();
-            handlers = null;
-        }
+        handlers = dexMethod.getHandlers();
         boolean[] r = new boolean[getInstructions().length];
         boolean[] catchers = new boolean[getInstructions().length];
         // we initially start with both the entry and exit block.
@@ -217,6 +210,7 @@
     /**
      * Return an instruction's basic block in the CFG given the index of the instruction in the CFG's instruction array.
      */
+    @Override
     public BasicBlock getBlockForInstruction(int index) {
         return getNode(instruction2Block[index]);
     }
@@ -232,6 +226,7 @@
             this.startIndex = startIndex;
         }
 
+        @Override
         public boolean isCatchBlock() {
             return DexCFG.this.isCatchBlock(getNumber());
         }
@@ -243,8 +238,8 @@
 
             Instruction last = getInstructions()[getLastInstructionIndex()];
             int[] targets = last.getBranchTargets();
-            for (int i = 0; i < targets.length; i++) {
-                BasicBlock b = getBlockForInstruction(targets[i]);
+            for (int target : targets) {
+                BasicBlock b = getBlockForInstruction(target);
                 addNormalEdgeTo(b);
             }
             addExceptionalEdges(last);
@@ -297,6 +292,10 @@
                                 e.printStackTrace();
                                 Assertions.UNREACHABLE();
                             }
+                            IMethod mTarget = cha.resolveMethod(target);
+                            if (mTarget == null) {
+                              goToAllHandlers = true;
+                            }
                         }
                     }
                 }
@@ -309,11 +308,11 @@
                         exceptionTypes = HashSetFactory.make(exceptionTypes);
                     }
 
-                    for (int j = 0; j < hs.length; j++) {
+                    for (ExceptionHandler element : hs) {
                         if (DEBUG) {
-                            System.err.println(" handler " + hs[j]);
+                            System.err.println(" handler " + element);
                         }
-                        BasicBlock b = getBlockForInstruction(hs[j].getHandler());
+                        BasicBlock b = getBlockForInstruction(element.getHandler());
                         if (DEBUG) {
                             System.err.println(" target " + b);
                         }
@@ -325,9 +324,9 @@
                             addExceptionalEdgeTo(b);
                         } else {
                             TypeReference caughtException = null;
-                            if (hs[j].getCatchClass() != null) {
+                            if (element.getCatchClass() != null) {
                                 ClassLoaderReference loader = DexCFG.this.getMethod().getDeclaringClass().getReference().getClassLoader();
-                                caughtException = ShrikeUtil.makeTypeReference(loader, hs[j].getCatchClass());
+                                caughtException = ShrikeUtil.makeTypeReference(loader, element.getCatchClass());
                                 if (DEBUG) {
                                     System.err.println(" caughtException " + caughtException);
                                 }
@@ -349,14 +348,14 @@
                                 if (!exceptionTypes.isEmpty()) {
                                     addExceptionalEdgeTo(b);
                                     exceptionTypes.clear();
-                                    caughtException = null;
+                                    assert caughtException == null;
                                 }
                             }
                             if (caughtException != null) {
                                 IClass caughtClass = cha.lookupClass(caughtException);
                                 // the set "caught" should be the set of exceptions that MUST
                                 // have been caught by the handlers in scope
-                                ArrayList<TypeReference> caught = new ArrayList<TypeReference>(exceptionTypes.size());
+                                ArrayList<TypeReference> caught = new ArrayList<>(exceptionTypes.size());
                                 // check if we should add an edge to the catch block.
                                 for (TypeReference t : exceptionTypes) {
                                     if (t != null) {
@@ -413,7 +412,7 @@
             if (pei == null) {
                 throw new IllegalArgumentException("pei is null");
             }
-            switch (((Instruction) pei).getOpcode()) {
+            switch (pei.getOpcode()) {
             //TODO: Make sure all the important cases and exceptions are covered.
             case AGET:
             case AGET_WIDE:
@@ -557,13 +556,7 @@
 
         private ExceptionHandler[] getExceptionHandlers() {
             ExceptionHandler[][] handlers;
-            try {
-                handlers = dexMethod.getHandlers();
-            } catch (InvalidClassFileException e) {
-                e.printStackTrace();
-                Assertions.UNREACHABLE();
-                handlers = null;
-            }
+            handlers = dexMethod.getHandlers();
             ExceptionHandler[] hs = handlers[getLastInstructionIndex()];
             return hs;
         }
@@ -578,6 +571,7 @@
             addExceptionalEdge(this, b);
         }
 
+        @Override
         public int getLastInstructionIndex() {
             if (this == entry() || this == exit()) {
                 // these are the special end blocks
@@ -592,18 +586,20 @@
             }
         }
 
+        @Override
         public int getFirstInstructionIndex() {
             return startIndex;
         }
 
         @Override
         public String toString() {
-            return "BB[Dex]" + getNumber() + " - " + dexMethod.getDeclaringClass().getReference().getName() + "." + dexMethod.getName();
+            return "BB[Dex]" + getNumber() + " - " + dexMethod.getDeclaringClass().getReference().getName() + '.' + dexMethod.getName();
         }
 
         /*
          * @see com.ibm.wala.cfg.BasicBlock#isExitBlock()
          */
+        @Override
         public boolean isExitBlock() {
             return this == DexCFG.this.exit();
         }
@@ -611,6 +607,7 @@
         /*
          * @see com.ibm.wala.cfg.BasicBlock#isEntryBlock()
          */
+        @Override
         public boolean isEntryBlock() {
             return this == DexCFG.this.entry();
         }
@@ -618,6 +615,7 @@
         /*
          * @see com.ibm.wala.cfg.BasicBlock#getMethod()
          */
+        @Override
         public IMethod getMethod() {
             return DexCFG.this.getMethod();
         }
@@ -636,33 +634,34 @@
         /*
          * @see com.ibm.wala.cfg.BasicBlock#getNumber()
          */
+        @Override
         public int getNumber() {
             return getGraphNodeId();
         }
 
+        @Override
         public Iterator<Instruction> iterator() {
-            return new ArrayIterator<Instruction>(getInstructions(), getFirstInstructionIndex(), getLastInstructionIndex());
+            return new ArrayIterator<>(getInstructions(), getFirstInstructionIndex(), getLastInstructionIndex());
         }
     }
 
     @Override
     public String toString() {
-        StringBuffer s = new StringBuffer("");
+        StringBuilder s = new StringBuilder();
         BitVector catches = this.getCatchBlocks();
-        for (Iterator<BasicBlock> it = iterator(); it.hasNext();) {
-            BasicBlock bb = it.next();
+        for (BasicBlock bb : this) {
             s.append("BB").append(getNumber(bb));
             if (catches.contains(bb.getNumber())) {
             	s.append("<Handler>");
             }
-            s.append("\n");
+            s.append('\n');
             for (int j = bb.getFirstInstructionIndex(); j <= bb.getLastInstructionIndex(); j++) {
-                s.append("  ").append(j).append("  ").append(getInstructions()[j]).append("\n");
+                s.append("  ").append(j).append("  ").append(getInstructions()[j]).append('\n');
             }
 
             Iterator<BasicBlock> succNodes = getSuccNodes(bb);
             while (succNodes.hasNext()) {
-                s.append("    -> BB").append(getNumber(succNodes.next())).append("\n");
+                s.append("    -> BB").append(getNumber(succNodes.next())).append('\n');
             }
         }
         return s.toString();
@@ -676,6 +675,7 @@
         return dexMethod.getMaxLocals();
     }
 
+    @Override
     public Set<ExceptionHandler> getExceptionHandlers() {
         return exceptionHandlers;
     }
@@ -683,6 +683,7 @@
     /*
      * @see com.ibm.wala.cfg.ControlFlowGraph#getProgramCounter(int)
      */
+    @Override
     public int getProgramCounter(int index) {
         return dexMethod.getAddressFromIndex(index);
         //    return dexMethod.getInstructionFromIndex(index).pc;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexFileModule.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexFileModule.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexFileModule.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexFileModule.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,14 +49,16 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.jar.JarFile;
 
-import org.jf.dexlib.ClassDefItem;
-import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Section;
+import org.jf.dexlib2.DexFileFactory;
+import org.jf.dexlib2.Opcodes;
+import org.jf.dexlib2.iface.ClassDef;
+import org.jf.dexlib2.iface.DexFile;
 
 import com.ibm.wala.classLoader.Module;
 import com.ibm.wala.classLoader.ModuleEntry;
@@ -68,23 +70,31 @@
  * @author barjo
  */
 public class DexFileModule implements Module {
+	private final File f;
     private final DexFile dexfile;
     private final Collection<ModuleEntry> entries;
+    public static final int AUTO_INFER_API_LEVEL = -1;
 
     public static DexFileModule make(File f) throws IllegalArgumentException, IOException {
+        return make(f, AUTO_INFER_API_LEVEL);
+    }
+
+    public static DexFileModule make(File f, int apiLevel) throws IllegalArgumentException, IOException {
     	if (f.getName().endsWith("jar")) {
-    		return new DexFileModule(new JarFile(f));
+    		try (final JarFile jar = new JarFile(f)) {
+    			return new DexFileModule(jar);
+    		}
     	} else {
-    		return new DexFileModule(f);
+    		return new DexFileModule(f, apiLevel);
     	}
     }
     
-    private static File tf(JarFile f) {
+    private static File tf(JarFile f) throws IOException {
     	String name = f.getName();
     	if (name.indexOf('/') >= 0) {
     		name = name.substring(name.lastIndexOf('/')+1);
     	}
-    	File tf = new File(System.getProperty("java.io.tmpdir") + "/" + name + "_classes.dex");
+    	File tf = Files.createTempFile("name", "_classes.dex").toFile();
     	tf.deleteOnExit();
     	System.err.println("using " + tf);
     	return tf;
@@ -93,28 +103,59 @@
     private DexFileModule(JarFile f) throws IllegalArgumentException, IOException {    	
     	this(TemporaryFile.streamToFile(tf(f), f.getInputStream(f.getEntry("classes.dex"))));
     }
-    
+
+
+    private DexFileModule(File f) throws IllegalArgumentException {
+        this(f, AUTO_INFER_API_LEVEL);
+    }
+
     /**
      * @param f
      *            the .dex or .apk file
-     * @throws IllegalArgumentException
      */
-    private DexFileModule(File f) throws IllegalArgumentException {    	
+    private DexFileModule(File f, int apiLevel) throws IllegalArgumentException {
         try {
-            dexfile = new DexFile(f);
+        	this.f = f;
+            dexfile = DexFileFactory.loadDexFile(f, apiLevel == AUTO_INFER_API_LEVEL? null : Opcodes.forApi(apiLevel));
         } catch (IOException e) {
             throw new IllegalArgumentException(e);
         }
 
         // create ModuleEntries from ClassDefItem
-        entries = new HashSet<ModuleEntry>();
+        entries = new HashSet<>();
+
+        for (ClassDef cdefitems : dexfile.getClasses()) {
+            entries.add(new DexModuleEntry(cdefitems, this));
+        }
+    }
+
+    /**
+     * @param f
+     *            the .oat or .apk file
+     * @param entry
+     *            the name of the .dex file inside the container file
+     * @param apiLevel
+     *            the api level wanted
+     */
+    public DexFileModule(File f, String entry, int apiLevel) throws IllegalArgumentException {
+        try {
+            this.f = f;
+            dexfile = DexFileFactory.loadDexEntry(f, entry,true, apiLevel == AUTO_INFER_API_LEVEL? null : Opcodes.forApi(apiLevel));
+        } catch (IOException e) {
+            throw new IllegalArgumentException(e);
+        }
 
-        Section<ClassDefItem> cldeff = dexfile.ClassDefsSection;
-        for (ClassDefItem cdefitems : cldeff.getItems()) {
-            entries.add(new DexModuleEntry(cdefitems));
+        // create ModuleEntries from ClassDefItem
+        entries = new HashSet<>();
+        for (ClassDef cdefitems : dexfile.getClasses()) {
+            entries.add(new DexModuleEntry(cdefitems, this));
         }
     }
 
+    public DexFileModule(File f, String entry) throws IllegalArgumentException {
+        this(f, entry, AUTO_INFER_API_LEVEL);
+    }
+
     /**
      * @return The DexFile associated to this module.
      */
@@ -122,11 +163,19 @@
         return dexfile;
     }
 
+    /**
+     * @return The DexFile associated to this module.
+     */
+    public File getFile() {
+        return f;
+    }
+
     /*
      * (non-Javadoc)
      *
      * @see com.ibm.wala.classLoader.Module#getEntries()
      */
+    @Override
     public Iterator<ModuleEntry> getEntries() {
         return entries.iterator();
     }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIClass.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIClass.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,37 +47,30 @@
 
 package com.ibm.wala.dalvik.classLoader;
 
-import static org.jf.dexlib.Util.AccessFlags.ABSTRACT;
-import static org.jf.dexlib.Util.AccessFlags.INTERFACE;
-import static org.jf.dexlib.Util.AccessFlags.PRIVATE;
-import static org.jf.dexlib.Util.AccessFlags.PUBLIC;
+import static org.jf.dexlib2.AccessFlags.ABSTRACT;
+import static org.jf.dexlib2.AccessFlags.INTERFACE;
+import static org.jf.dexlib2.AccessFlags.PRIVATE;
+import static org.jf.dexlib2.AccessFlags.PUBLIC;
+import static org.jf.dexlib2.AccessFlags.SYNTHETIC;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.jf.dexlib.AnnotationDirectoryItem;
-import org.jf.dexlib.AnnotationItem;
-import org.jf.dexlib.AnnotationSetItem;
-import org.jf.dexlib.AnnotationVisibility;
-import org.jf.dexlib.ClassDataItem;
-import org.jf.dexlib.ClassDataItem.EncodedField;
-import org.jf.dexlib.ClassDataItem.EncodedMethod;
-import org.jf.dexlib.ClassDefItem;
-import org.jf.dexlib.FieldIdItem;
-import org.jf.dexlib.MethodIdItem;
-import org.jf.dexlib.TypeIdItem;
-import org.jf.dexlib.TypeListItem;
+import org.jf.dexlib2.AnnotationVisibility;
+import org.jf.dexlib2.iface.ClassDef;
+import org.jf.dexlib2.iface.Field;
+import org.jf.dexlib2.iface.Method;
+import org.jf.dexlib2.iface.MethodParameter;
 
 import com.ibm.wala.classLoader.BytecodeClass;
 import com.ibm.wala.classLoader.IClassLoader;
 import com.ibm.wala.classLoader.IField;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.classLoader.Module;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.types.annotations.Annotation;
 import com.ibm.wala.util.collections.HashMapFactory;
@@ -90,7 +83,7 @@
      * Item which contains the class definitions.
      * (compute by DexFile, from the dexLib)
      */
-    private final ClassDefItem classDef;
+    private final ClassDef classDef;
 
     /**
      * Bitfields of these flags are used to indicate the accessibility and overall properties of classes and class members.
@@ -127,32 +120,28 @@
 
         //computeSuperName()
         // Set Super Name;
-        String descriptor = classDef.getSuperclass() != null? classDef.getSuperclass().getTypeDescriptor(): null;
+        String descriptor = classDef.getSuperclass() != null? classDef.getSuperclass(): null;
         if (descriptor != null && descriptor.endsWith(";"))
             descriptor = descriptor.substring(0,descriptor.length()-1); //remove last ';'
         superName = descriptor != null? ImmutableByteArray.make(descriptor): null;
 
         //computeInterfaceNames()
         // Set interfaceNames
-        final TypeListItem intfList = classDef.getInterfaces();
-        int size = intfList == null ? 0 : intfList.getTypeCount();
+        final List<String> intfList = classDef.getInterfaces();
+        int size = intfList == null ? 0 : intfList.size();
         //if (size != 0)
         //  System.out.println(intfList.getTypes().get(0).getTypeDescriptor());
 
 
         interfaceNames = new ImmutableByteArray[size];
         for (int i = 0; i < size; i++) {
-            TypeIdItem itf = intfList.getTypeIdItem(i);
-            descriptor = itf.getTypeDescriptor();
+            descriptor = intfList.get(i);
             if (descriptor.endsWith(";"))
                 descriptor = descriptor.substring(0, descriptor.length()-1);
             interfaceNames[i] = ImmutableByteArray
                     .make(descriptor);
         }
 
-        //Load class data
-        final ClassDataItem classData = classDef.getClassData();
-
         // Set direct instance fields
 //      if (classData == null) {
 //            throw new RuntimeException("DexIClass::DexIClass(): classData is null");
@@ -179,28 +168,29 @@
 //      }
 
         //computeFields()
-        if (classData != null) {
             //final EncodedField[] encInstFields = classData.getInstanceFields();
 
-        	final List<EncodedField> encInstFields = classData.getInstanceFields();
-            instanceFields = new IField[encInstFields.size()];
-        	for (int i = 0; i < encInstFields.size(); i++) {
-        		instanceFields[i] = new DexIField(encInstFields.get(i),this);
+        	final Iterable<? extends Field> encInstFields = classDef.getInstanceFields();
+        	List<IField> ifs = new LinkedList<>();
+        	for (Field dexf : encInstFields) {
+        		ifs.add(new DexIField(dexf,this));
         	}
+        	instanceFields = ifs.toArray(new IField[0]);
         	
             // Set direct static fields
-            final List<EncodedField> encStatFields = classData.getStaticFields();
-            staticFields = new IField[encStatFields.size()];
-            for (int i = 0; i < encStatFields.size(); i++) {
-                staticFields[i] = new DexIField(encStatFields.get(i),this);
+            final Iterable<? extends Field> encStatFields = classDef.getStaticFields();
+            List<IField> sfs = new LinkedList<>();
+            for (Field dexf : encStatFields) {
+                sfs.add(new DexIField(dexf,this));
             }
+            staticFields = sfs.toArray(new IField[0]);
         }
-    }
+    
 
     /**
      * @return The classDef Item associated with this class.
      */
-    public ClassDefItem getClassDefItem(){
+    public ClassDef getClassDefItem(){
         return classDef;
     }
 
@@ -208,6 +198,7 @@
      * (non-Javadoc)
      * @see com.ibm.wala.classLoader.IClass#isPublic()
      */
+    @Override
     public boolean isPublic() {
         return (modifiers & PUBLIC.getValue()) != 0;
     }
@@ -216,6 +207,7 @@
      * (non-Javadoc)
      * @see com.ibm.wala.classLoader.IClass#isPrivate()
      */
+    @Override
     public boolean isPrivate() {
         return (modifiers & PRIVATE.getValue()) != 0;
     }
@@ -224,6 +216,7 @@
      * (non-Javadoc)
      * @see com.ibm.wala.classLoader.IClass#isInterface()
      */
+    @Override
     public boolean isInterface() {
         return (modifiers & INTERFACE.getValue()) != 0;
 
@@ -232,15 +225,24 @@
     /*
      * @see com.ibm.wala.classLoader.IClass#isAbstract()
      */
+    @Override
     public boolean isAbstract() {
         return (modifiers & ABSTRACT.getValue()) != 0;
     }
 
+    /*
+     * @see com.ibm.wala.classLoader.IClass#isAbstract()
+     */
+    @Override
+    public boolean isSynthetic() {
+        return (modifiers & SYNTHETIC.getValue()) != 0;
+    }
 
     /*
      * (non-Javadoc)
      * @see com.ibm.wala.classLoader.IClass#getModifiers()
      */
+    @Override
     public int getModifiers() throws UnsupportedOperationException {
         return modifiers;
     }
@@ -265,76 +267,66 @@
         return hashCode;
       }
 
-      Collection<Annotation> getAnnotations(Set<AnnotationVisibility> types) {
+      Collection<Annotation> getAnnotations(Set<String> types) {
     	  Set<Annotation> result = HashSetFactory.make();
-    	  AnnotationDirectoryItem d = dexModuleEntry.getClassDefItem().getAnnotations();
-    	  if (d.getClassAnnotations() != null) {
-    		  for(AnnotationItem a : d.getClassAnnotations().getAnnotations()) {
-    			  if (types == null || types.contains(a.getVisibility())) {
-    				  result.add(DexUtil.getAnnotation(a, getClassLoader().getReference()));
-    			  }
+    	  for(org.jf.dexlib2.iface.Annotation a : classDef.getAnnotations()) {
+    		  if (types == null || types.contains(AnnotationVisibility.getVisibility(a.getVisibility()))) {
+    			  result.add(DexUtil.getAnnotation(a, getClassLoader().getReference()));
     		  }
     	  }
     	  return result;
       }
       
+      @Override
       public Collection<Annotation> getAnnotations() {
-    	  return getAnnotations((Set<AnnotationVisibility>)null);
+    	  return getAnnotations((Set<String>)null);
       }
 
-      public Collection<Annotation> getAnnotations(boolean runtimeInvisible) throws InvalidClassFileException {
+      @Override
+      public Collection<Annotation> getAnnotations(boolean runtimeInvisible) {
   		return getAnnotations(getTypes(runtimeInvisible));
       }
 
-	static Set<AnnotationVisibility> getTypes(boolean runtimeInvisible) {
-		Set<AnnotationVisibility> types = HashSetFactory.make();
-  		types.add(AnnotationVisibility.SYSTEM);
+	static Set<String> getTypes(boolean runtimeInvisible) {
+		Set<String> types = HashSetFactory.make();
+  		types.add(AnnotationVisibility.getVisibility(AnnotationVisibility.SYSTEM));
   		if (runtimeInvisible) {
-  			types.add(AnnotationVisibility.BUILD);
+  			types.add(AnnotationVisibility.getVisibility(AnnotationVisibility.BUILD));
   		} else {
-  			types.add(AnnotationVisibility.RUNTIME);
+  			types.add(AnnotationVisibility.getVisibility(AnnotationVisibility.RUNTIME));
   		}
 		return types;
 	}
 
-      List<AnnotationItem> getAnnotations(MethodIdItem m, Set<AnnotationVisibility> types) {
-    	  List<AnnotationItem> result = new ArrayList<AnnotationItem>();
-    	  AnnotationDirectoryItem d = dexModuleEntry.getClassDefItem().getAnnotations();
-    	  if (d != null) {
-    		  for(AnnotationItem a : d.getMethodAnnotations(m).getAnnotations()) {
-        		  if (types == null || types.contains(a.getVisibility())) {
-        			  result.add(a);
-        		  }
+      List<Annotation> getAnnotations(Method m, Set<String> set) {
+    	  List<Annotation> result = new ArrayList<>();
+    	  for(org.jf.dexlib2.iface.Annotation a : m.getAnnotations()) {
+    		  if (set == null || set.contains(AnnotationVisibility.getVisibility(a.getVisibility()))) {
+    			  result.add(DexUtil.getAnnotation(a, getClassLoader().getReference()));
     		  }
     	  }
     	  return result;
       }
 
-      List<AnnotationItem> getAnnotations(FieldIdItem m) {
-    	  List<AnnotationItem> result = new ArrayList<AnnotationItem>();
-    	  AnnotationDirectoryItem d = dexModuleEntry.getClassDefItem().getAnnotations();
-    	  if (d != null) {
-    		  for(AnnotationItem a : d.getFieldAnnotations(m).getAnnotations()) {
-    			  result.add(a);
-    		  }
+      Collection<Annotation> getAnnotations(Field m) {
+    	  List<Annotation> result = new ArrayList<>();
+    	  for(org.jf.dexlib2.iface.Annotation a : m.getAnnotations()) {
+    		  result.add(DexUtil.getAnnotation(a, getClassLoader().getReference()));
     	  }
     	  return result;
       }
 
-      Map<Integer,List<AnnotationItem>> getParameterAnnotations(MethodIdItem m) {
-    	  Map<Integer,List<AnnotationItem>> result = HashMapFactory.make();
-    	  AnnotationDirectoryItem d = dexModuleEntry.getClassDefItem().getAnnotations();
-    	  if (d != null) {
-    		  int i = 0;
-    		  for(AnnotationSetItem as : d.getParameterAnnotations(m).getAnnotationSets()) {
-    			  for(AnnotationItem a : as.getAnnotations()) {
-    				  if (! result.containsKey(i)) {
-    					  result.put(i, new ArrayList<AnnotationItem>());
-    				  }
-    				  result.get(i).add(a);
-    			  }
-    			  i++;
+      Map<Integer,List<Annotation>> getParameterAnnotations(Method m) {
+    	  Map<Integer,List<Annotation>> result = HashMapFactory.make();
+    	  int i = 0;
+    	  for(MethodParameter as : m.getParameters()) {
+    		  for(org.jf.dexlib2.iface.Annotation a : as.getAnnotations()) {
+    			  if (! result.containsKey(i)) {
+    				  result.put(i, new ArrayList<Annotation>());
+    			  }	
+    			  result.get(i).add(DexUtil.getAnnotation(a, getClassLoader().getReference()));
     		  }
+    		  i++;
     	  }
     	  return result;
       }
@@ -344,25 +336,23 @@
      * @see com.ibm.wala.classLoader.BytecodeClass#computeDeclaredMethods()
      */
     @Override
-    protected IMethod[] computeDeclaredMethods() throws InvalidClassFileException {
-    	ArrayList<IMethod> methodsAL = new ArrayList<IMethod>();
+    protected IMethod[] computeDeclaredMethods() {
+    	ArrayList<IMethod> methodsAL = new ArrayList<>();
     	    	
-        if (methods == null && classDef.getClassData() == null)
-            methods = new IMethod[0];
-
-        if (methods == null && classDef.getClassData() != null){
+        if (methods == null){
 //            final EncodedMethod[] directMethods = classDef.getClassData().getDirectMethods();
 //            final EncodedMethod[] virtualMethods = classDef.getClassData().getVirtualMethods();
-            final List<EncodedMethod> directMethods = classDef.getClassData().getDirectMethods();
-            final List<EncodedMethod> virtualMethods = classDef.getClassData().getVirtualMethods();
+            final Iterable<? extends Method> directMethods = classDef.getDirectMethods();
+            final Iterable<? extends Method> virtualMethods = classDef.getVirtualMethods();
 
             //methods = new IMethod[dSize+vSize];
 
             // Create Direct methods (static, private, constructor)
-            for (int i = 0; i < directMethods.size(); i++) {
-                EncodedMethod dMethod = directMethods.get(i);
+            int i = 0;
+            for (Method dMethod : directMethods) {
                 //methods[i] = new DexIMethod(dMethod,this);
-                methodsAL.add(new DexIMethod(dMethod,this));
+                DexIMethod method = new DexIMethod(dMethod,this);
+                methodsAL.add(method);
 
                 //Set construcorId
                 //if ( (dMethod.accessFlags & CONSTRUCTOR.getValue()) != 0){
@@ -370,15 +360,16 @@
                 //}
                 //Set clinitId             
                 //if (methods[i].isClinit())
-                if (methodsAL.get(i).isClinit()) {
+                if (method.isClinit()) {
                     clinitId = i;
                 }
+                i++;
             }
 
             // Create virtual methods (other methods)
-            for (int i = 0; i < virtualMethods.size(); i++) {
+            for (Method dexm : virtualMethods) {
                 //methods[dSize+i] = new DexIMethod(virtualMethods[i],this);
-                methodsAL.add(new DexIMethod(virtualMethods.get(i),this));
+                methodsAL.add(new DexIMethod(dexm,this));
                 //is this enough to determine if the class is an activity?
                 //maybe check superclass?  -- but that may also not be enough
                 //may need to keep checking superclass of superclass, etc.
@@ -387,7 +378,7 @@
         }
         
         if (methods == null)
-        	methods = methodsAL.toArray(new IMethod[methodsAL.size()]);
+        	methods = methodsAL.toArray(new IMethod[0]);
         
         return methods;
     }
@@ -396,19 +387,17 @@
      * (non-Javadoc)
      * @see com.ibm.wala.classLoader.IClass#getClassInitializer()
      */
+    @Override
     public IMethod getClassInitializer() {
         if (methods == null){
-            try {
-                computeDeclaredMethods();
-            } catch (InvalidClassFileException e) {
-            }
+            computeDeclaredMethods();
         }
 //      return construcorId!=-1?methods[construcorId]:null;
         return clinitId!=-1?methods[clinitId]:null;
     }
 
 	@Override
-	public Module getContainer() {
-		return dexModuleEntry.asModule();
+	public DexFileModule getContainer() {
+		return dexModuleEntry.getContainer();
 	}
 }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIContextInterpreter.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -54,34 +54,34 @@
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.NewSiteReference;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
-import com.ibm.wala.ssa.SSAOptions;
 import com.ibm.wala.types.FieldReference;
 
 public class DexIContextInterpreter implements SSAContextInterpreter {
 
-    public DexIContextInterpreter(SSAOptions options, AnalysisCache cache)
+    public DexIContextInterpreter(IAnalysisCacheView cache)
     {
-        this.options = options;
         this.cache = cache;
     }
 
-    private final SSAOptions options;
-    private final AnalysisCache cache;
+    private final IAnalysisCacheView cache;
 
 
+    @Override
     public boolean understands(CGNode node) {
         if(node.getMethod() instanceof DexIMethod)
             return true;
         return false;
     }
 
+    @Override
     public boolean recordFactoryType(CGNode node, IClass klass) {
         // TODO what the heck does this mean?
         //com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/JavaLangClassContextInterpreter.java has this set to false
@@ -89,42 +89,55 @@
 //      throw new RuntimeException("not yet implemented");
     }
 
+    @Override
     public Iterator<NewSiteReference> iterateNewSites(CGNode node) {
         return getIR(node).iterateNewSites();
     }
 
+    @Override
     public Iterator<FieldReference> iterateFieldsWritten(CGNode node) {
         // TODO implement this!
         throw new RuntimeException("not yet implemented");
     }
 
+    @Override
     public Iterator<FieldReference> iterateFieldsRead(CGNode node) {
         // TODO implement this!
         throw new RuntimeException("not yet implemented");
     }
 
+    @Override
     public Iterator<CallSiteReference> iterateCallSites(CGNode node) {
         return getIR(node).iterateCallSites();
     }
 
+    @Override
     public int getNumberOfStatements(CGNode node) {
         // TODO verify this is correct
         assert understands(node);
         return getIR(node).getInstructions().length;
     }
 
+    @Override
     public IR getIR(CGNode node) {
 //      new Exception("getting IR for method "+node.getMethod().getReference().toString()).printStackTrace();
-        return cache.getSSACache().findOrCreateIR(node.getMethod(), node.getContext(), options);
+        return cache.getIR(node.getMethod(), node.getContext());
     }
 
+    @Override
+    public IRView getIRView(CGNode node) {
+      return getIR(node);
+    }
+
+    @Override
     public DefUse getDU(CGNode node) {
-        return cache.getSSACache().findOrCreateDU(getIR(node), node.getContext());
+        return cache.getDefUse(getIR(node));
 //      return new DefUse(getIR(node));
     }
 
+    @Override
     public ControlFlowGraph<SSAInstruction, ISSABasicBlock> getCFG(CGNode n) {
         IR ir = getIR(n);
         return ir.getControlFlowGraph();
     }    
-};
+}
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIField.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIField.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIField.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIField.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,18 +48,11 @@
 package com.ibm.wala.dalvik.classLoader;
 
 
-import static org.jf.dexlib.Util.AccessFlags.FINAL;
-import static org.jf.dexlib.Util.AccessFlags.PRIVATE;
-import static org.jf.dexlib.Util.AccessFlags.PROTECTED;
-import static org.jf.dexlib.Util.AccessFlags.PUBLIC;
-import static org.jf.dexlib.Util.AccessFlags.STATIC;
-import static org.jf.dexlib.Util.AccessFlags.VOLATILE;
+import static org.jf.dexlib2.AccessFlags.*;
 
 import java.util.Collection;
 
-import org.jf.dexlib.ClassDataItem.EncodedField;
-import org.jf.dexlib.StringIdItem;
-import org.jf.dexlib.TypeIdItem;
+import org.jf.dexlib2.iface.Field;
 
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IField;
@@ -75,7 +68,7 @@
 /*
  * The EncodedFied object for which this DexIField is a wrapper
  */
-    private final EncodedField eField;
+    private final Field eField;
 
     /**
      * The declaring class for this method.
@@ -97,19 +90,20 @@
     private Atom name;
 
 
-    public DexIField(EncodedField encodedField, DexIClass klass) {
+    public DexIField(Field encodedField, DexIClass klass) {
     //public DexIField(EncodedField encodedField) {
         eField = encodedField;
         myClass = klass;
-        StringIdItem fieldName = eField.field.getFieldName();
-		name = Atom.findOrCreateUnicodeAtom(fieldName.getStringValue());
+        String fieldName = eField.getName();
+		name = Atom.findOrCreateUnicodeAtom(fieldName);
 
-        TypeIdItem fieldType = eField.field.getFieldType();
+        String fieldType = eField.getType();
 		TypeName T = DexUtil.getTypeName(fieldType);
         TypeReference type = TypeReference.findOrCreate(myClass.getClassLoader().getReference(), T);
         myFieldRef = FieldReference.findOrCreate(myClass.getReference(), name, type);
     }
 
+	@Override
 	public TypeReference getFieldTypeReference() {
 
         //compute the typeReference from the EncodedField
@@ -122,6 +116,7 @@
 
     }
 
+    @Override
     public FieldReference getReference() {
 
         if (fieldReference == null) {
@@ -135,45 +130,54 @@
 
     }
 
+    @Override
     public Atom getName() {
         return name;
     }
 
+    @Override
     public boolean isFinal() {
-        return (eField.accessFlags & FINAL.getValue()) != 0;
+        return (eField.getAccessFlags() & FINAL.getValue()) != 0;
     }
 
+    @Override
     public boolean isPrivate() {
-        return (eField.accessFlags & PRIVATE.getValue()) != 0;
+        return (eField.getAccessFlags() & PRIVATE.getValue()) != 0;
     }
 
+    @Override
     public boolean isProtected() {
-        return (eField.accessFlags & PROTECTED.getValue()) != 0;
+        return (eField.getAccessFlags() & PROTECTED.getValue()) != 0;
     }
 
+    @Override
     public boolean isPublic() {
-        return (eField.accessFlags & PUBLIC.getValue()) != 0;
+        return (eField.getAccessFlags() & PUBLIC.getValue()) != 0;
     }
 
+    @Override
     public boolean isStatic() {
-        return (eField.accessFlags & STATIC.getValue()) != 0;
+        return (eField.getAccessFlags() & STATIC.getValue()) != 0;
     }
 
+    @Override
     public IClass getDeclaringClass() {
         return myClass;
     }
 
+    @Override
     public boolean isVolatile() {
-        return (eField.accessFlags & VOLATILE.getValue()) != 0;
+        return (eField.getAccessFlags() & VOLATILE.getValue()) != 0;
     }
 
+    @Override
     public IClassHierarchy getClassHierarchy() {
         return myClass.getClassHierarchy();
     }
 
 	@Override
 	public Collection<Annotation> getAnnotations() {
-		return DexUtil.getAnnotations(myClass.getAnnotations(eField.field), myClass.getClassLoader().getReference());
+		return myClass.getAnnotations(eField);
 	}
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIMethod.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIMethod.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIMethod.java	2019-01-29 17:08:39.000000000 +0000
@@ -6,6 +6,8 @@
  * 
  * This file is a derivative of code released under the terms listed below.  
  *
+ * dexlib2 update: Julian Dolby (dolby@us.ibm.com)
+ * 
  */
 /*
  *
@@ -47,63 +49,64 @@
 
 package com.ibm.wala.dalvik.classLoader;
 
-import static org.jf.dexlib.Util.AccessFlags.ABSTRACT;
-import static org.jf.dexlib.Util.AccessFlags.BRIDGE;
-import static org.jf.dexlib.Util.AccessFlags.DECLARED_SYNCHRONIZED;
-import static org.jf.dexlib.Util.AccessFlags.FINAL;
-import static org.jf.dexlib.Util.AccessFlags.NATIVE;
-import static org.jf.dexlib.Util.AccessFlags.PRIVATE;
-import static org.jf.dexlib.Util.AccessFlags.PROTECTED;
-import static org.jf.dexlib.Util.AccessFlags.PUBLIC;
-import static org.jf.dexlib.Util.AccessFlags.STATIC;
-import static org.jf.dexlib.Util.AccessFlags.VOLATILE;
+import static org.jf.dexlib2.AccessFlags.ABSTRACT;
+import static org.jf.dexlib2.AccessFlags.BRIDGE;
+import static org.jf.dexlib2.AccessFlags.DECLARED_SYNCHRONIZED;
+import static org.jf.dexlib2.AccessFlags.FINAL;
+import static org.jf.dexlib2.AccessFlags.NATIVE;
+import static org.jf.dexlib2.AccessFlags.PRIVATE;
+import static org.jf.dexlib2.AccessFlags.PROTECTED;
+import static org.jf.dexlib2.AccessFlags.PUBLIC;
+import static org.jf.dexlib2.AccessFlags.STATIC;
+import static org.jf.dexlib2.AccessFlags.VOLATILE;
+import static org.jf.dexlib2.AccessFlags.SYNTHETIC;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
-import org.jf.dexlib.AnnotationItem;
-import org.jf.dexlib.AnnotationSetItem;
-import org.jf.dexlib.ClassDataItem.EncodedMethod;
-import org.jf.dexlib.CodeItem.EncodedTypeAddrPair;
-import org.jf.dexlib.CodeItem.TryItem;
-import org.jf.dexlib.FieldIdItem;
-import org.jf.dexlib.MethodIdItem;
-import org.jf.dexlib.StringIdItem;
-import org.jf.dexlib.TypeIdItem;
-import org.jf.dexlib.Code.InstructionWithReference;
-import org.jf.dexlib.Code.Opcode;
-import org.jf.dexlib.Code.TwoRegisterInstruction;
-import org.jf.dexlib.Code.Format.ArrayDataPseudoInstruction;
-import org.jf.dexlib.Code.Format.Instruction10t;
-import org.jf.dexlib.Code.Format.Instruction11n;
-import org.jf.dexlib.Code.Format.Instruction11x;
-import org.jf.dexlib.Code.Format.Instruction12x;
-import org.jf.dexlib.Code.Format.Instruction20t;
-import org.jf.dexlib.Code.Format.Instruction21c;
-import org.jf.dexlib.Code.Format.Instruction21h;
-import org.jf.dexlib.Code.Format.Instruction21s;
-import org.jf.dexlib.Code.Format.Instruction21t;
-import org.jf.dexlib.Code.Format.Instruction22b;
-import org.jf.dexlib.Code.Format.Instruction22c;
-import org.jf.dexlib.Code.Format.Instruction22s;
-import org.jf.dexlib.Code.Format.Instruction22t;
-import org.jf.dexlib.Code.Format.Instruction22x;
-import org.jf.dexlib.Code.Format.Instruction23x;
-import org.jf.dexlib.Code.Format.Instruction30t;
-import org.jf.dexlib.Code.Format.Instruction31c;
-import org.jf.dexlib.Code.Format.Instruction31i;
-import org.jf.dexlib.Code.Format.Instruction31t;
-import org.jf.dexlib.Code.Format.Instruction32x;
-import org.jf.dexlib.Code.Format.Instruction35c;
-import org.jf.dexlib.Code.Format.Instruction3rc;
-import org.jf.dexlib.Code.Format.Instruction51l;
-import org.jf.dexlib.Code.Format.PackedSwitchDataPseudoInstruction;
-import org.jf.dexlib.Code.Format.SparseSwitchDataPseudoInstruction;
-import org.jf.dexlib.EncodedValue.ArrayEncodedValue;
-import org.jf.dexlib.EncodedValue.TypeEncodedValue;
+import org.jf.dexlib2.Opcode;
+import org.jf.dexlib2.analysis.ClassPath;
+import org.jf.dexlib2.analysis.ClassPathResolver;
+import org.jf.dexlib2.analysis.MethodAnalyzer;
+import org.jf.dexlib2.iface.AnnotationElement;
+import org.jf.dexlib2.iface.Method;
+import org.jf.dexlib2.iface.TryBlock;
+import org.jf.dexlib2.iface.instruction.SwitchPayload;
+import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction;
+import org.jf.dexlib2.iface.instruction.formats.ArrayPayload;
+import org.jf.dexlib2.iface.instruction.formats.Instruction10t;
+import org.jf.dexlib2.iface.instruction.formats.Instruction11n;
+import org.jf.dexlib2.iface.instruction.formats.Instruction11x;
+import org.jf.dexlib2.iface.instruction.formats.Instruction12x;
+import org.jf.dexlib2.iface.instruction.formats.Instruction20t;
+import org.jf.dexlib2.iface.instruction.formats.Instruction21c;
+import org.jf.dexlib2.iface.instruction.formats.Instruction21ih;
+import org.jf.dexlib2.iface.instruction.formats.Instruction21lh;
+import org.jf.dexlib2.iface.instruction.formats.Instruction21s;
+import org.jf.dexlib2.iface.instruction.formats.Instruction21t;
+import org.jf.dexlib2.iface.instruction.formats.Instruction22b;
+import org.jf.dexlib2.iface.instruction.formats.Instruction22c;
+import org.jf.dexlib2.iface.instruction.formats.Instruction22s;
+import org.jf.dexlib2.iface.instruction.formats.Instruction22t;
+import org.jf.dexlib2.iface.instruction.formats.Instruction22x;
+import org.jf.dexlib2.iface.instruction.formats.Instruction23x;
+import org.jf.dexlib2.iface.instruction.formats.Instruction30t;
+import org.jf.dexlib2.iface.instruction.formats.Instruction31c;
+import org.jf.dexlib2.iface.instruction.formats.Instruction31i;
+import org.jf.dexlib2.iface.instruction.formats.Instruction31t;
+import org.jf.dexlib2.iface.instruction.formats.Instruction32x;
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c;
+import org.jf.dexlib2.iface.instruction.formats.Instruction3rc;
+import org.jf.dexlib2.iface.instruction.formats.Instruction51l;
+import org.jf.dexlib2.iface.reference.FieldReference;
+import org.jf.dexlib2.iface.reference.StringReference;
+import org.jf.dexlib2.iface.value.ArrayEncodedValue;
+import org.jf.dexlib2.iface.value.EncodedValue;
+import org.jf.dexlib2.iface.value.TypeEncodedValue;
 
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IBytecodeMethod;
@@ -138,9 +141,7 @@
 import com.ibm.wala.dalvik.dex.instructions.UnaryOperation.OpID;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeBT.ExceptionHandler;
-import com.ibm.wala.shrikeBT.IInstruction;
 import com.ibm.wala.shrikeBT.IndirectionData;
-import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.Descriptor;
 import com.ibm.wala.types.MethodReference;
@@ -155,12 +156,12 @@
 /**
  * A wrapper around a EncodedMethod object (from dexlib) that represents a method.
  */
-public class DexIMethod implements IBytecodeMethod {
+public class DexIMethod implements IBytecodeMethod<Instruction> {
 
 	/**
 	 * The EncodedMethod object for which this DexIMethod is a wrapper.
 	 */
-	private final EncodedMethod eMethod;
+	private final Method eMethod;
 
 	/**
 	 * The declaring class for this method.
@@ -187,7 +188,7 @@
 
 	private static int totalInsts = 0;
 
-	public DexIMethod(EncodedMethod encodedMethod, DexIClass klass) {
+	public DexIMethod(Method encodedMethod, DexIClass klass) {
 		eMethod = encodedMethod;
 		myClass = klass;
 	}
@@ -203,7 +204,7 @@
 	/**
 	 * @return the EncodedMethod object for which this DexIMethod is a wrapper.
 	 */
-	public EncodedMethod toEncodedMethod() {
+	public Method toEncodedMethod() {
 		return eMethod;
 	}
 
@@ -212,24 +213,24 @@
 	// IMethod methods
 	//-------------------------------------------
 
+	@Override
 	public TypeReference[] getDeclaredExceptions()
-			throws InvalidClassFileException, UnsupportedOperationException {
+			throws UnsupportedOperationException {
 /** BEGIN Custom change: Variable Names in synth. methods */
-		assert (eMethod.method != null);
         if (myClass.getClassDefItem().getAnnotations() == null) {
             return null;
         }
-        ArrayList<String> strings = new ArrayList<String>();
-        AnnotationSetItem annotationSet = myClass.getClassDefItem().getAnnotations().getMethodAnnotations(eMethod.method);
+        ArrayList<String> strings = new ArrayList<>();
+        Set<? extends org.jf.dexlib2.iface.Annotation> annotationSet = eMethod.getAnnotations();
 /** END Custom change: Variable Names in synth. methods */
 
-		if (annotationSet != null) {
-			for (AnnotationItem annotationItem: annotationSet.getAnnotations())
+        if (annotationSet != null) {
+			for (org.jf.dexlib2.iface.Annotation annotationItem: annotationSet)
 			{
-				if (annotationItem.getEncodedAnnotation().annotationType.getTypeDescriptor().contentEquals("Ldalvik/annotation/Throws;")) {
-					for (int i = 0; i < annotationItem.getEncodedAnnotation().values.length; i++) {
-						for (int j = 0; j < ((ArrayEncodedValue)annotationItem.getEncodedAnnotation().values[i]).values.length; j++) {
-							String tname = ((TypeEncodedValue)((ArrayEncodedValue)annotationItem.getEncodedAnnotation().values[i]).values[j]).value.getTypeDescriptor();
+				if (annotationItem.getType().contentEquals("Ldalvik/annotation/Throws;")) {
+					for (AnnotationElement e : annotationItem.getElements()) {
+						for (EncodedValue v : ((ArrayEncodedValue)e.getValue()).getValue()) {
+							String tname = ((TypeEncodedValue)v).getValue();
 							if (tname.endsWith(";"))
 								tname = tname.substring(0,tname.length()-1);
 							strings.add(tname);
@@ -252,6 +253,7 @@
 	}
 
 
+	@Override
 	public String getLocalVariableName(int bcIndex, int localNumber) {
 		throw new UnsupportedOperationException("getLocalVariableName not implemented");
 	}
@@ -259,18 +261,18 @@
 	/**
 	 * XXX not fully about the + 2.
 	 * @return the RegisterCount + 2 to make some room for the return and exception register
-	 * @see com.ibm.wala.classLoader.IMethod#getMaxLocals()
+	 * @see com.ibm.wala.classLoader.ShrikeCTMethod#getMaxLocals()
 	 */
 	public int getMaxLocals() {
-		return eMethod.codeItem.getRegisterCount() + 2;
+		return eMethod.getImplementation().getRegisterCount() + 2;
 	}
 
 	public int getReturnReg() {
-		return eMethod.codeItem.getRegisterCount();
+		return eMethod.getImplementation().getRegisterCount();
 	}
 
 	public int getExceptionReg() {
-		return eMethod.codeItem.getRegisterCount()+1;
+		return eMethod.getImplementation().getRegisterCount()+1;
 	}
 
 	/*
@@ -285,6 +287,7 @@
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#getDescriptor()
 	 */
+	@Override
 	public Descriptor getDescriptor() {
 		return getReference().getDescriptor();
 	}
@@ -293,6 +296,7 @@
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#getNumberOfParameters()
 	 */
+	@Override
 	public int getNumberOfParameters() {
 		final int number;
 
@@ -306,25 +310,22 @@
 		return number;
 	}
 
-	//returns the number of registers it takes for the parameters + the "this" register.
 	public int getNumberOfParameterRegisters() {
-		final int number;
+		int number = isStatic() || isClinit() ? 0 : 1;
 
-
-		if (isStatic() || isClinit()) {
-			number = eMethod.method.getPrototype().getParameterRegisterCount();
-		} else {
-			number = eMethod.method.getPrototype().getParameterRegisterCount() + 1;
+		for(int i = 0; i < getReference().getNumberOfParameters(); i++) {
+			TypeReference ref = getReference().getParameterType(i);
+			number += ref.equals(TypeReference.Double) || ref.equals(TypeReference.Long) ? 2 : 1;
 		}
+		
 		return number;
 	}
 
-
-
 	/*
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#getParameterType(int)
 	 */
+	@Override
 	public TypeReference getParameterType(int index) {
 		if (!isStatic()) {
 			if (index == 0) {
@@ -341,18 +342,18 @@
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#getReference()
 	 */
+	@Override
 	public MethodReference getReference() {
 		//Compute the method reference from the MethodIdItem
 		if (methodReference == null) {
 			// Set method name
-			Atom name = Atom.findOrCreateUnicodeAtom(eMethod.method.getMethodName().getStringValue());
+			Atom name = Atom.findOrCreateUnicodeAtom(eMethod.getName());
 
 			//            // Set the descriptor
 			//            Descriptor descriptor = Descriptor.findOrCreateUTF8(eMethod.method.getPrototype().getPrototypeString());
 			//            methodReference = MethodReference.findOrCreate(myClass.getReference(),name, descriptor);
 
-			ImmutableByteArray desc = ImmutableByteArray.make(eMethod.method.getPrototype().getPrototypeString());
-			Descriptor D = Descriptor.findOrCreate(myClass.getClassLoader().getLanguage(), desc);
+			Descriptor D = Descriptor.findOrCreate(myClass.getClassLoader().getLanguage(), ImmutableByteArray.make(DexUtil.getSignature(eMethod)));
 			methodReference = MethodReference.findOrCreate(myClass.getReference(), name, D);
 		}
 
@@ -364,6 +365,7 @@
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#getReturnType()
 	 */
+	@Override
 	public TypeReference getReturnType() {
 		//compute the typeReference from the MethodIdItem
 		if (typeReference == null) {
@@ -377,6 +379,7 @@
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#getSelector()
 	 */
+	@Override
 	public Selector getSelector() {
 		return getReference().getSelector();
 	}
@@ -386,6 +389,7 @@
 	 *
 	 * @see com.ibm.wala.classLoader.IMethod#getSignature()
 	 */
+	@Override
 	public String getSignature() {
 		return getReference().getSignature();
 	}
@@ -394,15 +398,17 @@
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#hasExceptionHandler()
 	 */
+	@Override
 	public boolean hasExceptionHandler() {
-		TryItem[] tries = eMethod.codeItem.getTries();;
-		return tries==null?false:tries.length > 0;
+		List<? extends TryBlock<? extends org.jf.dexlib2.iface.ExceptionHandler>> tries = eMethod.getImplementation().getTryBlocks();
+		return tries==null?false:tries.size() > 0;
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#hasLocalVariableTable()
 	 */
+	@Override
 	public boolean hasLocalVariableTable() {
 		throw new UnsupportedOperationException("DexIMethod: hasLocalVariableTable() not yet implemented");
 		//TODO Compute the local variable name from the DebugInfo Item
@@ -414,64 +420,72 @@
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#isAbstract()
 	 */
+	@Override
 	public boolean isAbstract() {
-		return (eMethod.accessFlags & ABSTRACT.getValue()) != 0;
+		return (eMethod.getAccessFlags() & ABSTRACT.getValue()) != 0;
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#isClinit()
 	 */
+	@Override
 	public boolean isClinit() {
-		return eMethod.method.getMethodName().getStringValue().equals(MethodReference.clinitName.toString());
+		return eMethod.getName().equals(MethodReference.clinitName.toString());
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#isFinal()
 	 */
+	@Override
 	public boolean isFinal() {
-		return (eMethod.accessFlags & FINAL.getValue()) != 0;
+		return (eMethod.getAccessFlags() & FINAL.getValue()) != 0;
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#isInit()
 	 */
+	@Override
 	public boolean isInit() {
-		return eMethod.method.getMethodName().getStringValue().equals(MethodReference.initAtom.toString());
+		return eMethod.getName().equals(MethodReference.initAtom.toString());
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#isNative()
 	 */
+	@Override
 	public boolean isNative() {
-		return (eMethod.accessFlags & NATIVE.getValue()) != 0;
+		return (eMethod.getAccessFlags() & NATIVE.getValue()) != 0;
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#isBridge()
 	 */
+	@Override
 	public boolean isBridge() {
-		return (eMethod.accessFlags & BRIDGE.getValue()) != 0;
+		return (eMethod.getAccessFlags() & BRIDGE.getValue()) != 0;
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#isPrivate()
 	 */
+	@Override
 	public boolean isPrivate() {
-		return (eMethod.accessFlags & PRIVATE.getValue()) != 0;
+		return (eMethod.getAccessFlags() & PRIVATE.getValue()) != 0;
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#isProtected()
 	 */
+	@Override
 	public boolean isProtected() {
-		return (eMethod.accessFlags & PROTECTED.getValue()) != 0;
+		return (eMethod.getAccessFlags() & PROTECTED.getValue()) != 0;
 	}
 
 	/*
@@ -479,32 +493,43 @@
 	 *
 	 * @see com.ibm.wala.classLoader.IMethod#isPublic()
 	 */
+	@Override
 	public boolean isPublic() {
-		return (eMethod.accessFlags & PUBLIC.getValue()) != 0;
+		return (eMethod.getAccessFlags() & PUBLIC.getValue()) != 0;
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMethod#isSynchronized()
 	 */
+	@Override
 	public boolean isSynchronized() {
-		return (eMethod.accessFlags & DECLARED_SYNCHRONIZED.getValue()) != 0;
+		return (eMethod.getAccessFlags() & DECLARED_SYNCHRONIZED.getValue()) != 0;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see com.ibm.wala.classLoader.IMethod#isSynthetic()
+	 * @see com.ibm.wala.classLoader.IMethod#isWalaSynthetic()
 	 */
-	public boolean isSynthetic() {
+	@Override
+	public boolean isWalaSynthetic() {
 		return false;
 	}
 
+    /*
+     * (non-Javadoc)
+     * @see com.ibm.wala.classLoader.IMethod#isSynthetic()
+     */
+    @Override
+    public boolean isSynthetic() { return (eMethod.getAccessFlags() & SYNTHETIC.getValue()) != 0; }
+
 	/*
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMember#isStatic()
 	 */
+	@Override
 	public boolean isStatic() {
-		return (eMethod.accessFlags & STATIC.getValue()) != 0;
+		return (eMethod.getAccessFlags() & STATIC.getValue()) != 0;
 	}
 
 	/*
@@ -512,13 +537,14 @@
 	 * @see com.ibm.wala.classLoader.IMember#isVolatile()
 	 */
 	public boolean isVolatile() {
-		return (eMethod.accessFlags & VOLATILE.getValue()) != 0;
+		return (eMethod.getAccessFlags() & VOLATILE.getValue()) != 0;
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see com.ibm.wala.classLoader.IMember#getDeclaringClass()
 	 */
+	@Override
 	public IClass getDeclaringClass() {
 		return myClass;
 	}
@@ -528,14 +554,17 @@
 	 *
 	 * @see com.ibm.wala.ipa.cha.IClassHierarchyDweller#getClassHierarchy()
 	 */
+	@Override
 	public IClassHierarchy getClassHierarchy() {
 		return myClass.getClassHierarchy();
 	}
 
+	@Override
 	public Atom getName() {
 		return getReference().getName();
 	}
 
+	@Override
 	public int getLineNumber(int bcIndex) {
 		return getInstructionIndex(bcIndex);
 	}
@@ -549,9 +578,6 @@
 		return getReference().toString();
 	}
 
-	/**
-	 * @see java.lang.Object#equals(Object)
-	 */
 	@Override
 	public boolean equals(Object obj) {
 		// instanceof is OK because this class is final.
@@ -564,9 +590,6 @@
 		}
 	}
 
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return 9661 * getReference().hashCode();
@@ -580,7 +603,8 @@
 	//-------------------------------------------
 
 
-	public int getBytecodeIndex(int i) throws InvalidClassFileException {
+	@Override
+	public int getBytecodeIndex(int i) {
 		// TODO Auto-generated method stub
 		//      System.out.println("DexIMethod: getBytecodeIndex() possibly not implemented correctly");
 		//      Integer.valueOf(eMethod.codeItem.getInstructions()[i].opcode.value);
@@ -590,14 +614,15 @@
 	}
 
 
-	public ExceptionHandler[][] getHandlers() throws InvalidClassFileException {
+	@Override
+	public ExceptionHandler[][] getHandlers() {
 
 		if (handlers != null)
 			return handlers;
 
 		//ExceptionHandler[][] handlers = new ExceptionHandler[eMethod.codeItem.getInstructions().length][];
 
-		TryItem[] tries = eMethod.codeItem.getTries();
+		List<? extends TryBlock<? extends org.jf.dexlib2.iface.ExceptionHandler>> tryBlocks = eMethod.getImplementation().getTryBlocks();
 
 		//
 		//      if (tries == null){
@@ -614,19 +639,19 @@
 		//      }
 
 		this.handlers = new ExceptionHandler[instructions().size()][];
-		if (tries == null){
+		if (tryBlocks == null){
 			//          return new ExceptionHandler[instructions.size()][];
 			return handlers;
 		}
 
-		ArrayList<ArrayList<ExceptionHandler>> temp_array = new ArrayList<ArrayList<ExceptionHandler>>();
+		ArrayList<ArrayList<ExceptionHandler>> temp_array = new ArrayList<>();
 		for (int i = 0; i < instructions().size(); i++) {
 			temp_array.add(new ArrayList<ExceptionHandler>());
 		}
 
-		for (TryItem tryItem: tries) {
+		for (TryBlock<? extends org.jf.dexlib2.iface.ExceptionHandler> tryItem: tryBlocks) {
 			int startAddress = tryItem.getStartCodeAddress();
-			int endAddress = tryItem.getStartCodeAddress() + tryItem.getTryLength();
+			int endAddress = tryItem.getStartCodeAddress() + tryItem.getCodeUnitCount();
 			/**
 			 * The end address points to the address immediately after the end of the last
 			 * instruction that the try block covers. We want the .catch directive and end_try
@@ -644,38 +669,28 @@
 			 */
 			if (endAddress > getAddressFromIndex(instructions().size()-1)) {
 				endInst = instructions().size()-1;
-				if (endAddress != (getAddressFromIndex(endInst) + (eMethod.codeItem.getInstructions())[endInst].getSize(getAddressFromIndex(endInst))))
+				int endSize = 0;
+				for(org.jf.dexlib2.iface.instruction.Instruction inst : eMethod.getImplementation().getInstructions()) {
+					endSize = inst.getCodeUnits();
+				}
+				if (endAddress != (getAddressFromIndex(endInst) + endSize))
 					throw new RuntimeException("Invalid code offset " + endAddress + " for the try block end address");
 			}
 			else {
 				endInst = getInstructionIndex(endAddress) - 1;
 			}
 
-			//add the catch all handler if it exists
-			int catchAllAddress = tryItem.encodedCatchHandler.getCatchAllHandlerAddress();
-			if (catchAllAddress != -1) {
-				//                CatchMethodItem catchAllMethodItem = new CatchMethodItem(labelCache, lastInstructionAddress, null,
-				//                        startAddress, endAddress, catchAllAddress);
-				//                methodItems.add(catchAllMethodItem);
-				//              System.out.println("Method: " + this.getSignature() + " - address: " + catchAllAddress);
-				//              System.out.println("Start: " + startInst + " End: " + endInst);
-				for (int i = startInst; i<=endInst; i++) {
-					temp_array.get(i).add(new ExceptionHandler(getInstructionIndex(catchAllAddress), null));
-				}
-				//throw new UnimplementedError("DexIMethod->handlers: getCatchAllHandlerAddress() not yet implemented");
-			}
-
 			for (int i = startInst; i <= endInst; i++) {
 				//add the rest of the handlers
-				for (EncodedTypeAddrPair etaps: tryItem.encodedCatchHandler.handlers) {
-					temp_array.get(i).add(new ExceptionHandler( getInstructionIndex(etaps.getHandlerAddress()), etaps.exceptionType.getTypeDescriptor() ));
+				for (org.jf.dexlib2.iface.ExceptionHandler etaps: tryItem.getExceptionHandlers()) {
+					temp_array.get(i).add(new ExceptionHandler( getInstructionIndex(etaps.getHandlerCodeAddress()), etaps.getExceptionType() ));
 				}
 			}
 		}
 
 
 		for (int i = 0; i < instructions().size(); i++) {
-			handlers[i] = (ExceptionHandler[])temp_array.get(i).toArray(new ExceptionHandler[temp_array.get(i).size()]);
+			handlers[i] = temp_array.get(i).toArray(new ExceptionHandler[0]);
 		
 			/*
 			System.out.println("i: " + i);
@@ -692,18 +707,50 @@
 
 
 
-	public IInstruction[] getInstructions() {
+	@Override
+	public Instruction[] getInstructions() {
 		if (instructions == null)
 			parseBytecode();
 
-		throw new UnsupportedOperationException(
-				"DexMethod doesn't use IInstruction - try getDexInstructions instead");
+		return instructions.toArray(new Instruction[0]);
 	}
 
+	private boolean odexMethod() {
+		for(org.jf.dexlib2.iface.instruction.Instruction inst : eMethod.getImplementation().getInstructions()) {
+			if (inst.getOpcode().odexOnly()) {
+				return true;
+			}
+		}
+		
+		return false;
+	}
 
-
+	Iterable<? extends org.jf.dexlib2.iface.instruction.Instruction> deodex() {
+		try {
+			DexFileModule m = myClass.getContainer();
+
+			ClassPathResolver path = 
+					new ClassPathResolver(Collections.singletonList(m.getFile().getParent() + '/'),
+							Collections.<String>emptyList(),
+							m.getDexFile());
+
+			ClassPath cp = new ClassPath(path.getResolvedClassProviders(), false, m.getDexFile().getOpcodes().artVersion);
+
+			MethodAnalyzer analyzer = new MethodAnalyzer(cp, eMethod, null, false);
+
+			return analyzer.getInstructions();
+		} catch (Exception e) {
+			assert false : e;
+		    return eMethod.getImplementation().getInstructions();
+		}
+	}
+	
 	protected void parseBytecode() {
-		org.jf.dexlib.Code.Instruction[] instrucs = eMethod.codeItem.getInstructions();
+
+		Iterable<? extends org.jf.dexlib2.iface.instruction.Instruction> instrucs = 
+			odexMethod()?
+			    deodex():
+				eMethod.getImplementation().getInstructions();
 
 		//      for (org.jfmethod.getInstructionIndex(.dexlib.Code.Instruction inst: instrucs)
 		//      {
@@ -820,26 +867,29 @@
 		int instCounter = -1;
 		//int pc = 0;
 		int currentCodeAddress = 0;
-		for (org.jf.dexlib.Code.Instruction inst: instrucs)
+		for (org.jf.dexlib2.iface.instruction.Instruction inst: instrucs)
 		{
 			totalInsts++;
 			instCounter++;
 			//          instLoc = pc - instCounter;
 			instLoc = currentCodeAddress;
 			//pc += inst.getFormat().size;
-			switch(inst.opcode)
+			switch(inst.getOpcode())
 			{
 			case NOP:
-				switch (inst.getFormat())
+			case ARRAY_PAYLOAD:
+			case PACKED_SWITCH_PAYLOAD:
+			case SPARSE_SWITCH_PAYLOAD:
+				switch (inst.getOpcode().format)
 				{
-				case ArrayData:
+				case ArrayPayload:
 				{
 					for (int i = 0; i < instructions.size(); i++)
 					{
 						if (instructions.getFromId(i) instanceof ArrayFill)
 							if (instLoc == (((ArrayFill)getInstructionFromIndex(i)).tableAddressOffset + getAddressFromIndex(i)))
 							{
-								((ArrayFill)getInstructionFromIndex(i)).setArrayDataTable((ArrayDataPseudoInstruction)inst);
+								((ArrayFill)getInstructionFromIndex(i)).setArrayDataTable((ArrayPayload)inst);
 
 
 
@@ -864,27 +914,31 @@
 					}
 					break;
 				}
-				case PackedSwitchData:
+				case PackedSwitchPayload:
 					for (int i = 0; i < instructions.size(); i++)
 					{
 						if (instructions.getFromId(i) instanceof Switch)
 							if (instLoc == (((Switch)getInstructionFromIndex(i)).tableAddressOffset + getAddressFromIndex(i)))
 							{
-								((Switch)getInstructionFromIndex(i)).setSwitchPad(new PackedSwitchPad(((PackedSwitchDataPseudoInstruction)inst),
-										getAddressFromIndex(i+1) - getAddressFromIndex(i)));
+								((Switch)getInstructionFromIndex(i))
+								   .setSwitchPad(new PackedSwitchPad(
+										   (SwitchPayload)inst,
+										   getAddressFromIndex(i+1) - getAddressFromIndex(i)));
 								break;
 							}
 					}
 					break;
-				case SparseSwitchData:
+				case SparseSwitchPayload:
 				{
 					for (int i = 0; i < instructions.size(); i++)
 					{
 						if (instructions.getFromId(i) instanceof Switch)
 							if (instLoc == (((Switch)getInstructionFromIndex(i)).tableAddressOffset + getAddressFromIndex(i)))
 							{
-								((Switch)getInstructionFromIndex(i)).setSwitchPad(new SparseSwitchPad(((SparseSwitchDataPseudoInstruction)inst),
-										getAddressFromIndex(i+1) - getAddressFromIndex(i)));
+								((Switch)getInstructionFromIndex(i)).setSwitchPad(
+										new SparseSwitchPad(
+											(SwitchPayload)inst,
+											getAddressFromIndex(i+1) - getAddressFromIndex(i)));
 								break;
 							}
 					}
@@ -897,147 +951,151 @@
 					//                  }
 					break;
 				}
-				case UnresolvedOdexInstruction:
-					throw new RuntimeException("UnresolvedOdexInstruction"
-							+ inst.opcode.toString() + inst.getFormat());
 				default:
-					instructions.add(new Instruction(currentCodeAddress, Opcode.NOP, this) {
+					class NOPInstruction extends Instruction {
+						private NOPInstruction(int pc, Opcode op, DexIMethod method) {
+							super(pc, op, method);
+						}
+
 						@Override
 						public void visit(Visitor visitor) {
 							// no op
 						} 
-					});
+					}
+					
+					instructions.add(new NOPInstruction(currentCodeAddress, Opcode.NOP, this));
 					break;
 				}
 				break;
 			case MOVE:
 				instructions.add(new UnaryOperation(instLoc,
 						UnaryOperation.OpID.MOVE, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case MOVE_FROM16:
 				instructions.add(new UnaryOperation(instLoc,
 						UnaryOperation.OpID.MOVE, ((Instruction22x)inst).getRegisterA(),
-						((Instruction22x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction22x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case MOVE_16:
 				instructions.add(new UnaryOperation(instLoc,
 						UnaryOperation.OpID.MOVE, ((Instruction32x)inst).getRegisterA(),
-						((Instruction32x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction32x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case MOVE_WIDE:
 				instructions.add(new UnaryOperation(instLoc,
 						UnaryOperation.OpID.MOVE_WIDE,
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case MOVE_WIDE_FROM16:
 				instructions.add(new UnaryOperation(instLoc,
 						UnaryOperation.OpID.MOVE_WIDE,
-						((Instruction22x)inst).getRegisterA(), ((Instruction22x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction22x)inst).getRegisterA(), ((Instruction22x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case MOVE_WIDE_16:
 				instructions.add(new UnaryOperation(instLoc,
 						UnaryOperation.OpID.MOVE_WIDE,
-						((Instruction32x)inst).getRegisterA(), ((Instruction32x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction32x)inst).getRegisterA(), ((Instruction32x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case MOVE_OBJECT:
 				instructions.add(new UnaryOperation(instLoc,
 						UnaryOperation.OpID.MOVE, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case MOVE_OBJECT_FROM16:
 				instructions.add(new UnaryOperation(instLoc,
 						UnaryOperation.OpID.MOVE, ((Instruction22x)inst).getRegisterA(),
-						((Instruction22x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction22x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case MOVE_OBJECT_16:
 				instructions.add(new UnaryOperation(instLoc,
 						UnaryOperation.OpID.MOVE, ((Instruction32x)inst).getRegisterA(),
-						((Instruction32x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction32x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case MOVE_RESULT:
 				//register b set as return register, -1;
 				instructions.add(new UnaryOperation(instLoc,
-						UnaryOperation.OpID.MOVE, ((Instruction11x)inst).getRegisterA(), getReturnReg(), inst.opcode, this));
+						UnaryOperation.OpID.MOVE, ((Instruction11x)inst).getRegisterA(), getReturnReg(), inst.getOpcode(), this));
 				break;
 			case MOVE_RESULT_WIDE:
 				instructions.add(new UnaryOperation(instLoc,
 						UnaryOperation.OpID.MOVE_WIDE,
-						((Instruction11x)inst).getRegisterA(), getReturnReg(), inst.opcode, this));
+						((Instruction11x)inst).getRegisterA(), getReturnReg(), inst.getOpcode(), this));
 				break;
 			case MOVE_RESULT_OBJECT:
 				instructions.add(new UnaryOperation(instLoc,
 						UnaryOperation.OpID.MOVE, ((Instruction11x)inst).getRegisterA(),
-						getReturnReg(), inst.opcode, this));
+						getReturnReg(), inst.getOpcode(), this));
 				break;
 			case MOVE_EXCEPTION:
 				instructions.add(new UnaryOperation(instLoc,
 						UnaryOperation.OpID.MOVE_EXCEPTION, ((Instruction11x)inst).getRegisterA(),
-						getExceptionReg(), inst.opcode, this));
+						getExceptionReg(), inst.getOpcode(), this));
 				break;
 			case RETURN_VOID:
-				instructions.add(new Return.ReturnVoid(instLoc, inst.opcode, this));
+			case RETURN_VOID_NO_BARRIER:
+				instructions.add(new Return.ReturnVoid(instLoc, inst.getOpcode(), this));
 				break;
 			case RETURN:
 				//I think only primitives call return, and objects call return-object
 				instructions.add(new Return.ReturnSingle(instLoc,
-						((Instruction11x)inst).getRegisterA(), true, inst.opcode, this));
+						((Instruction11x)inst).getRegisterA(), true, inst.getOpcode(), this));
 				break;
 			case RETURN_WIDE:
 				//+1 to second parameter okay?
 				instructions.add(new Return.ReturnDouble(instLoc,
-						((Instruction11x)inst).getRegisterA(), ((Instruction11x)inst).getRegisterA()+1, inst.opcode, this));
+						((Instruction11x)inst).getRegisterA(), ((Instruction11x)inst).getRegisterA()+1, inst.getOpcode(), this));
 				break;
 			case RETURN_OBJECT:
 				instructions.add(new Return.ReturnSingle(instLoc,
-						((Instruction11x)inst).getRegisterA(), false, inst.opcode, this));
+						((Instruction11x)inst).getRegisterA(), false, inst.getOpcode(), this));
 				break;
 			case CONST_4: {
 				instructions.add(new Constant.IntConstant(instLoc,
-						(int)((Instruction11n)inst).getLiteral(),((Instruction11n)inst).getRegisterA(), inst.opcode, this));
+						((Instruction11n)inst).getNarrowLiteral(),((Instruction11n)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			}
 			case CONST_16:
 				instructions.add(new Constant.IntConstant(instLoc,
-						(int)((Instruction21s)inst).getLiteral(), ((Instruction21s)inst).getRegisterA(), inst.opcode, this));
+						((Instruction21s)inst).getNarrowLiteral(), ((Instruction21s)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case CONST:
 				instructions.add(new Constant.IntConstant(instLoc,
-						(int)((Instruction31i)inst).getLiteral(), ((Instruction31i)inst).getRegisterA(), inst.opcode, this));
+						((Instruction31i)inst).getNarrowLiteral(), ((Instruction31i)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case CONST_HIGH16:
 				instructions.add(new Constant.IntConstant(instLoc,
-						(int)((Instruction21h)inst).getLiteral() << 16, ((Instruction21h)inst).getRegisterA(), inst.opcode, this));
+						((Instruction21ih)inst).getHatLiteral() << 16, ((Instruction21ih)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case CONST_WIDE_16:
 				instructions.add(new Constant.LongConstant(instLoc,
-						((Instruction21s)inst).getLiteral(), ((Instruction21s)inst).getRegisterA(), inst.opcode, this));
+						((Instruction21s)inst).getWideLiteral(), ((Instruction21s)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case CONST_WIDE_32:
 				instructions.add(new Constant.LongConstant(instLoc,
-						((Instruction31i)inst).getLiteral(), ((Instruction31i)inst).getRegisterA(), inst.opcode, this));
+						((Instruction31i)inst).getWideLiteral(), ((Instruction31i)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case CONST_WIDE:
 				instructions.add(new Constant.LongConstant(instLoc,
-						((Instruction51l)inst).getLiteral(), ((Instruction51l)inst).getRegisterA(), inst.opcode, this));
+						((Instruction51l)inst).getWideLiteral(), ((Instruction51l)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case CONST_WIDE_HIGH16:
 				instructions.add(new Constant.LongConstant(instLoc,
-						((Instruction21h)inst).getLiteral() << 16, ((Instruction21h)inst).getRegisterA(), inst.opcode, this));
+						((Instruction21lh)inst).getWideLiteral() << 16, ((Instruction21lh)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case CONST_STRING:
 
 				instructions.add(new Constant.StringConstant(instLoc,
-						((StringIdItem)((Instruction21c)inst).getReferencedItem()).getStringValue(),
-						((Instruction21c)inst).getRegisterA(), inst.opcode, this));
+						((StringReference)((Instruction21c)inst).getReference()).getString(),
+						((Instruction21c)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case CONST_STRING_JUMBO:
 				instructions.add(new Constant.StringConstant(instLoc,
-						((StringIdItem)((Instruction31c)inst).getReferencedItem()).getStringValue(),
-						((Instruction31c)inst).getRegisterA(), inst.opcode, this));
+						((StringReference)((Instruction31c)inst).getReference()).getString(),
+						((Instruction31c)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case CONST_CLASS: {
-				String cname = ((TypeIdItem)((Instruction21c)inst).getReferencedItem()).getTypeDescriptor();
+				String cname = ((org.jf.dexlib2.iface.reference.TypeReference)((Instruction21c)inst).getReference()).getType();
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 				
@@ -1045,18 +1103,18 @@
 				TypeReference typeRef = TypeReference.findOrCreate(myClass.getClassLoader().getReference(), cname);
 				
 				instructions.add(new Constant.ClassConstant(instLoc,
-						typeRef, ((Instruction21c)inst).getRegisterA(), inst.opcode, this));
+						typeRef, ((Instruction21c)inst).getRegisterA(), inst.getOpcode(), this));
 				//logger.debug("myClass found name: " + this.myClass.loader.lookupClass(TypeName.findOrCreate(cname)).toString());
 				break;
 			}
 			case MONITOR_ENTER:
-				instructions.add(new Monitor(instLoc, true, ((Instruction11x)inst).getRegisterA(), inst.opcode, this));
+				instructions.add(new Monitor(instLoc, true, ((Instruction11x)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case MONITOR_EXIT:
-				instructions.add(new Monitor(instLoc, false, ((Instruction11x)inst).getRegisterA(), inst.opcode, this));
+				instructions.add(new Monitor(instLoc, false, ((Instruction11x)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case CHECK_CAST: {
-				String cname = ((TypeIdItem)((Instruction21c)inst).getReferencedItem()).getTypeDescriptor();
+				String cname = ((org.jf.dexlib2.iface.reference.TypeReference)((Instruction21c)inst).getReference()).getType();
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
@@ -1064,35 +1122,35 @@
 				//retrieving type reference correctly?
 				instructions.add(new CheckCast(instLoc,
 						TypeReference.findOrCreate(myClass.getClassLoader().getReference(), cname),
-						((Instruction21c)inst).getRegisterA(), inst.opcode, this));
+						((Instruction21c)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			}
 			case INSTANCE_OF: {
-				String cname = ((TypeIdItem)((Instruction22c)inst).getReferencedItem()).getTypeDescriptor();
+				String cname = ((org.jf.dexlib2.iface.reference.TypeReference)((Instruction22c)inst).getReference()).getType();
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 				instructions.add(new InstanceOf(instLoc,
 						((Instruction22c)inst).getRegisterA(),
 						TypeReference.findOrCreate(myClass.getClassLoader().getReference(),
 								cname),
-								((Instruction22c)inst).getRegisterB(), inst.opcode, this));
+								((Instruction22c)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			}
 			case ARRAY_LENGTH:
 				instructions.add(new ArrayLength(instLoc,
 						((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case NEW_INSTANCE: {
 				//newsitereference use instLoc or pc?
-				String cname = ((TypeIdItem)((Instruction21c)inst).getReferencedItem()).getTypeDescriptor();
+				String cname = ((org.jf.dexlib2.iface.reference.TypeReference)((Instruction21c)inst).getReference()).getType();
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
 				instructions.add(new New(instLoc,
 						((Instruction21c)inst).getRegisterA(),
 						NewSiteReference.make(instLoc, TypeReference.findOrCreate(myClass.getClassLoader().getReference(),
-								cname)), inst.opcode, this));
+								cname)), inst.getOpcode(), this));
 				break;
 			}
 			case NEW_ARRAY:
@@ -1101,7 +1159,7 @@
 				params[0] = ((Instruction22c)inst).getRegisterB();
 				//              MyLogger.log(LogLevel.INFO, "Type: " +((TypeIdItem)((Instruction22c)inst).getReferencedItem()).getTypeDescriptor());
 
-				String cname = ((TypeIdItem)((Instruction22c)inst).getReferencedItem()).getTypeDescriptor();
+				String cname = ((org.jf.dexlib2.iface.reference.TypeReference)((Instruction22c)inst).getReference()).getType();
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
@@ -1109,12 +1167,12 @@
 						((Instruction22c)inst).getRegisterA(),
 						NewSiteReference.make(instLoc, TypeReference.findOrCreate(myClass.getClassLoader().getReference(),
 								cname)),
-								params, inst.opcode, this));
+								params, inst.getOpcode(), this));
 				break;
 			}
 			//TODO: FILLED ARRAYS
 			case FILLED_NEW_ARRAY: {
-				int registerCount = ((Instruction35c)inst).getRegCount();
+				int registerCount = ((Instruction35c)inst).getRegisterCount();
 				int[] params = new int[1];
 				params[0] = registerCount;
 				int[] args = new int[registerCount];
@@ -1135,7 +1193,7 @@
 						args[3] = ((Instruction35c)inst).getRegisterG();
 						break;
 					case 4:
-						args[4] = ((Instruction35c)inst).getRegisterA();
+						args[4] = ((Instruction35c)inst).getRegisterC();
 						break;
 					default:
 						throw new RuntimeException("Illegal instruction at "
@@ -1143,7 +1201,7 @@
 					}
 				}
 
-				String cname = ((TypeIdItem)((Instruction35c)inst).getReferencedItem()).getTypeDescriptor();
+				String cname = ((org.jf.dexlib2.iface.reference.TypeReference)((Instruction35c)inst).getReference()).getType();
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
@@ -1152,11 +1210,11 @@
 				TypeReference myTypeRef = TypeReference.findOrCreate(myClass.getClassLoader().getReference(), newSiteRef.getDeclaredType().getArrayElementType().getName().toString());
 
 				instructions.add(new NewArrayFilled(instLoc, getReturnReg(),
-						newSiteRef, myTypeRef, params, args, inst.opcode, this));
+						newSiteRef, myTypeRef, params, args, inst.getOpcode(), this));
 				break;
 			}
 			case FILLED_NEW_ARRAY_RANGE: {
-				int registerCount = ((Instruction3rc)inst).getRegCount();
+				int registerCount = ((Instruction3rc)inst).getRegisterCount();
 				int[] params = new int[1];
 				params[0] = registerCount;
 				int[] args = new int[registerCount];
@@ -1164,7 +1222,7 @@
 				for (int i = 0; i < registerCount; i++)
 					args[i] = ((Instruction3rc)inst).getStartRegister() + i;
 
-				String cname = ((TypeIdItem)((Instruction3rc)inst).getReferencedItem()).getTypeDescriptor();
+				String cname = ((org.jf.dexlib2.iface.reference.TypeReference)((Instruction3rc)inst).getReference()).getType();
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
@@ -1174,175 +1232,175 @@
 				TypeReference myTypeRef = TypeReference.findOrCreate(myClass.getClassLoader().getReference(), newSiteRef.getDeclaredType().getArrayElementType().getName().toString());
 
 
-				instructions.add(new NewArrayFilled(instLoc, getReturnReg(), newSiteRef, myTypeRef, params, args, inst.opcode, this));
+				instructions.add(new NewArrayFilled(instLoc, getReturnReg(), newSiteRef, myTypeRef, params, args, inst.getOpcode(), this));
 				break;
 			}
 			case FILL_ARRAY_DATA:
-				//              System.out.println("Array Reference: " + ((Instruction31t)inst).getRegisterA());
-				//              System.out.println("Table Address Offset: " + ((Instruction31t)inst).getTargetAddressOffset());
+				// System.out.println("Array Reference: " + ((Instruction31t)inst).getRegisterA());
+				// System.out.println("Table Address Offset: " + ((Instruction31t)inst).getCodeOffset());
 
-				TypeReference arrayElementType = findOutArrayElementType(instrucs, instructions.toArray(new Instruction[0]), instCounter);
-				instructions.add(new ArrayFill(instLoc, ((Instruction31t)inst).getRegisterA(), ((Instruction31t)inst).getTargetAddressOffset(),
-						TypeReference.findOrCreate(myClass.getClassLoader().getReference(), arrayElementType.getName().toString()), inst.opcode, this));
+				TypeReference arrayElementType = findOutArrayElementType(inst, instructions.toArray(new Instruction[0]), instCounter);
+				instructions.add(new ArrayFill(instLoc, ((Instruction31t)inst).getRegisterA(), ((Instruction31t)inst).getCodeOffset(),
+						TypeReference.findOrCreate(myClass.getClassLoader().getReference(), arrayElementType.getName().toString()), inst.getOpcode(), this));
 				break;
 			case THROW:
-				instructions.add(new Throw(instLoc, ((Instruction11x)inst).getRegisterA(), inst.opcode, this));
+				instructions.add(new Throw(instLoc, ((Instruction11x)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case GOTO:
-				instructions.add(new Goto(instLoc, ((Instruction10t)inst).getTargetAddressOffset(), inst.opcode, this));
+				instructions.add(new Goto(instLoc, ((Instruction10t)inst).getCodeOffset(), inst.getOpcode(), this));
 				break;
 			case GOTO_16:
-				instructions.add(new Goto(instLoc, ((Instruction20t)inst).getTargetAddressOffset(), inst.opcode, this));
+				instructions.add(new Goto(instLoc, ((Instruction20t)inst).getCodeOffset(), inst.getOpcode(), this));
 				break;
 			case GOTO_32:
-				instructions.add(new Goto(instLoc, ((Instruction30t)inst).getTargetAddressOffset(), inst.opcode, this));
+				instructions.add(new Goto(instLoc, ((Instruction30t)inst).getCodeOffset(), inst.getOpcode(), this));
 				break;
 
 			case PACKED_SWITCH:
 			case SPARSE_SWITCH:
-				instructions.add(new Switch(instLoc, ((Instruction31t)inst).getRegisterA(), ((Instruction31t)inst).getTargetAddressOffset(), inst.opcode, this));
+				instructions.add(new Switch(instLoc, ((Instruction31t)inst).getRegisterA(), ((Instruction31t)inst).getCodeOffset(), inst.getOpcode(), this));
 				break;
 
 			case CMPL_FLOAT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.CMPL_FLOAT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case CMPG_FLOAT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.CMPG_FLOAT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case CMPL_DOUBLE:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.CMPL_DOUBLE, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case CMPG_DOUBLE:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.CMPG_DOUBLE, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case CMP_LONG:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.CMPL_LONG, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case IF_EQ:
-				instructions.add(new Branch.BinaryBranch(instLoc, ((Instruction22t)inst).getTargetAddressOffset(),
+				instructions.add(new Branch.BinaryBranch(instLoc, ((Instruction22t)inst).getCodeOffset(),
 						Branch.BinaryBranch.CompareOp.EQ, ((Instruction22t)inst).getRegisterA(),
-						((Instruction22t)inst).getRegisterB(), inst.opcode, this));
+						((Instruction22t)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case IF_NE:
-				instructions.add(new Branch.BinaryBranch(instLoc, ((Instruction22t)inst).getTargetAddressOffset(),
+				instructions.add(new Branch.BinaryBranch(instLoc, ((Instruction22t)inst).getCodeOffset(),
 						Branch.BinaryBranch.CompareOp.NE, ((Instruction22t)inst).getRegisterA(),
-						((Instruction22t)inst).getRegisterB(), inst.opcode, this));
+						((Instruction22t)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case IF_LT:
-				instructions.add(new Branch.BinaryBranch(instLoc, ((Instruction22t)inst).getTargetAddressOffset(),
+				instructions.add(new Branch.BinaryBranch(instLoc, ((Instruction22t)inst).getCodeOffset(),
 						Branch.BinaryBranch.CompareOp.LT, ((Instruction22t)inst).getRegisterA(),
-						((Instruction22t)inst).getRegisterB(), inst.opcode, this));
+						((Instruction22t)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case IF_GE:
-				instructions.add(new Branch.BinaryBranch(instLoc, ((Instruction22t)inst).getTargetAddressOffset(),
+				instructions.add(new Branch.BinaryBranch(instLoc, ((Instruction22t)inst).getCodeOffset(),
 						Branch.BinaryBranch.CompareOp.GE, ((Instruction22t)inst).getRegisterA(),
-						((Instruction22t)inst).getRegisterB(), inst.opcode, this));
+						((Instruction22t)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case IF_GT:
-				instructions.add(new Branch.BinaryBranch(instLoc, ((Instruction22t)inst).getTargetAddressOffset(),
+				instructions.add(new Branch.BinaryBranch(instLoc, ((Instruction22t)inst).getCodeOffset(),
 						Branch.BinaryBranch.CompareOp.GT, ((Instruction22t)inst).getRegisterA(),
-						((Instruction22t)inst).getRegisterB(), inst.opcode, this));
+						((Instruction22t)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case IF_LE:
-				instructions.add(new Branch.BinaryBranch(instLoc, ((Instruction22t)inst).getTargetAddressOffset(),
+				instructions.add(new Branch.BinaryBranch(instLoc, ((Instruction22t)inst).getCodeOffset(),
 						Branch.BinaryBranch.CompareOp.LE, ((Instruction22t)inst).getRegisterA(),
-						((Instruction22t)inst).getRegisterB(), inst.opcode, this));
+						((Instruction22t)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case IF_EQZ:
 				instructions.add(new Branch.UnaryBranch(instLoc,
-						((Instruction21t)inst).getTargetAddressOffset(), Branch.UnaryBranch.CompareOp.EQZ,
-						((Instruction21t)inst).getRegisterA(), inst.opcode, this));
+						((Instruction21t)inst).getCodeOffset(), Branch.UnaryBranch.CompareOp.EQZ,
+						((Instruction21t)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case IF_NEZ:
 				instructions.add(new Branch.UnaryBranch(instLoc,
-						((Instruction21t)inst).getTargetAddressOffset(), Branch.UnaryBranch.CompareOp.NEZ,
-						((Instruction21t)inst).getRegisterA(), inst.opcode, this));
+						((Instruction21t)inst).getCodeOffset(), Branch.UnaryBranch.CompareOp.NEZ,
+						((Instruction21t)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case IF_LTZ:
 				instructions.add(new Branch.UnaryBranch(instLoc,
-						((Instruction21t)inst).getTargetAddressOffset(), Branch.UnaryBranch.CompareOp.LTZ,
-						((Instruction21t)inst).getRegisterA(), inst.opcode, this));
+						((Instruction21t)inst).getCodeOffset(), Branch.UnaryBranch.CompareOp.LTZ,
+						((Instruction21t)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case IF_GEZ:
 				instructions.add(new Branch.UnaryBranch(instLoc,
-						((Instruction21t)inst).getTargetAddressOffset(), Branch.UnaryBranch.CompareOp.GEZ,
-						((Instruction21t)inst).getRegisterA(), inst.opcode, this));
+						((Instruction21t)inst).getCodeOffset(), Branch.UnaryBranch.CompareOp.GEZ,
+						((Instruction21t)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case IF_GTZ:
 				instructions.add(new Branch.UnaryBranch(instLoc,
-						((Instruction21t)inst).getTargetAddressOffset(), Branch.UnaryBranch.CompareOp.GTZ,
-						((Instruction21t)inst).getRegisterA(), inst.opcode, this));
+						((Instruction21t)inst).getCodeOffset(), Branch.UnaryBranch.CompareOp.GTZ,
+						((Instruction21t)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case IF_LEZ:
 				instructions.add(new Branch.UnaryBranch(instLoc,
-						((Instruction21t)inst).getTargetAddressOffset(), Branch.UnaryBranch.CompareOp.LEZ,
-						((Instruction21t)inst).getRegisterA(), inst.opcode, this));
+						((Instruction21t)inst).getCodeOffset(), Branch.UnaryBranch.CompareOp.LEZ,
+						((Instruction21t)inst).getRegisterA(), inst.getOpcode(), this));
 				break;
 			case AGET:
 				instructions.add(new ArrayGet(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_int, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_int, inst.getOpcode(), this));
 				break;
 			case AGET_WIDE:
 				instructions.add(new ArrayGet(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_wide, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_wide, inst.getOpcode(), this));
 				break;
 			case AGET_OBJECT:
 				instructions.add(new ArrayGet(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_object, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_object, inst.getOpcode(), this));
 				break;
 			case AGET_BOOLEAN:
 				instructions.add(new ArrayGet(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_boolean, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_boolean, inst.getOpcode(), this));
 				break;
 			case AGET_BYTE:
 				instructions.add(new ArrayGet(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_byte, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_byte, inst.getOpcode(), this));
 				break;
 			case AGET_CHAR:
 				instructions.add(new ArrayGet(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_char, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_char, inst.getOpcode(), this));
 				break;
 			case AGET_SHORT:
 				instructions.add(new ArrayGet(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_short, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_short, inst.getOpcode(), this));
 				break;
 			case APUT:
 				instructions.add(new ArrayPut(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_int, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_int, inst.getOpcode(), this));
 				break;
 			case APUT_WIDE:
 				instructions.add(new ArrayPut(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_wide, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_wide, inst.getOpcode(), this));
 				break;
 			case APUT_OBJECT:
 				instructions.add(new ArrayPut(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_object, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_object, inst.getOpcode(), this));
 				break;
 			case APUT_BOOLEAN:
 				instructions.add(new ArrayPut(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_boolean, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_boolean, inst.getOpcode(), this));
 				break;
 			case APUT_BYTE:
 				instructions.add(new ArrayPut(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_byte, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_byte, inst.getOpcode(), this));
 				break;
 			case APUT_CHAR:
 				instructions.add(new ArrayPut(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_char, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_char, inst.getOpcode(), this));
 				break;
 			case APUT_SHORT:
 				instructions.add(new ArrayPut(instLoc, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_short, inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(), ((Instruction23x)inst).getRegisterC(), Type.t_short, inst.getOpcode(), this));
 				break;
 			case IGET:
 			case IGET_WIDE:
@@ -1351,9 +1409,9 @@
 			case IGET_BYTE:
 			case IGET_CHAR:
 			case IGET_SHORT: {
-				String cname = ((FieldIdItem)((Instruction22c)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String fname = ((FieldIdItem)((Instruction22c)inst).getReferencedItem()).getFieldName().getStringValue();
-				String ftname = ((FieldIdItem)((Instruction22c)inst).getReferencedItem()).getFieldType().getTypeDescriptor();
+				String cname = ((FieldReference)((Instruction22c)inst).getReference()).getDefiningClass();
+				String fname = ((FieldReference)((Instruction22c)inst).getReference()).getName();
+				String ftname = ((FieldReference)((Instruction22c)inst).getReference()).getType();
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
@@ -1364,7 +1422,7 @@
 
 				instructions.add(new GetField.GetInstanceField(
 						instLoc, ((Instruction22c)inst).getRegisterA(), ((Instruction22c)inst).getRegisterB(),
-						cname, fname, ftname, inst.opcode, this));
+						cname, fname, ftname, inst.getOpcode(), this));
 				break;
 			}
 			case IPUT:
@@ -1374,9 +1432,9 @@
 			case IPUT_BYTE:
 			case IPUT_CHAR:
 			case IPUT_SHORT: {
-				String cname = ((FieldIdItem)((InstructionWithReference)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String fname = ((FieldIdItem)((InstructionWithReference)inst).getReferencedItem()).getFieldName().getStringValue();
-				String ftname = ((FieldIdItem)((InstructionWithReference)inst).getReferencedItem()).getFieldType().getTypeDescriptor();
+				String cname = ((FieldReference)((Instruction22c)inst).getReference()).getDefiningClass();
+				String fname = ((FieldReference)((Instruction22c)inst).getReference()).getName();
+				String ftname = ((FieldReference)((Instruction22c)inst).getReference()).getType();
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
@@ -1387,7 +1445,7 @@
 
 				instructions.add(new PutField.PutInstanceField(
 						instLoc, ((TwoRegisterInstruction)inst).getRegisterA(), ((TwoRegisterInstruction)inst).getRegisterB(),
-						cname, fname, ftname, inst.opcode, this));
+						cname, fname, ftname, inst.getOpcode(), this));
 				break;
 			}
 			case SGET:
@@ -1397,9 +1455,9 @@
 			case SGET_BYTE:
 			case SGET_CHAR:
 			case SGET_SHORT: {
-				String cname = ((FieldIdItem)((Instruction21c)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String fname = ((FieldIdItem)((Instruction21c)inst).getReferencedItem()).getFieldName().getStringValue();
-				String ftname = ((FieldIdItem)((Instruction21c)inst).getReferencedItem()).getFieldType().getTypeDescriptor();
+				String cname = ((FieldReference)((Instruction21c)inst).getReference()).getDefiningClass();
+				String fname = ((FieldReference)((Instruction21c)inst).getReference()).getName();
+				String ftname = ((FieldReference)((Instruction21c)inst).getReference()).getType();
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
@@ -1409,7 +1467,7 @@
 					ftname = ftname.substring(0,ftname.length()-1);
 
 				instructions.add(new GetField.GetStaticField(instLoc,
-						((Instruction21c)inst).getRegisterA(), cname, fname, ftname, inst.opcode, this));
+						((Instruction21c)inst).getRegisterA(), cname, fname, ftname, inst.getOpcode(), this));
 				break;
 			}
 			case SPUT:
@@ -1419,9 +1477,9 @@
 			case SPUT_BYTE:
 			case SPUT_CHAR:
 			case SPUT_SHORT: {
-				String cname = ((FieldIdItem)((Instruction21c)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String fname = ((FieldIdItem)((Instruction21c)inst).getReferencedItem()).getFieldName().getStringValue();
-				String ftname = ((FieldIdItem)((Instruction21c)inst).getReferencedItem()).getFieldType().getTypeDescriptor();
+				String cname = ((FieldReference)((Instruction21c)inst).getReference()).getDefiningClass();
+				String fname = ((FieldReference)((Instruction21c)inst).getReference()).getName();
+				String ftname = ((FieldReference)((Instruction21c)inst).getReference()).getType();
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
@@ -1431,30 +1489,30 @@
 					ftname = ftname.substring(0,ftname.length()-1);
 
 				instructions.add(new PutField.PutStaticField(instLoc,
-						((Instruction21c)inst).getRegisterA(), cname, fname, ftname, inst.opcode, this));
+						((Instruction21c)inst).getRegisterA(), cname, fname, ftname, inst.getOpcode(), this));
 				break;
 			}
 			case INVOKE_VIRTUAL: {
-				int registerCount = ((Instruction35c)inst).getRegCount();
+				int registerCount = ((Instruction35c)inst).getRegisterCount();
 				int[] args = new int[registerCount];
 
 				for (int i = 0; i < registerCount; i++)
 				{
 					switch(i) {
 					case 0:
-						args[0] = ((Instruction35c)inst).getRegisterD();
+						args[0] = ((Instruction35c)inst).getRegisterC();
 						break;
 					case 1:
-						args[1] = ((Instruction35c)inst).getRegisterE();
+						args[1] = ((Instruction35c)inst).getRegisterD();
 						break;
 					case 2:
-						args[2] = ((Instruction35c)inst).getRegisterF();
+						args[2] = ((Instruction35c)inst).getRegisterE();
 						break;
 					case 3:
-						args[3] = ((Instruction35c)inst).getRegisterG();
+						args[3] = ((Instruction35c)inst).getRegisterF();
 						break;
 					case 4:
-						args[4] = ((Instruction35c)inst).getRegisterA();
+						args[4] = ((Instruction35c)inst).getRegisterG();
 						break;
 					default:
 						throw new RuntimeException("Illegal instruction at "
@@ -1462,9 +1520,9 @@
 					}
 				}
 
-				String cname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String mname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getMethodName().getStringValue();
-				String pname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getPrototype().getPrototypeString();
+				String cname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference()).getDefiningClass();
+				String mname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference()).getName();
+				String pname = DexUtil.getSignature((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference());
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
@@ -1476,33 +1534,33 @@
 				//              for (IMethod m: this.myClass.loader.lookupClass(TypeName.findOrCreate(cname)).getDeclaredMethods())
 				//                  System.out.println(m.getDescriptor().toString());
 
-				handleINVOKE_VIRTUAL(instLoc, cname, mname, pname, args, inst.opcode);
+				handleINVOKE_VIRTUAL(instLoc, cname, mname, pname, args, inst.getOpcode());
 				//instructions.add(new Invoke.InvokeVirtual(instLoc, cname, mname, pname, args, inst.opcode, this));
 				//logger.debug("\t" + inst.opcode.toString() + " class: "+ cname + ", method name: " + mname + ", prototype string: " + pname);
 
 				break;
 			}
 			case INVOKE_SUPER: {
-				int registerCount = ((Instruction35c)inst).getRegCount();
+				int registerCount = ((Instruction35c)inst).getRegisterCount();
 				int[] args = new int[registerCount];
 
 				for (int i = 0; i < registerCount; i++)
 				{
 					switch(i) {
 					case 0:
-						args[0] = ((Instruction35c)inst).getRegisterD();
+						args[0] = ((Instruction35c)inst).getRegisterC();
 						break;
 					case 1:
-						args[1] = ((Instruction35c)inst).getRegisterE();
+						args[1] = ((Instruction35c)inst).getRegisterD();
 						break;
 					case 2:
-						args[2] = ((Instruction35c)inst).getRegisterF();
+						args[2] = ((Instruction35c)inst).getRegisterE();
 						break;
 					case 3:
-						args[3] = ((Instruction35c)inst).getRegisterG();
+						args[3] = ((Instruction35c)inst).getRegisterF();
 						break;
 					case 4:
-						args[4] = ((Instruction35c)inst).getRegisterA();
+						args[4] = ((Instruction35c)inst).getRegisterG();
 						break;
 					default:
 						throw new RuntimeException("Illegal instruction at "
@@ -1510,39 +1568,39 @@
 					}
 				}
 
-				String cname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String mname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getMethodName().getStringValue();
-				String pname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getPrototype().getPrototypeString();
+				String cname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference()).getDefiningClass();
+				String mname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference()).getName();
+				String pname = DexUtil.getSignature((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference());
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
 
 				instructions.add(new Invoke.InvokeSuper(instLoc,
-						cname, mname, pname, args, inst.opcode, this));
+						cname, mname, pname, args, inst.getOpcode(), this));
 				break;
 			}
 			case INVOKE_DIRECT: {
-				int registerCount = ((Instruction35c)inst).getRegCount();
+				int registerCount = ((Instruction35c)inst).getRegisterCount();
 				int[] args = new int[registerCount];
 
 				for (int i = 0; i < registerCount; i++)
 				{
 					switch(i) {
 					case 0:
-						args[0] = ((Instruction35c)inst).getRegisterD();
+						args[0] = ((Instruction35c)inst).getRegisterC();
 						break;
 					case 1:
-						args[1] = ((Instruction35c)inst).getRegisterE();
+						args[1] = ((Instruction35c)inst).getRegisterD();
 						break;
 					case 2:
-						args[2] = ((Instruction35c)inst).getRegisterF();
+						args[2] = ((Instruction35c)inst).getRegisterE();
 						break;
 					case 3:
-						args[3] = ((Instruction35c)inst).getRegisterG();
+						args[3] = ((Instruction35c)inst).getRegisterF();
 						break;
 					case 4:
-						args[4] = ((Instruction35c)inst).getRegisterA();
+						args[4] = ((Instruction35c)inst).getRegisterG();
 						break;
 					default:
 						throw new RuntimeException("Illegal instruction at "
@@ -1551,40 +1609,40 @@
 				}
 
 				//              logger.debug(inst.opcode.toString() + " class: "+((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getContainingClass().getTypeDescriptor() + ", method name: " + ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getMethodName().getStringValue() + ", prototype string: " + ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getPrototype().getPrototypeString());
-				String cname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String mname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getMethodName().getStringValue();
-				String pname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getPrototype().getPrototypeString();
+				String cname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference()).getDefiningClass();
+				String mname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference()).getName();
+				String pname = DexUtil.getSignature((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference());
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
 
 				instructions.add(new Invoke.InvokeDirect(instLoc,
-						cname, mname, pname, args, inst.opcode, this));
+						cname, mname, pname, args, inst.getOpcode(), this));
 
 				break;
 			}
 			case INVOKE_STATIC: {
-				int registerCount = ((Instruction35c)inst).getRegCount();
+				int registerCount = ((Instruction35c)inst).getRegisterCount();
 				int[] args = new int[registerCount];
 
 				for (int i = 0; i < registerCount; i++)
 				{
 					switch(i) {
 					case 0:
-						args[0] = ((Instruction35c)inst).getRegisterD();
+						args[0] = ((Instruction35c)inst).getRegisterC();
 						break;
 					case 1:
-						args[1] = ((Instruction35c)inst).getRegisterE();
+						args[1] = ((Instruction35c)inst).getRegisterD();
 						break;
 					case 2:
-						args[2] = ((Instruction35c)inst).getRegisterF();
+						args[2] = ((Instruction35c)inst).getRegisterE();
 						break;
 					case 3:
-						args[3] = ((Instruction35c)inst).getRegisterG();
+						args[3] = ((Instruction35c)inst).getRegisterF();
 						break;
 					case 4:
-						args[4] = ((Instruction35c)inst).getRegisterA();
+						args[4] = ((Instruction35c)inst).getRegisterG();
 						break;
 					default:
 						throw new RuntimeException("Illegal instruction at "
@@ -1593,40 +1651,40 @@
 				}
 
 				//logger.debug(inst.opcode.toString() + " class: "+((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getContainingClass().getTypeDescriptor() + ", method name: " + ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getMethodName().getStringValue() + ", prototype string: " + ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getPrototype().getPrototypeString());
-				String cname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String mname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getMethodName().getStringValue();
-				String pname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getPrototype().getPrototypeString();
+				String cname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference()).getDefiningClass();
+				String mname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference()).getName();
+				String pname = DexUtil.getSignature((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference());
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
 
 
-				instructions.add(new Invoke.InvokeStatic(instLoc, cname, mname, pname, args, inst.opcode, this));
+				instructions.add(new Invoke.InvokeStatic(instLoc, cname, mname, pname, args, inst.getOpcode(), this));
 
 				break;
 			}
 			case INVOKE_INTERFACE: {
-				int registerCount = ((Instruction35c)inst).getRegCount();
+				int registerCount = ((Instruction35c)inst).getRegisterCount();
 				int[] args = new int[registerCount];
 
 				for (int i = 0; i < registerCount; i++)
 				{
 					switch(i) {
 					case 0:
-						args[0] = ((Instruction35c)inst).getRegisterD();
+						args[0] = ((Instruction35c)inst).getRegisterC();
 						break;
 					case 1:
-						args[1] = ((Instruction35c)inst).getRegisterE();
+						args[1] = ((Instruction35c)inst).getRegisterD();
 						break;
 					case 2:
-						args[2] = ((Instruction35c)inst).getRegisterF();
+						args[2] = ((Instruction35c)inst).getRegisterE();
 						break;
 					case 3:
-						args[3] = ((Instruction35c)inst).getRegisterG();
+						args[3] = ((Instruction35c)inst).getRegisterF();
 						break;
 					case 4:
-						args[4] = ((Instruction35c)inst).getRegisterA();
+						args[4] = ((Instruction35c)inst).getRegisterG();
 						break;
 					default:
 						throw new RuntimeException("Illegal instruction at "
@@ -1634,634 +1692,634 @@
 					}
 				}
 
-				String cname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String mname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getMethodName().getStringValue();
-				String pname = ((MethodIdItem)((Instruction35c)inst).getReferencedItem()).getPrototype().getPrototypeString();
+				String cname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference()).getDefiningClass();
+				String mname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference()).getName();
+				String pname = DexUtil.getSignature((org.jf.dexlib2.iface.reference.MethodReference)((Instruction35c)inst).getReference());
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
 
 				instructions.add(new Invoke.InvokeInterface(instLoc,
-						cname, mname, pname, args, inst.opcode, this));
+						cname, mname, pname, args, inst.getOpcode(), this));
 				break;
 			}
 			case INVOKE_VIRTUAL_RANGE: {
-				int registerCount = ((Instruction3rc)inst).getRegCount();
+				int registerCount = ((Instruction3rc)inst).getRegisterCount();
 				int[] args = new int[registerCount];
 
 				for (int i = 0; i < registerCount; i++)
 					args[i] = ((Instruction3rc)inst).getStartRegister() + i;
 
-				String cname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String mname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getMethodName().getStringValue();
-				String pname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getPrototype().getPrototypeString();
+				String cname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference()).getDefiningClass();
+				String mname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference()).getName();
+				String pname = DexUtil.getSignature((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference());
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
 
 				instructions.add(new Invoke.InvokeVirtual(instLoc,
-						cname, mname, pname, args, inst.opcode, this));
+						cname, mname, pname, args, inst.getOpcode(), this));
 				break;
 			}
 			case INVOKE_SUPER_RANGE: {
-				int registerCount = ((Instruction3rc)inst).getRegCount();
+				int registerCount = ((Instruction3rc)inst).getRegisterCount();
 				int[] args = new int[registerCount];
 
 				for (int i = 0; i < registerCount; i++)
 					args[i] = ((Instruction3rc)inst).getStartRegister() + i;
 
-				String cname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String mname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getMethodName().getStringValue();
-				String pname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getPrototype().getPrototypeString();
+				String cname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference()).getDefiningClass();
+				String mname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference()).getName();
+        String pname = DexUtil.getSignature((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference());
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
 				instructions.add(new Invoke.InvokeSuper(instLoc,
-						cname, mname, pname, args, inst.opcode, this));
+						cname, mname, pname, args, inst.getOpcode(), this));
 				break;
 			}
 			case INVOKE_DIRECT_RANGE: {
-				int registerCount = ((Instruction3rc)inst).getRegCount();
+				int registerCount = ((Instruction3rc)inst).getRegisterCount();
 				int[] args = new int[registerCount];
 
 				for (int i = 0; i < registerCount; i++)
 					args[i] = ((Instruction3rc)inst).getStartRegister() + i;
 
-				String cname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String mname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getMethodName().getStringValue();
-				String pname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getPrototype().getPrototypeString();
+				String cname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference()).getDefiningClass();
+				String mname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference()).getName();
+				String pname = DexUtil.getSignature((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference());
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
 				instructions.add(new Invoke.InvokeDirect(instLoc,
-						cname, mname, pname, args, inst.opcode, this));
+						cname, mname, pname, args, inst.getOpcode(), this));
 				break;
 			}
 			case INVOKE_STATIC_RANGE: {
-				int registerCount = ((Instruction3rc)inst).getRegCount();
+				int registerCount = ((Instruction3rc)inst).getRegisterCount();
 				int[] args = new int[registerCount];
 
 				for (int i = 0; i < registerCount; i++)
 					args[i] = ((Instruction3rc)inst).getStartRegister() + i;
 
-				String cname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String mname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getMethodName().getStringValue();
-				String pname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getPrototype().getPrototypeString();
+				String cname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference()).getDefiningClass();
+				String mname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference()).getName();
+				String pname = DexUtil.getSignature((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference());
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
 
-				instructions.add(new Invoke.InvokeStatic(instLoc, cname, mname, pname, args, inst.opcode, this));
+				instructions.add(new Invoke.InvokeStatic(instLoc, cname, mname, pname, args, inst.getOpcode(), this));
 
 				break;
 			}
 			case INVOKE_INTERFACE_RANGE: {
-				int registerCount = ((Instruction3rc)inst).getRegCount();
+				int registerCount = ((Instruction3rc)inst).getRegisterCount();
 				int[] args = new int[registerCount];
 
 				for (int i = 0; i < registerCount; i++)
 					args[i] = ((Instruction3rc)inst).getStartRegister() + i;
 
-				String cname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getContainingClass().getTypeDescriptor();
-				String mname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getMethodName().getStringValue();
-				String pname = ((MethodIdItem)((Instruction3rc)inst).getReferencedItem()).getPrototype().getPrototypeString();
+				String cname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference()).getDefiningClass();
+				String mname = ((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference()).getName();
+				String pname = DexUtil.getSignature((org.jf.dexlib2.iface.reference.MethodReference)((Instruction3rc)inst).getReference());
 
 				if (cname.endsWith(";"))
 					cname = cname.substring(0,cname.length()-1);
 
 				instructions.add(new Invoke.InvokeInterface(instLoc,
-						cname, mname, pname, args, inst.opcode, this));
+						cname, mname, pname, args, inst.getOpcode(), this));
 				break;
 			}
 			case NEG_INT:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.NEGINT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.NEGINT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case NOT_INT:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.NOTINT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.NOTINT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case NEG_LONG:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.NEGLONG, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.NEGLONG, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case NOT_LONG:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.NOTLONG, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.NOTLONG, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case NEG_FLOAT:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.NEGFLOAT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.NEGFLOAT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case NEG_DOUBLE:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.NEGDOUBLE, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.NEGDOUBLE, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case INT_TO_LONG:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.INTTOLONG, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.INTTOLONG, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case INT_TO_FLOAT:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.INTTOFLOAT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.INTTOFLOAT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case INT_TO_DOUBLE:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.INTTODOUBLE, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.INTTODOUBLE, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case LONG_TO_INT:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.LONGTOINT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.LONGTOINT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case LONG_TO_FLOAT:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.LONGTOFLOAT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.LONGTOFLOAT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case LONG_TO_DOUBLE:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.LONGTODOUBLE, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.LONGTODOUBLE, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case FLOAT_TO_INT:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.FLOATTOINT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.FLOATTOINT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case FLOAT_TO_LONG:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.FLOATTOLONG, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.FLOATTOLONG, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case FLOAT_TO_DOUBLE:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.FLOATTODOUBLE, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.FLOATTODOUBLE, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case DOUBLE_TO_INT:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.DOUBLETOINT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.DOUBLETOINT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case DOUBLE_TO_LONG:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.DOUBLETOLONG, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.DOUBLETOLONG, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case DOUBLE_TO_FLOAT:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.DOUBLETOFLOAT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.DOUBLETOFLOAT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case INT_TO_BYTE:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.INTTOBYTE, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.INTTOBYTE, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case INT_TO_CHAR:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.INTTOCHAR, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.INTTOCHAR, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case INT_TO_SHORT:
 				instructions.add(new UnaryOperation(instLoc,
-						OpID.INTTOSHORT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						OpID.INTTOSHORT, ((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case ADD_INT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.ADD_INT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case SUB_INT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SUB_INT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case MUL_INT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.MUL_INT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case DIV_INT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.DIV_INT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case REM_INT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.REM_INT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case AND_INT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.AND_INT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case OR_INT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.OR_INT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case XOR_INT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.XOR_INT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case SHL_INT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SHL_INT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case SHR_INT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SHR_INT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case USHR_INT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.USHR_INT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case ADD_LONG:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.ADD_LONG, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case SUB_LONG:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SUB_LONG, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case MUL_LONG:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.MUL_LONG, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case DIV_LONG:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.DIV_LONG, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case REM_LONG:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.REM_LONG, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case AND_LONG:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.AND_LONG, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case OR_LONG:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.OR_LONG, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case XOR_LONG:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.XOR_LONG, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case SHL_LONG:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SHL_LONG, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case SHR_LONG:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SHR_LONG, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case USHR_LONG:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.USHR_LONG, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case ADD_FLOAT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.ADD_FLOAT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case SUB_FLOAT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SUB_FLOAT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case MUL_FLOAT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.MUL_FLOAT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case DIV_FLOAT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.DIV_FLOAT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case REM_FLOAT:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.REM_FLOAT, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case ADD_DOUBLE:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.ADD_DOUBLE, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case SUB_DOUBLE:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SUB_DOUBLE, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case MUL_DOUBLE:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.MUL_DOUBLE, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case DIV_DOUBLE:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.DIV_DOUBLE, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case REM_DOUBLE:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.REM_DOUBLE, ((Instruction23x)inst).getRegisterA(),
-						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.opcode, this));
+						((Instruction23x)inst).getRegisterB(),((Instruction23x)inst).getRegisterC(), inst.getOpcode(), this));
 				break;
 			case ADD_INT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.ADD_INT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case SUB_INT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SUB_INT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case MUL_INT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.MUL_INT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case DIV_INT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.DIV_INT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case REM_INT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.REM_INT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case AND_INT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.AND_INT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case OR_INT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.OR_INT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case XOR_INT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.XOR_INT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case SHL_INT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SHL_INT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case SHR_INT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SHR_INT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case USHR_INT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.USHR_INT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case ADD_LONG_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.ADD_LONG, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case SUB_LONG_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SUB_LONG, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case MUL_LONG_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.MUL_LONG, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case DIV_LONG_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.DIV_LONG, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case REM_LONG_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.REM_LONG, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case AND_LONG_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.AND_LONG, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case OR_LONG_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.OR_LONG, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case XOR_LONG_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.XOR_LONG, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case SHL_LONG_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SHL_LONG, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case SHR_LONG_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SHR_LONG, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case USHR_LONG_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.USHR_LONG, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case ADD_FLOAT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.ADD_FLOAT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case SUB_FLOAT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SUB_FLOAT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case MUL_FLOAT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.MUL_FLOAT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case DIV_FLOAT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.DIV_FLOAT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case REM_FLOAT_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.REM_FLOAT, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case ADD_DOUBLE_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.ADD_DOUBLE, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case SUB_DOUBLE_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.SUB_DOUBLE, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case MUL_DOUBLE_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.MUL_DOUBLE, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case DIV_DOUBLE_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.DIV_DOUBLE, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case REM_DOUBLE_2ADDR:
 				instructions.add(new BinaryOperation(instLoc,
 						BinaryOperation.OpID.REM_DOUBLE, ((Instruction12x)inst).getRegisterA(),
-						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.opcode, this));
+						((Instruction12x)inst).getRegisterA(), ((Instruction12x)inst).getRegisterB(), inst.getOpcode(), this));
 				break;
 			case ADD_INT_LIT16: {
-				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.ADD_INT,
-						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case RSUB_INT: {
-				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.RSUB_INT,
-						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case MUL_INT_LIT16: {
-				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.MUL_INT,
-						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case DIV_INT_LIT16: {
-				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.DIV_INT,
-						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case REM_INT_LIT16: {
-				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.REM_INT,
-						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case AND_INT_LIT16: {
-				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.AND_INT,
-						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case OR_INT_LIT16: {
-				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.OR_INT,
-						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case XOR_INT_LIT16: {
-				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22s)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.XOR_INT,
-						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22s)inst).getRegisterA(), ((Instruction22s)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case ADD_INT_LIT8: {
-				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.ADD_INT,
-						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case RSUB_INT_LIT8: {
-				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.RSUB_INT,
-						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case MUL_INT_LIT8: {
-				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.MUL_INT,
-						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case DIV_INT_LIT8: {
-				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.DIV_INT,
-						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case REM_INT_LIT8: {
-				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.REM_INT,
-						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case AND_INT_LIT8: {
-				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.AND_INT,
-						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case OR_INT_LIT8: {
-				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.OR_INT,
-						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case XOR_INT_LIT8: {
-				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.XOR_INT,
-						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case SHL_INT_LIT8: {
-				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.SHL_INT,
-						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case SHR_INT_LIT8: {
-				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.SHR_INT,
-						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			case USHR_INT_LIT8: {
-				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getLiteral());
+				Literal lit = new Literal.LongLiteral(((Instruction22b)inst).getWideLiteral());
 				instructions.add(new BinaryLiteralOperation(instLoc, BinaryLiteralOperation.OpID.USHR_INT,
-						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.opcode, this));
+						((Instruction22b)inst).getRegisterA(), ((Instruction22b)inst).getRegisterB(), lit, inst.getOpcode(), this));
 				break;
 			}
 			default:
 				throw new RuntimeException("not implemented instruction: 0x"
-						+ inst.opcode.toString());
+						+ inst.getOpcode().toString() + " in " + eMethod.getDefiningClass() + ':' + eMethod.getName());
 
 			}
-			currentCodeAddress += inst.getSize(currentCodeAddress);
+			currentCodeAddress += inst.getCodeUnits();
 		}
 
 		//// comment out start
@@ -2315,7 +2373,7 @@
 		//
 		//              Instruction10t dInst = (Instruction10t)instruction;
 		//
-		//              int offset = dInst.getTargetAddressOffset();
+		//              int offset = dInst.getCodeOffset();
 		//              instructions.add(new Goto(i,offset));
 		//
 		//              break;
@@ -2877,7 +2935,7 @@
 		//
 		//              Instruction20t dInst = (Instruction20t)instruction;
 		//
-		//              int offset = dInst.getTargetAddressOffset();
+		//              int offset = dInst.getCodeOffset();
 		//              instructions.add(new Goto(i,offset));
 		//              break;
 		//          }
@@ -2886,7 +2944,7 @@
 		//
 		//              Instruction30t dInst = (Instruction30t)instruction;
 		//
-		//              int offset = dInst.getTargetAddressOffset();
+		//              int offset = dInst.getCodeOffset();
 		//              instructions.add(new Goto(i,offset));
 		//              break;
 		//          }
@@ -2987,7 +3045,7 @@
 		//              Instruction21t dInst = (Instruction21t)instruction;
 		//
 		//              Register oper1 = regBank.get(dInst.getRegisterA());
-		//              int offset = dInst.getTargetAddressOffset();
+		//              int offset = dInst.getCodeOffset();
 		//
 		//              switch(dInst.opcode) {
 		//              case IF_EQZ:
@@ -3108,34 +3166,33 @@
 		//      //comment out stop
 	}
 
-	private TypeReference findOutArrayElementType(
-			org.jf.dexlib.Code.Instruction[] instrucs, Instruction[] walaInstructions, int instCounter) {
-		if (instCounter < 0 || instrucs[instCounter].opcode != Opcode.FILL_ARRAY_DATA) {
+	private static TypeReference findOutArrayElementType(
+			org.jf.dexlib2.iface.instruction.Instruction inst, Instruction[] walaInstructions, int instCounter) {
+		if (instCounter < 0) {
 			throw new IllegalArgumentException();
 		} else if (instCounter == 0) {
 			throw new UnsupportedOperationException("fill-array-data as first instruction is not supported!");
 		}
-		Instruction31t arrayFill = (Instruction31t)instrucs[instCounter];
+						
+		Instruction31t arrayFill = (Instruction31t)inst;
 		int interestingRegister = arrayFill.getRegisterA();
 		int curCounter = instCounter - 1;
 
 		while (curCounter >= 0) {
-			org.jf.dexlib.Code.Instruction curInst = instrucs[curCounter];
+			Instruction curInst = walaInstructions[curCounter];
 			// do we have a 'new-array'-instruction, where the destination register coincides with the current interesting register?
 			// then we return the element type of that array
-			if (curInst.opcode == Opcode.NEW_ARRAY) {
-				Instruction22c newArrayInst = (Instruction22c) curInst;
-				if (newArrayInst.getRegisterA() == interestingRegister) {
-					NewArray newArray = (NewArray) walaInstructions[curCounter];
+			if (curInst.getOpcode() == Opcode.NEW_ARRAY) {
+				NewArray newArray = (NewArray) walaInstructions[curCounter];
+				if (newArray.destination == interestingRegister) {
 					return newArray.newSiteRef.getDeclaredType().getArrayElementType();
 				}
-			} else if (curInst.opcode == Opcode.MOVE_OBJECT || curInst.opcode == Opcode.MOVE_OBJECT_16 || curInst.opcode == Opcode.MOVE_OBJECT_FROM16) {
-				TwoRegisterInstruction tri = (TwoRegisterInstruction) curInst;
-				int regA = tri.getRegisterA();
-				int regB = tri.getRegisterB();
-				if (regA == interestingRegister) {
-					interestingRegister = regB;
-				}
+			} else if (curInst.getOpcode() == Opcode.MOVE_OBJECT || curInst.getOpcode() == Opcode.MOVE_OBJECT_16 || curInst.getOpcode() == Opcode.MOVE_OBJECT_FROM16) {
+                UnaryOperation uo = (UnaryOperation) curInst;
+
+                if (uo.destination == interestingRegister) {
+                    interestingRegister = uo.source;
+                }
 			}
 			// all other instructions are ignored
 			curCounter--;
@@ -3149,7 +3206,7 @@
 	}
 
 	public Instruction[] getDexInstructions() {
-		return (Instruction[]) instructions().toArray(new Instruction[instructions().size()]);
+		return instructions().toArray(new Instruction[0]);
 	}
 
 
@@ -3164,6 +3221,7 @@
 		return instructions().getPcFromIndex(index);
 	}
 
+	@Override
 	public int getInstructionIndex(int bytecodeindex) {
 		return instructions().getIndexFromPc(bytecodeindex);
 	}
@@ -3176,10 +3234,12 @@
 
 		private final int[] NOTHING = new int[0];
 
+		@Override
 		public int[] indirectlyReadLocals(int instructionIndex) {
 			return NOTHING;
 		}
 
+		@Override
 		public int[] indirectlyWrittenLocals(int instructionIndex) {
 			return NOTHING;
 		}
@@ -3187,6 +3247,7 @@
 	};
 
 
+	@Override
 	public IndirectionData getIndirectionData() {
 		return NO_INDIRECTIONS;
 	}
@@ -3213,22 +3274,19 @@
 
     /**
      *
-     * @throws InvalidClassFileException
      * @throws UnsupportedOperationException
      *
-     * @todo    Review this implementation - it may be horribly wrong!
+     * TODO: Review this implementation - it may be horribly wrong!
      */
 	@Override
-	public Collection<CallSiteReference> getCallSites()
-			throws InvalidClassFileException {
-        Collection<CallSiteReference> empty = Collections.emptySet();
+	public Collection<CallSiteReference> getCallSites() {
         if (isNative()) {
-            return empty;
+            return Collections.emptySet();
         }
 
         // assert(false) : "Please review getCallSites-Implementation before use!";        // TODO
 
-        ArrayList<CallSiteReference> csites = new ArrayList<CallSiteReference>();
+        ArrayList<CallSiteReference> csites = new ArrayList<>();
         // XXX The call Sites in this method or to this method?!!!
         for (Instruction inst: instructions()) {
             if (inst instanceof Invoke) {
@@ -3251,32 +3309,32 @@
 	}
 
 	@Override
-	public SourcePosition getSourcePosition(int instructionIndex) throws InvalidClassFileException {
+	public SourcePosition getSourcePosition(int instructionIndex) {
 		return null;
 	}
 
 	@Override
-	public SourcePosition getParameterSourcePosition(int paramNum) throws InvalidClassFileException {
+	public SourcePosition getParameterSourcePosition(int paramNum) {
 		return null;
 	}
 
 	@Override
 	public Collection<Annotation> getAnnotations() {
-		return DexUtil.getAnnotations(myClass.getAnnotations(eMethod.method, null), myClass.getClassLoader().getReference());
+		return myClass.getAnnotations(eMethod, null);
 	}
 
 	@Override
 	public Collection<Annotation> getAnnotations(boolean runtimeInvisible) {
-		return DexUtil.getAnnotations(myClass.getAnnotations(eMethod.method, DexIClass.getTypes(runtimeInvisible)), myClass.getClassLoader().getReference());
+		return myClass.getAnnotations(eMethod, DexIClass.getTypes(runtimeInvisible));
 	}
 
 	@Override
 	public Collection<Annotation>[] getParameterAnnotations() {
-		Map<Integer, List<AnnotationItem>> raw = myClass.getParameterAnnotations(eMethod.method);
+		Map<Integer, List<Annotation>> raw = myClass.getParameterAnnotations(eMethod);
 		@SuppressWarnings("unchecked")
 		Collection<Annotation>[] result = new Collection[ getReference().getNumberOfParameters() ];
-		for(Map.Entry<Integer, List<AnnotationItem>> x : raw.entrySet()) {
-			result[x.getKey()] = DexUtil.getAnnotations(x.getValue(), myClass.getClassLoader().getReference());
+		for(Map.Entry<Integer, List<Annotation>> x : raw.entrySet()) {
+			result[x.getKey()] = x.getValue();
 		}
 		return result;
 	}
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexIRFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,7 +16,6 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.dalvik.ssa.DexSSABuilder;
 import com.ibm.wala.ipa.callgraph.Context;
-import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.ssa.DefaultIRFactory;
 import com.ibm.wala.ssa.IR;
 import com.ibm.wala.ssa.SSACFG;
@@ -29,7 +28,6 @@
 public class DexIRFactory extends DefaultIRFactory {
     public final static boolean buildLocalMap = false;
 
-    @SuppressWarnings("rawtypes")
 	@Override
     public ControlFlowGraph makeCFG(IMethod method, Context C) throws IllegalArgumentException {
     	if (method == null) {
@@ -84,18 +82,14 @@
 
             @Override
             protected String instructionPosition(int instructionIndex) {
-                            try {
                 int bcIndex = method.getBytecodeIndex(instructionIndex);
                 int lineNumber = method.getLineNumber(bcIndex);
 
                 if (lineNumber == -1) {
                     return "";
                 } else {
-                    return "(line " + lineNumber + ")";
+                    return "(line " + lineNumber + ')';
                 }
-                            } catch (InvalidClassFileException e) {
-                              return "";
-                            }
             }
 
             @Override
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexModuleEntry.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexModuleEntry.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexModuleEntry.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexModuleEntry.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,19 +50,21 @@
 
 import java.io.InputStream;
 
-import org.jf.dexlib.ClassDefItem;
+import org.jf.dexlib2.iface.ClassDef;
 
 import com.ibm.wala.classLoader.Module;
 import com.ibm.wala.classLoader.ModuleEntry;
 
 public class DexModuleEntry implements ModuleEntry {
 
-    private final ClassDefItem classDefItem;
+    private final ClassDef classDefItem;
     private final String className;
-
-    public DexModuleEntry(ClassDefItem cdefitems) {
+    private final DexFileModule container;
+    
+    public DexModuleEntry(ClassDef cdefitems, DexFileModule container) {
         classDefItem = cdefitems;
-        String temp =cdefitems.getClassType().getTypeDescriptor();
+        this.container = container;
+        String temp =cdefitems.getType();
 //      className = temp;
         if (temp.endsWith(";"))
             className = temp.substring(0,temp.length()-1); //remove last ';'
@@ -71,7 +73,7 @@
 //      System.out.println(className);
     }
 
-    public ClassDefItem getClassDefItem(){
+    public ClassDef getClassDefItem(){
         return classDefItem;
     }
 
@@ -79,6 +81,7 @@
      * (non-Javadoc)
      * @see com.ibm.wala.classLoader.ModuleEntry#asModule()
      */
+    @Override
     public Module asModule() {
         throw new UnsupportedOperationException();
     }
@@ -87,6 +90,7 @@
      * (non-Javadoc)
      * @see com.ibm.wala.classLoader.ModuleEntry#getClassName()
      */
+    @Override
     public String getClassName() {
         return className;
     }
@@ -95,6 +99,7 @@
      * (non-Javadoc)
      * @see com.ibm.wala.classLoader.ModuleEntry#getInputStream()
      */
+    @Override
     public InputStream getInputStream() {
         throw new UnsupportedOperationException();
     }
@@ -103,6 +108,7 @@
      * (non-Javadoc)
      * @see com.ibm.wala.classLoader.ModuleEntry#getName()
      */
+    @Override
     public String getName() {
         return className;
     }
@@ -111,6 +117,7 @@
      * (non-Javadoc)
      * @see com.ibm.wala.classLoader.ModuleEntry#isClassFile()
      */
+    @Override
     public boolean isClassFile() {
         return false;
     }
@@ -119,6 +126,7 @@
      * (non-Javadoc)
      * @see com.ibm.wala.classLoader.ModuleEntry#isModuleFile()
      */
+    @Override
     public boolean isModuleFile() {
         return false;
     }
@@ -127,13 +135,44 @@
      * (non-Javadoc)
      * @see com.ibm.wala.classLoader.ModuleEntry#isSourceFile()
      */
+    @Override
     public boolean isSourceFile() {
         return false;
     }
 
 	@Override
-	public Module getContainer() {
-		return asModule();
+	public DexFileModule getContainer() {
+		return container;
 	}
 
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((className == null) ? 0 : className.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof DexModuleEntry)) {
+            return false;
+        }
+        DexModuleEntry other = (DexModuleEntry) obj;
+        if (className == null) {
+            if (other.className != null) {
+                return false;
+            }
+        } else if (!className.equals(other.className)) {
+            return false;
+        }
+        return true;
+    }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexUtil.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexUtil.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/DexUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,29 +1,43 @@
 package com.ibm.wala.dalvik.classLoader;
 
+import static org.jf.dexlib2.ValueType.ANNOTATION;
+import static org.jf.dexlib2.ValueType.ARRAY;
+import static org.jf.dexlib2.ValueType.BOOLEAN;
+import static org.jf.dexlib2.ValueType.BYTE;
+import static org.jf.dexlib2.ValueType.CHAR;
+import static org.jf.dexlib2.ValueType.DOUBLE;
+import static org.jf.dexlib2.ValueType.ENUM;
+import static org.jf.dexlib2.ValueType.FIELD;
+import static org.jf.dexlib2.ValueType.FLOAT;
+import static org.jf.dexlib2.ValueType.INT;
+import static org.jf.dexlib2.ValueType.LONG;
+import static org.jf.dexlib2.ValueType.METHOD;
+import static org.jf.dexlib2.ValueType.NULL;
+import static org.jf.dexlib2.ValueType.SHORT;
+import static org.jf.dexlib2.ValueType.STRING;
+import static org.jf.dexlib2.ValueType.TYPE;
+
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
-import org.jf.dexlib.AnnotationItem;
-import org.jf.dexlib.FieldIdItem;
-import org.jf.dexlib.MethodIdItem;
-import org.jf.dexlib.TypeIdItem;
-import org.jf.dexlib.EncodedValue.AnnotationEncodedSubValue;
-import org.jf.dexlib.EncodedValue.ArrayEncodedValue;
-import org.jf.dexlib.EncodedValue.BooleanEncodedValue;
-import org.jf.dexlib.EncodedValue.ByteEncodedValue;
-import org.jf.dexlib.EncodedValue.CharEncodedValue;
-import org.jf.dexlib.EncodedValue.DoubleEncodedValue;
-import org.jf.dexlib.EncodedValue.EncodedValue;
-import org.jf.dexlib.EncodedValue.EnumEncodedValue;
-import org.jf.dexlib.EncodedValue.FieldEncodedValue;
-import org.jf.dexlib.EncodedValue.FloatEncodedValue;
-import org.jf.dexlib.EncodedValue.IntEncodedValue;
-import org.jf.dexlib.EncodedValue.LongEncodedValue;
-import org.jf.dexlib.EncodedValue.MethodEncodedValue;
-import org.jf.dexlib.EncodedValue.ShortEncodedValue;
-import org.jf.dexlib.EncodedValue.StringEncodedValue;
-import org.jf.dexlib.EncodedValue.TypeEncodedValue;
-import org.jf.dexlib.EncodedValue.ValueType;
+import org.jf.dexlib2.iface.AnnotationElement;
+import org.jf.dexlib2.iface.value.AnnotationEncodedValue;
+import org.jf.dexlib2.iface.value.ArrayEncodedValue;
+import org.jf.dexlib2.iface.value.BooleanEncodedValue;
+import org.jf.dexlib2.iface.value.ByteEncodedValue;
+import org.jf.dexlib2.iface.value.CharEncodedValue;
+import org.jf.dexlib2.iface.value.DoubleEncodedValue;
+import org.jf.dexlib2.iface.value.EncodedValue;
+import org.jf.dexlib2.iface.value.EnumEncodedValue;
+import org.jf.dexlib2.iface.value.FieldEncodedValue;
+import org.jf.dexlib2.iface.value.FloatEncodedValue;
+import org.jf.dexlib2.iface.value.IntEncodedValue;
+import org.jf.dexlib2.iface.value.LongEncodedValue;
+import org.jf.dexlib2.iface.value.MethodEncodedValue;
+import org.jf.dexlib2.iface.value.ShortEncodedValue;
+import org.jf.dexlib2.iface.value.StringEncodedValue;
+import org.jf.dexlib2.iface.value.TypeEncodedValue;
 
 import com.ibm.wala.shrikeCT.AnnotationsReader.AnnotationAttribute;
 import com.ibm.wala.shrikeCT.AnnotationsReader.ArrayElementValue;
@@ -44,25 +58,21 @@
 
 public class DexUtil {
 
-	static Collection<Annotation> getAnnotations(Collection<AnnotationItem> as, ClassLoaderReference clr) {
+	static Collection<Annotation> getAnnotations(Collection<org.jf.dexlib2.iface.Annotation> as, ClassLoaderReference clr) {
 		Collection<Annotation> result = HashSetFactory.make();
-		for(AnnotationItem a : as) {
+		for(org.jf.dexlib2.iface.Annotation a : as) {
 			result.add(getAnnotation(a, clr));
 		}
 		return result;
 	}
-
-	static Annotation getAnnotation(AnnotationItem a, ClassLoaderReference clr) {
-		return getAnnotation(a.getEncodedAnnotation(), clr);
-	}
-
-	static Annotation getAnnotation(AnnotationEncodedSubValue ea, ClassLoaderReference clr) {
+	
+	static Annotation getAnnotation(org.jf.dexlib2.iface.Annotation ea, ClassLoaderReference clr) {
 		Map<String,ElementValue> values = HashMapFactory.make();
-		TypeReference at = getTypeRef(ea.annotationType, clr);
-
-		for(int i = 0; i < ea.names.length; i++) {
-			String name = ea.names[i].getStringValue();
-			EncodedValue v = ea.values[i];
+		TypeReference at = getTypeRef(ea.getType(), clr);
+		
+		for(AnnotationElement elt : ea.getElements()) {
+			String name = elt.getName();
+			EncodedValue v = elt.getValue();
 			ElementValue value = getValue(clr, v);
 			values.put(name, value);
 		}
@@ -72,77 +82,89 @@
 
 	static ElementValue getValue(ClassLoaderReference clr, EncodedValue v) {
 		switch (v.getValueType()) {
-		case VALUE_ANNOTATION:
-			Annotation a = getAnnotation((AnnotationEncodedSubValue)v, clr);
-			return new AnnotationAttribute(a.getType().getName().toString() +";", a.getNamedArguments());
-			
-		case VALUE_ARRAY:
-			EncodedValue[] vs = ((ArrayEncodedValue)v).values;
-			ElementValue rs[] = new ElementValue[ vs.length ];
-			for(int idx = 0; idx < vs.length; idx++) {
-				rs[idx] = getValue(clr, vs[idx]);
+		case ANNOTATION: {
+			Map<String,ElementValue> values = HashMapFactory.make();
+			String at = ((AnnotationEncodedValue)v).getType();
+			
+			for(AnnotationElement elt : ((AnnotationEncodedValue)v).getElements()) {
+				String name = elt.getName();
+				EncodedValue ev = elt.getValue();
+				ElementValue value = getValue(clr, ev);
+				values.put(name, value);
 			}
-			return new ArrayElementValue(rs);
 			
-		case VALUE_BOOLEAN:
-			Boolean bl = ((BooleanEncodedValue)v).value;
+			return new AnnotationAttribute(at, values);
+		}
+		
+		case ARRAY: {
+			List<? extends EncodedValue> vs = ((ArrayEncodedValue)v).getValue();
+			ElementValue[] rs = new ElementValue[ vs.size() ];
+			int idx = 0;
+			for(EncodedValue ev : vs) {
+				rs[idx++] = getValue(clr, ev);
+			}
+			return new ArrayElementValue(rs);
+		}
+		
+		case BOOLEAN:
+			Boolean bl = ((BooleanEncodedValue)v).getValue();
 			return new ConstantElementValue(bl);
 			
-		case VALUE_BYTE:
-			Byte bt = ((ByteEncodedValue)v).value;
+		case BYTE:
+			Byte bt = ((ByteEncodedValue)v).getValue();
 			return new ConstantElementValue(bt);
 			
-		case VALUE_CHAR:
-			Character c = ((CharEncodedValue)v).value;
+		case CHAR:
+			Character c = ((CharEncodedValue)v).getValue();
 			return new ConstantElementValue(c);
 			
-		case VALUE_DOUBLE:
-			Double d = ((DoubleEncodedValue)v).value;
+		case DOUBLE:
+			Double d = ((DoubleEncodedValue)v).getValue();
 			return new ConstantElementValue(d);
 			
-		case VALUE_ENUM:
-			FieldIdItem o = ((EnumEncodedValue)v).value;
-			return new EnumElementValue(o.getFieldType().getTypeDescriptor(), o.getFieldName().getStringValue());
-			
-		case VALUE_FIELD:
-			o = v.getValueType()==ValueType.VALUE_ENUM? ((EnumEncodedValue)v).value: ((FieldEncodedValue)v).value;
-			String fieldName = o.getFieldName().getStringValue();
-			TypeReference ft = getTypeRef(o.getFieldType(), clr);
-			TypeReference ct = getTypeRef(o.getContainingClass(), clr);
+		case ENUM:
+			org.jf.dexlib2.iface.reference.FieldReference o = ((EnumEncodedValue)v).getValue();
+			return new EnumElementValue(o.getType(), o.getName());
+			
+		case FIELD:
+			o = v.getValueType()==ENUM? ((EnumEncodedValue)v).getValue(): ((FieldEncodedValue)v).getValue();
+			String fieldName = o.getName();
+			TypeReference ft = getTypeRef(o.getType(), clr);
+			TypeReference ct = getTypeRef(o.getDefiningClass(), clr);
 			return new ConstantElementValue(FieldReference.findOrCreate(ct, Atom.findOrCreateUnicodeAtom(fieldName), ft));
 						
-		case VALUE_FLOAT:
-			Float f = ((FloatEncodedValue)v).value;
+		case FLOAT:
+			Float f = ((FloatEncodedValue)v).getValue();
 			return new ConstantElementValue(f);
 			
-		case VALUE_INT:
-			Integer iv = ((IntEncodedValue)v).value;
+		case INT:
+			Integer iv = ((IntEncodedValue)v).getValue();
 			return new ConstantElementValue(iv);
 			
-		case VALUE_LONG:
-			Long l = ((LongEncodedValue)v).value;
+		case LONG:
+			Long l = ((LongEncodedValue)v).getValue();
 			return new ConstantElementValue(l);
 			
-		case VALUE_METHOD:
-			MethodIdItem m = ((MethodEncodedValue)v).value;
-			ct = getTypeRef(m.getContainingClass(), clr);
-			String methodName = m.getMethodName().getStringValue();
-			String methodSig = m.getPrototype().getPrototypeString();
+		case METHOD:
+			org.jf.dexlib2.iface.reference.MethodReference m = ((MethodEncodedValue)v).getValue();
+			ct = getTypeRef(m.getDefiningClass(), clr);
+			String methodName = m.getName();
+			String methodSig = getSignature(m);
 			return new ConstantElementValue(MethodReference.findOrCreate(ct, Atom.findOrCreateUnicodeAtom(methodName), Descriptor.findOrCreateUTF8(methodSig)));
 			
-		case VALUE_NULL:
+		case NULL:
 			return new ConstantElementValue(null);
 			
-		case VALUE_SHORT:
-			Short s = ((ShortEncodedValue)v).value;
+		case SHORT:
+			Short s = ((ShortEncodedValue)v).getValue();
 			return new ConstantElementValue(s);
 
-		case VALUE_STRING:
-			String str = ((StringEncodedValue)v).value.getStringValue();
+		case STRING:
+			String str = ((StringEncodedValue)v).getValue();
 			return new ConstantElementValue(str);
 			
-		case VALUE_TYPE:
-			TypeIdItem t = ((TypeEncodedValue)v).value;
+		case TYPE:
+			String t = ((TypeEncodedValue)v).getValue();
 			return new ConstantElementValue(getTypeName(t) + ";");
 			
 		default:
@@ -151,12 +173,21 @@
 		}
 	}
 	
-	static TypeReference getTypeRef(TypeIdItem type, ClassLoaderReference clr) {
+	static String getSignature(org.jf.dexlib2.iface.reference.MethodReference ref) {
+		StringBuilder sig = new StringBuilder("(");
+		for(CharSequence p : ref.getParameterTypes()) {
+			sig = sig.append(p);
+		}
+		sig.append(')').append(ref.getReturnType());
+		return sig.toString();
+	}
+	
+	static TypeReference getTypeRef(String type, ClassLoaderReference clr) {
 		return TypeReference.findOrCreate(clr, getTypeName(type));
 	}
 	
-	static TypeName getTypeName(TypeIdItem fieldType) {
-		ImmutableByteArray fieldTypeArray = ImmutableByteArray.make(fieldType.getTypeDescriptor());
+	static TypeName getTypeName(String fieldType) {
+		ImmutableByteArray fieldTypeArray = ImmutableByteArray.make(fieldType);
 	    TypeName T = null;
 	    if (fieldTypeArray.get(fieldTypeArray.length() - 1) == ';') {
 	        T = TypeName.findOrCreate(fieldTypeArray, 0, fieldTypeArray.length() - 1);
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/InstructionArray.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/InstructionArray.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/InstructionArray.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/InstructionArray.java	2019-01-29 17:08:39.000000000 +0000
@@ -68,11 +68,12 @@
     List<Integer> index2pc;
 
     public InstructionArray() {
-        instructions = new ArrayList<Instruction>();
-        pc2index = new HashMap<Integer, Integer>();
-        index2pc = new ArrayList<Integer>();
+        instructions = new ArrayList<>();
+        pc2index = new HashMap<>();
+        index2pc = new ArrayList<>();
     }
 
+    @Override
     public boolean add(Instruction e) {
         boolean ret = instructions.add(e);
 
@@ -84,6 +85,7 @@
         return ret;
     }
 
+    @Override
     public boolean addAll(Collection<? extends Instruction> c) {
         boolean ret = false;
 
@@ -94,18 +96,22 @@
         return ret;
     }
 
+    @Override
     public boolean contains(Object o) {
         return instructions.contains(o);
     }
 
+    @Override
     public boolean containsAll(Collection<?> c) {
         return instructions.containsAll(c);
     }
 
+    @Override
     public boolean equals(Object o) {
         return instructions.equals(o);
     }
 
+    @Override
     public int hashCode() {
         return instructions.hashCode();
     }
@@ -114,38 +120,47 @@
         return instructions.indexOf(o);
     }
 
+    @Override
     public boolean isEmpty() {
         return instructions.isEmpty();
     }
 
+    @Override
     public Iterator<Instruction> iterator() {
         return instructions.iterator();
     }
 
+    @Override
     public void clear() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean remove(Object o) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean removeAll(Collection<?> c) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public boolean retainAll(Collection<?> c) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public int size() {
         return instructions.size();
     }
 
+    @Override
     public Object[] toArray() {
         return instructions.toArray();
     }
 
+    @Override
     public <T> T[] toArray(T[] a) {
         return instructions.toArray(a);
     }
@@ -173,7 +188,6 @@
 
 
     /**
-     * @param id
      * @return The instruction from its id.
      */
     public Instruction getFromId(int id) {
@@ -181,7 +195,6 @@
     }
 
     /**
-     * @param pc
      * @return The instruction from its pc.
      */
     public Instruction getFromPc(int pc) {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/classLoader/WDexClassLoaderImpl.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,10 +50,8 @@
 import java.io.IOException;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.TreeSet;
 
 import com.ibm.wala.classLoader.ClassLoaderImpl;
 import com.ibm.wala.classLoader.IClass;
@@ -63,15 +61,14 @@
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeName;
-import com.ibm.wala.util.collections.HashCodeComparator;
 import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.config.SetOfClasses;
 import com.ibm.wala.util.warnings.Warning;
 import com.ibm.wala.util.warnings.Warnings;
 
 /**
- * ClassLoader for Java & Dalvik.
+ * ClassLoader for Java &amp; Dalvik.
  *
  */
 public class WDexClassLoaderImpl extends ClassLoaderImpl {
@@ -104,17 +101,13 @@
         // module are loaded according to the given order (same as in Java VM)
         Set<ModuleEntry> classModuleEntries = HashSetFactory.make();
         
-        for (Iterator<Module> it = modules.iterator(); it.hasNext();) {
-            Module archive = it.next();
+        for (Module archive : modules) {
             Set<ModuleEntry> classFiles = getDexFiles(archive);
             
             removeClassFiles(classFiles, classModuleEntries);
             loadAllDexClasses(classFiles);
-            
-            for (Iterator<ModuleEntry> it2 = classFiles.iterator(); it2.hasNext();) {
-            	ModuleEntry file = it2.next();
-            	classModuleEntries.add(file);
-            }
+
+            classModuleEntries.addAll(classFiles);
         }                       
     }
     
@@ -122,28 +115,13 @@
     /**
      * Remove from s any class file module entries which already are in t
      */
-    private void removeClassFiles(Set<ModuleEntry> s, Set<ModuleEntry> t) {
-    	Set<String> old = HashSetFactory.make();
-    	for (Iterator<ModuleEntry> it = t.iterator(); it.hasNext();) {
-    		ModuleEntry m = it.next();
-    		old.add(m.getClassName());
-    	}
-    	HashSet<ModuleEntry> toRemove = HashSetFactory.make();
-    	for (Iterator<ModuleEntry> it = s.iterator(); it.hasNext();) {
-    		ModuleEntry m = it.next();
-    		if (old.contains(m.getClassName())) {
-    			toRemove.add(m);
-    		}
-    	}
-    	s.removeAll(toRemove);
+    private static void removeClassFiles(Set<ModuleEntry> s, Set<ModuleEntry> t) {
+	    s.removeAll(t);
     }
     
-    private Set<ModuleEntry> getDexFiles(Module M) throws IOException {
-    	TreeSet<ModuleEntry> sortedEntries = new TreeSet<ModuleEntry>(HashCodeComparator.instance());
-    	sortedEntries.addAll(Iterator2Collection.toSet(M.getEntries()));
+    private static Set<ModuleEntry> getDexFiles(Module M) {
     	HashSet<ModuleEntry> result = HashSetFactory.make();
-    	for (Iterator<ModuleEntry> it = sortedEntries.iterator(); it.hasNext();) {
-    		ModuleEntry entry = (ModuleEntry) it.next();
+    	for (ModuleEntry entry : Iterator2Iterable.make(M.getEntries())) {
     		if (entry instanceof DexModuleEntry) {    		
     			result.add(entry);
     		} 
@@ -152,11 +130,10 @@
     }
     
     
-    private void loadAllDexClasses(Collection<ModuleEntry> moduleEntries) {
+    @SuppressWarnings("unused")
+	private void loadAllDexClasses(Collection<ModuleEntry> moduleEntries) {
     	
-    	for (Iterator<ModuleEntry> it = moduleEntries.iterator(); it.hasNext();) {
-    		ModuleEntry entry = it.next();
-
+    	for (ModuleEntry entry : moduleEntries) {
     		// Dalvik class
     		if (entry instanceof DexModuleEntry) {
     			DexModuleEntry dexEntry = ((DexModuleEntry) entry);
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayFill.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayFill.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayFill.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayFill.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,8 +51,8 @@
  */
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
-import org.jf.dexlib.Code.Format.ArrayDataPseudoInstruction;
+import org.jf.dexlib2.Opcode;
+import org.jf.dexlib2.iface.instruction.formats.ArrayPayload;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 import com.ibm.wala.types.TypeReference;
@@ -63,7 +63,7 @@
     public final int array;
     public final int tableAddressOffset;
     public int registerIndex;
-    private ArrayDataPseudoInstruction table;
+    private ArrayPayload table;
     public final TypeReference type;
 
 
@@ -85,16 +85,16 @@
     }
 
 
-    public void setArrayDataTable(ArrayDataPseudoInstruction table) {
-        this.table = table;
+    public void setArrayDataTable(ArrayPayload inst) {
+        this.table = inst;
     }
 
-    public ArrayDataPseudoInstruction getTable() {
+    public ArrayPayload getTable() {
         return table;
     }
 
     public int getElementCount() {
-        return table.getElementCount();
+        return table.getArrayElements().size();
     }
 
     public TypeReference getType() {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayGet.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayGet.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayGet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayGet.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,14 +48,14 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 import com.ibm.wala.types.TypeReference;
 
 public class ArrayGet extends Instruction {
 
-    public enum Type{t_int,t_wide,t_boolean,t_byte,t_char, t_object, t_short};
+    public enum Type{t_int,t_wide,t_boolean,t_byte,t_char, t_object, t_short}
 
     public final int destination;
     public final int array;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayLength.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayLength.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayLength.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayLength.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayPut.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayPut.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayPut.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/ArrayPut.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 import com.ibm.wala.dalvik.dex.instructions.ArrayGet.Type;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryLiteralOperation.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryLiteralOperation.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryLiteralOperation.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryLiteralOperation.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,9 +48,9 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import com.ibm.wala.dalvik.dex.instructions.BinaryOperation.DalvikBinaryOp;
+import org.jf.dexlib2.Opcode;
 
-import com.ibm.wala.cast.ir.ssa.CAstBinaryOp;
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 import com.ibm.wala.dalvik.classLoader.Literal;
 import com.ibm.wala.shrikeBT.IBinaryOpInstruction;
@@ -65,7 +65,7 @@
         ADD_INT,RSUB_INT,MUL_INT,DIV_INT,REM_INT,AND_INT,OR_INT,XOR_INT,SHL_INT,SHR_INT,USHR_INT,
         ADD_LONG,RSUB_LONG,MUL_LONG,DIV_LONG,REM_LONG,AND_LONG,OR_LONG,XOR_LONG,SHL_LONG,SHR_LONG,USHR_LONG,
         ADD_FLOAT,RSUB_FLOAT,MUL_FLOAT,DIV_FLOAT,REM_FLOAT,
-        ADD_DOUBLE,RSUB_DOUBLE,MUL_DOUBLE,DIV_DOUBLE,REM_DOUBLE};
+        ADD_DOUBLE,RSUB_DOUBLE,MUL_DOUBLE,DIV_DOUBLE,REM_DOUBLE}
 
     public final OpID op;
     public final int oper1;
@@ -90,21 +90,21 @@
         switch(op)
         {
         case CMPL_FLOAT:
-            return CAstBinaryOp.LT;
+            return DalvikBinaryOp.LT;
         case CMPG_FLOAT:
-            return CAstBinaryOp.GT;
+            return DalvikBinaryOp.GT;
         case CMPL_DOUBLE:
-            return CAstBinaryOp.LT;
+            return DalvikBinaryOp.LT;
         case CMPG_DOUBLE:
-            return CAstBinaryOp.GT;
+            return DalvikBinaryOp.GT;
         case CMPL_LONG:
-            return CAstBinaryOp.LT;
+            return DalvikBinaryOp.LT;
         case CMPG_LONG:
-            return CAstBinaryOp.GT;
+            return DalvikBinaryOp.GT;
         case CMPL_INT:
-            return CAstBinaryOp.LT;
+            return DalvikBinaryOp.LT;
         case CMPG_INT:
-            return CAstBinaryOp.GT;
+            return DalvikBinaryOp.GT;
         case ADD_INT:
             return IBinaryOpInstruction.Operator.ADD;
         case RSUB_INT:
@@ -169,8 +169,9 @@
             return IBinaryOpInstruction.Operator.DIV;
         case REM_DOUBLE:
             return IBinaryOpInstruction.Operator.REM;
+		default:
+			return null;
         }
-        return null;
     }
 
     public boolean isFloat()
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryOperation.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryOperation.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryOperation.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/BinaryOperation.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,23 +48,34 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
-import com.ibm.wala.cast.ir.ssa.CAstBinaryOp;
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 import com.ibm.wala.shrikeBT.IBinaryOpInstruction;
 import com.ibm.wala.shrikeBT.IShiftInstruction;
 
 public class BinaryOperation extends Instruction {
 
-    public static enum OpID {CMPL_FLOAT,CMPG_FLOAT,
+    public enum OpID {CMPL_FLOAT,CMPG_FLOAT,
         CMPL_DOUBLE,CMPG_DOUBLE,
         CMPL_LONG,CMPG_LONG,
         CMPL_INT,CMPG_INT,
         ADD_INT,SUB_INT,MUL_INT,DIV_INT,REM_INT,AND_INT,OR_INT,XOR_INT,SHL_INT,SHR_INT,USHR_INT,
         ADD_LONG,SUB_LONG,MUL_LONG,DIV_LONG,REM_LONG,AND_LONG,OR_LONG,XOR_LONG,SHL_LONG,SHR_LONG,USHR_LONG,
         ADD_FLOAT,SUB_FLOAT,MUL_FLOAT,DIV_FLOAT,REM_FLOAT,
-        ADD_DOUBLE,SUB_DOUBLE,MUL_DOUBLE,DIV_DOUBLE,REM_DOUBLE};
+        ADD_DOUBLE,SUB_DOUBLE,MUL_DOUBLE,DIV_DOUBLE,REM_DOUBLE}
+
+    /**
+     * for binary ops not defined in JVML
+     */
+    public enum DalvikBinaryOp implements IBinaryOpInstruction.IOperator {
+        LT, GT;
+
+        @Override
+        public String toString() {
+            return super.toString().toLowerCase();
+        }
+    }
 
     public final OpID op;
     public final int oper1;
@@ -84,26 +95,24 @@
         visitor.visitBinaryOperation(this);
     }
 
-    public IBinaryOpInstruction.IOperator getOperator()
-    {
-        switch(op)
-        {
+    public IBinaryOpInstruction.IOperator getOperator() {
+        switch(op) {
         case CMPL_FLOAT:
-            return CAstBinaryOp.LT;
+            return DalvikBinaryOp.LT;
         case CMPG_FLOAT:
-            return CAstBinaryOp.GT;
+            return DalvikBinaryOp.GT;
         case CMPL_DOUBLE:
-            return CAstBinaryOp.LT;
+            return DalvikBinaryOp.LT;
         case CMPG_DOUBLE:
-            return CAstBinaryOp.GT;
+            return DalvikBinaryOp.GT;
         case CMPL_LONG:
-            return CAstBinaryOp.LT;
+            return DalvikBinaryOp.LT;
         case CMPG_LONG:
-            return CAstBinaryOp.GT;
+            return DalvikBinaryOp.GT;
         case CMPL_INT:
-            return CAstBinaryOp.LT;
+            return DalvikBinaryOp.LT;
         case CMPG_INT:
-            return CAstBinaryOp.GT;
+            return DalvikBinaryOp.GT;
         case ADD_INT:
             return IBinaryOpInstruction.Operator.ADD;
         case SUB_INT:
@@ -168,8 +177,9 @@
             return IBinaryOpInstruction.Operator.DIV;
         case REM_DOUBLE:
             return IBinaryOpInstruction.Operator.REM;
+		default:
+	        return null;
         }
-        return null;
     }
     public boolean isFloat()
     {
@@ -196,28 +206,20 @@
     }
 
     public boolean isUnsigned() {
-    	
-    	/**
-    	 * At the moment, WALA asserts that false is returned here. Maybe WALA will support unsigned
-    	 * arithmetic in its IR some time in the future - then the commented code will make sense.
-    	 */
-    	return false;
-//        switch(op)
-//        {
-//        case AND_INT:
-//        case OR_INT:
-//        case XOR_INT:
-//        case SHL_INT:
-//        case USHR_INT:
-//        case AND_LONG:
-//        case OR_LONG:
-//        case XOR_LONG:
-//        case SHL_LONG:
-//        case USHR_LONG:
-//            return true;
-//        default:
-//            return false;
-//        }
+    	  switch(op)  {
+        case AND_INT:
+        case OR_INT:
+        case XOR_INT:
+        case SHL_INT:
+        case USHR_INT:
+        case AND_LONG:
+        case OR_LONG:
+        case XOR_LONG:
+        case SHL_LONG:
+        case USHR_LONG:
+            return true;
+        default:
+            return false;
+        }
     }
-
 }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Branch.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Branch.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Branch.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Branch.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 import com.ibm.wala.shrikeBT.IConditionalBranchInstruction;
@@ -68,7 +68,7 @@
 
     public static class UnaryBranch extends Branch
     {
-        public enum CompareOp {EQZ,NEZ,LTZ,LEZ,GTZ,GEZ};
+        public enum CompareOp {EQZ,NEZ,LTZ,LEZ,GTZ,GEZ}
         public final int oper1;
         public final CompareOp op;
 
@@ -103,7 +103,7 @@
 
     public static class BinaryBranch extends Branch
     {
-        public enum CompareOp {EQ,NE,LT,LE,GT,GE};
+        public enum CompareOp {EQ,NE,LT,LE,GT,GE}
         public final int oper1;
         public final int oper2;
         public final CompareOp op;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/CheckCast.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/CheckCast.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/CheckCast.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/CheckCast.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 import com.ibm.wala.types.TypeReference;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Constant.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Constant.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Constant.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Constant.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 import com.ibm.wala.types.TypeReference;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/GetField.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/GetField.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/GetField.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/GetField.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Goto.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Goto.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Goto.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Goto.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/InstanceOf.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/InstanceOf.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/InstanceOf.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/InstanceOf.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 import com.ibm.wala.types.TypeReference;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Instruction.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Instruction.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Instruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Instruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,15 +48,16 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 
 public abstract class Instruction {
 
+    @SuppressWarnings("unused")
     public static class Visitor {
  
-        public void visitArrayLength(ArrayLength instruction) {
+		public void visitArrayLength(ArrayLength instruction) {
          }
 
         public void visitArrayGet(ArrayGet instruction) {
@@ -145,7 +146,7 @@
      * True if the instruction can continue.
      * @see com.ibm.wala.shrikeBT.IInstruction#isFallThrough()
      */
-    public boolean isFallThrough() {
+	public boolean isFallThrough() {
         return opcode.canContinue();
     }
 
@@ -153,7 +154,7 @@
      * True if the instruction can throw an exception
      * @see com.ibm.wala.shrikeBT.IInstruction#isPEI()
      */
-    public boolean isPEI() {
+	public boolean isPEI() {
         return opcode.canThrow();
     }
 
@@ -171,12 +172,10 @@
         return opcode;
     }
 
-    public int[] getBranchTargets() {
+	public int[] getBranchTargets() {
         return noInstructions;
     }
 
-
-
     public abstract void visit(Visitor visitor);
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Invoke.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Invoke.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Invoke.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Invoke.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,11 +48,12 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
 import com.ibm.wala.shrikeBT.IInvokeInstruction.IDispatch;
+import com.ibm.wala.types.Descriptor;
 
 public abstract class Invoke extends Instruction {
 
@@ -68,6 +69,8 @@
         this.methodName = methodName;
         this.descriptor = descriptor;
         this.args = args;
+        
+        assert Descriptor.findOrCreateUTF8(descriptor) != null;
     }
 
     public static class InvokeVirtual extends Invoke
@@ -87,15 +90,15 @@
         public String toString()
         {
             StringBuilder argString = new StringBuilder();
-            argString.append("(");
+            argString.append('(');
             String sep = "";
             for(int r:args)
             {
-                argString.append(sep+r);
+                argString.append(sep).append(r);
                 sep=",";
             }
-            argString.append(")");
-            return "InvokeVirtual "+clazzName+" "+methodName+" "+descriptor+" "+argString.toString()+" "+pc;
+            argString.append(')');
+            return "InvokeVirtual "+clazzName+ ' ' +methodName+ ' ' +descriptor+ ' ' + argString + ' ' +pc;
         }
 
     }
@@ -105,6 +108,7 @@
                 String clazzName, String methodName, String descriptor,
                 int[] args, Opcode opcode, DexIMethod method) {
             super(instLoc, clazzName, methodName, descriptor, args, opcode, method);
+           	assert descriptor.contains("(");
         }
 
         @Override
@@ -117,15 +121,15 @@
         public String toString()
         {
             StringBuilder argString = new StringBuilder();
-            argString.append("(");
+            argString.append('(');
             String sep = "";
             for(int r:args)
             {
-                argString.append(sep+r);
+                argString.append(sep).append(r);
                 sep=",";
             }
-            argString.append(")");
-            return "InvokeSuper "+clazzName+" "+methodName+" "+descriptor+" "+argString.toString()+" "+pc;
+            argString.append(')');
+            return "InvokeSuper "+clazzName+ ' ' +methodName+ ' ' +descriptor+ ' ' + argString + ' ' +pc;
         }
 
     }
@@ -147,15 +151,15 @@
         public String toString()
         {
             StringBuilder argString = new StringBuilder();
-            argString.append("(");
+            argString.append('(');
             String sep = "";
             for(int r:args)
             {
-                argString.append(sep+r);
+                argString.append(sep).append(r);
                 sep=",";
             }
-            argString.append(")");
-            return "InvokeDirect "+clazzName+" "+methodName+" "+descriptor+" "+argString.toString()+" "+pc;
+            argString.append(')');
+            return "InvokeDirect "+clazzName+ ' ' +methodName+ ' ' +descriptor+ ' ' + argString + ' ' +pc;
         }
 
 
@@ -178,15 +182,15 @@
         public String toString()
         {
             StringBuilder argString = new StringBuilder();
-            argString.append("(");
+            argString.append('(');
             String sep = "";
             for(int r:args)
             {
-                argString.append(sep+r);
+                argString.append(sep).append(r);
                 sep=",";
             }
-            argString.append(")");
-            return "InvokeStatic "+clazzName+" "+methodName+" "+descriptor+" "+argString.toString()+" "+pc;
+            argString.append(')');
+            return "InvokeStatic "+clazzName+ ' ' +methodName+ ' ' +descriptor+ ' ' + argString + ' ' +pc;
         }
 
     }
@@ -207,15 +211,15 @@
         public String toString()
         {
             StringBuilder argString = new StringBuilder();
-            argString.append("(");
+            argString.append('(');
             String sep = "";
             for(int r:args)
             {
-                argString.append(sep+r);
+                argString.append(sep).append(r);
                 sep=",";
             }
-            argString.append(")");
-            return "InvokeInterface "+clazzName+" "+methodName+" "+descriptor+" "+argString.toString()+" "+pc;
+            argString.append(')');
+            return "InvokeInterface "+clazzName+ ' ' +methodName+ ' ' +descriptor+ ' ' + argString + ' ' +pc;
         }
 
     }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Monitor.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Monitor.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Monitor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Monitor.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/NewArrayFilled.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/NewArrayFilled.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/NewArrayFilled.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/NewArrayFilled.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/NewArray.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/NewArray.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/NewArray.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/NewArray.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/New.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/New.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/New.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/New.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/PackedSwitchPad.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/PackedSwitchPad.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/PackedSwitchPad.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/PackedSwitchPad.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,27 +48,36 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Format.PackedSwitchDataPseudoInstruction;
+import org.jf.dexlib2.iface.instruction.SwitchElement;
+import org.jf.dexlib2.iface.instruction.SwitchPayload;
 
 public class PackedSwitchPad implements SwitchPad {
 
-    public final int firstValue;
+    public int firstValue;
     public final int[] offsets;
     public final int defaultOffset;
     private int [] labelsAndOffsets;
     private int[] values;
 
-    public PackedSwitchPad(PackedSwitchDataPseudoInstruction s, int defaultOffset) {
-        this.firstValue = s.getFirstKey();
-        this.offsets = s.getTargets();
+    public PackedSwitchPad(SwitchPayload inst, int defaultOffset) {
+    	int i = 0;
+    	this.offsets = new int[inst.getSwitchElements().size()];
+    	for(SwitchElement elt : inst.getSwitchElements()) {
+    		if (i == 0) {
+    			firstValue = elt.getKey();
+    		}
+    		offsets[i++] = elt.getOffset();
+    	}
         this.defaultOffset = defaultOffset;
     }
 
+    @Override
     public int[] getOffsets()
     {
         return offsets;
     }
 
+    @Override
     public int[] getValues()
     {
         if (values != null)
@@ -83,11 +92,13 @@
 
 
 
+    @Override
     public int getDefaultOffset() {
         //return Integer.MIN_VALUE;
         return defaultOffset;
     }
 
+    @Override
     public int[] getLabelsAndOffsets() {
         if(labelsAndOffsets != null)
             return labelsAndOffsets;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/PutField.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/PutField.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/PutField.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/PutField.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Return.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Return.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Return.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Return.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/SparseSwitchPad.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/SparseSwitchPad.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/SparseSwitchPad.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/SparseSwitchPad.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,8 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Format.SparseSwitchDataPseudoInstruction;
+import org.jf.dexlib2.iface.instruction.SwitchElement;
+import org.jf.dexlib2.iface.instruction.SwitchPayload;
 
 public class SparseSwitchPad implements SwitchPad {
 
@@ -57,29 +58,38 @@
     public final int defaultOffset;
     private int [] labelsAndOffsets;
 
-    public SparseSwitchPad(SparseSwitchDataPseudoInstruction s, int defaultOffset)
+    public SparseSwitchPad(SwitchPayload inst, int defaultOffset)
     {
-        this.values = s.getKeys();
-        this.offsets = s.getTargets();
+    	int i = 0;
+    	this.values = new int[ inst.getSwitchElements().size() ];
+    	this.offsets = new int[ inst.getSwitchElements().size() ];
+    	for(SwitchElement elt : inst.getSwitchElements()) {
+    		values[i] = elt.getKey();
+    		offsets[i++] = elt.getOffset();
+    	}
         this.defaultOffset = defaultOffset;
     }
 
+    @Override
     public int [] getOffsets()
     {
         return offsets;
     }
 
+    @Override
     public int [] getValues()
     {
         return values;
     }
 
 
+    @Override
     public int getDefaultOffset() {
         //return Integer.MIN_VALUE;
         return defaultOffset;
     }
 
+    @Override
     public int[] getLabelsAndOffsets() {
 //      return values;
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Switch.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Switch.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Switch.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Switch.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Throw.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Throw.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Throw.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/Throw.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/UnaryOperation.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/UnaryOperation.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/UnaryOperation.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/instructions/UnaryOperation.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,9 +48,8 @@
 
 package com.ibm.wala.dalvik.dex.instructions;
 
-import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib2.Opcode;
 
-import com.ibm.wala.cast.ir.ssa.CAstUnaryOp;
 import com.ibm.wala.dalvik.classLoader.DexIMethod;
 import com.ibm.wala.shrikeBT.IUnaryOpInstruction;
 import com.ibm.wala.shrikeBT.IUnaryOpInstruction.IOperator;
@@ -58,7 +57,20 @@
 
 public class UnaryOperation extends Instruction {
 
-    public static enum OpID {MOVE, MOVE_WIDE, MOVE_EXCEPTION, NOT, NEGINT, NOTINT, NEGLONG, NOTLONG, NEGFLOAT, NEGDOUBLE, DOUBLETOLONG, DOUBLETOFLOAT, INTTOBYTE, INTTOCHAR, INTTOSHORT, DOUBLETOINT, FLOATTODOUBLE, FLOATTOLONG, FLOATTOINT, LONGTODOUBLE, LONGTOFLOAT, LONGTOINT, INTTODOUBLE, INTTOFLOAT, INTTOLONG};
+    public enum OpID {MOVE, MOVE_WIDE, MOVE_EXCEPTION, NOT, NEGINT, NOTINT, NEGLONG, NOTLONG, NEGFLOAT, NEGDOUBLE, DOUBLETOLONG, DOUBLETOFLOAT, INTTOBYTE, INTTOCHAR, INTTOSHORT, DOUBLETOINT, FLOATTODOUBLE, FLOATTOLONG, FLOATTOINT, LONGTODOUBLE, LONGTOFLOAT, LONGTOINT, INTTODOUBLE, INTTOFLOAT, INTTOLONG}
+
+    /**
+     * for unary ops not defined in JVML
+     */
+    public enum DalvikUnaryOp implements IUnaryOpInstruction.IOperator {
+        BITNOT;
+
+        @Override
+        public String toString() {
+            return super.toString().toLowerCase();
+        }
+
+    }
 
     public final OpID op;
     public final int source;
@@ -119,15 +131,15 @@
         {
         // SSA unary ops
         case NOT:
-            return CAstUnaryOp.BITNOT;
+            return DalvikUnaryOp.BITNOT;
         case NEGINT:
             return IUnaryOpInstruction.Operator.NEG;
         case NOTINT:
-            return CAstUnaryOp.BITNOT;
+            return DalvikUnaryOp.BITNOT;
         case NEGLONG:
             return IUnaryOpInstruction.Operator.NEG;
         case NOTLONG:
-            return CAstUnaryOp.BITNOT;
+            return DalvikUnaryOp.BITNOT;
         case NEGFLOAT:
             return IUnaryOpInstruction.Operator.NEG;
         case NEGDOUBLE:
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/util/config/DexAnalysisScopeReader.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/util/config/DexAnalysisScopeReader.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/util/config/DexAnalysisScopeReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/dex/util/config/DexAnalysisScopeReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -57,7 +57,7 @@
 import com.ibm.wala.util.config.AnalysisScopeReader;
 
 /**
- * Create AnalysisScope from java & dalvik file.
+ * Create AnalysisScope from java &amp; dalvik file.
  * 
  * @see com.ibm.wala.ipa.callgraph.AnalysisScope
  */
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModelClass.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModelClass.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModelClass.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModelClass.java	2019-01-29 17:08:39.000000000 +0000
@@ -84,10 +84,10 @@
  *  
  *  In the generated code this class may be found as "Lcom/ibm/wala/AndroidModelClass"
  *
- *  @see    com.ibm.wala.dalvik.ipa.callgraph.impl.FakeRootClass
+ *  @see    com.ibm.wala.ipa.callgraph.impl.FakeRootClass
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
- *  @todo   Move this class into an other loader? Currently: Primordial
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
+ *  TODO: Move this class into an other loader? Currently: Primordial
  */
 public final /* singleton */ class AndroidModelClass extends SyntheticClass {
     private static Logger logger = LoggerFactory.getLogger(AndroidModelClass.class);
@@ -127,7 +127,7 @@
         clinit.setStatic(true);
         final TypeSafeInstructionFactory instructionFactory = new TypeSafeInstructionFactory(cha);
         
-        final Set<TypeReference> components = AndroidEntryPointManager.MANAGER.getComponents();
+        final Set<TypeReference> components = AndroidEntryPointManager.getComponents();
         int ssaNo = 1;
 
         if (AndroidEntryPointManager.MANAGER.doFlatComponents()) {
@@ -144,7 +144,7 @@
                     final MethodReference ctor = MethodReference.findOrCreate(component, MethodReference.initSelector);
                     final CallSiteReference site = CallSiteReference.make(pc, ctor, IInvokeInstruction.Dispatch.SPECIAL);
                     final SSAValue exception = new SSAValue(ssaNo++, TypeReference.JavaLangException, clinitRef);
-                    final List<SSAValue> params = new ArrayList<SSAValue>();
+                    final List<SSAValue> params = new ArrayList<>();
                     params.add(instance);
                     final SSAInstruction ctorCall = instructionFactory.InvokeInstruction(pc, params, exception, site);
                     clinit.addStatement(ctorCall);
@@ -237,7 +237,7 @@
     //  Contents of the class: Fields
     //  We have none...
     //
-    private Map<Atom, IField> fields = new HashMap<Atom, IField>();
+    private Map<Atom, IField> fields = new HashMap<>();
 
     @Override
     public IField getField(Atom name) {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModel.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModel.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -46,7 +46,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
@@ -68,10 +67,10 @@
 import com.ibm.wala.dalvik.util.AndroidComponent;
 import com.ibm.wala.dalvik.util.AndroidEntryPointManager;
 import com.ibm.wala.dalvik.util.AndroidTypes;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.cha.IClassHierarchyDweller;
 import com.ibm.wala.ipa.summaries.MethodSummary;
@@ -121,7 +120,7 @@
  *
  *  All these Models are added to a synthetic AndroidModelClass.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public class AndroidModel /* makes SummarizedMethod */ 
         implements IClassHierarchyDweller {
@@ -130,7 +129,7 @@
 
     protected IClassHierarchy cha;
     protected AnalysisOptions options;
-    protected AnalysisCache cache;
+    protected IAnalysisCacheView cache;
     private AbstractAndroidModel labelSpecial;
     private IInstantiationBehavior instanceBehavior;
     private SSAValueManager paramManager;
@@ -153,7 +152,7 @@
     protected boolean built;
     protected SummarizedMethod model;
 
-    public AndroidModel(final IClassHierarchy cha, final AnalysisOptions options, final AnalysisCache cache) {
+    public AndroidModel(final IClassHierarchy cha, final AnalysisOptions options, final IAnalysisCacheView cache) {
         this.options = options;
         this.cha = cha;
         this.cache = cache;
@@ -168,13 +167,13 @@
      *  Generates the model on a sub-set of Entrypoints. 
      *
      *  Asks {@link #selectEntryPoint(AndroidEntryPoint)} for each EntryPoint known to the AndroidEntryPointManager,
-     *  if the EntryPoint should be included in the model. Then calls {@link #build(Atom, Iterable<? extends Entrypoint>)}
+     *  if the EntryPoint should be included in the model. Then calls {@link #build(Atom, Collection)}
      *  on these.
      *
      *  @param  name    The name the generated method will be known as
      */
     protected void build(Atom name) throws CancelException {
-        final List<AndroidEntryPoint> restrictedEntries = new ArrayList<AndroidEntryPoint>();
+        final List<AndroidEntryPoint> restrictedEntries = new ArrayList<>();
 
         for (AndroidEntryPoint ep: AndroidEntryPointManager.ENTRIES) {
             if (selectEntryPoint(ep)) {
@@ -335,7 +334,7 @@
     /**
      *  Add Instructions to the model.
      *
-     *  {@link #build(Iterable<?extends Entrypoint>)} prepares the MethodSummary, then calls populate() to
+     *  {@link #build(Atom, Collection)} prepares the MethodSummary, then calls populate() to
      *  add the instructions, then finishes the model. Populate is only an extra function to shorten build(),
      *  calling it doesn't make sense in an other context.
      */
@@ -383,8 +382,8 @@
 
             
             {
-                final AndroidBoot boot = new AndroidBoot(null); 
-                boot.addBootCode(tsif, null, paramManager, this.body);
+                final AndroidBoot boot = new AndroidBoot(); 
+                boot.addBootCode(tsif, paramManager, this.body);
                 //tool.attachActivities(allActivities, application, boot.getMainThread(), /* Should be application context TODO */
                 //        boot.getPackageContext(), nullBinder, nullIntent); 
             }
@@ -417,11 +416,11 @@
             //  Collect arguments to ep
             //  if there are multiple paramses call the entrypoint multiple times
             //
-            List<List<SSAValue>> paramses = new ArrayList<List<SSAValue>>(1);
+            List<List<SSAValue>> paramses = new ArrayList<>(1);
             {
-                final List<Integer> mutliTypePositions = new ArrayList<Integer>();
+                final List<Integer> mutliTypePositions = new ArrayList<>();
                 { // Add single-type parameters and collect positions for multi-type
-                    final List<SSAValue> params = new ArrayList<SSAValue>(ep.getNumberOfParameters());
+                    final List<SSAValue> params = new ArrayList<>(ep.getNumberOfParameters());
                     paramses.add(params);
 
                     for (int i = 0; i < ep.getNumberOfParameters(); ++i) {
@@ -453,12 +452,12 @@
                     final int typeCountOnPosition = typesOnPosition.length;
 
                     { // Extend the list size to hold the product
-                        final List<List<SSAValue>> new_paramses = new ArrayList<List<SSAValue>>(paramses.size() * typeCountOnPosition);
+                        final List<List<SSAValue>> new_paramses = new ArrayList<>(paramses.size() * typeCountOnPosition);
 
                         for (int i = 0; i < typeCountOnPosition; ++i) {
                             //new_paramses.addAll(paramses); *grrr* JVM! You could copy at least null - but noooo...
                             for (final List<SSAValue> params : paramses) {
-                                final List<SSAValue> new_params = new ArrayList<SSAValue>(params.size());
+                                final List<SSAValue> new_params = new ArrayList<>(params.size());
                                 new_params.addAll(params);
                                 new_paramses.add(new_params);
                             }
@@ -534,7 +533,7 @@
                         this.paramManager.invalidate(returnKey);
                         final SSAValue newValue = this.paramManager.getFree(returnType, returnKey);
                         final int phiPC = body.getNextProgramCounter();
-                        final List<SSAValue> toPhi = new ArrayList<SSAValue>(2);
+                        final List<SSAValue> toPhi = new ArrayList<>(2);
                         toPhi.add(oldValue);
                         toPhi.add(returnValue);
                         final SSAPhiInstruction phi = tsif.PhiInstruction(phiPC, newValue, toPhi);
@@ -576,7 +575,6 @@
      *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentStarters
      *
      *  @param  asMethod    The signature to generate
-     *  @param  flags       Control the behavior of the wrapper, may be null
      *  @param  caller      The class of the caller; only needed depending on the flags
      *  @param  info        The IntentSterter used
      *  @param  callerNd    CGNoodle of the caller - may be null
@@ -584,7 +582,10 @@
      */
     public SummarizedMethod getMethodAs(MethodReference asMethod, TypeReference caller,
             IntentStarters.StartInfo info, CGNode callerNd) throws CancelException {
-        Set<StarterFlags> flags = info.getFlags();
+        Set<StarterFlags> flags = null;
+        if (info != null) {
+          flags = info.getFlags();
+        }
         //System.out.println("\n\nAS: " + asMethod + "\n\n");
         if (!built) {
             getMethod();
@@ -633,7 +634,7 @@
             } catch (Exception e) { }
         }*/
         final List<Parameter> modelsActivities = modelAcc.allExtend(AndroidTypes.ActivityName, getClassHierarchy()); // are in models scope
-        final List<SSAValue> allActivities = new ArrayList<SSAValue>(modelsActivities.size());   // create instances in this scope 
+        final List<SSAValue> allActivities = new ArrayList<>(modelsActivities.size());   // create instances in this scope 
         for (Parameter activity: modelsActivities) {
             final TypeReference activityType = activity.getType();
             final Parameter inAsMethod = acc.firstOf(activityType);
@@ -674,7 +675,7 @@
         assert(allActivities.size() == modelsActivities.size());
 
         // The defaults for connectThrough
-        final Set<SSAValue> defaults = new HashSet<SSAValue>();
+        final Set<SSAValue> defaults = new HashSet<>();
         { // Calls that don't take a bundle usually call through with a null-bundle
             final SSAValue nullBundle = pm.getUnmanaged(AndroidTypes.Bundle, "nullBundle");
             redirect.addConstant(nullBundle.getNumber(), new ConstantValue(null));
@@ -698,7 +699,7 @@
         final SSAValue intent = acc.firstExtends(AndroidTypes.Intent, cha);
 
         final AndroidStartComponentTool tool = new AndroidStartComponentTool(getClassHierarchy(), asMethod, flags, caller, instructionFactory,
-                acc, pm, redirect, self, info, callerNd);
+                acc, pm, redirect, self, info);
 
         final AndroidTypes.AndroidContextType contextType;
         final SSAValue androidContext;  // of AndroidTypes.Context: The callers android-context
@@ -720,7 +721,7 @@
 
         // Call the model
         {
-            final List<SSAValue> redirectParams = acc.connectThrough(modelAcc, new HashSet<SSAValue>(allActivities), defaults,
+            final List<SSAValue> redirectParams = acc.connectThrough(modelAcc, new HashSet<>(allActivities), defaults,
                     getClassHierarchy(), /* IInstantiator this.createInstance(type, redirect, pm)  */ instantiator, false, null, null);
             final int callPC = redirect.getNextProgramCounter();
             final CallSiteReference site = CallSiteReference.make(callPC, this.model.getReference(),
@@ -768,8 +769,8 @@
             // Collect all Activity.mResultCode and Activity.mResultData
 
             // Result information of all activities.
-            final List<SSAValue> resultCodes = new ArrayList<SSAValue>();
-            final List<SSAValue> resultData = new ArrayList<SSAValue>();
+            final List<SSAValue> resultCodes = new ArrayList<>();
+            final List<SSAValue> resultData = new ArrayList<>();
             final SSAValue mResultCode; // = Phi(resultCodes)
             final SSAValue mResultData; // = Phi(resultData)
            
@@ -794,7 +795,7 @@
                 final CallSiteReference site = CallSiteReference.make(callPC, mRef, IInvokeInstruction.Dispatch.VIRTUAL);
                 //final SSAValue exception = new SSAValue(pm.getUnmanaged(), TypeReference.JavaLangException, asMethod, "exception");
                 final SSAValue exception = pm.getException();
-                final List<SSAValue> params = new ArrayList<SSAValue>();
+                final List<SSAValue> params = new ArrayList<>();
                 params.add(self);
                 params.add(outRequestCode); // Was an agument to start...
                 params.add(mResultCode);
@@ -878,7 +879,7 @@
 
         final SummarizedMethod model = getMethod();
 
-        final List<SSAValue> params = new ArrayList<SSAValue>();
+        final List<SSAValue> params = new ArrayList<>();
         { // Collect Params
             final FlatInstantiator instantiator = new FlatInstantiator(encap, instructionFactory, pm, this.cha, asMethod, this.scope);
 
@@ -933,6 +934,7 @@
         return method;
     }
 
+    @Override
     public IClassHierarchy getClassHierarchy() {
         return this.cha;
     }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/IntentModel.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/IntentModel.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/IntentModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/IntentModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -40,12 +40,10 @@
  */
 package com.ibm.wala.dalvik.ipa.callgraph.androidModel;
 
-import java.util.logging.Logger;
-
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint;
 import com.ibm.wala.dalvik.util.AndroidComponent;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.SummarizedMethod;
 import com.ibm.wala.util.CancelException;
@@ -53,7 +51,7 @@
 /**
  *  Like MicroModel but includes CallBacks.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2014-02-12
  */
 public class IntentModel extends AndroidModel {
@@ -66,12 +64,13 @@
      *  
      *  {@inheritDoc}
      */
+    @Override
     protected boolean selectEntryPoint(AndroidEntryPoint ep) {
         return ep.isMemberOf(this.target) || ep.belongsTo(AndroidComponent.APPLICATION) ||
             ep.belongsTo(AndroidComponent.PROVIDER);
     }
 
-    public IntentModel(final IClassHierarchy cha, final AnalysisOptions options, final AnalysisCache cache, Atom target) {
+    public IntentModel(final IClassHierarchy cha, final AnalysisOptions options, final IAnalysisCacheView cache, Atom target) {
         super(cha, options, cache);
 
         this.target = target;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MicroModel.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MicroModel.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MicroModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MicroModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -40,11 +40,9 @@
  */
 package com.ibm.wala.dalvik.ipa.callgraph.androidModel;
 
-import java.util.logging.Logger;
-
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.SummarizedMethod;
 import com.ibm.wala.util.CancelException;
@@ -54,7 +52,7 @@
  *
  *  Is used by the IntentContextInterpreter if a Intent can be resolved internally.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-12
  */
 public class MicroModel extends AndroidModel {
@@ -66,11 +64,12 @@
      *  
      *  {@inheritDoc}
      */
+    @Override
     protected boolean selectEntryPoint(AndroidEntryPoint ep) {
         return ep.isMemberOf(this.target);
     }
 
-    public MicroModel(final IClassHierarchy cha, final AnalysisOptions options, final AnalysisCache cache, Atom target) {
+    public MicroModel(final IClassHierarchy cha, final AnalysisOptions options, final IAnalysisCacheView cache, Atom target) {
         super(cha, options, cache);
 
         this.target = target;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MiniModel.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MiniModel.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MiniModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MiniModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -40,12 +40,10 @@
  */
 package com.ibm.wala.dalvik.ipa.callgraph.androidModel;
 
-import java.util.logging.Logger;
-
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint;
 import com.ibm.wala.dalvik.util.AndroidComponent;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.SummarizedMethod;
 import com.ibm.wala.types.Descriptor;
@@ -68,7 +66,7 @@
  *  the Context at the call site is insufficient to determine the actual target. In this case an 
  *  UnknownTargetModel which uses an MiniModel and an ExternalModel is placed there.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-29
  */
 public class MiniModel extends AndroidModel {
@@ -80,6 +78,7 @@
      *  
      *  {@inheritDoc}
      */
+    @Override
     protected boolean selectEntryPoint(AndroidEntryPoint ep) {
         if (ep.belongsTo(forCompo)) {
              
@@ -87,14 +86,15 @@
         }
         return false;
     }
+    @Override
     public Descriptor getDescriptor() throws CancelException {
         final Descriptor descr = super.getDescriptor();
          
         return descr;
     }
 
-    public MiniModel(final IClassHierarchy cha, final AnalysisOptions options, final AnalysisCache cache, 
-            final AndroidComponent forCompo) throws CancelException {
+    public MiniModel(final IClassHierarchy cha, final AnalysisOptions options, final IAnalysisCacheView cache, 
+            final AndroidComponent forCompo) {
         super(cha, options, cache);
     
         this.forCompo = forCompo;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/package-info.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/package-info.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/package-info.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/package-info.java	2019-01-29 17:08:39.000000000 +0000
@@ -46,20 +46,20 @@
  *  To model add a lifecycle-model one has to do the following steps:
  *
  *  1.  Scan for the Entrypoints of the application
- *      <code>
+ *      {@code
  *      AndroidEntryPointLocator epl = new AndroidEntryPointLocator(options);
- *      List&lt;AndroidEntryPoint&gt; entrypoints = epl.getEntryPoints(cha);
+ *      List<AndroidEntryPoint> entrypoints = epl.getEntryPoints(cha);
  *      AndroidEntryPointManager.ENTRIES = entrypoints;
- *      </code>
+ *      }
  *  2.  Optionally read in the AndroidManifest.xml
- *      <code>
+ *      {@code
  *      final AndroidManifestXMLReader reader = new AndroidManifestXMLReader(manifestFile);
- *      </code>
+ *      }
  *  3.  Optionally change the order of entrypoints and change the instantiation behaviour
  *  4.  Create the model and use it as the new entrypoint of the analysis 
- *      <code>
+ *      {@code
  *      IMethod model = new AndroidModel(cha, p.options, p.scfg.cache).getMethod();
- *      </code>
+ *      }
  *
  *  The model generated that way will "start" all components of the App. The various start-calls
  *  occurring in these components will not yet call anything useful. To change this there are two
@@ -70,11 +70,11 @@
  *      starting _all_ the Activities is generated.
  *
  *      TODO: This is about to change!
- *      <code>
+ *      {@code
  *      AnalysisOptions options;
  *      ActivityMiniModel activities = new ActivityMiniModel(cha, p.options, p.scfg.cache);
  *      options.setSelector(new DelegatingMethodTargetSelector(activities.overrideAll(), options.getMethodTargetSelector()));
- *      </code>
+ *      }
  *
  * * Resolve the calls context-sensitive:
  *      In Android all calls to different components use an Intent. The IntentContextSelector 
@@ -83,16 +83,16 @@
  *
  *      The IntentContextInterpreter then replaces the IR of the start-calls to start only the
  *      resolved component (or a placeholder like startExternalACTIVITY)
- *      <code>
+ *      {@code
  *          final ContextSelector contextSelector = new IntentContextSelector(new DefaultContextSelector(options, cha))
  *          final SSAContextInterpreter contextInterpreter = new FallbackContextInterpreter(new DelegatingSSAContextInterpreter(
  *              new IntentContextInterpreter(cha, options, cache), new DefaultSSAInterpreter(options, cache)));
- *      </code>
+ *      }
  *
  *  For the context-sensitive stuff to be able to resolve the targets either the AndroidManifest.xml
  *  should have been read or overrides been placed manually (or both).
  *
  *  @since  2013-10-25
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 package com.ibm.wala.dalvik.ipa.callgraph.androidModel;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/AndroidModelParameterManager.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/AndroidModelParameterManager.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/AndroidModelParameterManager.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/AndroidModelParameterManager.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,7 +44,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Logger;
 
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.types.MethodReference;
@@ -62,15 +61,15 @@
  *  However it does no allocations or Phi-Statements on its own. It just juggles with the numbers.
  *
  *  @see com.ibm.wala.dalvik.ipa.callgraph.androidModel.structure.AbstractAndroidModel
- *  @see com.ibm.wala.dalvik.ipa.callgraph.impl.DexFakeRootMethod
  *
- *  @author  Tobias Blaschke <code@toiasblaschke.de>
+ *  @author  Tobias Blaschke &lt;code@toiasblaschke.de&gt;
  *  @since   2013-09-19
  *
  *  TODO:
- *  @todo   Track if a variable has been refered to to be able to prune unused Phi-Instructions later
- *  @todo   Trim Memory consumption? The whole class should not be in memory for long time so this
- *      might be not neccessary.
+ *  <ul>
+ *    <li>Track if a variable has been refered to to be able to prune unused Phi-Instructions later</li>
+ *    <li>Trim Memory consumption? The whole class should not be in *  memory for long time so this might be not neccessary.</li>
+ *  </ul>
  */
 public class AndroidModelParameterManager {
  
@@ -108,7 +107,7 @@
     }
 
     /** The main data-structure of the management  */
-    private Map<TypeReference, List<ManagedParameter>> seenTypes = new HashMap<TypeReference, List<ManagedParameter>>();
+    private Map<TypeReference, List<ManagedParameter>> seenTypes = new HashMap<>();
 
     /**
      *  Setting the behaviour may be handy in the later model.
@@ -205,7 +204,7 @@
             }
             param.setInScope = currentScope;
 
-            List<ManagedParameter> aParam = new ArrayList<ManagedParameter>();
+            List<ManagedParameter> aParam = new ArrayList<>();
             aParam.add(param);
 
             
@@ -297,7 +296,7 @@
             }
 
             
-            List<ManagedParameter> aParam = new ArrayList<ManagedParameter>();
+            List<ManagedParameter> aParam = new ArrayList<>();
             aParam.add(param);
 
             seenTypes.put(type, aParam);
@@ -331,7 +330,7 @@
         if (seenTypes.containsKey(type)) {
             seenTypes.get(type).add(param);
         } else {
-            List<ManagedParameter> aParam = new ArrayList<ManagedParameter>();
+            List<ManagedParameter> aParam = new ArrayList<>();
             aParam.add(param);
 
             seenTypes.put(type, aParam);
@@ -373,7 +372,7 @@
         if (seenTypes.containsKey(type)) {
             seenTypes.get(type).add(param);
         } else {
-            List<ManagedParameter> aParam = new ArrayList<ManagedParameter>();
+            List<ManagedParameter> aParam = new ArrayList<>();
             aParam.add(param);
 
             seenTypes.put(type, aParam);
@@ -476,7 +475,7 @@
             throw new IllegalArgumentException("The argument type may not be null");
         }
 
-        List<Integer> ret = new ArrayList<Integer>();
+        List<Integer> ret = new ArrayList<>();
 
         if (seenTypes.containsKey(type)) {
             for (ManagedParameter param : seenTypes.get(type)) {
@@ -663,7 +662,7 @@
      *  Handed through to an IInstantiationBehavior if set in the constructor.
      *
      *  @return true if Type is a REUSE type
-     *  @throws IllegalStateExcpetion if AndroidModelParameterManager was constructed without an IInstanciationBehavior
+     *  @throws IllegalStateException if AndroidModelParameterManager was constructed without an IInstanciationBehavior
      */
     public boolean isReuse(TypeReference type) {
         if (this.behaviour == null) {
@@ -678,7 +677,7 @@
      *  Shorthand for not({@link #isReuse(TypeReference)}.
      *
      *  @return true if type is a CREATE-Type
-     *  @throws IllegalStateExcpetion if AndroidModelParameterManager was constructed without an IInstanciationBehavior
+     *  @throws IllegalStateException if AndroidModelParameterManager was constructed without an IInstanciationBehavior
      */
     public boolean isCreate(TypeReference type) {
         return (! isReuse(type));
@@ -686,6 +685,6 @@
 
     @Override
     public String toString() {
-        return "<AndroidModelParameterManager " + this.description + ">";
+        return "<AndroidModelParameterManager " + this.description + '>';
     }
 }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/DefaultInstantiationBehavior.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/DefaultInstantiationBehavior.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/DefaultInstantiationBehavior.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/DefaultInstantiationBehavior.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,7 +44,6 @@
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Logger;
 
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IClassLoader;
@@ -58,12 +57,13 @@
 /**
  *  Contains some predefined behaviors.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-25
  */
-public class DefaultInstantiationBehavior extends IInstantiationBehavior implements Serializable {
+public class DefaultInstantiationBehavior extends IInstantiationBehavior {
 
     /* package-private */ static final class BehviourValue implements Serializable {
+		private static final long serialVersionUID = 190943987799306506L;
 		public final InstanceBehavior behaviour;
         public final Exactness exactness;
         public final BehviourValue cacheFrom;
@@ -82,6 +82,7 @@
     }
 
     /* package-private */ static final class BehaviorKey<T> implements Serializable {
+        private static final long serialVersionUID = -1932639921432060660L;
         // T is expected to be TypeName or Atom
         final T base;
 
@@ -90,21 +91,21 @@
         }
 
         public static BehaviorKey<TypeName> mk(TypeName base) {
-            return new BehaviorKey<TypeName>(base);
+            return new BehaviorKey<>(base);
         }
 
         public static BehaviorKey<Atom> mk(Atom base) {
-            return new BehaviorKey<Atom>(base);
+            return new BehaviorKey<>(base);
         }
 
         public static BehaviorKey<Atom> mkPackage(String pack) {
-            return new BehaviorKey<Atom>(Atom.findOrCreateAsciiAtom(pack));
+            return new BehaviorKey<>(Atom.findOrCreateAsciiAtom(pack));
         }
 
         @Override
         public boolean equals(Object o) {
             if (o instanceof BehaviorKey) {
-                BehaviorKey other = (BehaviorKey) o;
+                BehaviorKey<?> other = (BehaviorKey<?>) o;
                 return base.equals(other.base);
             } else {
                 return false;
@@ -118,12 +119,12 @@
 
         @Override
         public String toString() {
-            return "<BehaviorKey of " + base.toString() + ">";
+            return "<BehaviorKey of " + base.toString() + '>';
         }
     }
 
 
-    private final Map<BehaviorKey, BehviourValue> behaviours = new HashMap<BehaviorKey, BehviourValue>();
+    private final Map<BehaviorKey<?>, BehviourValue> behaviours = new HashMap<>();
     private final transient IClassHierarchy cha;
 
     public DefaultInstantiationBehavior(final IClassHierarchy cha) {
@@ -209,8 +210,6 @@
     }
 
     /**
-     *  {@inheritDoc}
-     *
      *  @param  asParameterTo   not considered
      *  @param  inCall          not considered
      *  @param  withName        not considered
@@ -276,7 +275,7 @@
         {
             String prefix = type.toString();
             while (prefix.contains("/")) {
-                prefix = prefix.substring(0, prefix.lastIndexOf("/") - 1);
+                prefix = prefix.substring(0, prefix.lastIndexOf('/') - 1);
                 final BehaviorKey<Atom> prefixKey= BehaviorKey.mk(Atom.findOrCreateAsciiAtom(prefix));
                 if (behaviours.containsKey(prefixKey)) {
                     // cache
@@ -351,11 +350,11 @@
         if (this.serializationIncludesCache) {
             stream.writeObject(this.behaviours);
         } else {
-            final Map<BehaviorKey, BehviourValue> strippedBehaviours = new HashMap<BehaviorKey, BehviourValue>();
-            for (final BehaviorKey key : this.behaviours.keySet()) {
-                final BehviourValue val = this.behaviours.get(key);
+            final Map<BehaviorKey<?>, BehviourValue> strippedBehaviours = new HashMap<>();
+            for (final Map.Entry<BehaviorKey<?>, BehviourValue> entry : this.behaviours.entrySet()) {
+                final BehviourValue val = entry.getValue();
                 if (! val.isCached() ) {
-                    strippedBehaviours.put(key, val);
+                    strippedBehaviours.put(entry.getKey(), val);
                 }
             }
             stream.writeObject(strippedBehaviours);
@@ -369,11 +368,12 @@
      *  hard-coded behaviors don't get mixed with loaded ones. It may be deserialized but using a
      *  LoadedInstantiationBehavior instead may be a better way (as it starts in an empty state)
      */
-    private void readObject(java.io.ObjectInputStream stream) 
+	@SuppressWarnings("unchecked")
+	private void readObject(java.io.ObjectInputStream stream) 
         throws IOException, ClassNotFoundException {
 
         DefaultInstantiationBehavior.this.behaviours.clear();
-        this.behaviours.putAll((Map<BehaviorKey, BehviourValue>) stream.readObject());
+        this.behaviours.putAll((Map<BehaviorKey<?>, BehviourValue>) stream.readObject());
     }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/FlatInstantiator.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/FlatInstantiator.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/FlatInstantiator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/FlatInstantiator.java	2019-01-29 17:08:39.000000000 +0000
@@ -80,7 +80,7 @@
  *
  *  This variant limits recursion depth.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public class FlatInstantiator implements IInstantiator {
     private static final Logger logger = LoggerFactory.getLogger(FlatInstantiator.class);
@@ -137,7 +137,7 @@
      *
      *  If T is an array-type a new array of length 1 is generated.
      *
-     *  @todo   Do we want to mix in REUSE-Parameters?
+     *  TODO: Do we want to mix in REUSE-Parameters?
      */
     public SSAValue createInstance(final TypeReference T, final boolean asManaged, VariableKey key, Set<? extends SSAValue> seen) {
         return createInstance(T, asManaged, key, seen, 0);
@@ -149,7 +149,7 @@
         }
         if (seen == null) {
             logger.debug("Empty seen");
-            seen = new HashSet<SSAValue>();
+            seen = new HashSet<>();
         }
        
         if (currentDepth > this.maxDepth) {
@@ -161,7 +161,7 @@
         { // Special type?
             final SpecializedInstantiator sInst = new SpecializedInstantiator(body, instructionFactory, pm,
                     cha, scope, analysisScope, this);
-            if (sInst.understands(T)) {
+            if (SpecializedInstantiator.understands(T)) {
                 return sInst.createInstance(T, asManaged, key, seen, currentDepth);
             }
         }
@@ -251,7 +251,7 @@
                 this.body.addConstant(arrayLength.getNumber(), new ConstantValue(1));
                 arrayLength.setAssigned();
 
-                final ArrayList<SSAValue> params = new ArrayList<SSAValue>(1);
+                final ArrayList<SSAValue> params = new ArrayList<>(1);
                 params.add(arrayLength);
 
                 newInst = this.instructionFactory.NewInstruction(pc, instance, nRef, params);
@@ -271,7 +271,7 @@
         } else {
             // Abstract, Interface or array
             logger.debug("Not a regular class {}", T);
-            final Set<SSAValue> subInstances = new HashSet<SSAValue>();
+            final Set<SSAValue> subInstances = new HashSet<>();
             for (final TypeReference type : types) {
                 final IClass subKlass = this.cha.lookupClass(type);
 
@@ -286,8 +286,7 @@
                     selectAndCallCtor(subInstance, seen, currentDepth);
                     assert (subInstance.getNumber() == newInst.getDef()) : "Unexpected: number and def differ: " + subInstance.getNumber() + ", " +
                                     newInst.getDef();
-                    final Set<SSAValue> newSeen = new HashSet<SSAValue>();  // Narf
-                    newSeen.addAll(seen);
+                    final Set<SSAValue> newSeen = new HashSet<>(seen);  // Narf
                     newSeen.add(subInstance);
                     seen = newSeen;
                     subInstances.add(subInstance);
@@ -343,10 +342,7 @@
         return instance; 
     }
 
-    /**
-     *  @return an unallocated SSAVariable
-     */
-    private void createPrimitive(SSAValue instance) {
+    private static void createPrimitive(SSAValue instance) {
         // XXX; something else?
         instance.setAssigned();
     }
@@ -385,13 +381,13 @@
      *
      *  @param  self the "this" to call the constructor on
      *  @param  ctor the constructor to call
-     *  @param  params parameters to the ctor _without_ implicit this
+     *  @param  ctorParams parameters to the ctor _without_ implicit this
      */
     protected void addCallCtor(SSAValue self, MethodReference ctor, List<SSAValue> ctorParams) {
         final int pc = this.body.getNextProgramCounter();
         final SSAValue exception = pm.getException();
         final CallSiteReference site = CallSiteReference.make(pc, ctor, IInvokeInstruction.Dispatch.SPECIAL);
-        final List<SSAValue> params = new ArrayList<SSAValue>(1 + ctorParams.size());
+        final List<SSAValue> params = new ArrayList<>(1 + ctorParams.size());
         params.add(self);
         params.addAll(ctorParams);
         final SSAInstruction ctorCall = instructionFactory.InvokeInstruction(pc, params, exception, site);
@@ -411,7 +407,7 @@
             this.body.addConstant(nullSelf.getNumber(), new ConstantValue(null));
             nullSelf.setAssigned();
         //}
-        final Set<SSAValue> seen = new HashSet<SSAValue>(1 + overrides.size());
+        final Set<SSAValue> seen = new HashSet<>(1 + overrides.size());
         seen.add(nullSelf);
         seen.addAll(overrides);
         
@@ -433,9 +429,9 @@
     private Set<TypeReference> getTypes(final TypeReference T) {
         final IClass cls = this.cha.lookupClass(T);
         if (isExcluded(cls)) {
-            return new HashSet<TypeReference>();
+            return new HashSet<>();
         }
-        return getTypes(T, Collections.EMPTY_SET);
+        return getTypes(T, Collections.<TypeReference>emptySet());
     }
 
     /**
@@ -443,7 +439,7 @@
      */
     private Set<TypeReference> getTypes(final TypeReference T, final Set<TypeReference> seen) {
         logger.debug("getTypes({}, {})", T, seen);
-        final Set<TypeReference> ret = new HashSet<TypeReference>();
+        final Set<TypeReference> ret = new HashSet<>();
         ret.add(T);
        
         if (T.isPrimitiveType()) {
@@ -515,7 +511,7 @@
                 }
 
                 if ((inner.isInterface()) || (inner.isAbstract())) {
-                    final Set<TypeReference> innerTypes = getTypes(inner.getReference(), Collections.EMPTY_SET);
+                    final Set<TypeReference> innerTypes = getTypes(inner.getReference(), Collections.<TypeReference>emptySet());
                     for (TypeReference iT : innerTypes) {
                         TypeReference aT = TypeReference.findOrCreateArrayOf(iT);
                         for (int i = 1; i < dim; ++i) {
@@ -662,6 +658,8 @@
     /**
      *  Satisfy the interface.
      */
+    @Override
+    @SuppressWarnings("unchecked")
     public int createInstance(TypeReference type, Object... instantiatorArgs) {
         // public SSAValue createInstance(final TypeReference T, final boolean asManaged, VariableKey key, Set<SSAValue> seen) {
         if (! (instantiatorArgs[0] instanceof Boolean)) {
@@ -683,12 +681,12 @@
             }
         }
         if (instantiatorArgs[2] != null) {
-            final Set seen = (Set) instantiatorArgs[2];
+            final Set<?> seen = (Set<?>) instantiatorArgs[2];
             if (! seen.isEmpty()) {
                 final Object o = seen.iterator().next();
                 if (! (o instanceof SSAValue)) {
                     throw new IllegalArgumentException("Argument 2 to createInstance has to be null or an instance of Set<? extends SSAValue>, " +
-                            "got Set<" + o.getClass() + ">");
+                            "got Set<" + o.getClass() + '>');
                 }
             }
         }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/IInstantiationBehavior.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/IInstantiationBehavior.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/IInstantiationBehavior.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/IInstantiationBehavior.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,9 +48,11 @@
 
 /**
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public abstract class IInstantiationBehavior implements Serializable {
+	private static final long serialVersionUID = -3698760758700891479L;
+
     /**
      *  The handling for a variable occurring in the AndroidModel.
      */
@@ -67,7 +69,7 @@
     } 
     
     /**
-     *  Information on how the IInstanciationBehavior made its decision for {@link #InstanceBehavior}
+     *  Information on how the IInstanciationBehavior made its decision for {@link InstanceBehavior}
      */
     public static enum Exactness { 
         /**
@@ -92,7 +94,7 @@
     /**
      *  Returns how the model should behave on the type.
      *
-     *  See the documentation of {@link #InstanceBehavior} for the description of the possible behaviours.
+     *  See the documentation of {@link InstanceBehavior} for the description of the possible behaviours.
      *
      *  Although this function takes a parameter withName one should not rely on its value.
      *
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/Instantiator.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/Instantiator.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/Instantiator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/Instantiator.java	2019-01-29 17:08:39.000000000 +0000
@@ -84,7 +84,7 @@
  *
  *  Creates an instance of (hopefully) anything.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public class Instantiator implements IInstantiator {
     private static final Logger logger = LoggerFactory.getLogger(Instantiator.class);
@@ -126,7 +126,7 @@
      *
      *  If T is an array-type a new array of length 1 is generated.
      *
-     *  @todo   Do we want to mix in REUSE-Parameters?
+     *  TODO: Do we want to mix in REUSE-Parameters?
      */
     public SSAValue createInstance(final TypeReference T, final boolean asManaged, VariableKey key, Set<? extends SSAValue> seen) {
         if (T == null) {
@@ -134,7 +134,7 @@
         }
         if (seen == null) {
             logger.debug("Empty seen");
-            seen = new HashSet<SSAValue>();
+            seen = new HashSet<>();
         }
 
         { // Special type?
@@ -252,7 +252,7 @@
                 this.body.addConstant(arrayLength.getNumber(), new ConstantValue(1));
                 arrayLength.setAssigned();
 
-                final ArrayList<SSAValue> params = new ArrayList<SSAValue>(1);
+                final ArrayList<SSAValue> params = new ArrayList<>(1);
                 params.add(arrayLength);
 
                 newInst = this.instructionFactory.NewInstruction(pc, instance, nRef, params);
@@ -272,7 +272,7 @@
         } else {
             // Abstract, Interface or array
             logger.debug("Not a regular class {}", T);
-            final Set<SSAValue> subInstances = new HashSet<SSAValue>();
+            final Set<SSAValue> subInstances = new HashSet<>();
             for (final TypeReference type : types) {
                 final IClass subKlass = this.cha.lookupClass(type);
 
@@ -287,8 +287,7 @@
                     selectAndCallCtor(subInstance, seen);
                     assert (subInstance.getNumber() == newInst.getDef()) : "Unexpected: number and def differ: " + subInstance.getNumber() + ", " +
                                     newInst.getDef();
-                    final Set<SSAValue> newSeen = new HashSet<SSAValue>();  // Narf
-                    newSeen.addAll(seen);
+                    final Set<SSAValue> newSeen = new HashSet<>(seen);  // Narf
                     newSeen.add(subInstance);
                     seen = newSeen;
                     subInstances.add(subInstance);
@@ -344,10 +343,7 @@
         return instance; 
     }
 
-    /**
-     *  @return an unallocated SSAVariable
-     */
-    private void createPrimitive(SSAValue instance) {
+    private static void createPrimitive(SSAValue instance) {
         // XXX; something else?
         instance.setAssigned();
     }
@@ -386,13 +382,13 @@
      *
      *  @param  self the "this" to call the constructor on
      *  @param  ctor the constructor to call
-     *  @param  params parameters to the ctor _without_ implicit this
+     *  @param  ctorParams parameters to the ctor _without_ implicit this
      */
     private void addCallCtor(SSAValue self, MethodReference ctor, List<SSAValue> ctorParams) {
         final int pc = this.body.getNextProgramCounter();
         final SSAValue exception = pm.getException();
         final CallSiteReference site = CallSiteReference.make(pc, ctor, IInvokeInstruction.Dispatch.SPECIAL);
-        final List<SSAValue> params = new ArrayList<SSAValue>(1 + ctorParams.size());
+        final List<SSAValue> params = new ArrayList<>(1 + ctorParams.size());
         params.add(self);
         params.addAll(ctorParams);
         final SSAInstruction ctorCall = instructionFactory.InvokeInstruction(pc, params, exception, site);
@@ -412,7 +408,7 @@
             this.body.addConstant(nullSelf.getNumber(), new ConstantValue(null));
             nullSelf.setAssigned();
         //}
-        final Set<SSAValue> seen = new HashSet<SSAValue>(1 + overrides.size());
+        final Set<SSAValue> seen = new HashSet<>(1 + overrides.size());
         seen.add(nullSelf);
         seen.addAll(overrides);
         
@@ -434,9 +430,9 @@
     private Set<TypeReference> getTypes(final TypeReference T) {
         final IClass cls = this.cha.lookupClass(T);
         if (isExcluded(cls)) {
-            return new HashSet<TypeReference>();
+            return new HashSet<>();
         }
-        return getTypes(T, Collections.EMPTY_SET);
+        return getTypes(T, Collections.<TypeReference>emptySet());
     }
 
     /**
@@ -444,7 +440,7 @@
      */
     private Set<TypeReference> getTypes(final TypeReference T, final Set<TypeReference> seen) {
         logger.debug("getTypes({}, {})", T, seen);
-        final Set<TypeReference> ret = new HashSet<TypeReference>();
+        final Set<TypeReference> ret = new HashSet<>();
         ret.add(T);
        
         if (T.isPrimitiveType()) {
@@ -516,7 +512,7 @@
                 }
 
                 if ((inner.isInterface()) || (inner.isAbstract())) {
-                    final Set<TypeReference> innerTypes = getTypes(inner.getReference(), Collections.EMPTY_SET);
+                    final Set<TypeReference> innerTypes = getTypes(inner.getReference(), Collections.<TypeReference>emptySet());
                     for (TypeReference iT : innerTypes) {
                         TypeReference aT = TypeReference.findOrCreateArrayOf(iT);
                         for (int i = 1; i < dim; ++i) {
@@ -536,11 +532,12 @@
     /**
      *  Path back to Object (including T itself).
      */
+    @SuppressWarnings("unused")
     private List<TypeReference> getAllSuper(final TypeReference T) {
         if (T.isPrimitiveType()) {
             throw new IllegalArgumentException("Not you that call primitive type on :P");
         }
-        final List<TypeReference> ret = new ArrayList<TypeReference>();
+        final List<TypeReference> ret = new ArrayList<>();
 
         IClass cls = this.cha.lookupClass(T);
         if (cls == null) {
@@ -663,6 +660,8 @@
     /**
      *  Satisfy the interface.
      */
+    @Override
+    @SuppressWarnings("unchecked")
     public int createInstance(TypeReference type, Object... instantiatorArgs) {
         // public SSAValue createInstance(final TypeReference T, final boolean asManaged, VariableKey key, Set<SSAValue> seen) {
         if (! (instantiatorArgs[0] instanceof Boolean)) {
@@ -676,12 +675,12 @@
                     "got: " + instantiatorArgs[2].getClass()); 
         }
         if (instantiatorArgs[2] != null) {
-            final Set seen = (Set) instantiatorArgs[2];
+            final Set<?> seen = (Set<?>) instantiatorArgs[2];
             if (! seen.isEmpty()) {
                 final Object o = seen.iterator().next();
                 if (! (o instanceof SSAValue)) {
                     throw new IllegalArgumentException("Argument 2 to createInstance has to be null or an instance of Set<? extends SSAValue>, " +
-                            "got Set<" + o.getClass() + ">");
+                            "got Set<" + o.getClass() + '>');
                 }
             }
         }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/LoadedInstantiationBehavior.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/LoadedInstantiationBehavior.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/LoadedInstantiationBehavior.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/LoadedInstantiationBehavior.java	2019-01-29 17:08:39.000000000 +0000
@@ -57,12 +57,13 @@
  *
  *  This class generates an empty mutable IInstantiationBehavior.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-25
  */
-public class LoadedInstantiationBehavior extends IInstantiationBehavior implements Serializable {
+public class LoadedInstantiationBehavior extends IInstantiationBehavior {
 
     private static final class BehviourValue implements Serializable {
+        private static final long serialVersionUID = -7558845015122601212L;
         public final InstanceBehavior behaviour;
         public final Exactness exactness;
         public final BehviourValue cacheFrom;
@@ -74,7 +75,7 @@
 
         @Override
         public String toString() {
-            return "<BehaviorValue " + behaviour + " - " + exactness + " = " + cacheFrom + ">";
+            return "<BehaviorValue " + behaviour + " - " + exactness + " = " + cacheFrom + '>';
         }
 
         /**
@@ -86,6 +87,8 @@
     }
 
     private static final class BehaviorKey<T> implements Serializable {
+        private static final long serialVersionUID = 73530;
+
         // T is expected to be TypeName or Atom
         final T base;
 
@@ -94,18 +97,18 @@
         }
 
         public static BehaviorKey<TypeName> mk(TypeName base) {
-            return new BehaviorKey<TypeName>(base);
+            return new BehaviorKey<>(base);
         }
 
         public static BehaviorKey<Atom> mk(Atom base) {
-            return new BehaviorKey<Atom>(base);
+            return new BehaviorKey<>(base);
         }
 
 
         @Override
         public boolean equals(Object o) {
             if (o instanceof BehaviorKey) {
-                BehaviorKey other = (BehaviorKey) o;
+                BehaviorKey<?> other = (BehaviorKey<?>) o;
                 return base.equals(other.base);
             } else {
                 return false;
@@ -119,12 +122,12 @@
 
         @Override
         public String toString() {
-            return "<BehaviorKey of " + base.getClass() + " " + base.toString() + " hash=" + this.hashCode() + "/>";
+            return "<BehaviorKey of " + base.getClass() + ' ' + base.toString() + " hash=" + this.hashCode() + "/>";
         }
     }
 
     private InstanceBehavior defaultBehavior = null;
-    private final Map<BehaviorKey, BehviourValue> behaviours = new HashMap<BehaviorKey, BehviourValue>();
+    private final Map<BehaviorKey<?>, BehviourValue> behaviours = new HashMap<>();
     private final IClassHierarchy cha;
 
     public LoadedInstantiationBehavior(IClassHierarchy cha) {
@@ -136,8 +139,6 @@
     }
 
     /**
-     *  {@inheritDoc}
-     *
      *  @param  asParameterTo   not considered
      *  @param  inCall          not considered
      *  @param  withName        not considered
@@ -205,7 +206,7 @@
         {
             String prefix = type.toString();
             while (prefix.contains("/")) {
-                prefix = prefix.substring(0, prefix.lastIndexOf("/") - 1);
+                prefix = prefix.substring(0, prefix.lastIndexOf('/') - 1);
                 final BehaviorKey<Atom> prefixKey= BehaviorKey.mk(Atom.findOrCreateAsciiAtom(prefix));
                 if (behaviours.containsKey(prefixKey)) {
                     // cache
@@ -258,8 +259,7 @@
         }
     }
 
-    public void setBehavior(final TypeName type, final TypeName asParameterTo, final MethodReference inCall, 
-            final String withName, final InstanceBehavior beh, final Exactness exactness) {
+    public void setBehavior(final TypeName type, final InstanceBehavior beh, final Exactness exactness) {
 
 
         final BehaviorKey<TypeName> typeK= BehaviorKey.mk(type);
@@ -268,8 +268,7 @@
         behaviours.put(typeK, val);
     }
 
-    public void setBehavior(final Atom pack, final TypeName asParameterTo, final MethodReference inCall, 
-            final String withName, final InstanceBehavior beh, final Exactness exactness) {
+    public void setBehavior(final Atom pack, final InstanceBehavior beh, final Exactness exactness) {
 
 
         final BehaviorKey<Atom> typeK= BehaviorKey.mk(pack);
@@ -304,22 +303,23 @@
         if (this.serializationIncludesCache) {
             stream.writeObject(this.behaviours);
         } else {
-            final Map<BehaviorKey, BehviourValue> strippedBehaviours = new HashMap<BehaviorKey, BehviourValue>();
-            for (final BehaviorKey key : this.behaviours.keySet()) {
-                final BehviourValue val = this.behaviours.get(key);
+            final Map<BehaviorKey<?>, BehviourValue> strippedBehaviours = new HashMap<>();
+            for (final Map.Entry<BehaviorKey<?>, BehviourValue> entry : this.behaviours.entrySet()) {
+                final BehviourValue val = entry.getValue();
                 if (! val.isCached() ) {
-                    strippedBehaviours.put(key, val);
+                    strippedBehaviours.put(entry.getKey(), val);
                 }
             }
             stream.writeObject(strippedBehaviours);
         }
     }
 
+    @SuppressWarnings("unchecked")
     private void readObject(java.io.ObjectInputStream stream)
         throws IOException, ClassNotFoundException {
 
         this.behaviours.clear();
-        this.behaviours.putAll( (Map<BehaviorKey, BehviourValue>) stream.readObject());
+        this.behaviours.putAll((Map<BehaviorKey<?>, BehviourValue>) stream.readObject());
     }
 
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/package-info.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/package-info.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/package-info.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/package-info.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,6 +47,6 @@
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.androidModel.parameters.IInstantiationBehavior
  *
  *  @since  2013-10-25
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 package com.ibm.wala.dalvik.ipa.callgraph.androidModel.parameters;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,7 +42,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Logger;
 
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.dalvik.ipa.callgraph.androidModel.AndroidModel;
@@ -76,7 +75,7 @@
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.androidModel.parameters.IInstantiationBehavior
  *  @see    com.ibm.wala.util.ssa.ParameterAccessor 
  *  
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-11-02
  */
 public class ReuseParameters {
@@ -115,7 +114,7 @@
      */
     public void collectParameters(final Iterable<? extends Entrypoint> entrypoints) {
 //        int paramsToModel = firstParamSSA();
-        this.reuseParameters = new ArrayList<TypeName>();
+        this.reuseParameters = new ArrayList<>();
 
         for (final Entrypoint ep : entrypoints) {
             final int paramCount = ep.getNumberOfParameters();
@@ -128,8 +127,8 @@
                     }
                     
                     // Assert the rest of the types have the same name
-                    for (int j = 0; j < types.length; ++j) {
-                        final TypeName paramType = types[j].getName();
+                    for (TypeReference type : types) {
+                        final TypeName paramType = type.getName();
 
                         if (isReuse(paramType, ALL_TARGETS)) {
                             if (! reuseParameters.contains(paramType)) {    // XXX: Why not use a Set?
@@ -148,7 +147,7 @@
      *
      *  @see    com.ibm.wala.util.ssa.ParameterAccessor
      */
-    private int ssaFor(IMethod inCallTo, int paramNo) {
+    private static int ssaFor(IMethod inCallTo, int paramNo) {
         assert (paramNo >= 0);
         assert (paramNo < inCallTo.getNumberOfParameters());
 
@@ -164,7 +163,7 @@
      *
      *  @see    com.ibm.wala.util.ssa.ParameterAccessor
      */
-    private int firstOf(TypeName type, IMethod inCallTo) {
+    private static int firstOf(TypeName type, IMethod inCallTo) {
         for (int i = 0; i < inCallTo.getNumberOfParameters(); ++i) {
             if (inCallTo.getParameterType(i).getName().equals(type)) {
                 return i;
@@ -225,7 +224,7 @@
      *  @param returnType the return type of the later function
      */
     private Descriptor toDescriptor(TypeName returnType) { // Keep private!
-        final TypeName[] aTypes = reuseParameters.toArray(new TypeName[reuseParameters.size()]);
+        final TypeName[] aTypes = reuseParameters.toArray(new TypeName[0]);
 
         return Descriptor.findOrCreate(aTypes, returnType); 
     }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/SpecializedInstantiator.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/SpecializedInstantiator.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/SpecializedInstantiator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/SpecializedInstantiator.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,7 +44,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import com.ibm.wala.classLoader.IField;
 import com.ibm.wala.dalvik.ipa.callgraph.androidModel.AndroidModelClass;
@@ -73,7 +72,7 @@
  *  For example instantiating an android.content.Context would pull in all Android-components in
  *  scope resulting in a massivly overapproximated model.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public class SpecializedInstantiator extends FlatInstantiator {
 
@@ -97,8 +96,9 @@
      *
      *  If T is an array-type a new array of length 1 is generated.
      *
-     *  @todo   Do we want to mix in REUSE-Parameters?
+     *  TODO: Do we want to mix in REUSE-Parameters?
      */
+    @Override
     public SSAValue createInstance(final TypeReference T, final boolean asManaged, VariableKey key, Set<? extends SSAValue> seen) {
         return createInstance(T, asManaged, key, seen, 0);
     }
@@ -106,7 +106,7 @@
     /* package private */ SSAValue createInstance(final TypeReference T, final boolean asManaged, VariableKey key, Set<? extends SSAValue> seen, int currentDepth) {
         if (seen == null) {
             
-            seen = new HashSet<SSAValue>();
+            seen = new HashSet<>();
         }
        
         if (currentDepth > this.maxDepth) {
@@ -131,11 +131,11 @@
         assert(understands(T));
 
         if (T.equals(AndroidTypes.Context)) {
-            return createContext(T, asManaged, key, seen);
+            return createContext(T, key);
         }
 
         if (T.equals(AndroidTypes.ContextWrapper)) {
-            return createContextWrapper(T, asManaged, key, seen);
+            return createContextWrapper(T, key);
         }
 
         return null;
@@ -144,7 +144,7 @@
 
 
 
-    private static final Set<TypeReference> understandTypes = new HashSet<TypeReference>();
+    private static final Set<TypeReference> understandTypes = new HashSet<>();
     static {
         understandTypes.add(AndroidTypes.Context);
         understandTypes.add(AndroidTypes.ContextWrapper);
@@ -159,8 +159,8 @@
     /**
      *  Creates a new instance of android/content/Context.
      */
-    public SSAValue createContext(final TypeReference T, final boolean asManaged, VariableKey key, Set<? extends SSAValue> seen) {
-        final List<SSAValue> appComponents = new ArrayList<SSAValue>();
+    public SSAValue createContext(final TypeReference T, VariableKey key) {
+        final List<SSAValue> appComponents = new ArrayList<>();
         {
             // TODO: Can we create a tighter conterxt?
             // TODO: Force an Application-Context?
@@ -197,7 +197,7 @@
                     appComponents.add(instance);
                 }
             } else {
-                for (TypeReference component : AndroidEntryPointManager.MANAGER.getComponents()) {
+                for (TypeReference component : AndroidEntryPointManager.getComponents()) {
                     final VariableKey iKey = new SSAValue.TypeKey(component.getName());
 
                     if (this.pm.isSeen(iKey)) {
@@ -233,14 +233,14 @@
     }
 
 
-    public SSAValue createContextWrapper(final TypeReference T, final boolean asManaged, VariableKey key, Set<? extends SSAValue> seen) {
+    public SSAValue createContextWrapper(final TypeReference T, VariableKey key) {
         final VariableKey contextKey = new SSAValue.TypeKey(AndroidTypes.ContextName);
         final SSAValue context;
         {
             if (this.pm.isSeen(contextKey)) {
                 context = this.pm.getCurrent(contextKey);
             } else {
-                context = createContext(AndroidTypes.Context, true, contextKey, seen);
+                context = createContext(AndroidTypes.Context, contextKey);
             }
         }
 
@@ -249,7 +249,7 @@
             // call: ContextWrapper(Context base)
             final MethodReference ctor = MethodReference.findOrCreate(T, MethodReference.initAtom, 
                     Descriptor.findOrCreate(new TypeName[] { AndroidTypes.ContextName }, TypeReference.VoidName));
-            final List<SSAValue> params = new ArrayList<SSAValue>();
+            final List<SSAValue> params = new ArrayList<>();
             params.add(context);
             addCallCtor(instance, ctor, params);
         }
@@ -261,6 +261,8 @@
     /**
      *  Satisfy the interface.
      */
+    @Override
+    @SuppressWarnings("unchecked")
     public int createInstance(TypeReference type, Object... instantiatorArgs) {
         // public SSAValue createInstance(final TypeReference T, final boolean asManaged, VariableKey key, Set<SSAValue> seen) {
         if (! (instantiatorArgs[0] instanceof Boolean)) {
@@ -282,12 +284,12 @@
             }
         }
         if (instantiatorArgs[2] != null) {
-            final Set seen = (Set) instantiatorArgs[2];
+            final Set<?> seen = (Set<?>) instantiatorArgs[2];
             if (! seen.isEmpty()) {
                 final Object o = seen.iterator().next();
                 if (! (o instanceof SSAValue)) {
                     throw new IllegalArgumentException("Argument 2 to createInstance has to be null or an instance of Set<? extends SSAValue>, " +
-                            "got Set<" + o.getClass() + ">");
+                            "got Set<" + o.getClass() + '>');
                 }
             }
         }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/AbstractAndroidModel.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/AbstractAndroidModel.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/AbstractAndroidModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/AbstractAndroidModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -69,10 +69,9 @@
  *  which aids in keeping track of SSA-Variables and adding Phi-Functions.
  *
  *  @see        com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.ExecutionOrder
- *  @see        com.ibm.wala.dalvik.ipa.callgraph.impl.DexFakeRootMethod
  *  @see        com.ibm.wala.dalvik.ipa.callgraph.androidModel.parameters.AndroidModelParameterManager
  *
- *  @author     Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author     Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since      2013-09-07
  */
 public abstract class AbstractAndroidModel  {
@@ -99,7 +98,7 @@
         assert (start != null) : "The argument start was null";
         assert (end != null) : "The argument end was null";
 
-        List<TypeReference> returnTypes = new ArrayList<TypeReference>();
+        List<TypeReference> returnTypes = new ArrayList<>();
         for (Entrypoint ep : this.entryPoints) {
             if (ep instanceof AndroidEntryPoint) {
                 AndroidEntryPoint aep = (AndroidEntryPoint)ep;
@@ -160,7 +159,7 @@
      *
      *  This function is expected to be called on entrypoints in ascending order.
      *
-     *  You are expected to call {@link #enter(ExecutionOrder, int)} iff a
+     *  You are expected to call {@link #enter(com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.ExecutionOrder, int)} iff a
      *  Label got skipped over.
      *
      *  @param  order       The entrypoint in question
@@ -197,7 +196,7 @@
      *  Gets called when Label ExecutionOrder.AT_FIRST got stepped over.
      *
      *  In most cases you don't want to invoke this function directly but to use 
-     *  {@link #enter(ExecutionOrder.AT_FIRST, int)} instead.
+     *  {@code enter(ExecutionOrder.AT_FIRST, int)} instead.
      *
      *  Sideeffects: currentSection is updated, instructions are inserted into the body
      *
@@ -205,13 +204,13 @@
      *      you'll simply pass body.getNextProgramCounter()
      *  @return             Program Counter after insertion of the code
      */
-    protected int enterAT_FIRST(int PC) { return PC; };
+    protected int enterAT_FIRST(int PC) { return PC; }
 
      /**
      *  Gets called when Label ExecutionOrder.BEFORE_LOOP got stepped over.
      *
      *  In most cases you don't want to invoke this function directly but to use 
-     *  {@link #enter(ExecutionOrder.BEFORE_LOOP, int)} instead
+     *  {@code enter(ExecutionOrder.BEFORE_LOOP, int)} instead
      *
      *  Sideeffects: currentSection is updated, instructions are inserted into the body
      *
@@ -219,13 +218,13 @@
      *      you'll simply pass body.getNextProgramCounter()
      *  @return             Program Counter after insertion of the code
      */
-    protected int enterBEFORE_LOOP (int PC) { return PC; };
+    protected int enterBEFORE_LOOP (int PC) { return PC; }
 
     /**
      *  Gets called when Label ExecutionOrder.START_OF_LOOP got stepped over.
      *
      *  In most cases you don't want to invoke this function directly but to use 
-     *  {@link #enter(ExecutionOrder.START_OF_LOOP, int)} instead
+     *  {@code enter(ExecutionOrder.START_OF_LOOP, int)} instead
      *
      *  Sideeffects: currentSection is updated, instructions are inserted into the body
      *
@@ -233,13 +232,13 @@
      *      you'll simply pass body.getNextProgramCounter()
      *  @return             Program Counter after insertion of the code
      */
-    protected int enterSTART_OF_LOOP (int PC) { return PC; };
+    protected int enterSTART_OF_LOOP (int PC) { return PC; }
 
     /**
      *  Gets called when Label ExecutionOrder.MIDDLE_OF_LOOP got stepped over.
      *
      *  In most cases you don't want to invoke this function directly but to use 
-     *  {@link #enter(ExecutionOrder.MIDDLE_OF_LOOP, int)} instead
+     *  {@code enter(ExecutionOrder.MIDDLE_OF_LOOP, int)} instead
      *
      *  Sideeffects: currentSection is updated, instructions are inserted into the body
      *
@@ -247,13 +246,13 @@
      *      you'll simply pass body.getNextProgramCounter()
      *  @return             Program Counter after insertion of the code
      */
-    protected int enterMIDDLE_OF_LOOP (int PC) { return PC; };
+    protected int enterMIDDLE_OF_LOOP (int PC) { return PC; }
     
     /**
      *  Gets called when Label ExecutionOrder.MULTIPLE_TIMES_IN_LOOP got stepped over.
      *
      *  In most cases you don't want to invoke this function directly but to use 
-     *  {@link #enter(ExecutionOrder.MULTIPLE_TIMES_IN_LOOP, int)} instead
+     *  {@code enter(ExecutionOrder.MULTIPLE_TIMES_IN_LOOP, int)} instead
      *
      *  Sideeffects: currentSection is updated, instructions are inserted into the body
      *
@@ -261,13 +260,13 @@
      *      you'll simply pass body.getNextProgramCounter()
      *  @return             Program Counter after insertion of the code
      */
-    protected int enterMULTIPLE_TIMES_IN_LOOP (int PC) { return PC; };
+    protected int enterMULTIPLE_TIMES_IN_LOOP (int PC) { return PC; }
 
     /**
      *  Gets called when Label ExecutionOrder.END_OF_LOOP got stepped over.
      *
      *  In most cases you don't want to invoke this function directly but to use 
-     *  {@link #enter(ExecutionOrder.END_OF_LOOP, int)} instead
+     *  {@code enter(ExecutionOrder.END_OF_LOOP, int)} instead
      *
      *  Sideeffects: currentSection is updated, instructions are inserted into the body
      *
@@ -275,13 +274,13 @@
      *      you'll simply pass body.getNextProgramCounter()
      *  @return             Program Counter after insertion of the code
      */
-    protected int enterEND_OF_LOOP (int PC) { return PC; };
+    protected int enterEND_OF_LOOP (int PC) { return PC; }
 
     /**
      *  Gets called when Label ExecutionOrder.AFTER_LOOP got stepped over.
      *
      *  In most cases you don't want to invoke this function directly but to use 
-     *  {@link #enter(ExecutionOrder.AFTER_LOOP, int)} instead
+     *  {@code enter(ExecutionOrder.AFTER_LOOP, int)} instead
      *
      *  Sideeffects: currentSection is updated, instructions are inserted into the body
      *
@@ -289,13 +288,13 @@
      *      you'll simply pass body.getNextProgramCounter()
      *  @return             Program Counter after insertion of the code
      */
-    protected int enterAFTER_LOOP (int PC) { return PC; };
+    protected int enterAFTER_LOOP (int PC) { return PC; }
 
     /**
      *  Gets called when Label ExecutionOrder.AT_LAST got stepped over.
      *
      *  In most cases you don't want to invoke this function directly but to use 
-     *  {@link #enter(ExecutionOrder.AT_LAST, int)} instead
+     *  {@code enter(ExecutionOrder.AT_LAST, int)} instead
      *  
      *  Sideeffects: currentSection is updated, instructions are inserted into the body
      *
@@ -303,7 +302,7 @@
      *      you'll simply pass body.getNextProgramCounter()
      *  @return             Program Counter after insertion of the code
      */
-    protected int enterAT_LAST (int PC) { return PC; };
+    protected int enterAT_LAST (int PC) { return PC; }
 
     /**
      *  Gets called when the model gets finished.
@@ -317,7 +316,7 @@
      *      you'll simply pass body.getNextProgramCounter()
      *  @return             Program Counter after insertion of the code
      */
-    protected int leaveAT_LAST (int PC) { return PC; };
+    protected int leaveAT_LAST (int PC) { return PC; }
 
     /**
      *  Dispatches to the enterLABEL-functions. Does also call functions to any labels that
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopAndroidModel.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopAndroidModel.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopAndroidModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopAndroidModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -74,9 +74,7 @@
  *  restart of the Application (instance-state) or when the potential restart of the App
  *  shall be ignored.
  *
- *  {@inheritDoc}
- *
- *  @author     Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author     Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public class LoopAndroidModel extends SingleStartAndroidModel {
     private static final Logger logger = LoggerFactory.getLogger(LoopAndroidModel.class);
@@ -104,6 +102,7 @@
      *
      * {@inheritDoc}
      */
+    @Override
     protected int enterSTART_OF_LOOP (int PC) {
         logger.info("PC {} is the jump target of START_OF_LOOP", PC);
         
@@ -112,7 +111,7 @@
         paramManager.scopeDown(true);
 
         // Top-Half of Phi-Handling
-        outerStartingPhis = new HashMap<TypeReference, SSAValue>();
+        outerStartingPhis = new HashMap<>();
         List<TypeReference> outerPhisNeeded = returnTypesBetween(ExecutionOrder.START_OF_LOOP,
                 ExecutionOrder.AFTER_LOOP);
         
@@ -138,6 +137,7 @@
      *
      *  {@inheritDoc}
      */
+    @Override
     protected int enterAFTER_LOOP (int PC) {
         assert(outerLoopPC > 0) : "Somehow you managed to get the loop-target negative. This is wierd!";
 
@@ -145,9 +145,8 @@
         int phiPC = outerLoopPC + 1;
         boolean oldAllowReserved = body.allowReserved(true);
         logger.info("Setting block-inner Phis");
-        for (TypeReference phiType : outerStartingPhis.keySet()) {
-            final SSAValue oldPhi = outerStartingPhis.get(phiType);
-            final List<SSAValue> forPhi = new ArrayList<SSAValue>(2);
+        for (final SSAValue oldPhi : outerStartingPhis.values()) {
+            final List<SSAValue> forPhi = new ArrayList<>(2);
             forPhi.add(paramManager.getSuper(oldPhi.key));
             forPhi.add(paramManager.getCurrent(oldPhi.key));
             
@@ -170,11 +169,12 @@
         
         // Add Phi-Statements at the beginning of this block...
         logger.info("Setting outer-block Phis");
-        for (TypeReference phiType : outerStartingPhis.keySet()) {
-            final VariableKey  phiKey = outerStartingPhis.get(phiType).key;
+        for (Map.Entry<TypeReference, SSAValue> entry : outerStartingPhis.entrySet()) {
+            final VariableKey  phiKey = entry.getValue().key;
             PC = body.getNextProgramCounter();
 
             List<SSAValue> all = paramManager.getAllForPhi(phiKey);
+            final TypeReference phiType = entry.getKey();
             logger.debug("Into phi {} for {}", all, phiType.getName());
             // Narf ... unpacking...
 
@@ -194,6 +194,7 @@
      *
      *  {@inheritDoc}
      */
+    @Override
     protected int leaveAT_LAST (int PC) {
         logger.info("Leaving Model with PC = {}", PC);
         return PC;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopKillAndroidModel.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopKillAndroidModel.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopKillAndroidModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopKillAndroidModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -72,7 +72,7 @@
  *  needed again they get started using that savedIstanceState.
  *
  *  @see        com.ibm.wala.dalvik.ipa.callgraph.androidModel.structure.LoopAndroidModel
- *  @author     Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author     Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public class LoopKillAndroidModel extends LoopAndroidModel {
     private static final Logger logger = LoggerFactory.getLogger(LoopKillAndroidModel.class);
@@ -98,6 +98,7 @@
      *
      * {@inheritDoc}
      */
+    @Override
     protected int enterAT_FIRST(int PC) {
         logger.info("PC {} is the jump target of START_OF_LOOP", PC);
         
@@ -106,7 +107,7 @@
         paramManager.scopeDown(true);
 
         // Top-Half of Phi-Handling
-        outerStartingPhis = new HashMap<TypeReference, SSAValue>();
+        outerStartingPhis = new HashMap<>();
         List<TypeReference> outerPhisNeeded = returnTypesBetween(ExecutionOrder.START_OF_LOOP,
                 ExecutionOrder.AFTER_LOOP);
         
@@ -132,6 +133,7 @@
      *
      *  {@inheritDoc}
      */
+    @Override
     protected int leaveAT_LAST (int PC) {
         assert(outerLoopPC > 0) : "Somehow you managed to get the loop-target negative. This is wierd!";
 
@@ -139,9 +141,8 @@
         int phiPC = outerLoopPC + 1;
         boolean oldAllowReserved = body.allowReserved(true);
         logger.info("Setting block-inner Phis");
-        for (TypeReference phiType : outerStartingPhis.keySet()) {
-            final SSAValue oldPhi = outerStartingPhis.get(phiType);
-            final List<SSAValue> forPhi = new ArrayList<SSAValue>(2);
+        for (final SSAValue oldPhi : outerStartingPhis.values()) {
+            final List<SSAValue> forPhi = new ArrayList<>(2);
             forPhi.add(paramManager.getSuper(oldPhi.key));
             forPhi.add(paramManager.getCurrent(oldPhi.key));
             
@@ -164,11 +165,12 @@
         
         // Add Phi-Statements at the beginning of this block...
         logger.info("Setting outer-block Phis");
-        for (TypeReference phiType : outerStartingPhis.keySet()) {
-            final VariableKey  phiKey = outerStartingPhis.get(phiType).key;
+        for (Map.Entry<TypeReference, SSAValue> entry : outerStartingPhis.entrySet()) {
+            final VariableKey  phiKey = entry.getValue().key;
             PC = body.getNextProgramCounter();
 
             List<SSAValue> all = paramManager.getAllForPhi(phiKey);
+            final TypeReference phiType = entry.getKey();
             logger.debug("Into phi {} for {}", all, phiType.getName());
             // Narf ... unpacking...
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/package-info.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/package-info.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/package-info.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/package-info.java	2019-01-29 17:08:39.000000000 +0000
@@ -45,9 +45,9 @@
  *
  *  All Classes in this package extend AbstractAndroidModel.
  *
- *  @see    com.com.ibm.wala.dalvik.ipa.callgraph.androidModel.structure.AbstractAndroidModel
+ *  @see    com.ibm.wala.dalvik.ipa.callgraph.androidModel.structure.AbstractAndroidModel
  *
  *  @since  2013-10-25
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 package com.ibm.wala.dalvik.ipa.callgraph.androidModel.structure;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SequentialAndroidModel.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SequentialAndroidModel.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SequentialAndroidModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SequentialAndroidModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -53,9 +53,7 @@
  *  This model should not be particular useful in practice. However it might come in
  *  handy for debugging purposes or as a skeleton for an other Model.
  *
- *  {@inheritDoc}
- *
- *  @author     Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author     Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since      2013-09-18
  */
 public final class SequentialAndroidModel extends AbstractAndroidModel {
@@ -80,6 +78,7 @@
       *
       * {@inheritDoc}
       */
+    @Override
     protected int enterAT_FIRST(int PC) { 
         return PC;
     }
@@ -89,6 +88,7 @@
       *
       * {@inheritDoc}
       */
+    @Override
     protected int enterBEFORE_LOOP (int PC) {
         return PC;
     }
@@ -98,6 +98,7 @@
      *
      * {@inheritDoc}
      */
+    @Override
     protected int enterSTART_OF_LOOP (int PC) {
         return PC;
     }
@@ -107,6 +108,7 @@
      *
      * {@inheritDoc}
      */
+    @Override
     protected int enterMIDDLE_OF_LOOP (int PC) {
         return PC;
     }
@@ -116,6 +118,7 @@
      *
      * {@inheritDoc}
      */
+    @Override
     protected int enterMULTIPLE_TIMES_IN_LOOP (int PC) {
         return PC;
     }
@@ -125,6 +128,7 @@
      *
      * {@inheritDoc}
      */
+    @Override
     protected int enterEND_OF_LOOP (int PC) {
         return PC;
     }
@@ -134,6 +138,7 @@
      *
      * {@inheritDoc}
      */
+    @Override
     protected int enterAFTER_LOOP (int PC) {
         return PC;
     }
@@ -143,6 +148,7 @@
      *
      * {@inheritDoc}
      */
+    @Override
     protected int enterAT_LAST (int PC) {
         return PC;
     }
@@ -152,6 +158,7 @@
      *
      * {@inheritDoc}
      */
+    @Override
     protected int leaveAT_LAST (int PC) {
         return PC;
     }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SingleStartAndroidModel.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SingleStartAndroidModel.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SingleStartAndroidModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SingleStartAndroidModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -71,11 +71,9 @@
  *  The incorporated loop is wrapped around user-interaction methods. These are in the section
  *  MULTIPLE_TIMES_IN_LOOP.
  *
- *  {@inheritDoc}
- *
  *  @see        com.ibm.wala.dalvik.ipa.callgraph.androidModel.structure.LoopAndroidModel
  *  @see        com.ibm.wala.dalvik.ipa.callgraph.androidModel.structure.LoopKillAndroidModel
- *  @author     Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author     Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public class SingleStartAndroidModel extends AbstractAndroidModel {
     private static final Logger logger = LoggerFactory.getLogger(SingleStartAndroidModel.class);
@@ -104,6 +102,7 @@
      *
      * {@inheritDoc}
      */
+    @Override
     protected int enterMULTIPLE_TIMES_IN_LOOP (int PC) {
         logger.info("PC {} is the jump target of START_OF_LOOP", PC);
         this.outerLoopPC = PC;
@@ -111,7 +110,7 @@
         paramManager.scopeDown(true);
 
         // Top-Half of Phi-Handling
-        outerStartingPhis = new HashMap<TypeReference, SSAValue>();
+        outerStartingPhis = new HashMap<>();
         List<TypeReference> outerPhisNeeded = returnTypesBetween(ExecutionOrder.START_OF_LOOP,
                 ExecutionOrder.AFTER_LOOP);
         
@@ -137,6 +136,7 @@
      *
      *  {@inheritDoc}
      */
+    @Override
     protected int enterEND_OF_LOOP (int PC) {
         assert(outerLoopPC > 0) : "Somehow you managed to get the loop-target negative. This is wierd!";
 
@@ -144,9 +144,8 @@
         int phiPC = outerLoopPC + 1;
         boolean oldAllowReserved = body.allowReserved(true);
         logger.info("Setting block-inner Phis");
-        for (TypeReference phiType : outerStartingPhis.keySet()) {
-            final SSAValue oldPhi = outerStartingPhis.get(phiType);
-            final List<SSAValue> forPhi = new ArrayList<SSAValue>(2);
+        for (final SSAValue oldPhi : outerStartingPhis.values()) {
+            final List<SSAValue> forPhi = new ArrayList<>(2);
             forPhi.add(paramManager.getSuper(oldPhi.key));
             forPhi.add(paramManager.getCurrent(oldPhi.key));
             
@@ -171,11 +170,13 @@
         
         // Add Phi-Statements at the beginning of this block...
         logger.info("Setting outer-block Phis");
-        for (TypeReference phiType : outerStartingPhis.keySet()) {
-            final VariableKey  phiKey = outerStartingPhis.get(phiType).key;
+        for (Map.Entry<TypeReference, SSAValue> entry : outerStartingPhis.entrySet()) {
+            final SSAValue ssaValue = entry.getValue();
+            final VariableKey  phiKey = ssaValue.key;
             PC = body.getNextProgramCounter();
 
             List<SSAValue> all = paramManager.getAllForPhi(phiKey);
+            final TypeReference phiType = entry.getKey();
             logger.debug("Into phi {} for {}", all, phiType.getName());
             // Narf ... unpacking...
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidBoot.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidBoot.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidBoot.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidBoot.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,7 +42,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.NewSiteReference;
@@ -57,7 +56,6 @@
 import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.ssa.ParameterAccessor;
 import com.ibm.wala.util.ssa.SSAValue;
 import com.ibm.wala.util.ssa.SSAValueManager;
 import com.ibm.wala.util.ssa.TypeSafeInstructionFactory;
@@ -72,7 +70,7 @@
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.androidModel.AndroidModel
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointManager
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-23
  */
 public class AndroidBoot {
@@ -97,16 +95,16 @@
     private VolatileMethodSummary body;
 
 
-    public AndroidBoot(Set<BootAction> whatToDo) {
+//    public AndroidBoot() {
 //        this.scope = null;  // Place something here?
-    }
+//    }
 
     private SSAValue mainThread = null;
     private SSAValue systemContext = null;
     private SSAValue packageContext = null;
 
-    public void addBootCode(final TypeSafeInstructionFactory instructionFactory, final ParameterAccessor acc,
-            final SSAValueManager pm, final VolatileMethodSummary body) {
+    public void addBootCode(final TypeSafeInstructionFactory instructionFactory, final SSAValueManager pm,
+            final VolatileMethodSummary body) {
         this.instructionFactory = instructionFactory;
 //        this.acc = acc;
         this.pm = pm;
@@ -114,7 +112,7 @@
 
         mainThread = createMainThred();
         systemContext = createSystemContext(mainThread);
-        packageContext = createPackageContext(mainThread, systemContext);
+        packageContext = createPackageContext(mainThread);
     }
 
     public SSAValue getSystemContext() {
@@ -166,7 +164,7 @@
             final MethodReference mRef = MethodReference.findOrCreate(AndroidTypes.ActivityThread, MethodReference.initSelector);
             final SSAValue exception = this.pm.getUnmanaged(TypeReference.JavaLangException, "ctor_exc" ); 
             final CallSiteReference site = CallSiteReference.make(pc, mRef, IInvokeInstruction.Dispatch.SPECIAL);
-            final List<SSAValue> params = new ArrayList<SSAValue>(1);
+            final List<SSAValue> params = new ArrayList<>(1);
             params.add(mainThread);
             final SSAInstruction ctorCall = instructionFactory.InvokeInstruction(pc, params, exception, site);
             body.addStatement(ctorCall);
@@ -179,7 +177,8 @@
      *
      *  @see    android.app.ContextImpl.createPackageContextAsUser
      */
-    private SSAValue createSystemContext(SSAValue mainThread) {
+	@SuppressWarnings("JavadocReference")
+	private SSAValue createSystemContext(SSAValue mainThread) {
         final SSAValue systemContext = this.pm.getUnmanaged(AndroidTypes.ContextImpl, "systemContextImpl");
         { // Call ContextImpl.getSystemContext()
             final int pc = this.body.getNextProgramCounter();
@@ -188,7 +187,7 @@
             final MethodReference mRef = MethodReference.findOrCreate(AndroidTypes.ActivityThread, mSel);
             final CallSiteReference site = CallSiteReference.make(pc, mRef, IInvokeInstruction.Dispatch.VIRTUAL);
             final SSAValue exception = this.pm.getException();
-            final List<SSAValue> params = new ArrayList<SSAValue>(1);
+            final List<SSAValue> params = new ArrayList<>(1);
             params.add(mainThread);
             final SSAInstruction call = instructionFactory.InvokeInstruction(pc, systemContext, params, exception, site);
             body.addStatement(call);
@@ -211,7 +210,8 @@
      *
      *  @see    android.app.ContextImpl.createPackageContextAsUser
      */
-    private SSAValue createPackageContext(final SSAValue mainThread, final SSAValue systemContext) {
+	@SuppressWarnings("JavadocReference")
+	private SSAValue createPackageContext(final SSAValue mainThread) {
         final SSAValue packageContext = this.pm.getUnmanaged(AndroidTypes.ContextImpl, "packageContextImpl");
         { // New-Site
             final int pc = this.body.getNextProgramCounter();
@@ -234,7 +234,7 @@
             final MethodReference mRef = MethodReference.findOrCreate(AndroidTypes.ContextImpl, MethodReference.initSelector);
             final SSAValue exception = this.pm.getUnmanaged(TypeReference.JavaLangException, "ctor_exc" ); 
             final CallSiteReference site = CallSiteReference.make(pc, mRef, IInvokeInstruction.Dispatch.SPECIAL);
-            final List<SSAValue> params = new ArrayList<SSAValue>(1);
+            final List<SSAValue> params = new ArrayList<>(1);
             params.add(packageContext);
             final SSAInstruction ctorCall = instructionFactory.InvokeInstruction(pc, params, exception, site);
             body.addStatement(ctorCall);
@@ -334,7 +334,7 @@
             final MethodReference mRef = MethodReference.findOrCreate(AndroidTypes.ContextImpl, mSel);
             final SSAValue exception = this.pm.getException();
             final CallSiteReference site = CallSiteReference.make(pc, mRef, IInvokeInstruction.Dispatch.VIRTUAL);
-            final List<SSAValue> params = new ArrayList<SSAValue>(7);
+            final List<SSAValue> params = new ArrayList<>(7);
             params.add(packageContext);
             params.add(nullApk);        // TODO: This would contain a Context too?
             params.add(nullIBinder);     // OK: is null in Android-Sources too
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidStartComponentTool.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidStartComponentTool.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidStartComponentTool.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidStartComponentTool.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,7 +43,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
@@ -51,7 +53,6 @@
 import com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentStarters.StartInfo;
 import com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentStarters.StarterFlags;
 import com.ibm.wala.dalvik.util.AndroidTypes;
-import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.VolatileMethodSummary;
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
@@ -75,11 +76,13 @@
  *
  *  This class is only used by AndroidModel.getMethodAs() as it got a bit lengthy.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-22
  */
 public class AndroidStartComponentTool {
-    
+
+	private static final Logger logger = LoggerFactory.getLogger(AndroidStartComponentTool.class);
+
     private final IClassHierarchy cha;
 //    private final MethodReference asMethod;
     private final Set<StarterFlags> flags;
@@ -96,7 +99,7 @@
     public AndroidStartComponentTool(final IClassHierarchy cha, final MethodReference asMethod, final Set<StarterFlags> flags,
             final TypeReference caller, final TypeSafeInstructionFactory instructionFactory, final ParameterAccessor acc,
             final SSAValueManager pm, final VolatileMethodSummary redirect, final Parameter self,
-            final StartInfo info, final CGNode callerNd) {
+            final StartInfo info) {
         
         if (cha == null) {
             throw new IllegalArgumentException("cha may not be null");
@@ -205,7 +208,7 @@
                 AndroidTypes.ConfigurationName }, TypeReference.VoidName);
         final Selector mSel = new Selector(Atom.findOrCreateAsciiAtom("attach"), desc);
         final MethodReference mRef = MethodReference.findOrCreate(AndroidTypes.Activity, mSel);
-        final List<SSAValue> params = new ArrayList<SSAValue>(13);
+        final List<SSAValue> params = new ArrayList<>(13);
         params.add(null);   // activity
         params.add(context);
         params.add(thread);
@@ -308,7 +311,8 @@
             
             return androidContext;
         } else {
-            throw new UnsupportedOperationException("Can not handle the callers android-context of " + caller);
+            logger.debug("Can not handle the callers android-context of " + caller);
+            return null;
         }
     }
 
@@ -344,7 +348,7 @@
                 final MethodReference mRef = MethodReference.findOrCreate(AndroidTypes.IntentSender, mSel);
                 final CallSiteReference site = CallSiteReference.make(callPC, mRef, IInvokeInstruction.Dispatch.VIRTUAL);
                 final SSAValue exception = pm.getException();
-                final List<SSAValue> params = new ArrayList<SSAValue>(1);
+                final List<SSAValue> params = new ArrayList<>(1);
                 params.add(intentSender);
                 final SSAInstruction invokation = instructionFactory.InvokeInstruction(callPC, iIntentSender, params, exception, site);
                 redirect.addStatement(invokation);
@@ -356,7 +360,7 @@
                 final MethodReference mRef = MethodReference.findOrCreate(AndroidTypes.IntentSender, mSel);
                 final CallSiteReference site = CallSiteReference.make(callPC, mRef, IInvokeInstruction.Dispatch.VIRTUAL);
                 final SSAValue exception = pm.getException();
-                final List<SSAValue> params = new ArrayList<SSAValue>(1);
+                final List<SSAValue> params = new ArrayList<>(1);
                 params.add(iIntentSender);
                 final SSAInstruction invokation = instructionFactory.InvokeInstruction(callPC, iBinder, params, exception, site);
                 redirect.addStatement(invokation);
@@ -391,7 +395,7 @@
                 final MethodReference mRef = MethodReference.findOrCreate(AndroidTypes.ActivityThread, mSel);
                 final CallSiteReference site = CallSiteReference.make(callPC, mRef, IInvokeInstruction.Dispatch.VIRTUAL);
                 final SSAValue exception = pm.getException();
-                final List<SSAValue> params = new ArrayList<SSAValue>(1);
+                final List<SSAValue> params = new ArrayList<>(1);
                 params.add(mMainThread);
                 final SSAInstruction invokation = instructionFactory.InvokeInstruction(callPC, iBinder,  params, exception, site);
                 redirect.addStatement(invokation);
@@ -464,7 +468,7 @@
             final MethodReference mRef = MethodReference.findOrCreate(AndroidTypes.Activity, mSel);
             final CallSiteReference site = CallSiteReference.make(callPC, mRef, IInvokeInstruction.Dispatch.VIRTUAL);
             final SSAValue exception = pm.getException();
-            final List<SSAValue> params = new ArrayList<SSAValue>(1);
+            final List<SSAValue> params = new ArrayList<>(1);
             params.add(activity);
             params.add(intent);
             final SSAInstruction invokation = instructionFactory.InvokeInstruction(callPC, params, exception, site);
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/ExternalModel.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/ExternalModel.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/ExternalModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/ExternalModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,7 +43,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.logging.Logger;
 
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
@@ -52,8 +51,8 @@
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint;
 import com.ibm.wala.dalvik.util.AndroidComponent;
 import com.ibm.wala.dalvik.util.AndroidTypes;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.MethodSummary;
 import com.ibm.wala.ipa.summaries.SummarizedMethod;
@@ -79,7 +78,7 @@
  *
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextInterpreter
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-15
  */
 public class ExternalModel extends AndroidModel {
@@ -99,7 +98,7 @@
         return false;
     }
 
-    public ExternalModel(final IClassHierarchy cha, final AnalysisOptions options, final AnalysisCache cache, 
+    public ExternalModel(final IClassHierarchy cha, final AnalysisOptions options, final IAnalysisCacheView cache, 
             AndroidComponent target) {
         super(cha, options, cache);
         
@@ -221,7 +220,7 @@
             final CallSiteReference site = CallSiteReference.make(callPC, mRef, IInvokeInstruction.Dispatch.VIRTUAL);
             final SSAValue exception = new SSAValue(nextLocal++, TypeReference.JavaLangException, this.mRef, "exception");
             outBundle = new SSAValue(nextLocal++, inBundle);
-            final List<SSAValue> params = new ArrayList<SSAValue>(1);
+            final List<SSAValue> params = new ArrayList<>(1);
             params.add(inIntent);
             final SSAInstruction invokation = instructionFactory.InvokeInstruction(callPC, outBundle, 
                     params, exception, site);
@@ -277,7 +276,7 @@
             final CallSiteReference site = CallSiteReference.make(callPC, mRef, IInvokeInstruction.Dispatch.VIRTUAL);
             final SSAValue exception = new SSAValue(nextLocal++, TypeReference.JavaLangException, this.mRef, "exception");
             outIntent = new SSAValue(nextLocal++, inIntent);
-            final List<SSAValue> params = new ArrayList<SSAValue>(3);
+            final List<SSAValue> params = new ArrayList<>(3);
             params.add(inIntent);
             params.add(outName);
             params.add(outValue);
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/Overrides.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/Overrides.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/Overrides.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/Overrides.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,7 +44,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
@@ -53,11 +52,9 @@
 import com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentStarters;
 import com.ibm.wala.dalvik.util.AndroidComponent;
 import com.ibm.wala.dalvik.util.AndroidEntryPointManager;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
-import com.ibm.wala.ipa.callgraph.Context;
-import com.ibm.wala.ipa.callgraph.ContextKey;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.SummarizedMethod;
@@ -76,7 +73,7 @@
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentStarters
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-28
  */
 public class Overrides {
@@ -85,9 +82,9 @@
     private final AndroidModel caller;
     private final IClassHierarchy cha;
     private final AnalysisOptions options;
-    private final AnalysisCache cache;
+    private final IAnalysisCacheView cache;
 
-    public Overrides(AndroidModel caller, IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
+    public Overrides(AndroidModel caller, IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache) {
         this.caller = caller;
         this.cha = cha;
         this.options = options;
@@ -139,10 +136,7 @@
             this.child = child;
         }
 
-       /**
-         * {@inheritDoc}
-         */
-        @Override
+       @Override
         public IMethod getCalleeTarget(CGNode caller, CallSiteReference site, IClass receiver) {
             /*if (caller == null) {
                 throw new IllegalArgumentException("caller is null");
@@ -161,7 +155,7 @@
             final MethodReference mRef = site.getDeclaredTarget();
             if (syntheticMethods.containsKey(mRef)) {
                 if (caller != null) {   // XXX: Debug remove
-                    Context ctx = caller.getContext();
+                    // Context ctx = caller.getContext();
 
                     
                     
@@ -197,17 +191,17 @@
      *  the MethodTargetSelector returned.
      *
      *  @return a MethodTargetSelector that overrides all startComponent-calls.
-     *  @todo   Use delayed computation?
+     *  TODO: Use delayed computation?
      */
     public MethodTargetSelector overrideAll() throws CancelException {
         final HashMap<MethodReference, SummarizedMethod> overrides = HashMapFactory.make();
-        final Map<AndroidComponent, AndroidModel> callTo = new EnumMap<AndroidComponent, AndroidModel>(AndroidComponent.class);
+        final Map<AndroidComponent, AndroidModel> callTo = new EnumMap<>(AndroidComponent.class);
         final IProgressMonitor monitor = AndroidEntryPointManager.MANAGER.getProgressMonitor();
         int monitorCounter = 0;
 
         { // Make Mini-Models to override to
             for (final AndroidComponent target: AndroidComponent.values()) {
-                if (AndroidEntryPointManager.MANAGER.EPContainAny(target)) {
+                if (AndroidEntryPointManager.EPContainAny(target)) {
                     final AndroidModel targetModel = new UnknownTargetModel(this.cha, this.options, this.cache, target);
                     callTo.put(target, targetModel); 
                 } else {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/package-info.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/package-info.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/package-info.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/package-info.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,6 +51,6 @@
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa 
  *
  *  @since  2013-10-25
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 package com.ibm.wala.dalvik.ipa.callgraph.androidModel.stubs;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/SystemServiceModel.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/SystemServiceModel.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/SystemServiceModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/SystemServiceModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,7 +42,6 @@
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.logging.Logger;
 
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.dalvik.ipa.callgraph.androidModel.AndroidModel;
@@ -50,8 +49,8 @@
 import com.ibm.wala.dalvik.ipa.callgraph.androidModel.parameters.Instantiator;
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint;
 import com.ibm.wala.dalvik.util.AndroidTypes;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.MethodSummary;
 import com.ibm.wala.ipa.summaries.SummarizedMethod;
@@ -66,7 +65,6 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.ssa.ParameterAccessor;
-import com.ibm.wala.util.ssa.ParameterAccessor.Parameter;
 import com.ibm.wala.util.ssa.SSAValue;
 import com.ibm.wala.util.ssa.SSAValueManager;
 import com.ibm.wala.util.ssa.TypeSafeInstructionFactory;
@@ -79,7 +77,7 @@
  *
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextInterpreter
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-15
  */
 public class SystemServiceModel extends AndroidModel {
@@ -97,7 +95,7 @@
         return false;
     }
 
-    public SystemServiceModel(final IClassHierarchy cha, final AnalysisOptions options, final AnalysisCache cache, 
+    public SystemServiceModel(final IClassHierarchy cha, final AnalysisOptions options, final IAnalysisCacheView cache, 
             Atom target) {
         super(cha, options, cache);
         
@@ -184,7 +182,7 @@
     /**
      *  Fill the model with instructions.
      *
-     *  @todo use "global" instances
+     *  TODO: use "global" instances
      */
     //@Override
     private void populate(Iterable<? extends AndroidEntryPoint> entrypoints) {
@@ -202,7 +200,7 @@
 
         if (this.target.equals("phone")) {
             
-            retVal = instantiator.createInstance(AndroidTypes.TelephonyManager, false, new SSAValue.UniqueKey(), new HashSet<Parameter>(pAcc.all()));
+            retVal = instantiator.createInstance(AndroidTypes.TelephonyManager, false, new SSAValue.UniqueKey(), new HashSet<>(pAcc.all()));
         //} else if (this.target.equals("Lwindow")) { // TODO: Is an interface
         //     
         //    final TypeName wmN = TypeName.findOrCreate("Landroid/view/WindowManager");
@@ -217,43 +215,43 @@
              
             final TypeName n = TypeName.findOrCreate("Landroid/app/KeyguardManager");
             final TypeReference T = TypeReference.findOrCreate(ClassLoaderReference.Primordial, n);
-            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<Parameter>(pAcc.all()));
+            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<>(pAcc.all()));
         } else if (this.target.equals("location")) {
              
             final TypeName n = TypeName.findOrCreate("Landroid/location/LocationManager");
             final TypeReference T = TypeReference.findOrCreate(ClassLoaderReference.Primordial, n);
-            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<Parameter>(pAcc.all()));
+            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<>(pAcc.all()));
         } else if (this.target.equals("search")) {
              // TODO: Param: Handler
             final TypeName n = TypeName.findOrCreate("Landroid/app/SearchManager");
             final TypeReference T = TypeReference.findOrCreate(ClassLoaderReference.Primordial, n);
-            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<Parameter>(pAcc.all()));
+            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<>(pAcc.all()));
         //} else if (this.target.equals("Lvibrator")) { // TODO: Is abstract
         } else if (this.target.equals("connection")) {
              // TODO: use ConnectivityManager.from
             final TypeName n = TypeName.findOrCreate("Landroid/net/ConnectivityManager");
             final TypeReference T = TypeReference.findOrCreate(ClassLoaderReference.Primordial, n);
-            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<Parameter>(pAcc.all()));
+            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<>(pAcc.all()));
         } else if (this.target.equals("wifi")) {
              // Handle Params: Context context, IWifiManager service
             final TypeName n = TypeName.findOrCreate("Landroid/net/wifi/WifiManager");
             final TypeReference T = TypeReference.findOrCreate(ClassLoaderReference.Primordial, n);
-            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<Parameter>(pAcc.all()));
+            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<>(pAcc.all()));
         } else if (this.target.equals("input_method")) {
              // TODO: Use InputMethodManager.getInstance?
             final TypeName n = TypeName.findOrCreate("Landroid/view/inputmethod/InputMethodManager");
             final TypeReference T = TypeReference.findOrCreate(ClassLoaderReference.Primordial, n);
-            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<Parameter>(pAcc.all()));
+            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<>(pAcc.all()));
         } else if (this.target.equals("uimode")) {
             
             final TypeName n = TypeName.findOrCreate("Landroid/app/UiModeManager");
             final TypeReference T = TypeReference.findOrCreate(ClassLoaderReference.Primordial, n);
-            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<Parameter>(pAcc.all()));
+            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<>(pAcc.all()));
         } else if (this.target.equals("download")) {
                 // TODO: Params ContentResolver resolver, String packageName
             final TypeName n = TypeName.findOrCreate("Landroid/app/DownloadManager");
             final TypeReference T = TypeReference.findOrCreate(ClassLoaderReference.Primordial, n);
-            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<Parameter>(pAcc.all()));
+            retVal = instantiator.createInstance(T, false, new SSAValue.UniqueKey(), new HashSet<>(pAcc.all()));
         } else {
             retVal = pm.getUnmanaged(TypeReference.JavaLangObject, "notFound");
             this.body.addConstant(retVal.getNumber(), new ConstantValue(null));
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/UnknownTargetModel.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/UnknownTargetModel.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/UnknownTargetModel.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/UnknownTargetModel.java	2019-01-29 17:08:39.000000000 +0000
@@ -45,7 +45,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import com.ibm.wala.classLoader.CallSiteReference;
 import com.ibm.wala.classLoader.IClass;
@@ -57,8 +56,8 @@
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint;
 import com.ibm.wala.dalvik.util.AndroidComponent;
 import com.ibm.wala.dalvik.util.AndroidEntryPointManager;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.MethodSummary;
 import com.ibm.wala.ipa.summaries.SummarizedMethod;
@@ -84,7 +83,7 @@
  *
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextInterpreter
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-18
  */
 public class UnknownTargetModel  extends AndroidModel {
@@ -109,8 +108,8 @@
     /**
      *  @param  target  Component Type, may be null: No restrictions are imposed on AndroidModel then
      */
-    public UnknownTargetModel(final IClassHierarchy cha, final AnalysisOptions options, final AnalysisCache cache, 
-            AndroidComponent target) throws CancelException {
+    public UnknownTargetModel(final IClassHierarchy cha, final AnalysisOptions options, final IAnalysisCacheView cache, 
+            AndroidComponent target) {
         super(cha, options, cache);
         
         if (target == null) {   // TODO: Enable
@@ -172,10 +171,10 @@
                 final TypeName[] othersA = miniModel.getDescriptor().getParameters();
                 final Set<TypeName> others;
                 if (othersA != null) {
-                    others = new HashSet<TypeName>(Arrays.asList(othersA));
+                    others = new HashSet<>(Arrays.asList(othersA));
                 } else {
                     
-                    others = new HashSet<TypeName>();
+                    others = new HashSet<>();
                 }
                 doMini = others.size() > 0;
                 others.addAll(Arrays.asList(externalModel.getDescriptor().getParameters()));
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java	2019-01-29 17:08:39.000000000 +0000
@@ -59,7 +59,7 @@
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
  *
- *  @author  Tobias Blaschke <code@toiasblaschke.de>
+ *  @author  Tobias Blaschke &lt;code@toiasblaschke.de&gt;
  *  @since   2013-09-01
  */
 public class AndroidEntryPoint extends DexEntryPoint {
@@ -163,17 +163,16 @@
      * @return the section of this entrypoint
      */
     public ExecutionOrder getSection() {
-        if (this.order.compareTo(ExecutionOrder.BEFORE_LOOP) == -1) return ExecutionOrder.AT_FIRST;
-        if (this.order.compareTo(ExecutionOrder.START_OF_LOOP) == -1) return ExecutionOrder.BEFORE_LOOP;
-        if (this.order.compareTo(ExecutionOrder.MIDDLE_OF_LOOP) == -1) return ExecutionOrder.START_OF_LOOP;
-        if (this.order.compareTo(ExecutionOrder.MULTIPLE_TIMES_IN_LOOP) == -1) return ExecutionOrder.MIDDLE_OF_LOOP;
-        if (this.order.compareTo(ExecutionOrder.END_OF_LOOP) == -1) return ExecutionOrder.MULTIPLE_TIMES_IN_LOOP;
-        if (this.order.compareTo(ExecutionOrder.AFTER_LOOP) == -1) return ExecutionOrder.END_OF_LOOP;
-        if (this.order.compareTo(ExecutionOrder.AT_LAST) == -1) return ExecutionOrder.AFTER_LOOP;
+        if (this.order.compareTo(ExecutionOrder.BEFORE_LOOP) < 0) return ExecutionOrder.AT_FIRST;
+        if (this.order.compareTo(ExecutionOrder.START_OF_LOOP) < 0) return ExecutionOrder.BEFORE_LOOP;
+        if (this.order.compareTo(ExecutionOrder.MIDDLE_OF_LOOP) < 0) return ExecutionOrder.START_OF_LOOP;
+        if (this.order.compareTo(ExecutionOrder.MULTIPLE_TIMES_IN_LOOP) < 0) return ExecutionOrder.MIDDLE_OF_LOOP;
+        if (this.order.compareTo(ExecutionOrder.END_OF_LOOP) < 0) return ExecutionOrder.MULTIPLE_TIMES_IN_LOOP;
+        if (this.order.compareTo(ExecutionOrder.AFTER_LOOP) < 0) return ExecutionOrder.END_OF_LOOP;
+        if (this.order.compareTo(ExecutionOrder.AT_LAST) < 0) return ExecutionOrder.AFTER_LOOP;
         return ExecutionOrder.AT_LAST;
     }
 
-    /** {@inheritDoc} */
     public int getOrderValue() { return order.getOrderValue(); }
     public int compareTo(AndroidEntryPoint.IExecutionOrder o) {
         return this.order.compareTo(o);
@@ -189,7 +188,7 @@
      * Before building the model a list of AdroidEntryPoints is to be sorted by that criterion. 
      * You can use AndroidEntryPoint.ExecutionOrderComperator for that task.
      */
-    public static class ExecutionOrder implements Comparable<IExecutionOrder>, IExecutionOrder {
+    public static class ExecutionOrder implements IExecutionOrder {
         // This is an Enum-Style class
         /** Visit the EntryPoint once at the beginning of the model use that for initialization stuff  */
         public final static ExecutionOrder AT_FIRST = new ExecutionOrder(0);
@@ -215,7 +214,7 @@
          *  Unrecommended way to generate the Order based on an Integer.
          *
          *  This method is handy when reading back files. In your code you should prefer the methods
-         *  {@link #after(IExecutionOrder)} and {@link #between(IExecutionOrder, IExecutionOrder)}.
+         *  {@link #after(com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder)} and {@link #between(com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder, com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder)}.
          */
         public ExecutionOrder(int val) { 
             this.value=val; 
@@ -237,7 +236,8 @@
             if (label.equals("AT_LAST")) { this.value = ExecutionOrder.AT_LAST.getOrderValue(); return; }
             throw new IllegalArgumentException("ExecutionOrder was constructed from an illegal label: " + label);
         }
-        /** {@inheritDoc} */
+
+        @Override
         public int getOrderValue() { return this.value; }
 
         /**
@@ -264,7 +264,7 @@
          *  Use this to place a call to an EntryPoint between two other EntryPoint calls or ExecutionOrder "labels".
          *  between() does not care about section-boundaries by itself! 
          *
-         *  Use {@link between(IExecutionOrder[], IExecutionOrder[])} and use labels as additional placement-information 
+         *  Use {@link #between(com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder[], com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder[])} and use labels as additional placement-information 
          *  to prevent unexpected misplacement.
          *
          *  @param  after   the call or "label" to be executed before this one
@@ -299,7 +299,7 @@
          *  This method is intended to be more robust when changing the position-information of referred-to
          *  ExecutionOrders.
          *
-         *  In any other means it behaves exactly like {@link #between(IExecutionOrder, IExecutionOrder)}.
+         *  In any other means it behaves exactly like {@link #between(com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder, com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder)}.
          *
          *  @param  after   the calls or "labels"  to be executed before this one
          *  @param  before  the calls or "labels" to be executed after this one (inclusive)
@@ -359,7 +359,7 @@
         }
 
         /**
-         *  Prefer {@link #after(IExecutionOrder)} whenever possible.
+         *  Prefer {@link #after(com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.IExecutionOrder)} whenever possible.
          */
         public static ExecutionOrder after (int after) {
             return between(after, ((after / (Integer.MAX_VALUE / 8)) + 1) * (Integer.MAX_VALUE / 8));
@@ -393,26 +393,22 @@
             return new ExecutionOrder(before.getOrderValue() + 1);
         }
 
-        /**
-         * {@inheritDoc}
-         */
+        @Override
         public ExecutionOrder getSection() {
-            if (this.compareTo(ExecutionOrder.BEFORE_LOOP) == -1) return ExecutionOrder.AT_FIRST;
-            if (this.compareTo(ExecutionOrder.START_OF_LOOP) == -1) return ExecutionOrder.BEFORE_LOOP;
-            if (this.compareTo(ExecutionOrder.MIDDLE_OF_LOOP) == -1) return ExecutionOrder.START_OF_LOOP;
-            if (this.compareTo(ExecutionOrder.MULTIPLE_TIMES_IN_LOOP) == -1) return ExecutionOrder.MIDDLE_OF_LOOP;
-            if (this.compareTo(ExecutionOrder.END_OF_LOOP) == -1) return ExecutionOrder.MULTIPLE_TIMES_IN_LOOP;
-            if (this.compareTo(ExecutionOrder.AFTER_LOOP) == -1) return ExecutionOrder.END_OF_LOOP;
-            if (this.compareTo(ExecutionOrder.AT_LAST) == -1) return ExecutionOrder.AFTER_LOOP;
+            if (this.compareTo(ExecutionOrder.BEFORE_LOOP) < 0) return ExecutionOrder.AT_FIRST;
+            if (this.compareTo(ExecutionOrder.START_OF_LOOP) < 0) return ExecutionOrder.BEFORE_LOOP;
+            if (this.compareTo(ExecutionOrder.MIDDLE_OF_LOOP) < 0) return ExecutionOrder.START_OF_LOOP;
+            if (this.compareTo(ExecutionOrder.MULTIPLE_TIMES_IN_LOOP) < 0) return ExecutionOrder.MIDDLE_OF_LOOP;
+            if (this.compareTo(ExecutionOrder.END_OF_LOOP) < 0) return ExecutionOrder.MULTIPLE_TIMES_IN_LOOP;
+            if (this.compareTo(ExecutionOrder.AFTER_LOOP) < 0) return ExecutionOrder.END_OF_LOOP;
+            if (this.compareTo(ExecutionOrder.AT_LAST) < 0) return ExecutionOrder.AFTER_LOOP;
             return ExecutionOrder.AT_LAST;
         }
 
 
         @Override
         public int compareTo(IExecutionOrder o) {
-            if (this.value == o.getOrderValue()) return 0;
-            if (this.value > o.getOrderValue()) return 1;
-            return -1;
+            return this.value - o.getOrderValue();
         }
 
         @Override
@@ -426,13 +422,13 @@
             if (this.compareTo(ExecutionOrder.AFTER_LOOP) == 0) return "ExecutionOrder.AFTER_LOOP";
             if (this.compareTo(ExecutionOrder.AT_LAST) == 0) return "ExecutionOrder.AT_LAST";
 
-            if (this.compareTo(ExecutionOrder.BEFORE_LOOP) == -1) return "in section ExecutionOrder.AT_FIRST";
-            if (this.compareTo(ExecutionOrder.START_OF_LOOP) == -1) return "in section ExecutionOrder.BEFORE_LOOP";
-            if (this.compareTo(ExecutionOrder.MIDDLE_OF_LOOP) == -1) return "in section ExecutionOrder.START_OF_LOOP";
-            if (this.compareTo(ExecutionOrder.MULTIPLE_TIMES_IN_LOOP) == -1) return "in section ExecutionOrder.MIDDLE_OF_LOOP";
-            if (this.compareTo(ExecutionOrder.END_OF_LOOP) == -1) return "in section ExecutionOrder.MULTIPLE_TIMES_IN_LOOP";
-            if (this.compareTo(ExecutionOrder.AFTER_LOOP) == -1) return "in section ExecutionOrder.END_OF_LOOP";
-            if (this.compareTo(ExecutionOrder.AT_LAST) == -1) return "in section ExecutionOrder.AFTER_LOOP";
+            if (this.compareTo(ExecutionOrder.BEFORE_LOOP) < 0) return "in section ExecutionOrder.AT_FIRST";
+            if (this.compareTo(ExecutionOrder.START_OF_LOOP) < 0) return "in section ExecutionOrder.BEFORE_LOOP";
+            if (this.compareTo(ExecutionOrder.MIDDLE_OF_LOOP) < 0) return "in section ExecutionOrder.START_OF_LOOP";
+            if (this.compareTo(ExecutionOrder.MULTIPLE_TIMES_IN_LOOP) < 0) return "in section ExecutionOrder.MIDDLE_OF_LOOP";
+            if (this.compareTo(ExecutionOrder.END_OF_LOOP) < 0) return "in section ExecutionOrder.MULTIPLE_TIMES_IN_LOOP";
+            if (this.compareTo(ExecutionOrder.AFTER_LOOP) < 0) return "in section ExecutionOrder.END_OF_LOOP";
+            if (this.compareTo(ExecutionOrder.AT_LAST) < 0) return "in section ExecutionOrder.AFTER_LOOP";
             return "in section ExecutionOrder.AT_LAST";
         }
     }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/DexEntryPoint.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/DexEntryPoint.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/DexEntryPoint.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/DexEntryPoint.java	2019-01-29 17:08:39.000000000 +0000
@@ -46,8 +46,6 @@
  */
 package com.ibm.wala.dalvik.ipa.callgraph.impl;
 
-import java.util.logging.Logger;
-
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ipa.callgraph.impl.DefaultEntrypoint;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/DexExplicitCallGraph.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/DexExplicitCallGraph.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/DexExplicitCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/DexExplicitCallGraph.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/*
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html.
- * 
- * This file is a derivative of code released under the terms listed below.  
- *
- */
-/**
- *
- * Copyright (c) 2009-2012,
- *
- *  Galois, Inc. (Aaron Tomb <atomb@galois.com>, Rogan Creswick <creswick@galois.com>)
- *  Steve Suh    <suhsteve@gmail.com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The names of the contributors may not be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-package com.ibm.wala.dalvik.ipa.callgraph.impl;
-
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
-import com.ibm.wala.ipa.callgraph.AnalysisOptions;
-import com.ibm.wala.ipa.callgraph.CGNode;
-import com.ibm.wala.ipa.callgraph.impl.Everywhere;
-import com.ibm.wala.ipa.callgraph.impl.ExplicitCallGraph;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.util.CancelException;
-
-/**
- *  @deprecated The Android-Model has been moved out from DrexFakeRootMethod, so DexExplicitCallGraph is not needed any longer
- */
-@Deprecated
-public class DexExplicitCallGraph extends ExplicitCallGraph {
-
-	public DexExplicitCallGraph(IClassHierarchy cha, AnalysisOptions options,
-			AnalysisCache cache) {
-		super(cha, options, cache);
-	}
-	
-	@Override
-	protected CGNode makeFakeRootNode() throws CancelException {
-		return findOrCreateNode(new DexFakeRootMethod(cha, options, getAnalysisCache()), Everywhere.EVERYWHERE);
-	}
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/DexFakeRootMethod.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/DexFakeRootMethod.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/DexFakeRootMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/DexFakeRootMethod.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,280 +0,0 @@
-/*
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html.
- * 
- * This file is a derivative of code released under the terms listed below.  
- *
- */
-/**
- *
- * Copyright (c) 2009-2012,
- *
- *  Galois, Inc. (Aaron Tomb <atomb@galois.com>, Rogan Creswick <creswick@galois.com>)
- *  Steve Suh    <suhsteve@gmail.com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The names of the contributors may not be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-package com.ibm.wala.dalvik.ipa.callgraph.impl;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import com.ibm.wala.cfg.IBasicBlock;
-import com.ibm.wala.classLoader.CallSiteReference;
-import com.ibm.wala.classLoader.IClass;
-import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.classLoader.NewSiteReference;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
-import com.ibm.wala.ipa.callgraph.AnalysisOptions;
-import com.ibm.wala.ipa.callgraph.impl.AbstractRootMethod;
-import com.ibm.wala.ipa.callgraph.impl.Everywhere;
-import com.ibm.wala.ipa.callgraph.impl.FakeRootClass;
-import com.ibm.wala.ipa.callgraph.impl.FakeRootMethod;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.shrikeBT.IInvokeInstruction;
-import com.ibm.wala.ssa.SSAArrayStoreInstruction;
-import com.ibm.wala.ssa.SSANewInstruction;
-import com.ibm.wala.types.Descriptor;
-import com.ibm.wala.types.MemberReference;
-import com.ibm.wala.types.MethodReference;
-import com.ibm.wala.types.TypeName;
-import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.strings.Atom;
-import com.ibm.wala.util.warnings.Warning;
-import com.ibm.wala.util.warnings.Warnings;
-
-/**
- *  @deprecated building the Android-model uses a "normal" fake-root now
- */
-@Deprecated
-public class DexFakeRootMethod extends AbstractRootMethod {
-
-	public static final Atom name = Atom.findOrCreateAsciiAtom("DexFakeRootMethod");
-
-	public static final Descriptor descr = Descriptor.findOrCreate(new TypeName[0], TypeReference.VoidName);
-
-	public static final MethodReference rootMethod = MethodReference.findOrCreate(FakeRootClass.FAKE_ROOT_CLASS, name, descr);
-	
-	public static Map<TypeReference, Integer> referenceTypeMap = new HashMap<TypeReference, Integer>();
-	
-//	public static Set<TypeReference> referenceTypeSet = new HashSet<TypeReference>();
-	
-	public DexFakeRootMethod(final IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache) {
-		super(rootMethod, cha, options, cache);
-	}
-
-	@Override
-	public SSANewInstruction addAllocation(TypeReference T) {
-		return addAllocation(T, true);
-	}
-
-	private SSANewInstruction addAllocation(TypeReference T, boolean invokeCtor) {
-		if (T == null) {
-			throw new IllegalArgumentException("T is null");
-		}
-		int instance = nextLocal++;
-		SSANewInstruction result = null;
-		if (T.isReferenceType()) {
-			NewSiteReference ref = NewSiteReference.make(statements.size(), T);
-			if (T.isArrayType()) {
-				int[] sizes = new int[T.getDimensionality()];
-				Arrays.fill(sizes, getValueNumberForIntConstant(1));
-				result = insts.NewInstruction(statements.size(), instance, ref, sizes);
-			} else {
-				result = insts.NewInstruction(statements.size(), instance, ref);
-			}
-			statements.add(result);
-
-			IClass klass = cha.lookupClass(T);
-			if (klass == null) {
-				Warnings.add(AllocationFailure.create(T));
-				return null;
-			}
-
-			if (klass.isArrayClass()) {
-				int arrayRef = result.getDef();
-				TypeReference e = klass.getReference().getArrayElementType();
-				while (e != null && !e.isPrimitiveType()) {
-					// allocate an instance for the array contents
-					NewSiteReference n = NewSiteReference.make(statements.size(), e);
-					int alloc = nextLocal++;
-					SSANewInstruction ni = null;
-					if (e.isArrayType()) {
-						int[] sizes = new int[T.getDimensionality()];
-						Arrays.fill(sizes, getValueNumberForIntConstant(1));
-						ni = insts.NewInstruction(statements.size(), alloc, n, sizes);
-					} else {
-						ni = insts.NewInstruction(statements.size(), alloc, n);
-					}
-					statements.add(ni);
-
-					// emit an astore
-					SSAArrayStoreInstruction store = insts.ArrayStoreInstruction(statements.size(), arrayRef, getValueNumberForIntConstant(0), alloc, e);
-					statements.add(store);
-
-					e = e.isArrayType() ? e.getArrayElementType() : null;
-					arrayRef = alloc;
-				}
-			}
-			if (invokeCtor) {
-				IMethod ctor = cha.resolveMethod(klass, MethodReference.initSelector);
-				if (ctor!=null) {
-					int[] allocSites = null;
-					referenceTypeMap.put(T, instance);
-
-					if (!ctor.getDeclaringClass().getName().toString().equals(klass.getName().toString())) {
-						boolean found = false;
-						for (IMethod im: klass.getAllMethods()) {
-							if (im.getDeclaringClass().getName().toString().equals(klass.getName().toString()) && 
-									im.getSelector().getName().toString().equals(MethodReference.initAtom.toString())) {
-								ctor = im;
-								allocSites = new int[ctor.getNumberOfParameters()];
-								allocSites[0] = instance;
-								for (int j = 1; j < ctor.getNumberOfParameters(); j++) {
-									if (im.getParameterType(j).isPrimitiveType()) {
-										allocSites[j] = addLocal();
-									}
-									else if (referenceTypeMap.containsKey(im.getParameterType(j))) {
-										allocSites[j] = referenceTypeMap.get(im.getParameterType(j)).intValue();
-									}
-									else {
-										SSANewInstruction n = addAllocation(im.getParameterType(j), invokeCtor); 
-										allocSites[j] = (n == null) ? -1 : n.getDef();
-										referenceTypeMap.put(im.getParameterType(j), allocSites[j]);
-									}									
-								}
-								found = true;
-								break;
-							}
-						}
-						if (!found) {
-							Set<IClass> implementors = cha.getImplementors(T);
-							int[] values = new int[implementors.size()];
-							int countErrors = 0;
-							int index = 0;
-							for (IClass ic: implementors){
-								int value;
-								
-								if (referenceTypeMap.containsKey(ic.getReference())) {
-									value = referenceTypeMap.get(ic.getReference()).intValue();
-								}
-								else {
-									SSANewInstruction n = addAllocation(ic.getReference(), invokeCtor);
-									value = (n == null) ? -1 : n.getDef();
-									referenceTypeMap.put(ic.getReference(), value);
-								}
-								if (value == -1) {
-									countErrors++;
-								} else {
-									values[index - countErrors] = value;
-								}
-								index++;
-							}
-
-							if (countErrors > 0) {
-								int[] oldValues = values;
-								values = new int[oldValues.length - countErrors];
-								System.arraycopy(oldValues, 0, values, 0, values.length);
-							}
-							if (values.length > 1) {
-								instance = addPhi(values);
-								referenceTypeMap.put(T, instance);
-							}
-						}
-					}
-					if (allocSites!=null)
-					for (int p=0;p<allocSites.length; p++) {
-						if (allocSites[p] == -1) {
-							Warnings.add(AllocationFailure.create(T));
-							return null;
-						}
-					}
-					addInvocation(allocSites==null?new int[] {instance}:allocSites, CallSiteReference.make(statements.size(), ctor.getReference(),
-							IInvokeInstruction.Dispatch.SPECIAL));
-				}
-			}
-		}
-		cache.invalidate(this, Everywhere.EVERYWHERE);
-		return result;
-	}
-	
-
-	private static class AllocationFailure extends Warning {
-
-		final TypeReference t;
-
-		AllocationFailure(TypeReference t) {
-			super(Warning.SEVERE);
-			this.t = t;
-		}
-
-		@Override
-		public String getMsg() {
-			return getClass().toString() + " : " + t;
-		}
-
-		public static AllocationFailure create(TypeReference t) {
-			return new AllocationFailure(t);
-		}
-	}
-	
-	/**
-	 * @return true iff m is the fake root method.
-	 * @throws IllegalArgumentException if m is null
-	 */
-	public static boolean isFakeRootMethod(MemberReference m) {
-		if (m == null) {
-			throw new IllegalArgumentException("m is null");
-		}
-		return m.equals(rootMethod);
-	}
-
-	/**
-	 * @return true iff block is a basic block in the fake root method
-	 * @throws IllegalArgumentException if block is null
-	 */
-	public static boolean isFromFakeRoot(IBasicBlock<?> block) {
-		if (block == null) {
-			throw new IllegalArgumentException("block is null");
-		}
-		IMethod m = block.getMethod();
-		return FakeRootMethod.isFakeRootMethod(m.getReference());
-	}
-
-	public static MethodReference getRootMethod() {
-		return rootMethod;
-	}
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/AndroidContext.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/AndroidContext.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/AndroidContext.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/AndroidContext.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 /**
  *  Fetches an android/content/Context.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-14
  */
 public class AndroidContext implements Context {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/DexSSAPropagationCallGraphBuilder.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/DexSSAPropagationCallGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/DexSSAPropagationCallGraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/DexSSAPropagationCallGraphBuilder.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-/*
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html.
- * 
- * This file is a derivative of code released under the terms listed below.  
- *
- */
-/**
- *
- * Copyright (c) 2009-2012,
- *
- *  Galois, Inc. (Aaron Tomb <atomb@galois.com>, Rogan Creswick <creswick@galois.com>)
- *  Steve Suh    <suhsteve@gmail.com>
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The names of the contributors may not be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-package com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa;
-
-import com.ibm.wala.dalvik.ipa.callgraph.impl.DexExplicitCallGraph;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
-import com.ibm.wala.ipa.callgraph.AnalysisOptions;
-import com.ibm.wala.ipa.callgraph.ContextSelector;
-import com.ibm.wala.ipa.callgraph.impl.ExplicitCallGraph;
-import com.ibm.wala.ipa.callgraph.propagation.InstanceKeyFactory;
-import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
-import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
-import com.ibm.wala.ipa.callgraph.propagation.cfa.DefaultPointerKeyFactory;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
-
-/**
- *  @deprecated Building the AndroidLivecycle works with a "normal" CGB
- */
-@Deprecated
-public class DexSSAPropagationCallGraphBuilder extends
-	SSAPropagationCallGraphBuilder {
-	
-
-	
-	public DexSSAPropagationCallGraphBuilder(IClassHierarchy cha,
-			AnalysisOptions options, AnalysisCache cache,
-			ContextSelector appContextSelector,
-			SSAContextInterpreter appContextInterpreter, InstanceKeyFactory instanceKeys) {
-	    super(cha, options, cache, new DefaultPointerKeyFactory());
-	    setContextSelector(appContextSelector);
-	    setContextInterpreter(appContextInterpreter);
-	    setInstanceKeys(instanceKeys);
-	}
-
-	@Override
-	protected ExplicitCallGraph createEmptyCallGraph(IClassHierarchy cha, AnalysisOptions options) {
-		return new DexExplicitCallGraph(cha, options, getAnalysisCache());
-	}
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextInterpreter.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextInterpreter.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextInterpreter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextInterpreter.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,7 +43,6 @@
 import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import com.ibm.wala.cfg.ControlFlowGraph;
 import com.ibm.wala.classLoader.CallSiteReference;
@@ -58,17 +57,18 @@
 import com.ibm.wala.dalvik.ipa.callgraph.androidModel.stubs.UnknownTargetModel;
 import com.ibm.wala.dalvik.util.AndroidComponent;
 import com.ibm.wala.dalvik.util.AndroidEntryPointManager;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ipa.callgraph.ContextKey;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.propagation.AbstractTypeInNode;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.SummarizedMethod;
 import com.ibm.wala.ssa.DefUse;
 import com.ibm.wala.ssa.IR;
+import com.ibm.wala.ssa.IRView;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.types.FieldReference;
@@ -91,16 +91,16 @@
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.androidModel.MicroModel
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.androidModel.stubs.ExternalModel
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-14
  */
 public class IntentContextInterpreter implements SSAContextInterpreter {
     private final IntentStarters intentStarters;
     private final IClassHierarchy cha;
     private final AnalysisOptions options;
-    private final AnalysisCache cache;
+    private final IAnalysisCacheView cache;
 
-    public IntentContextInterpreter(IClassHierarchy cha, final AnalysisOptions options, final AnalysisCache cache) {
+    public IntentContextInterpreter(IClassHierarchy cha, final AnalysisOptions options, final IAnalysisCacheView cache) {
         this.cha = cha;
         this.options = options;
         this.cache = cache;
@@ -112,12 +112,12 @@
      */
     private AndroidComponent fetchTargetComponent(final Intent intent, final IMethod method) {
         assert (method != null);
-        assert (intentStarters.getInfo(method.getReference()) != null) : "No IntentStarter for Method " + method + " " + intent;
+        assert (intentStarters.getInfo(method.getReference()) != null) : "No IntentStarter for Method " + method + ' ' + intent;
         if (intent.getComponent() != null) {
             return intent.getComponent();
         } else if (intent.getType() == Intent.IntentType.SYSTEM_SERVICE) {
             
-            return null;
+            return AndroidComponent.UNKNOWN;
         } else {
             final Set<AndroidComponent> possibleTargets = intentStarters.getInfo(method.getReference()).getComponentsPossible(); 
             if (possibleTargets.size() == 1) {
@@ -132,7 +132,7 @@
         }
     } 
 
-    private TypeReference getCaller(final Context ctx, final CGNode node) {
+    private static TypeReference getCaller(final Context ctx, final CGNode node) {
         if (ctx.get(ContextKey.CALLER) != null) {
             System.out.println("CALLER CONTEXT" + ctx.get(ContextKey.CALLER));
             return node.getMethod().getReference().getDeclaringClass();
@@ -246,6 +246,11 @@
         }
     }
 
+    @Override
+    public IRView getIRView(CGNode node) {
+      return getIR(node);
+    }
+
     /**
      *  If the function associated with the node is handled by this class.
      *
@@ -257,13 +262,6 @@
             throw new IllegalArgumentException("node is null");
         }
         final MethodReference target = node.getMethod().getReference();
-
-        { // DEBUG
-            if (target.toString().contains("getSystemService")) {
-                return true;
-            }
-        }
-
         return (
                 intentStarters.isStarter(target) 
         );
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContext.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContext.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContext.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContext.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,7 +49,7 @@
  *
  *  This class takes a parent so we don't loose information by overwriting.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-14
  */
 public class IntentContext implements Context {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextSelector.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextSelector.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextSelector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextSelector.java	2019-01-29 17:08:39.000000000 +0000
@@ -40,53 +40,25 @@
  */
 package com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa;
 
-import com.ibm.wala.ipa.callgraph.ContextSelector;
-
-import com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.Intent;
-import com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentMap;
-import com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContext;
-import com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.AndroidContext;
-import com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextInterpreter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.ibm.wala.classLoader.CallSiteReference;
-import com.ibm.wala.classLoader.IClass;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.types.Selector;
+import com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentStarters.StartInfo;
+import com.ibm.wala.dalvik.util.AndroidEntryPointManager;
+import com.ibm.wala.dalvik.util.AndroidTypes;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.Context;
+import com.ibm.wala.ipa.callgraph.ContextSelector;
 import com.ibm.wala.ipa.callgraph.propagation.ConstantKey;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
-
+import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.MethodReference;
-import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.ipa.callgraph.propagation.NormalAllocationInNode;
-import com.ibm.wala.ipa.callgraph.propagation.AbstractTypeInNode;
-import com.ibm.wala.ssa.SSAInstruction;
-import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
-
-import com.ibm.wala.util.strings.Atom;
-import com.ibm.wala.dalvik.util.AndroidTypes;
+import com.ibm.wala.types.Selector;
 import com.ibm.wala.util.intset.EmptyIntSet;
 import com.ibm.wala.util.intset.IntSet;
-import com.ibm.wala.util.intset.BimodalMutableIntSet;
 import com.ibm.wala.util.intset.IntSetUtil;
-import com.ibm.wala.ssa.SymbolTable;
-import com.ibm.wala.util.collections.HashMapFactory;
-
-import com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentStarters;
-import com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentStarters.StartInfo;
-
-import com.ibm.wala.dalvik.util.AndroidEntryPointManager;
-
-import com.ibm.wala.util.strings.StringStuff;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import com.ibm.wala.util.collections.Pair;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  *  Adds Intents to the Context of functions that start Android-Components.
@@ -98,7 +70,7 @@
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextInterpreter
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentStarters
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-14
  */
 public class IntentContextSelector implements ContextSelector {
@@ -107,7 +79,6 @@
     private final IntentMap intents = new IntentMap();
     private final ContextSelector parent;
     private final IntentStarters intentStarters;
-    private final Map<InstanceKey, AndroidContext> seenContext;
 
     public IntentContextSelector(final IClassHierarchy cha) {
         this(null, cha);
@@ -118,7 +89,6 @@
      */
     public IntentContextSelector(final ContextSelector parent, final IClassHierarchy cha) {
         this.parent = parent;
-        this.seenContext = HashMapFactory.make();
         this.intentStarters = new IntentStarters(cha);
     }
 
@@ -156,8 +126,8 @@
 
             Intent intent = null;
             { // Seach intent
-                for (int j = 0; j < actualParameters.length; ++j) {
-                    final InstanceKey param = actualParameters[j];
+                for (InstanceKey actualParameter : actualParameters) {
+                    final InstanceKey param = actualParameter;
                     if (param == null) {
                         continue;
                     } else if (param.getConcreteType().getName().equals(AndroidTypes.IntentName)) {
@@ -194,7 +164,7 @@
             final Intent intent;
             { // Extract target-Service as intent
                 if (param instanceof ConstantKey) {
-                    final String target = (String) ((ConstantKey)param).getValue();
+					final String target = (String) ((ConstantKey<?>)param).getValue();
                     intent = new Intent(target) {
                         @Override
                         public Intent.IntentType getType() {
@@ -228,14 +198,12 @@
             final Selector calleeSel = callee.getSelector();
 
             boolean isExplicit = false;
-            final InstanceKey uriKey;
             final InstanceKey actionKey;
             { // fetch actionKey, uriKey
                 switch (callee.getNumberOfParameters()) {
                     case 1:
                         logger.debug("Handling Intent()");
                         actionKey = null;
-                        uriKey = null;
                         break;
                     case 2:
                         if (calleeSel.equals(Selector.make("<init>(Ljava/lang/String;)V"))) {
@@ -256,41 +224,34 @@
                             logger.error("No handling implemented for: {}", callee);
                             actionKey = null;
                         }
-                        uriKey = null;
                         break;
                     case 3:
                         if (calleeSel.equals(Selector.make("<init>(Ljava/lang/String;Landroid/net/Uri;)V"))) {
                             logger.debug("Handling Intent(String action, Uri uri)");
                             // TODO: Use Information of the URI...
                             actionKey = actualParameters[1];
-                            uriKey = actualParameters[2];
                         } else if (calleeSel.equals(Selector.make("<init>(Landroid/content/Context;Ljava/lang/Class;)V"))) {
                             logger.debug("Handling Intent(Context, Class)");
                             actionKey = actualParameters[2];
-                            uriKey = null;
                             isExplicit = true;
                         } else {
                             logger.error("No handling implemented for: {}",  callee);
                             actionKey = null;
-                            uriKey = null;
                         }
                         break;
                     case 5:
                         if (calleeSel.equals(Selector.make("<init>(Ljava/lang/String;Landroid/net/Uri;Landroid/content/Context;Ljava/lang/Class;)V"))) {
                             logger.debug("Handling Intent(String action, Uri uri, Context, Class)");
                             actionKey = actualParameters[4];
-                            uriKey = actualParameters[2];
                             isExplicit = true;
                         } else {
                             logger.error("No handling implemented for: {}", callee);
                             actionKey = null;
-                            uriKey = null;
                         }
                         break;
                     default:
                         logger.error("Can't extract Info from Intent-Constructor: {} (not implemented)", site);
                         actionKey = null;
-                        uriKey = null;
                 }
             } // of fetch actionKey
 
@@ -415,8 +376,8 @@
             final int[] relevant = info.getRelevant();
 
             if (relevant != null) {
-                for (int i = 0; i < relevant.length; ++i) {
-                    ret = IntSetUtil.add(ret, relevant[i]);
+                for (int element : relevant) {
+                    ret = IntSetUtil.add(ret, element);
                 }
             }
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/Intent.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/Intent.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/Intent.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/Intent.java	2019-01-29 17:08:39.000000000 +0000
@@ -40,8 +40,6 @@
  */
 package com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa;
 
-import java.util.logging.Logger;
-
 import com.ibm.wala.dalvik.util.AndroidComponent;
 import com.ibm.wala.dalvik.util.AndroidEntryPointManager;
 import com.ibm.wala.ipa.callgraph.ContextItem;
@@ -70,7 +68,7 @@
  * @see     com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextSelector
  * @see     com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextInterpreter
  *
- * @author  Tobias Blaschke <code@tobiasblaschke.de>
+ * @author  Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  * @since   2013-10-12
  */
 public class Intent implements ContextItem, Comparable<Intent> {
@@ -92,7 +90,7 @@
         BROADCAST,          
         /** Do not handle intent */
         IGNORE
-    };
+    }
 
     private enum Explicit {
         UNSET,
@@ -140,8 +138,10 @@
                 explicit = Explicit.EXPLICIT;
                 break;
             case EXPLICIT:
-                
                 unbind();
+                break;
+            default:
+            	throw new UnsupportedOperationException(String.format("unexpected explicitness setting %s", explicit));
         }
     }
 
@@ -153,6 +153,7 @@
         this.immutable = true;
     }
 
+    @Override
     public Intent clone() {
         final Intent clone = new Intent();
         clone.action = this.action; // OK here?
@@ -252,7 +253,7 @@
      *  IntentStarters.StartInfo to determine the Target. However it is nicer to set the Component
      *  here.
      *
-     *  @todo   Set the Component somewhere
+     *  TODO: Set the Component somewhere
      */
     public AndroidComponent getComponent() {
         return this.targetCompontent;
@@ -260,7 +261,7 @@
 
     private static boolean isSystemService(Intent intent) {  
         assert (intent.action != null);
-        return (intent != null && intent.action != null && (intent.action.getVal(0) != 'L') && (intent.action.rIndex((byte) '/') < 0) && (intent.action.rIndex((byte) '.') < 0));
+        return (intent.action.getVal(0) != 'L') && (intent.action.rIndex((byte) '/') < 0) && (intent.action.rIndex((byte) '.') < 0);
     }
 
     /**
@@ -270,9 +271,10 @@
      *
      *  Recomputes if the Intent is internal.
      *  TODO: 
-     *  @todo   Implement it ;)
-     *  @todo   What to return if it does not, but Summary-Information is available?
-     *  @todo   We should read in the Manifest.xml rather than relying on the packet name!
+     *  @param intent 
+     *  TODO: Implement it ;)
+     *  TODO: What to return if it does not, but Summary-Information is available?
+     *  TODO: We should read in the Manifest.xml rather than relying on the packet name!
      */
     private static boolean isInternal(Intent intent) {  // XXX: This may loop forever!
         /*final Intent override = AndroidEntryPointManager.MANAGER.getIntent(intent);
@@ -311,13 +313,11 @@
             // Unknown so not selected as external
             return false;
         }
-        return (! (intent.action.toString().startsWith("L" + pack) || intent.action.toString().startsWith(pack)));
+        return (! (intent.action.toString().startsWith('L' + pack) || intent.action.toString().startsWith(pack)));
     }
 
     /**
      *  Fallback: tries to determine on the Intent itself if it's a standard action.
-     *
-     *  Use {@link #isStandardAction(boolean)} instead.
      */
     private static boolean isStandardAction(Intent intent) {    //TODO: This may loop forever!
         /*final Intent override = AndroidEntryPointManager.MANAGER.getIntent(intent);
@@ -379,13 +379,13 @@
 
     @Override
     public String toString() {
-        StringBuffer ret;
+        StringBuilder ret;
         if ((this.action == null) || (this.action.equals(UNBOUND))) {
             return "Unbound Intent";
         } else if (getType() == IntentType.SYSTEM_SERVICE) {
-            ret = new StringBuffer("SystemService(");
+            ret = new StringBuilder("SystemService(");
         } else {
-            ret = new StringBuffer("Intent(");
+            ret = new StringBuilder("Intent(");
         }
         ret.append(this.action.toString());
         if (uri != null) {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentMap.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentMap.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,7 +42,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Logger;
 
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.ipa.callgraph.propagation.ConstantKey;
@@ -55,11 +54,11 @@
  *
  *  This class is only of use in conjunction with the IntentContextSelector
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 /*package*/ class IntentMap {
-    private final Map<InstanceKey, Intent> seen = new HashMap<InstanceKey, Intent>();
-    private final Map<Intent, Intent> immutables = new HashMap<Intent, Intent>();
+    private final Map<InstanceKey, Intent> seen = new HashMap<>();
+    private final Map<Intent, Intent> immutables = new HashMap<>();
 
     public Intent findOrCreateImmutable(final Intent intent) {
         if (immutables.containsKey(intent)) {
@@ -187,9 +186,9 @@
     }
 
     public Intent setAction(final Intent intent, final String action, boolean isExplicit) {
-        for (final InstanceKey candKey : seen.keySet()) {
-            if (seen.get(candKey).equals(intent)) {
-                return setAction(candKey, action, isExplicit);
+        for (final Map.Entry<InstanceKey, Intent> entry : seen.entrySet()) {
+            if (entry.getValue().equals(intent)) {
+                return setAction(entry.getKey(), action, isExplicit);
             }
         }
 
@@ -204,7 +203,7 @@
         final String action;
         {
             if (actionKey instanceof ConstantKey) {
-                final Object actionO = ((ConstantKey)actionKey).getValue();
+                final Object actionO = ((ConstantKey<?>) actionKey).getValue();
                 if (actionO instanceof String) {
                     action = StringStuff.deployment2CanonicalTypeString((String) actionO);
                 } else if (actionO instanceof IClass) {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentStarters.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentStarters.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentStarters.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentStarters.java	2019-01-29 17:08:39.000000000 +0000
@@ -61,9 +61,9 @@
  * This is used by the IntentContextSelector to add an IntentContext to this Methods.
  *
  * TODO:
- * @todo    Fill in better values for targetAccuracy and componentType
- * @todo    Add declaring class
- * @author  Tobias Blaschke <code@tobiasblaschke.de>
+ * TODO: Fill in better values for targetAccuracy and componentType
+ * TODO: Add declaring class
+ * @author  Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  * @since   1013-10-16
  */
 public class IntentStarters {
@@ -146,7 +146,7 @@
         /**
          *  These influence how the model is built.
          *
-         *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentStarters.StarerFlags
+         *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentStarters.StarterFlags
          */
         public Set<StarterFlags> getFlags() {
             return this.flags;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/package-info.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/package-info.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/package-info.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/package-info.java	2019-01-29 17:08:39.000000000 +0000
@@ -64,6 +64,6 @@
  * @see     com.ibm.wala.dalvik.ipa.callgraph.androidModel.MicroModel 
  * @see     com.ibm.wala.dalvik.ipa.callgraph.androidModel.stubs.UnknownTargetModel
  * @see     com.ibm.wala.dalvik.ipa.callgraph.androidModel.stubs.ExternalModel
- * @author  Tobias Blaschke <code@tobiasblaschke.de>
+ * @author  Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 package com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/AbstractIntRegisterMachine.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/AbstractIntRegisterMachine.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/AbstractIntRegisterMachine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/AbstractIntRegisterMachine.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,9 +11,6 @@
  *******************************************************************************/
 package com.ibm.wala.dalvik.ssa;
 
-import java.util.Iterator;
-import java.util.logging.Logger;
-
 import com.ibm.wala.dalvik.classLoader.DexCFG;
 import com.ibm.wala.dalvik.classLoader.DexCFG.BasicBlock;
 import com.ibm.wala.dalvik.classLoader.DexConstants;
@@ -54,14 +51,15 @@
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
 import com.ibm.wala.shrikeBT.IPutInstruction;
 import com.ibm.wala.shrikeBT.IUnaryOpInstruction;
-import com.ibm.wala.shrikeBT.InstanceofInstruction;
 import com.ibm.wala.shrikeBT.MonitorInstruction;
 import com.ibm.wala.shrikeBT.NewInstruction;
 import com.ibm.wala.shrikeBT.SwitchInstruction;
 import com.ibm.wala.shrikeBT.ThrowInstruction;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.CancelRuntimeException;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.UnimplementedError;
+import com.ibm.wala.util.graph.INodeWithNumber;
 
 /**
  * Skeleton of functionality to propagate information through the Java bytecode stack machine using ShrikeBT.
@@ -119,14 +117,17 @@
     protected void init(Meeter meeter, final FlowProvider flow) {
         final MeetOperator meet = new MeetOperator(meeter);
         ITransferFunctionProvider<BasicBlock, MachineState> xferFunctions = new ITransferFunctionProvider<BasicBlock, MachineState>() {
+            @Override
             public boolean hasNodeTransferFunctions() {
                 return flow.needsNodeFlow();
             }
 
+            @Override
             public boolean hasEdgeTransferFunctions() {
                 return flow.needsEdgeFlow();
             }
 
+            @Override
             public UnaryOperator<MachineState> getNodeTransferFunction(final BasicBlock node) {
                 return new UnaryOperator<MachineState>() {
                     @Override
@@ -161,6 +162,7 @@
                 };
             }
 
+            @Override
             public UnaryOperator<MachineState> getEdgeTransferFunction(final BasicBlock from, final BasicBlock to) {
                 return new UnaryOperator<MachineState>() {
                     @Override
@@ -195,12 +197,13 @@
                 };
             }
 
+            @Override
             public AbstractMeetOperator<MachineState> getMeetOperator() {
                 return meet;
             }
         };
 
-        IKilldallFramework<BasicBlock, MachineState> problem = new BasicFramework<BasicBlock, MachineState>(cfg, xferFunctions);
+        IKilldallFramework<BasicBlock, MachineState> problem = new BasicFramework<>(cfg, xferFunctions);
         solver = new DataflowSolver<BasicBlock, MachineState>(problem) {
             private MachineState entry;
 
@@ -229,8 +232,8 @@
                 /*
                  * Add only the entry variable to the work list.
                  */
-                 for (Iterator it = getFixedPointSystem().getStatementsThatUse(entry); it.hasNext();) {
-                     AbstractStatement s = (AbstractStatement) it.next();
+                 for (INodeWithNumber inn : Iterator2Iterable.make(getFixedPointSystem().getStatementsThatUse(entry))) {
+                     AbstractStatement s = (AbstractStatement) inn;
                      addToWorkList(s);
                  }
             }
@@ -349,7 +352,7 @@
      * @param bb the basic block at whose entry the meet occurs
      * @return true if the lhs value changes. false otherwise.
      */
-    private boolean meet(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
+    private static boolean meet(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
 
 //      boolean changed = meetStacks(lhs, rhs, bb, meeter);
 
@@ -365,7 +368,7 @@
      * @param bb the basic block at whose entry the meet occurs
      * @return true if the lhs value changes. false otherwise.
      */
-    private boolean meetForCatchBlock(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
+    private static boolean meetForCatchBlock(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
 
         boolean changed = meetLocals(lhs, rhs, bb, meeter);
 
@@ -470,7 +473,7 @@
      * @param bb the basic block at whose entry the meet occurs
      * @return true if the lhs value changes. false otherwise.
      */
-    private boolean meetLocals(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
+    private static boolean meetLocals(IVariable lhs, IVariable[] rhs, BasicBlock bb, Meeter meeter) {
 
         boolean changed = false;
         MachineState L = (MachineState) lhs;
@@ -618,9 +621,6 @@
 
         /**
          * set the value of local i to symbol j
-         *
-         * @param i
-         * @param j
          */
         public void setLocal(int i, int j) {
             if (locals == null) {
@@ -634,7 +634,6 @@
         }
 
         /**
-         * @param i
          * @return the number of the symbol corresponding to local i
          */
         public int getLocal(int i) {
@@ -682,7 +681,7 @@
 //          if (isTOP()) {
 //              return "<TOP>@" + System.identityHashCode(this);
 //          }
-//          StringBuffer result = new StringBuffer("<");
+//          StringBuffer result = new StringBuilder("<");
 //          result.append("S");
 //          if (stackHeight == 0) {
 //              result.append("[empty]");
@@ -696,7 +695,7 @@
         }
 
 //      private StringBuffer array2StringBuffer(int[] array, int n) {
-//          StringBuffer result = new StringBuffer("[");
+//          StringBuffer result = new StringBuilder("[");
 //          if (array == null) {
 //              result.append(OPTIMISTIC ? "TOP" : "BOTTOM");
 //          } else {
@@ -709,19 +708,10 @@
 //          return result;
 //      }
 
+        @Override
         public void copyState(MachineState other) {
-            if (other.stack == null) {
-                stack = null;
-            } else {
-                stack = new int[other.stack.length];
-                System.arraycopy(other.stack, 0, stack, 0, other.stack.length);
-            }
-            if (other.locals == null) {
-                locals = null;
-            } else {
-                locals = new int[other.locals.length];
-                System.arraycopy(other.locals, 0, locals, 0, other.locals.length);
-            }
+            stack = other.stack == null ? null : other.stack.clone();
+            locals = other.locals == null ? null : other.locals.clone();
             stackHeight = other.stackHeight;
         }
 
@@ -834,21 +824,24 @@
             this.edgeVisitor = ev;
         }
 
+        @Override
         public boolean needsNodeFlow() {
             return true;
         }
 
+        @Override
         public boolean needsEdgeFlow() {
             return false;
         }
 
+        @Override
         public MachineState flow(MachineState entry, BasicBlock basicBlock) {
             workingState = entry.duplicate();
             currentBlock = basicBlock;
             currentSuccessorBlock = null;
             Instruction[] instructions = getInstructions();
             if (DEBUG) {
-                System.err.println("Entry to BB" + cfg.getNumber(basicBlock) + " " + workingState);
+                System.err.println("Entry to BB" + cfg.getNumber(basicBlock) + ' ' + workingState);
             }
             for (int i = basicBlock.getFirstInstructionIndex(); i <= basicBlock.getLastInstructionIndex(); i++) {
                 currentInstructionIndex = i;
@@ -861,13 +854,14 @@
             return workingState;
         }
 
+        @Override
         public MachineState flow(MachineState entry, BasicBlock from, BasicBlock to) {
             workingState = entry.duplicate();
             currentBlock = from;
             currentSuccessorBlock = to;
             Instruction[] instructions = getInstructions();
             if (DEBUG) {
-                System.err.println("Entry to BB" + cfg.getNumber(from) + " " + workingState);
+                System.err.println("Entry to BB" + cfg.getNumber(from) + ' ' + workingState);
             }
             for (int i = from.getFirstInstructionIndex(); i <= from.getLastInstructionIndex(); i++) {
                 currentInstructionIndex = i;
@@ -903,7 +897,7 @@
         protected class BasicRegisterMachineVisitor extends Visitor {
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitArrayLength(ArrayLengthInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitArrayLength(ArrayLengthInstruction)
              */
             @Override
             public void visitArrayLength(ArrayLength instruction) {
@@ -915,7 +909,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitArrayLoad(IArrayLoadInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitArrayLoad(IArrayLoadInstruction)
              */
             @Override
             public void visitArrayGet(ArrayGet instruction) {
@@ -928,7 +922,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitArrayStore(IArrayStoreInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitArrayStore(IArrayStoreInstruction)
              */
             @Override
             public void visitArrayPut(ArrayPut instruction) {
@@ -940,7 +934,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitBinaryOp(IBinaryOpInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitBinaryOp(IBinaryOpInstruction)
              */
             @Override
             public void visitBinaryOperation(BinaryOperation instruction) {
@@ -950,7 +944,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitComparison(IComparisonInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitComparison(IComparisonInstruction)
              */
 //          @Override
 //          public void visitComparison(IComparisonInstruction instruction) {
@@ -960,7 +954,7 @@
 //          }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitConditionalBranch(IConditionalBranchInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitConditionalBranch(IConditionalBranchInstruction)
              */
             @Override
             public void visitBranch(Branch instruction) {
@@ -971,7 +965,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitConstant(ConstantInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitConstant(ConstantInstruction)
              */
             @Override
             public void visitConstant(Constant instruction) {
@@ -981,7 +975,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitConversion(IConversionInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitConversion(IConversionInstruction)
              */
 //          @Override
 //          public void visitConversion(IConversionInstruction instruction) {
@@ -990,7 +984,7 @@
 //          }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitDup(DupInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitDup(DupInstruction)
              */
 //          @Override
 //          public void visitDup(DupInstruction instruction) {
@@ -1023,7 +1017,7 @@
 //          }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitGet(IGetInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitGet(IGetInstruction)
              */
             @Override
             public void visitGetField(GetField instruction) {
@@ -1040,7 +1034,7 @@
 //          }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitInstanceof(InstanceofInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitInstanceof
              */
             @Override
             public void visitInstanceof(InstanceOf instruction) {
@@ -1051,7 +1045,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitInvoke(IInvokeInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitInvoke(IInvokeInstruction)
              */
             @Override
             public void visitInvoke(Invoke instruction) {
@@ -1066,7 +1060,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitMonitor(MonitorInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitMonitor(MonitorInstruction)
              */
             @Override
             public void visitMonitor(Monitor instruction) {
@@ -1076,7 +1070,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitLocalLoad(ILoadInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitLocalLoad(ILoadInstruction)
              */
 //          @Override
 //          public void visitLocalLoad(ILoadInstruction instruction) {
@@ -1085,7 +1079,7 @@
 //          }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitLocalStore(IStoreInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitLocalStore(IStoreInstruction)
              */
 //          @Override
 //          public void visitLocalStore(IStoreInstruction instruction) {
@@ -1094,7 +1088,7 @@
 //          }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitNew(NewInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitNew(NewInstruction)
              */
             @Override
             public void visitNew(New instruction) {
@@ -1105,7 +1099,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitPop(PopInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitPop(PopInstruction)
              */
 //          @Override
 //          public void visitPop(PopInstruction instruction) {
@@ -1115,7 +1109,7 @@
 //          }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitPut(IPutInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitPut(IPutInstruction)
              */
             @Override
             public void visitPutField(PutField instruction) {
@@ -1125,7 +1119,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitShift(IShiftInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitShift(IShiftInstruction)
              */
 //          @Override
 //          public void visitShift(IShiftInstruction instruction) {
@@ -1133,7 +1127,7 @@
 //          }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitSwap(SwapInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitSwap(SwapInstruction)
              */
 //          @Override
 //          public void visitSwap(SwapInstruction instruction) {
@@ -1141,7 +1135,7 @@
 //          }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitSwitch(SwitchInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitSwitch(SwitchInstruction)
              */
             @Override
             public void visitSwitch(Switch instruction) {
@@ -1151,7 +1145,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitThrow(ThrowInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitThrow(ThrowInstruction)
              */
             @Override
             public void visitThrow(Throw instruction) {
@@ -1163,7 +1157,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitUnaryOp(IUnaryOpInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitUnaryOp(IUnaryOpInstruction)
              */
             @Override
             public void visitUnaryOperation(UnaryOperation instruction) {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,11 +11,8 @@
  *******************************************************************************/
 package com.ibm.wala.dalvik.ssa;
 
-import java.nio.ByteBuffer;
+import java.util.Arrays;
 import java.util.Iterator;
-import java.util.logging.Logger;
-
-import org.jf.dexlib.Code.Format.ArrayDataPseudoInstruction.ArrayElement;
 
 import com.ibm.wala.cfg.IBasicBlock;
 import com.ibm.wala.classLoader.CallSiteReference;
@@ -49,7 +46,6 @@
 import com.ibm.wala.dalvik.dex.instructions.Throw;
 import com.ibm.wala.dalvik.dex.instructions.UnaryOperation;
 import com.ibm.wala.shrikeBT.ArrayLengthInstruction;
-import com.ibm.wala.shrikeBT.CheckCastInstruction;
 import com.ibm.wala.shrikeBT.ConstantInstruction;
 import com.ibm.wala.shrikeBT.GotoInstruction;
 import com.ibm.wala.shrikeBT.IArrayLoadInstruction;
@@ -59,7 +55,6 @@
 import com.ibm.wala.shrikeBT.IGetInstruction;
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
 import com.ibm.wala.shrikeBT.IUnaryOpInstruction;
-import com.ibm.wala.shrikeBT.InstanceofInstruction;
 import com.ibm.wala.shrikeBT.MonitorInstruction;
 import com.ibm.wala.shrikeBT.NewInstruction;
 import com.ibm.wala.shrikeBT.ReturnInstruction;
@@ -119,7 +114,7 @@
     final private SymbolTable symbolTable;
 
     /**
-     * A logical mapping from <bcIndex, valueNumber> -> local number if null, don't build it.
+     * A logical mapping from &lt;bcIndex, valueNumber&gt; -&gt; local number if null, don't build it.
      */
     private final SSA2LocalMap localMap;
 
@@ -139,8 +134,8 @@
             boolean buildLocalMap, SSAPiNodePolicy piNodePolicy) {
         super(scfg);
         localMap = buildLocalMap ? new SSA2LocalMap(scfg, instructions.length, cfg.getNumberOfNodes(), method.getMaxLocals()) : null;
-        init(new SymbolTableMeeter(cfg, instructions, scfg), new SymbolicPropagator(scfg, instructions,
-                localMap, cfg, piNodePolicy));
+        init(new SymbolTableMeeter(cfg, scfg), new SymbolicPropagator(scfg, instructions,
+                cfg, piNodePolicy));
         this.method = method;
         this.symbolTable = symbolTable;
         this.insts = method.getDeclaringClass().getClassLoader().getInstructionFactory();
@@ -155,7 +150,7 @@
 
         final DexCFG dexCFG;
 
-        SymbolTableMeeter(SSACFG cfg, SSAInstruction[] instructions, DexCFG dexCFG) {
+        SymbolTableMeeter(SSACFG cfg, DexCFG dexCFG) {
             this.cfg = cfg;
 //            this.instructions = instructions;
             this.dexCFG = dexCFG;
@@ -198,11 +193,12 @@
 //          }
 //      }
 
+        @Override
         public int meetLocal(int n, int[] rhs, DexCFG.BasicBlock bb) {
             if (allTheSame(rhs)) {
-                for (int i = 0; i < rhs.length; i++) {
-                    if (rhs[i] != TOP) {
-                        return rhs[i];
+                for (int rh : rhs) {
+                    if (rh != TOP) {
+                        return rh;
                     }
                 }
                 // didn't find anything but TOP
@@ -235,7 +231,6 @@
         /**
          * Are all rhs values all the same? Note, we consider TOP (-1) to be same as everything else.
          *
-         * @param rhs
          * @return boolean
          */
         private boolean allTheSame(int[] rhs) {
@@ -348,10 +343,10 @@
 
         final SSAPiNodePolicy piNodePolicy;
 
-        public SymbolicPropagator(DexCFG dexCFG, SSAInstruction[] instructions, SSA2LocalMap localMap,
-                SSACFG cfg, SSAPiNodePolicy piNodePolicy) {
+        public SymbolicPropagator(DexCFG dexCFG, SSAInstruction[] instructions, SSACFG cfg,
+                SSAPiNodePolicy piNodePolicy) {
             super(dexCFG);
-            this.piNodePolicy = null;// piNodePolicy;
+            this.piNodePolicy = piNodePolicy;
             this.cfg = cfg;
             this.creators = new SSAInstruction[0];
             this.dexCFG = dexCFG;
@@ -370,9 +365,7 @@
             instructions[getCurrentInstructionIndex()] = s;
             for (int i = 0; i < s.getNumberOfDefs(); i++) {
                 if (creators.length < (s.getDef(i) + 1)) {
-                    SSAInstruction[] arr = new SSAInstruction[2 * s.getDef(i)];
-                    System.arraycopy(creators, 0, arr, 0, creators.length);
-                    creators = arr;
+                    creators = Arrays.copyOf(creators, 2 * s.getDef(i));
                 }
 
                 assert s.getDef(i) != -1 : "invalid def " + i + " for " + s;
@@ -429,7 +422,7 @@
 			// TODO: make sure all visit functions are overridden
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitArrayLength(ArrayLengthInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitArrayLength(ArrayLengthInstruction)
              */
             @Override
             public void visitArrayLength(ArrayLength instruction) {
@@ -442,7 +435,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitArrayLoad(IArrayLoadInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitArrayLoad(IArrayLoadInstruction)
              */
             @Override
             public void visitArrayGet(ArrayGet instruction) {
@@ -463,7 +456,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitArrayStore(IArrayStoreInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitArrayStore(IArrayStoreInstruction)
              */
             @Override
             public void visitArrayPut(ArrayPut instruction) {
@@ -482,46 +475,37 @@
 
             @Override
             public void visitArrayFill(ArrayFill instruction) {
-
-                Iterator<ArrayElement> iae = instruction.getTable().getElements();
+                Iterator<Number> iae = instruction.getTable().getArrayElements().iterator();
                 int i = 0;
                 while (iae.hasNext())
                 {
-                    ArrayElement ae = (ArrayElement)iae.next();
-                    int ElementWidth = ae.elementWidth;
-
+                    Number ae = iae.next();                    
                     int index = symbolTable.getConstant(i);
                     int arrayRef = workingState.getLocal(instruction.array);
                     TypeReference t = instruction.getType();
 //                  System.out.println(t.getName().toString());
                     int value;
-
-                    //fetch the byte[] array for the element
-                    byte[] temp_byte = new byte[ElementWidth];
-                    for (int j = 0; j < ElementWidth; j++)
-                        temp_byte[j] = ae.buffer[ae.bufferIndex+(ElementWidth-1)-j];
-                    ByteBuffer byte_buffer = ByteBuffer.wrap(temp_byte);
 //
 //                      System.out.println("Index: " + ae.bufferIndex + ", Width: " + ae.elementWidth + ", Value: " +  byte_buffer.getSomethingDependingonType );
 
 
                     //okay to call the getConstant(String) for a char?
                     if (t.equals(TypeReference.Char))
-                        value = symbolTable.getConstant(Character.toString(byte_buffer.getChar()));
+                        value = symbolTable.getConstant((char) ae.intValue());
                     else if (t.equals(TypeReference.Byte))
-                        value = symbolTable.getConstant((int)byte_buffer.get());
+                        value = symbolTable.getConstant(ae.byteValue());
                     else if (t.equals(TypeReference.Short))
-                        value = symbolTable.getConstant((int)byte_buffer.getShort());
+                        value = symbolTable.getConstant(ae.shortValue());
                     else if (t.equals(TypeReference.Int))
-                        value = symbolTable.getConstant(byte_buffer.getInt());
+                        value = symbolTable.getConstant(ae.intValue());
                     else if (t.equals(TypeReference.Long))
-                        value = symbolTable.getConstant(byte_buffer.getLong());
+                        value = symbolTable.getConstant(ae.longValue());
                     else if (t.equals(TypeReference.Float))
-                        value = symbolTable.getConstant(byte_buffer.getFloat());
+                        value = symbolTable.getConstant(ae.floatValue());
                     else if (t.equals(TypeReference.Double))
-                        value = symbolTable.getConstant(byte_buffer.getDouble());
+                        value = symbolTable.getConstant(ae.doubleValue());
                     else if (t.equals(TypeReference.Boolean))
-                        value = symbolTable.getConstant((byte_buffer.get() == 1)?true:false);
+                        value = symbolTable.getConstant(ae.intValue() != 0);
                     else
                     {
                         
@@ -537,7 +521,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitBinaryOp(IBinaryOpInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitBinaryOp(IBinaryOpInstruction)
              */
             @Override
             public void visitBinaryOperation(BinaryOperation instruction) {
@@ -554,7 +538,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitBinaryOp(IBinaryOpInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitBinaryOp(IBinaryOpInstruction)
              */
             @Override
             public void visitBinaryLiteral(BinaryLiteralOperation instruction) {
@@ -598,7 +582,7 @@
 			}
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitCheckCast(CheckCastInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitCheckCast
              */
             @Override
             public void visitCheckCast(CheckCast instruction) {
@@ -613,7 +597,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitConditionalBranch(IConditionalBranchInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitConditionalBranch(IConditionalBranchInstruction)
              */
             @Override
             public void visitBranch(Branch instruction) {
@@ -643,7 +627,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitConstant(ConstantInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitConstant(ConstantInstruction)
              */
             @Override
             public void visitConstant(Constant instruction) {
@@ -710,7 +694,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitConversion(IConversionInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitConversion(IConversionInstruction)
              */
             // TODO: is this just a unary operation?
 //          @Override
@@ -727,7 +711,7 @@
 //          }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitGet(IGetInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitGet(IGetInstruction)
              */
             @Override
             public void visitGetField(GetField instruction) {
@@ -763,7 +747,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitGoto(GotoInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitGoto(GotoInstruction)
              */
             @Override
             public void visitGoto(Goto instruction) {
@@ -771,7 +755,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitInstanceof(InstanceofInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitInstanceof
              */
             @Override
             public void visitInstanceof(InstanceOf instruction) {
@@ -786,7 +770,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitInvoke(IInvokeInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitInvoke(IInvokeInstruction)
              */
             @Override
             public void visitInvoke(Invoke instruction) {
@@ -802,7 +786,6 @@
 
                 Language lang = dexCFG.getMethod().getDeclaringClass().getClassLoader().getLanguage();
                 // TODO: check that the signature needed by findOrCreate can use the descriptor
-                
                 MethodReference m = MethodReference.findOrCreate(lang, loader, instruction.clazzName, instruction.methodName, instruction.descriptor);
 
 
@@ -904,7 +887,7 @@
 //          }
 //
 //          /*
-//           * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitLocalStore(com.ibm.wala.shrikeBT.StoreInstruction)
+//           * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitLocalStore(com.ibm.wala.shrikeBT.StoreInstruction)
 //           */
 //          @Override
 //          public void visitLocalStore(IStoreInstruction instruction) {
@@ -915,7 +898,7 @@
 //          }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitMonitor(MonitorInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitMonitor(MonitorInstruction)
              */
             @Override
             public void visitMonitor(Monitor instruction) {
@@ -925,7 +908,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitNew(NewInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitNew(NewInstruction)
              */
             @Override
             public void visitNew(New instruction) {
@@ -991,7 +974,7 @@
 
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitGet(IGetInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitGet(IGetInstruction)
              */
             @Override
             public void visitPutField(PutField instruction) {
@@ -1012,7 +995,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitReturn(ReturnInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitReturn(ReturnInstruction)
              */
             @Override
             public void visitReturn(Return instruction) {
@@ -1047,7 +1030,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitShift(IShiftInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitShift(IShiftInstruction)
              */
             // TODO: this is just a binary operation
 //          @Override
@@ -1061,7 +1044,7 @@
 //          }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitSwitch(SwitchInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitSwitch(SwitchInstruction)
              */
             @Override
             public void visitSwitch(Switch instruction) {
@@ -1105,7 +1088,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitThrow(ThrowInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitThrow(ThrowInstruction)
              */
             @Override
             public void visitThrow(Throw instruction) {
@@ -1124,7 +1107,7 @@
             }
 
             /**
-             * @see com.ibm.wala.shrikeBT.Instruction.Visitor#visitUnaryOp(IUnaryOpInstruction)
+             * @see com.ibm.wala.shrikeBT.IInstruction.Visitor#visitUnaryOp(IUnaryOpInstruction)
              */
             @Override
             public void visitUnaryOperation(UnaryOperation instruction) {
@@ -1288,10 +1271,6 @@
 
         }
 
-        /**
-         * @param piCause
-         * @param ref
-         */
         private void reuseOrCreatePi(SSAInstruction piCause, int ref) {
             int n = getCurrentInstructionIndex();
             SSACFG.BasicBlock bb = cfg.getBlockForInstruction(n);
@@ -1392,7 +1371,7 @@
     }
 
     /**
-     * A logical mapping from <pc, valueNumber> -> local number Note: make sure this class remains static: this persists as part of
+     * A logical mapping from &lt;pc, valueNumber&gt; -&gt; local number Note: make sure this class remains static: this persists as part of
      * the IR!!
      */
     private static class SSA2LocalMap implements com.ibm.wala.ssa.IR.SSA2LocalMap {
@@ -1400,7 +1379,7 @@
         private final DexCFG dexCFG;
 
         /**
-         * Mapping Integer -> IntPair where p maps to (vn,L) iff we've started a range at pc p where value number vn corresponds to
+         * Mapping Integer -&gt; IntPair where p maps to (vn,L) iff we've started a range at pc p where value number vn corresponds to
          * local L
          */
         private final IntPair[] localStoreMap;
@@ -1434,7 +1413,7 @@
 		void startRange(int pc, int localNumber, int valueNumber) {
             int max = ((DexIMethod)dexCFG.getMethod()).getMaxLocals();
             if (localNumber >= max) {
-                assert false : "invalid local " + localNumber + ">" + max;
+                assert false : "invalid local " + localNumber + '>' + max;
             }
 
             localStoreMap[pc] = new IntPair(valueNumber, localNumber);
@@ -1444,8 +1423,7 @@
          * Finish populating the map of local variable information
          */
         private void finishLocalMap(DexSSABuilder builder) {
-            for (Iterator<BasicBlock> it = dexCFG.iterator(); it.hasNext();) {
-                BasicBlock bb = it.next();
+            for (BasicBlock bb : dexCFG) {
                 MachineState S = builder.getIn(bb);
                 int number = bb.getNumber();
                 block2LocalState[number] = S.getLocals();
@@ -1456,6 +1434,7 @@
          * @param index - index into IR instruction array
          * @param vn - value number
          */
+        @Override
         public String[] getLocalNames(int index, int vn) {
             try {
                 if (!dexCFG.getMethod().hasLocalVariableTable()) {
@@ -1516,10 +1495,10 @@
         /**
          * @return the indices i s.t. x[i] == y, or null if none found.
          */
-        private int[] extractIndices(int[] x, int y) {
+        private static int[] extractIndices(int[] x, int y) {
             int count = 0;
-            for (int i = 0; i < x.length; i++) {
-                if (x[i] == y) {
+            for (int element : x) {
+                if (element == y) {
                     count++;
                 }
             }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidAnalysisScope.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidAnalysisScope.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidAnalysisScope.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidAnalysisScope.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,22 +26,43 @@
 import com.ibm.wala.util.config.FileOfClasses;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.io.FileProvider;
+import org.jf.dexlib2.DexFileFactory;
+import org.jf.dexlib2.Opcodes;
+import org.jf.dexlib2.dexbacked.DexBackedDexFile;
+import org.jf.dexlib2.iface.MultiDexContainer;
 
 public class AndroidAnalysisScope {
 
 	private static final String BASIC_FILE = "primordial.txt";
 
-	public static AnalysisScope setUpAndroidAnalysisScope(URI classpath, String exclusions, ClassLoader loader, URI... androidLib) throws IOException {
+	/**
+	 * Creates an Android Analysis Scope
+	 * @param codeFileName  the name of a .oat|.apk|.dex file
+	 * @param exclusions  the name of the exclusions file (nullable)
+	 * @param loader  the classloader to use
+	 * @param androidLib  an array of libraries (e.g. the Android SDK jar) to add to the scope
+	 * @return  a {@link AnalysisScope}
+	 */
+	public static AnalysisScope setUpAndroidAnalysisScope(URI codeFileName, String exclusions, ClassLoader loader, URI... androidLib) throws IOException {
+		return setUpAndroidAnalysisScope(codeFileName, DexFileModule.AUTO_INFER_API_LEVEL, exclusions, loader, androidLib);
+	}
+
+
+	public static AnalysisScope setUpAndroidAnalysisScope(URI codeFileName, int apiLevel, String exclusions, ClassLoader loader, URI... androidLib) throws IOException {
 		AnalysisScope scope;
+		File exclusionsFile = exclusions != null? new File(exclusions) : null;
+
 		if (androidLib == null || androidLib.length == 0) {
-			scope = AnalysisScopeReader.readJavaScope(BASIC_FILE, new File(exclusions), loader);
+			scope = AnalysisScopeReader.readJavaScope(BASIC_FILE, exclusionsFile, loader);
 		} else {
 			scope = AnalysisScope.createJavaAnalysisScope();
 
-			File exclusionsFile = new File(exclusions);
-	        InputStream fs = exclusionsFile.exists()? new FileInputStream(exclusionsFile): FileProvider.class.getClassLoader().getResourceAsStream(exclusionsFile.getName());
-	        scope.setExclusions(new FileOfClasses(fs));
-	        
+			if (exclusionsFile != null) {
+				try (final InputStream fs = exclusionsFile.exists() ? new FileInputStream(exclusionsFile) : FileProvider.class.getClassLoader().getResourceAsStream(exclusionsFile.getName())) {
+					scope.setExclusions(new FileOfClasses(fs));
+				}
+			}
+
 			scope.setLoaderImpl(ClassLoaderReference.Primordial,
 					"com.ibm.wala.dalvik.classLoader.WDexClassLoaderImpl");
 
@@ -49,27 +70,33 @@
 				try {
 					scope.addToScope(ClassLoaderReference.Primordial, DexFileModule.make(new File(al)));
 				} catch (Exception e) {
-					e.printStackTrace();
-					scope.addToScope(ClassLoaderReference.Primordial, new JarFileModule(new JarFile(new File(al))));					
+					scope.addToScope(ClassLoaderReference.Primordial, new JarFileModule(new JarFile(new File(al))));
 				}
 			}
-
 		}
 
 		scope.setLoaderImpl(ClassLoaderReference.Application,
 				"com.ibm.wala.dalvik.classLoader.WDexClassLoaderImpl");
 
-		scope.addToScope(ClassLoaderReference.Application, DexFileModule.make(new File(classpath)));
-		
+		File codeFile = new File(codeFileName);
+		boolean isContainerFile = codeFile.getName().endsWith(".oat") || codeFile.getName().endsWith(".apk");
+
+		if (isContainerFile) {
+			MultiDexContainer<? extends DexBackedDexFile> multiDex = DexFileFactory.loadDexContainer(codeFile, apiLevel == DexFileModule.AUTO_INFER_API_LEVEL ? null : Opcodes.forApi(apiLevel));
+
+			for (String dexEntry : multiDex.getDexEntryNames()) {
+				scope.addToScope(ClassLoaderReference.Application, new DexFileModule(codeFile, dexEntry, apiLevel));
+			}
+		} else {
+			scope.addToScope(ClassLoaderReference.Application, DexFileModule.make(codeFile, apiLevel));
+		}
+
 		return scope;
 	}
-	
+
+
 	/**
 	 * Handle .apk file.
-	 * 
-	 * @param classPath
-	 * @param scope
-	 * @param loader
 	 */
 	public static void addClassPathToScope(String classPath,
 			AnalysisScope scope, ClassLoaderReference loader) {
@@ -79,14 +106,14 @@
 		try {
 			String[] paths = classPath.split(File.pathSeparator);
 
-			for (int i = 0; i < paths.length; i++) {
-				if (paths[i].endsWith(".jar")
-						|| paths[i].endsWith(".apk")
-						|| paths[i].endsWith(".dex")) { // Handle android file.
-					File f = new File(paths[i]);
+			for (String path : paths) {
+				if (path.endsWith(".jar")
+						|| path.endsWith(".apk")
+						|| path.endsWith(".dex")) { // Handle android file.
+					File f = new File(path);
 					scope.addToScope(loader, DexFileModule.make(f));
 				} else {
-					File f = new File(paths[i]);
+					File f = new File(path);
 					if (f.isDirectory()) { // handle directory FIXME not working
 											// for .dex and .apk files into that
 											// directory
@@ -97,7 +124,7 @@
 							scope.addClassFileToScope(loader, f);
 						} catch (InvalidClassFileException e) {
 							throw new IllegalArgumentException(
-									"Invalid class file");
+									"Invalid class file", e);
 						}
 					}
 				}
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidComponent.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidComponent.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidComponent.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidComponent.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,7 +50,7 @@
 /**
  *  Android Components like Activity, Service, ...
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-16
  */
 public enum AndroidComponent {
@@ -239,6 +239,7 @@
      *  @return the corresponding Enum-Element or AndroidComponent.UNKNOWN
      */
     public static AndroidComponent from(final IMethod method, final IClassHierarchy cha) {
+        if (method == null) return AndroidComponent.UNKNOWN;
         IClass type = method.getDeclaringClass();
 
         if (type == null) {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointLocator.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointLocator.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointLocator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointLocator.java	2019-01-29 17:08:39.000000000 +0000
@@ -78,7 +78,7 @@
  *  Iterates the ClassHierarchy matching its elements to a set of hardcoded entrypoint-specifications.
  *  Then optionally uses heuristics to select further entrypoints.
  *
- *  @author     Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author     Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public final class AndroidEntryPointLocator {
     private static final Logger logger = LoggerFactory.getLogger(AndroidEntryPointLocator.class);
@@ -118,7 +118,7 @@
         WITH_ANDROID
     }
 
-    private final static List<AndroidPossibleEntryPoint> possibleEntryPoints = new ArrayList<AndroidPossibleEntryPoint>();
+    private final static List<AndroidPossibleEntryPoint> possibleEntryPoints = new ArrayList<>();
     protected final Set<LocatorFlags> flags;
 
     public AndroidEntryPointLocator(final Set<LocatorFlags> flags) {
@@ -146,16 +146,26 @@
             throw new IllegalArgumentException("I need a ClassHierarchy to search");
         }
 
-        Set<AndroidEntryPoint> entryPoints = new HashSet<AndroidEntryPoint>();
+        Set<AndroidEntryPoint> entryPoints = new HashSet<>();
 
         mon.beginTask("Locating Entrypoints", IProgressMonitor.UNKNOWN);
         int dummy = 0;  // for the progress monitor
         for (IClass cls : cha) {
             mon.worked(dummy++);
+            if (cls.getName().toString().contains("MainActivity")) {
+            	System.err.println("got here");
+            }
             if (isExcluded(cls)) continue;
-            if (!cls.isInterface() && !cls.isAbstract() && cls.getClassLoader().getName().equals(AnalysisScope.APPLICATION)) {
+            if (!cls.isInterface() && 
+            	!cls.isAbstract() && 
+            	!( cls.getClassLoader().getName().equals(AnalysisScope.PRIMORDIAL) ||
+            	   cls.getClassLoader().getName().equals(AnalysisScope.EXTENSION)
+            	 )) {
 nextMethod:
                 for (final IMethod m : cls.getDeclaredMethods()) {
+                    if (cls.getName().toString().contains("MainActivity")) {
+                    	System.err.println("got here: " + m);
+                    }
                 	// If there is a Method signature in the possible entry points use thatone
                     for (AndroidPossibleEntryPoint e: possibleEntryPoints) {
                         if (e.name.equals(m.getName().toString()) ) {
@@ -173,7 +183,7 @@
         } // for IClass : cha
 
         if (this.flags.contains(LocatorFlags.EP_HEURISTIC) || this.flags.contains(LocatorFlags.CB_HEURISTIC)) {
-            final Set<TypeReference> bases = new HashSet<TypeReference>();
+            final Set<TypeReference> bases = new HashSet<>();
 
             if (this.flags.contains(LocatorFlags.EP_HEURISTIC)) {
                 // Add bases for EP-Heuristic
@@ -191,7 +201,7 @@
                     // Restrict the set
                     bases.add(AndroidTypes.Application);
                     bases.add(AndroidTypes.Activity);
-                    /** @todo TODO: add Fragments in getEntryPoints */
+                    /** TODO: TODO: add Fragments in getEntryPoints */
                     //bases.add(AndroidTypes.Fragment);
                     bases.add(AndroidTypes.Service);
                     bases.add(AndroidTypes.ContentProvider);
@@ -206,7 +216,7 @@
         }
 
 
-        List<AndroidEntryPoint> ret = new ArrayList<AndroidEntryPoint>(entryPoints);
+        List<AndroidEntryPoint> ret = new ArrayList<>(entryPoints);
         Collections.sort(ret, new AndroidEntryPoint.ExecutionOrderComperator());
         mon.done();
         return ret;
@@ -238,7 +248,7 @@
                     // Don't consider internal overrides
                     continue;
                 }
-                final Collection<IMethod> methods = candid.getDeclaredMethods();
+                final Collection<? extends IMethod> methods = candid.getDeclaredMethods();
                 for (final IMethod method : methods) {
 
 
@@ -249,10 +259,8 @@
                     if (baseClass.getMethod(method.getSelector()) != null) {
                         final AndroidEntryPoint ep = makeEntryPointForHeuristic(method, cha);
                        
-                        if (! eps.contains(ep)) {  // Just to be sure that a previous element stays as-is
-                            if (eps.add(ep)) {
-                                logger.debug("Heuristic 1: selecting {} for base {}", method, base);
-                            }
+                        if (eps.add(ep)) {  // Just to be sure that a previous element stays as-is
+                            logger.debug("Heuristic 1: selecting {} for base {}", method, base);
                         }
                     }
                 }
@@ -264,7 +272,7 @@
 //        return test.getName().toString().contains("$"); // PRETTY!
 //    }
 
-    private AndroidEntryPoint makeEntryPointForHeuristic(final IMethod method, final IClassHierarchy cha) {
+    private static AndroidEntryPoint makeEntryPointForHeuristic(final IMethod method, final IClassHierarchy cha) {
         AndroidComponent compo;
         { // Guess component
             compo = AndroidComponent.from(method, cha);
@@ -272,7 +280,7 @@
 
             }
         }
-        final AndroidEntryPoint ep = new AndroidEntryPoint(selectPositionForHeuristic(method), method, cha, compo);
+        final AndroidEntryPoint ep = new AndroidEntryPoint(selectPositionForHeuristic(), method, cha, compo);
 
         return ep;
     }
@@ -319,7 +327,7 @@
             { // Overridden methods
                 if (isAPIComponent(appClass)) continue;
                 if (isExcluded(appClass)) continue;
-                final Collection<IMethod> methods = appClass.getDeclaredMethods();
+                final Collection<? extends IMethod> methods = appClass.getDeclaredMethods();
                 for (final IMethod method : methods) {
                     if ((method.isInit() || method.isClinit()) && (! this.flags.contains(LocatorFlags.WITH_CTOR))) {
                         logger.debug("Skipping constructor of {}", method); 
@@ -330,10 +338,9 @@
                     if (androidClass.getMethod(method.getSelector()) != null) {
                         final AndroidEntryPoint ep = makeEntryPointForHeuristic(method, cha);
 
-                        if (! eps.contains(ep)) {  // Just to be sure that a previous element stays as-is
-                        if (eps.add(ep)) {
+                        if (eps.add(ep)) {  // Just to be sure that a previous element stays as-is
                             logger.debug("Heuristic 2a: selecting {}", method);
-                        }} else {
+                        } else {
                             logger.debug("Heuristic 2a: already selected {}", method);
                         }
                     }
@@ -349,18 +356,17 @@
                     }
                     if (isExcluded(iFace)) continue;
                     logger.debug("Searching Interface {}", iFace);
-                    final Collection<IMethod> ifMethods = iFace.getDeclaredMethods();
+                    final Collection<? extends IMethod> ifMethods = iFace.getDeclaredMethods();
                     for (final IMethod ifMethod : ifMethods) {
                         final IMethod method = appClass.getMethod(ifMethod.getSelector());
                         if (method != null && method.getDeclaringClass().getClassLoader().getReference().equals(ClassLoaderReference.Application)) {
                             // The function is overridden
-                            final AndroidEntryPoint ep = new AndroidEntryPoint(selectPositionForHeuristic(method), method, cha);
+                            final AndroidEntryPoint ep = new AndroidEntryPoint(selectPositionForHeuristic(), method, cha);
 
-                            if (! eps.contains(ep)) {  // Just to be sure that a previous element stays as-is
-                            if (eps.add(ep)) {
+                            if (eps.add(ep)) {  // Just to be sure that a previous element stays as-is
                                 logger.debug("Heuristic 2b: selecting {}", method);
-                            }}
-                        } else {
+                            }
+                        } else if (method != null) {
                             // The function is taken from the super-class
                             if (this.flags.contains(LocatorFlags.WITH_SUPER)) {
                                 final AndroidEntryPoint ep = makeEntryPointForHeuristic(method, cha);
@@ -370,8 +376,7 @@
                                     for (final AndroidEntryPoint eps_ep : eps) {
                                         if (eps_ep.equals(ep)) {
                                             final TypeReference[] oldTypes = eps_ep.getParameterTypes(0);
-                                            final TypeReference[] newTypes = new TypeReference[oldTypes.length + 1];
-                                            System.arraycopy(oldTypes, 0, newTypes, 0, oldTypes.length);
+                                            final TypeReference[] newTypes = Arrays.copyOf(oldTypes, oldTypes.length + 1);
                                             newTypes[oldTypes.length] = appClass.getReference();
                                             eps_ep.setParameterTypes(0, newTypes);
                                             logger.debug("New This-Types for {} are {}", method.getSelector(), Arrays.toString(newTypes));
@@ -394,12 +399,13 @@
         }
     }
 
-    private boolean isAPIComponent(final IMethod method) {
+    private static boolean isAPIComponent(final IMethod method) {
         return isAPIComponent(method.getDeclaringClass());
     }
 
-    private boolean isAPIComponent(final IClass cls) {
-        if (cls.getClassLoader().getReference().equals(ClassLoaderReference.Application)) {
+    private static boolean isAPIComponent(final IClass cls) {
+        ClassLoaderReference clr = cls.getClassLoader().getReference();
+		if (! (clr.equals(ClassLoaderReference.Primordial) || clr.equals(ClassLoaderReference.Extension))) {
             if (cls.getName().toString().startsWith("Landroid/")) {
                 return true;
             }
@@ -409,7 +415,7 @@
         }
     }
 
-    private boolean isExcluded(final IClass cls) {
+    private static boolean isExcluded(final IClass cls) {
     	final SetOfClasses set = cls.getClassHierarchy().getScope().getExclusions();
     	if (set == null) {
     		return false; // exclusions null ==> no exclusions ==> no class is excluded
@@ -424,7 +430,7 @@
      *
      *  Currently all methods are placed at ExecutionOrder.MULTIPLE_TIMES_IN_LOOP.
      */
-    private ExecutionOrder selectPositionForHeuristic(IMethod method) {
+    private static ExecutionOrder selectPositionForHeuristic() {
         return ExecutionOrder.MULTIPLE_TIMES_IN_LOOP;
     }
 
@@ -443,21 +449,22 @@
         private final String name;
         public final AndroidEntryPoint.ExecutionOrder order;
 
-        public AndroidPossibleEntryPoint(AndroidComponent c, String n, ExecutionOrder o) { 
+        public AndroidPossibleEntryPoint(String n, ExecutionOrder o) {
 //            cls = c; 
             name = n; 
             order = o; 
         }
  
-        public AndroidPossibleEntryPoint(AndroidComponent c, String n, AndroidPossibleEntryPoint o) { 
+        public AndroidPossibleEntryPoint(String n, AndroidPossibleEntryPoint o) {
 //            cls = c; 
             name = n; 
             order = o.order; 
         }
        
-        public int getOrderValue() { return order.getOrderValue(); }
-        public int compareTo(AndroidEntryPoint.IExecutionOrder o) { return order.compareTo(o); }
-        public AndroidEntryPoint.ExecutionOrder getSection() { return order.getSection(); }
+        @Override public int getOrderValue() { return order.getOrderValue(); }
+        @Override public int compareTo(AndroidEntryPoint.IExecutionOrder o) { return order.compareTo(o); }
+        @Override public AndroidEntryPoint.ExecutionOrder getSection() { return order.getSection(); }
+
         public static class ExecutionOrderComperator implements Comparator<AndroidPossibleEntryPoint> {
             @Override public int compare(AndroidPossibleEntryPoint a, AndroidPossibleEntryPoint b) {
                 return a.order.compareTo(b.order);
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointManager.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointManager.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointManager.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointManager.java	2019-01-29 17:08:39.000000000 +0000
@@ -76,13 +76,13 @@
  *
  *  See the single settings for further description.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public final /* singleton */ class AndroidEntryPointManager implements Serializable {
     private static final Logger logger = LoggerFactory.getLogger(AndroidEntryPointManager.class);
 
     public static AndroidEntryPointManager MANAGER = new AndroidEntryPointManager();
-    public static List<AndroidEntryPoint> ENTRIES = new ArrayList<AndroidEntryPoint>();
+    public static List<AndroidEntryPoint> ENTRIES = new ArrayList<>();
     /**
      * This is TRANSIENT!
      */
@@ -94,7 +94,7 @@
     /**
      *  Determines if any EntryPoint extends the specified component.
      */
-    public boolean EPContainAny(AndroidComponent compo) {
+    public static boolean EPContainAny(AndroidComponent compo) {
         for (AndroidEntryPoint ep: ENTRIES) {
             if (ep.belongsTo(compo)) {
                 return true;
@@ -106,16 +106,16 @@
     private AndroidEntryPointManager() {}
 
     public static void reset() {
-        ENTRIES = new ArrayList<AndroidEntryPoint>();
+        ENTRIES = new ArrayList<>();
         MANAGER = new AndroidEntryPointManager();
     }
 
-    public Set<TypeReference> getComponents() {
+    public static Set<TypeReference> getComponents() {
         if (ENTRIES.isEmpty()) {
             throw new IllegalStateException("No entrypoints loaded yet.");
         }
         
-        final Set<TypeReference> ret = new HashSet<TypeReference>();
+        final Set<TypeReference> ret = new HashSet<>();
         for (final AndroidEntryPoint ep : ENTRIES) {
             final TypeReference epClass = ep.getMethod().getDeclaringClass().getReference();
             if (AndroidComponent.isAndroidComponent(epClass , ep.getClassHierarchy())) {
@@ -222,7 +222,7 @@
     /**
      *  Whether to generate a global android environment.
      *
-     *  See the {@link #setDoBootSequence()} documentation.
+     *  See the {@link #setDoBootSequence} documentation.
      *
      *  @return the setting, defaults to true
      */
@@ -252,7 +252,7 @@
         return prev;
     }
 
-    private Class abstractAndroidModel = LoopAndroidModel.class;
+    private Class<? extends AbstractAndroidModel> abstractAndroidModel = LoopAndroidModel.class;
     /**
      *  What special handling to insert into the model.
      *
@@ -271,13 +271,13 @@
             return new LoopAndroidModel(body, insts, paramManager, entryPoints);
         } else {
             try {
-                final Constructor<AbstractAndroidModel> ctor = this.abstractAndroidModel.getDeclaredConstructor(
+                final Constructor<? extends AbstractAndroidModel> ctor = this.abstractAndroidModel.getDeclaredConstructor(
                     VolatileMethodSummary.class, TypeSafeInstructionFactory.class, SSAValueManager.class,
                     Iterable.class);
                 if (ctor == null) {
                     throw new IllegalStateException("Canot find the constructor of " + this.abstractAndroidModel);
                 }
-                return (AbstractAndroidModel) ctor.newInstance(body, insts, paramManager, entryPoints);
+                return ctor.newInstance(body, insts, paramManager, entryPoints);
             } catch (java.lang.InstantiationException e) {
                 throw new IllegalStateException(e);
             } catch (java.lang.IllegalAccessException e) {
@@ -293,31 +293,27 @@
     /**
      *  The behavior set using setModelBehavior(Class).
      *
-     *  Use {@link makeModelBehavior(VolatileMethodSummary, JavaInstructionFactory, AndroidModelParameterManager, Iterable<? extends Entrypoint>} 
+     *  Use {@link #makeModelBehavior}
      *  to retrieve an instance of this class.
      *
      *  If no class was set it returns null, makeModelBehavior will generate a LoopAndroidModel by default.
      *
      *  @return null or the class set using setModelBehavior
      */
-    public Class getModelBehavior() {
+    public Class<? extends AbstractAndroidModel> getModelBehavior() {
         return this.abstractAndroidModel;
     }
 
     /**
      *  Set the class instantiated by makeModelBehavior.
      *
-     *  @throws IllgealArgumentException if the abstractAndroidModel does not subclass AbstractAndroidModel
+     *  @throws IllegalArgumentException if the abstractAndroidModel is null
      */
-    public void setModelBehavior(Class abstractAndroidModel) {
+    public void setModelBehavior(Class<? extends AbstractAndroidModel> abstractAndroidModel) {
         if (abstractAndroidModel == null) {
             throw new IllegalArgumentException("abstractAndroidModel may not be null. Use SequentialAndroidModel " +
                     "if no special handling shall be inserted.");
         }
-        if (! AbstractAndroidModel.class.isAssignableFrom(abstractAndroidModel)) {
-            throw new IllegalArgumentException("The given argument abstractAndroidModel does not subclass " +
-                    "AbtractAndroidModel");
-        }
         this.abstractAndroidModel = abstractAndroidModel;
     }
 
@@ -366,7 +362,7 @@
      *  See: {@link #setPackage(String)}
      *
      *  @return The package or null if it was indeterminable.
-     *  @see    guessPacakge()
+     *  @see    #guessPackage()
      */
     public String getPackage() {
         if (this.pack == null) {
@@ -384,7 +380,7 @@
      *  the package based on the first entrypoint.
      *
      *  @return The package or null if it was indeterminable.
-     *  @see    getPackage()
+     *  @see    #getPackage()
      */
     public String guessPackage() {
         if (this.pack != null) {
@@ -422,7 +418,7 @@
      *  @param  intent  An Intent with more or the same information as known to the system before.
      *  @throws IllegalArgumentException if you lower the information on an already registered Intent or the 
      *      information is incompatible.
-     *  @see    registerIntentForce()
+     *  @see    #registerIntentForce
      */
     public void registerIntent(Intent intent) {
         if (overrideIntents.containsKey(intent)) {
@@ -480,7 +476,7 @@
      *
      *  @param  from    the Intent to override
      *  @param  to      the new Intent to resolve once 'from' is seen
-     *  @see    setOverrideForce()
+     *  @see    #setOverrideForce
      *  @throws IllegalArgumentException if you override an Intent with itself
      */
     public void setOverride(Intent from, Intent to) {
@@ -536,7 +532,7 @@
         }
     }
 
-    public static final Map<Intent, Intent> DEFAULT_INTENT_OVERRIDES = new HashMap<Intent, Intent>();
+    public static final Map<Intent, Intent> DEFAULT_INTENT_OVERRIDES = new HashMap<>();
     static {
         DEFAULT_INTENT_OVERRIDES.put(
                 new AndroidSettingFactory.ExternalIntent("Landroid/intent/action/DIAL"),
@@ -549,12 +545,13 @@
      *  See {@link #setOverride(Intent, Intent)}. 
      */
     public void setOverrides(Map<Intent, Intent> overrides) {
-        for (final Intent from : overrides.keySet()) {
-            final Intent to = overrides.get(from);
+        for (final Map.Entry<Intent, Intent> entry : overrides.entrySet()) {
+            final Intent from = entry.getKey();
+            final Intent to = entry.getValue();
             if (from.equals(to)) {
                 registerIntent(to);
             } else {
-                setOverride(from, overrides.get(from));
+                setOverride(from, to);
             }
         }
     }
@@ -587,7 +584,7 @@
      *  @param  intent  The intent to resolve
      *  @return where to resolve it to or the given intent if no information is available
      *
-     *  @todo TODO: Malicious Intent-Table could cause endless loops
+     *  TODO: TODO: Malicious Intent-Table could cause endless loops
      */
     public Intent getIntent(Intent intent) {
         if (overrideIntents.containsKey(intent)) {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ActivityEP.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ActivityEP.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ActivityEP.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ActivityEP.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,7 +44,6 @@
 
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint;
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.ExecutionOrder;
-import com.ibm.wala.dalvik.util.AndroidComponent;
 import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoint;
 
 /**
@@ -53,7 +52,7 @@
  *  The specifications are read and handled by AndroidEntryPointLocator.
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public final class ActivityEP {
 	// see: http://developer.android.com/reference/android/app/Activity.html
@@ -71,9 +70,8 @@
      *  This does not have to be called before Service.onCreate but the user assumably starts most 
      *  apps with an activity we place it slightly before the Services
      */
-    public static final AndroidPossibleEntryPoint onCreate = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY, 
-            "onCreate",
-			ExecutionOrder.after(
+    public static final AndroidPossibleEntryPoint onCreate = new AndroidPossibleEntryPoint("onCreate", 
+            ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.AT_FIRST,
                     // ApplicationEP.onCreate,      // Uncommenting would create a ring-dependency
@@ -90,9 +88,8 @@
      *  Called after onCreate(Bundle) — or after onRestart() when the activity had been stopped, but is now again 
      *  being displayed to the user. It will be followed by onResume(). 
      */
-	public static final AndroidPossibleEntryPoint onStart = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY, 
-            "onStart",
-			ExecutionOrder.after(
+	public static final AndroidPossibleEntryPoint onStart = new AndroidPossibleEntryPoint("onStart", 
+            ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreate, 
                     ExecutionOrder.START_OF_LOOP
@@ -109,8 +106,7 @@
      *
      *  This method is called between onStart() and onPostCreate(Bundle).
      */
-    public static final AndroidPossibleEntryPoint onRestoreInstanceState = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY, 
-            "onRestoreInstanceState",
+    public static final AndroidPossibleEntryPoint onRestoreInstanceState = new AndroidPossibleEntryPoint("onRestoreInstanceState", 
             ExecutionOrder.after(onStart));
 
     /**
@@ -118,8 +114,7 @@
      *
      *  Called after onStart() and onRestoreInstanceState(Bundle)
      */
-    public static final AndroidPossibleEntryPoint onPostCreate = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY, 
-            "onPostCreate",
+    public static final AndroidPossibleEntryPoint onPostCreate = new AndroidPossibleEntryPoint("onPostCreate", 
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onRestoreInstanceState,
@@ -133,9 +128,8 @@
      *  Called after onRestoreInstanceState(Bundle), onRestart(), or onPause()
      *  Use onWindowFocusChanged(boolean) to know for certain that your activity is visible to the user.
      */
-	public static final AndroidPossibleEntryPoint onResume = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY, 
-            "onResume",
-			ExecutionOrder.after(
+	public static final AndroidPossibleEntryPoint onResume = new AndroidPossibleEntryPoint("onResume", 
+            ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
 				    onPostCreate,
                     onRestoreInstanceState,
@@ -147,8 +141,7 @@
     /**
      *  Called when activity resume is complete.
      */
-    public static final AndroidPossibleEntryPoint onPostResume = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY, 
-            "onPostResume",
+    public static final AndroidPossibleEntryPoint onPostResume = new AndroidPossibleEntryPoint("onPostResume", 
             ExecutionOrder.after(onResume));
 
     /**
@@ -157,8 +150,7 @@
      *
      *  An activity will always be paused before receiving a new intent, so you can count on onResume() being called after this method. 
      */
-    public static final AndroidPossibleEntryPoint onNewIntent = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onNewIntent",
+    public static final AndroidPossibleEntryPoint onNewIntent = new AndroidPossibleEntryPoint("onNewIntent",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onPostCreate,
@@ -172,10 +164,9 @@
      *
      *  Next call will be either onRestart(), onDestroy(), or nothing, depending on later user activity. 
      */
-	public static final AndroidPossibleEntryPoint onStop = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY, 
-            "onStop",
+	public static final AndroidPossibleEntryPoint onStop = new AndroidPossibleEntryPoint("onStop", 
             ExecutionOrder.after(
-    			ExecutionOrder.AFTER_LOOP
+            ExecutionOrder.END_OF_LOOP
             ));
 
     /**
@@ -183,9 +174,8 @@
      *
      *  Called after onStop(), followed by onStart() and then onResume(). 
      */
-	public static final AndroidPossibleEntryPoint onRestart = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY, 
-            "onRestart",
-			ExecutionOrder.after(onStop) );
+	public static final AndroidPossibleEntryPoint onRestart = new AndroidPossibleEntryPoint("onRestart", 
+            ExecutionOrder.after(onStop) );
 
 
     /**
@@ -196,9 +186,8 @@
      *  If called, this method will occur before onStop(). There are no guarantees about whether it will 
      *  occur before or after onPause().
      */
-   public static final AndroidPossibleEntryPoint onSaveInstanceState = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY, 
-           "onSaveInstanceState",
-            ExecutionOrder.after(onPostResume));
+   public static final AndroidPossibleEntryPoint onSaveInstanceState = new AndroidPossibleEntryPoint("onSaveInstanceState", 
+           ExecutionOrder.after(onPostResume));
 
    /**
     *   Activity is going to the background.
@@ -212,9 +201,8 @@
     *   After receiving this call you will usually receive a following call to onStop()
     *   however in some cases there will be a direct call back to onResume() without going through the stopped state.
     */
-	public static final AndroidPossibleEntryPoint onPause = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY, 
-            "onPause",
-			ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
+	public static final AndroidPossibleEntryPoint onPause = new AndroidPossibleEntryPoint("onPause", 
+            ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
 				onResume,
 				onSaveInstanceState,
 				ExecutionOrder.MIDDLE_OF_LOOP
@@ -225,8 +213,7 @@
      *  Someone called finish() on the Activity, or the system is temporarily destroying this Activity to save space.
      *  There are situations where the system will simply kill the activity's hosting process without calling this method.
      */
-	public static final AndroidPossibleEntryPoint onDestroy = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY, 
-            "onDestroy",
+	public static final AndroidPossibleEntryPoint onDestroy = new AndroidPossibleEntryPoint("onDestroy", 
             ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
                 onStop,
     			ExecutionOrder.AT_LAST
@@ -235,9 +222,8 @@
     /**
      *  Called when an Activity started by this one returns its result.
      */
-	public static final AndroidPossibleEntryPoint onActivityResult = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY, 
-            "onActivityResult",
-			ExecutionOrder.after(
+	public static final AndroidPossibleEntryPoint onActivityResult = new AndroidPossibleEntryPoint("onActivityResult", 
+            ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.MULTIPLE_TIMES_IN_LOOP,
                     // If this Activity starts an notherone it most certainly goes into background so
@@ -254,8 +240,7 @@
      *
      * TODO: Assert included everywhere
      */
-    public static final AndroidPossibleEntryPoint dispatchPopulateAccessibilityEvent = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "dispatchPopulateAccessibilityEvent",
+    public static final AndroidPossibleEntryPoint dispatchPopulateAccessibilityEvent = new AndroidPossibleEntryPoint("dispatchPopulateAccessibilityEvent",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.AT_FIRST,
@@ -290,8 +275,7 @@
      *
      *  This method was deprecated in API level 13.
      */
-    public static final AndroidPossibleEntryPoint onCreateDialog = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onCreateDialog",
+    public static final AndroidPossibleEntryPoint onCreateDialog = new AndroidPossibleEntryPoint("onCreateDialog",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     getVisible,
@@ -305,8 +289,7 @@
      *
      *  This method was deprecated in API level 13.
      */
-    public static final AndroidPossibleEntryPoint onPrepareDialog = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onPrepareDialog",
+    public static final AndroidPossibleEntryPoint onPrepareDialog = new AndroidPossibleEntryPoint("onPrepareDialog",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreateDialog,
@@ -321,8 +304,7 @@
      * TODO: More info 
      *  This implementation handles tags to embed fragments inside of the activity.
      */
-    public static final AndroidPossibleEntryPoint onCreateView = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onCreateView",
+    public static final AndroidPossibleEntryPoint onCreateView = new AndroidPossibleEntryPoint("onCreateView",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     getVisible,
@@ -335,8 +317,7 @@
      *  Called when a Fragment is being attached to this activity, immediately after the call to its 
      *  Fragment.onAttach() method and before Fragment.onCreate(). 
      */
-    public static final AndroidPossibleEntryPoint onAttachFragment = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onAttachFragment",
+    public static final AndroidPossibleEntryPoint onAttachFragment = new AndroidPossibleEntryPoint("onAttachFragment",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreateView,
@@ -352,8 +333,7 @@
      *  Note that this function is guaranteed to be called before View.onDraw
      *  including before or after onMeasure(int, int).
      */
-    public static final AndroidPossibleEntryPoint onAttachedToWindow = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onAttachedToWindow",
+    public static final AndroidPossibleEntryPoint onAttachedToWindow = new AndroidPossibleEntryPoint("onAttachedToWindow",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreateView,
@@ -366,8 +346,7 @@
      *  Called when the main window associated with the activity has been detached from the window manager. 
      *  See View.onDetachedFromWindow() for more information.   # TODO See
      */
-     public static final AndroidPossibleEntryPoint onDetachedFromWindow = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onDetachedFromWindow",
+     public static final AndroidPossibleEntryPoint onDetachedFromWindow = new AndroidPossibleEntryPoint("onDetachedFromWindow",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onAttachedToWindow,
@@ -386,8 +365,7 @@
      *
      *  Due to a call to Window.setContentView or Window.addContentView
      */
-     public static final AndroidPossibleEntryPoint onContentChanged = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onContentChanged",
+     public static final AndroidPossibleEntryPoint onContentChanged = new AndroidPossibleEntryPoint("onContentChanged",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreateView,
@@ -406,8 +384,7 @@
       *
       * TODO: Do we have to register an entrypoint for this?
       */
-     public static final AndroidPossibleEntryPoint onApplyThemeResource = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-             "onApplyThemeResource",
+     public static final AndroidPossibleEntryPoint onApplyThemeResource = new AndroidPossibleEntryPoint("onApplyThemeResource",
              ExecutionOrder.directlyAfter(onStart)   // Narf
              );
 
@@ -417,8 +394,7 @@
      *
      *  This simply returns null so that all panel sub-windows will have the default menu behavior. 
      */
-    public static final AndroidPossibleEntryPoint onCreatePanelView = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onCreatePanelView",
+    public static final AndroidPossibleEntryPoint onCreatePanelView = new AndroidPossibleEntryPoint("onCreatePanelView",
             ExecutionOrder.between(
                 getVisible,
                 allInitialViewsSetUp
@@ -429,8 +405,7 @@
      *
      *  This calls through to the new onCreateOptionsMenu(Menu) method for the FEATURE_OPTIONS_PANEL panel
      */
-    public static final AndroidPossibleEntryPoint onCreatePanelMenu = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onCreatePanelMenu",
+    public static final AndroidPossibleEntryPoint onCreatePanelMenu = new AndroidPossibleEntryPoint("onCreatePanelMenu",
             ExecutionOrder.between(
                 getVisible,
                 allInitialViewsSetUp
@@ -441,8 +416,7 @@
      *
      *  This calls through to the new onPrepareOptionsMenu(Menu) method for the FEATURE_OPTIONS_PANEL 
      */
-    public static final AndroidPossibleEntryPoint onPreparePanel = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onPreparePanel",
+    public static final AndroidPossibleEntryPoint onPreparePanel = new AndroidPossibleEntryPoint("onPreparePanel",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     getVisible,
@@ -459,8 +433,7 @@
      *  This calls through to onOptionsMenuClosed(Menu) method for the FEATURE_OPTIONS_PANEL.
      *  For context menus (FEATURE_CONTEXT_MENU), the onContextMenuClosed(Menu) will be called. 
      */
-    public static final AndroidPossibleEntryPoint onPanelClosed = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onPanelClosed",
+    public static final AndroidPossibleEntryPoint onPanelClosed = new AndroidPossibleEntryPoint("onPanelClosed",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreatePanelMenu,                  
@@ -480,8 +453,7 @@
      *
      * Use onContextItemSelected(android.view.MenuItem) to know when an item has been selected. 
      */
-    public static final AndroidPossibleEntryPoint onCreateContextMenu = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onCreateContextMenu",
+    public static final AndroidPossibleEntryPoint onCreateContextMenu = new AndroidPossibleEntryPoint("onCreateContextMenu",
             ExecutionOrder.between(
                 getVisible,
                 allInitialViewsSetUp
@@ -492,8 +464,7 @@
      * 
      *  You can use this method for any items for which you would like to do processing without those other facilities. 
      */
-    public static final AndroidPossibleEntryPoint onContextItemSelected = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onContextItemSelected",
+    public static final AndroidPossibleEntryPoint onContextItemSelected = new AndroidPossibleEntryPoint("onContextItemSelected",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreateContextMenu,
@@ -508,8 +479,7 @@
      *
      * either by the user canceling the menu with the back/menu button, or when an item is selected.
      */
-    public static final AndroidPossibleEntryPoint onContextMenuClosed = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onContextMenuClosed",
+    public static final AndroidPossibleEntryPoint onContextMenuClosed = new AndroidPossibleEntryPoint("onContextMenuClosed",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreateContextMenu,
@@ -519,17 +489,14 @@
                 ExecutionOrder.AFTER_LOOP   // To much? XXX
             ));
  
-    public static final AndroidPossibleEntryPoint onCreateOptionsMenu = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onCreateOptionsMenu",
+    public static final AndroidPossibleEntryPoint onCreateOptionsMenu = new AndroidPossibleEntryPoint("onCreateOptionsMenu",
             ExecutionOrder.directlyAfter(onCreateContextMenu)   // TODO: Well it behaves different! See onPrepareOptionsMenu, 
             );
-    public static final AndroidPossibleEntryPoint onOptionsItemSelected = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onOptionsItemSelected",
+    public static final AndroidPossibleEntryPoint onOptionsItemSelected = new AndroidPossibleEntryPoint("onOptionsItemSelected",
             ExecutionOrder.directlyAfter(onContextItemSelected)
             );
     
-    public static final AndroidPossibleEntryPoint onPrepareOptionsMenu = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onPrepareOptionsMenu",
+    public static final AndroidPossibleEntryPoint onPrepareOptionsMenu = new AndroidPossibleEntryPoint("onPrepareOptionsMenu",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreateOptionsMenu,
@@ -541,15 +508,13 @@
                 }
             ));
 
-    public static final AndroidPossibleEntryPoint onOptionsMenuClosed = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onOptionsMenuClosed",
+    public static final AndroidPossibleEntryPoint onOptionsMenuClosed = new AndroidPossibleEntryPoint("onOptionsMenuClosed",
             ExecutionOrder.directlyAfter(onContextMenuClosed)
             );
 
     
     /** TODO: More Info */
-    public static final AndroidPossibleEntryPoint onMenuOpened = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onMenuOpened",
+    public static final AndroidPossibleEntryPoint onMenuOpened = new AndroidPossibleEntryPoint("onMenuOpened",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreateOptionsMenu,
@@ -569,8 +534,7 @@
      *
      * This calls through to the new onOptionsItemSelected(MenuItem) 
      */
-     public static final AndroidPossibleEntryPoint onMenuItemSelected = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onMenuItemSelected",
+     public static final AndroidPossibleEntryPoint onMenuItemSelected = new AndroidPossibleEntryPoint("onMenuItemSelected",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreateContextMenu,
@@ -586,13 +550,11 @@
             ));
 
 
-    public static final AndroidPossibleEntryPoint onTitleChanged = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onTitleChanged",
-           ExecutionOrder.directlyAfter(getVisible)  // TODO: What placement to choose?
+    public static final AndroidPossibleEntryPoint onTitleChanged = new AndroidPossibleEntryPoint("onTitleChanged",
+            ExecutionOrder.directlyAfter(getVisible)  // TODO: What placement to choose?
     );
-    public static final AndroidPossibleEntryPoint onChildTitleChanged = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onChildTitleChanged",
-           ExecutionOrder.directlyAfter(onTitleChanged)
+    public static final AndroidPossibleEntryPoint onChildTitleChanged = new AndroidPossibleEntryPoint("onChildTitleChanged",
+            ExecutionOrder.directlyAfter(onTitleChanged)
     );
    
    
@@ -612,8 +574,7 @@
      *  Note that this callback will be invoked for the touch down action that begins a touch gesture, but may not be invoked for 
      *  the touch-moved and touch-up actions that follow.
      */
-    public static final AndroidPossibleEntryPoint onUserInteraction = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onUserInteraction",
+    public static final AndroidPossibleEntryPoint onUserInteraction = new AndroidPossibleEntryPoint("onUserInteraction",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     getVisible,
@@ -623,8 +584,7 @@
                 }
             ));
 
-    public static final AndroidPossibleEntryPoint dispatchTouchEvent = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "dispatchTouchEvent",
+    public static final AndroidPossibleEntryPoint dispatchTouchEvent = new AndroidPossibleEntryPoint("dispatchTouchEvent",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     // TODO: Relation to onGenericMotionEvent
@@ -641,8 +601,7 @@
      *
      *  This is most useful to process touch events that happen outside of your window bounds, where there is no view to receive it.
      */
-    public static final AndroidPossibleEntryPoint onTouchEvent = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onTouchEvent",
+    public static final AndroidPossibleEntryPoint onTouchEvent = new AndroidPossibleEntryPoint("onTouchEvent",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     // TODO: Relation to onGenericMotionEvent
@@ -657,8 +616,7 @@
      *
      *  TODO: Verify before on... stuff
      */
-    public static final AndroidPossibleEntryPoint dispatchGenericMotionEvent = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "dispatchGenericMotionEvent",
+    public static final AndroidPossibleEntryPoint dispatchGenericMotionEvent = new AndroidPossibleEntryPoint("dispatchGenericMotionEvent",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onUserInteraction,  // TODO: Verify
@@ -676,15 +634,13 @@
      *
      *  TODO: After onUserInteraction?
      */
-    public static final AndroidPossibleEntryPoint onGenericMotionEvent = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onGenericMotionEvent",
+    public static final AndroidPossibleEntryPoint onGenericMotionEvent = new AndroidPossibleEntryPoint("onGenericMotionEvent",
             ExecutionOrder.after(
                 dispatchGenericMotionEvent
             ));
 
     
-    public static final AndroidPossibleEntryPoint dispatchTrackballEvent = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "dispatchTrackballEvent",
+    public static final AndroidPossibleEntryPoint dispatchTrackballEvent = new AndroidPossibleEntryPoint("dispatchTrackballEvent",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     dispatchPopulateAccessibilityEvent,
@@ -702,8 +658,7 @@
      *  The call here happens before trackball movements are converted to DPAD key events, which then get sent 
      *  back to the view hierarchy, and will be processed at the point for things like focus navigation.
      */
-    public static final AndroidPossibleEntryPoint onTrackballEvent = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onTrackballEvent",
+    public static final AndroidPossibleEntryPoint onTrackballEvent = new AndroidPossibleEntryPoint("onTrackballEvent",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     dispatchTrackballEvent,
@@ -716,8 +671,7 @@
      *  You can override this to intercept all key events before they are dispatched to the window.
      *  TODO: Verify before on... stuff
      */
-    public static final AndroidPossibleEntryPoint dispatchKeyEvent = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "dispatchKeyEvent",
+    public static final AndroidPossibleEntryPoint dispatchKeyEvent = new AndroidPossibleEntryPoint("dispatchKeyEvent",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onUserInteraction,  // TODO: Verify
@@ -729,8 +683,7 @@
                 }
             ));
 
-    public static final AndroidPossibleEntryPoint dispatchKeyShortcutEvent = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "dispatchKeyShortcutEvent",
+    public static final AndroidPossibleEntryPoint dispatchKeyShortcutEvent = new AndroidPossibleEntryPoint("dispatchKeyShortcutEvent",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     dispatchKeyEvent,
@@ -751,8 +704,7 @@
      *
      * TODO: After onUserInteraction?
      */
-    public static final AndroidPossibleEntryPoint onKeyDown = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onKeyDown",
+    public static final AndroidPossibleEntryPoint onKeyDown = new AndroidPossibleEntryPoint("onKeyDown",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onUserInteraction,
@@ -761,8 +713,7 @@
                 }
             ));
 
-    public static final AndroidPossibleEntryPoint onKeyLongPress = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onKeyLongPress",
+    public static final AndroidPossibleEntryPoint onKeyLongPress = new AndroidPossibleEntryPoint("onKeyLongPress",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     dispatchKeyEvent,
@@ -770,8 +721,7 @@
                 }
             ));
 
-    public static final AndroidPossibleEntryPoint onKeyMultiple = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onKeyMultiple",
+    public static final AndroidPossibleEntryPoint onKeyMultiple = new AndroidPossibleEntryPoint("onKeyMultiple",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     dispatchKeyEvent,
@@ -779,8 +729,7 @@
                 }
             ));
  
-    public static final AndroidPossibleEntryPoint onKeyShortcut = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onKeyShortcut",
+    public static final AndroidPossibleEntryPoint onKeyShortcut = new AndroidPossibleEntryPoint("onKeyShortcut",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     dispatchKeyEvent,
@@ -792,8 +741,7 @@
     /**
      * The default implementation handles KEYCODE_BACK to stop the activity and go back.
      */
-    public static final AndroidPossibleEntryPoint onKeyUp = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onKeyUp",
+    public static final AndroidPossibleEntryPoint onKeyUp = new AndroidPossibleEntryPoint("onKeyUp",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     dispatchKeyEvent,
@@ -804,8 +752,7 @@
                 }
             ));
 
-    public static final AndroidPossibleEntryPoint onBackPressed = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onBackPressed",
+    public static final AndroidPossibleEntryPoint onBackPressed = new AndroidPossibleEntryPoint("onBackPressed",
             ExecutionOrder.after(   // TODO Why is this so late?
                  new AndroidEntryPoint.IExecutionOrder[] {
                     dispatchKeyEvent,
@@ -818,8 +765,7 @@
     /**
      *   This method will be invoked by the default implementation of onNavigateUp() 
      */
-    public static final AndroidPossibleEntryPoint onCreateNavigateUpTaskStack = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onCreateNavigateUpTaskStack",
+    public static final AndroidPossibleEntryPoint onCreateNavigateUpTaskStack = new AndroidPossibleEntryPoint("onCreateNavigateUpTaskStack",
             ExecutionOrder.between(
                  new AndroidEntryPoint.IExecutionOrder[] {
                    ExecutionOrder.START_OF_LOOP 
@@ -835,8 +781,7 @@
     /**
      * Prepare the synthetic task stack that will be generated during Up navigation from a different task. 
      */
-    public static final AndroidPossibleEntryPoint onPrepareNavigateUpTaskStack = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onPrepareNavigateUpTaskStack",
+    public static final AndroidPossibleEntryPoint onPrepareNavigateUpTaskStack = new AndroidPossibleEntryPoint("onPrepareNavigateUpTaskStack",
             ExecutionOrder.between(
                  new AndroidEntryPoint.IExecutionOrder[] {
                     onCreateNavigateUpTaskStack,
@@ -853,9 +798,8 @@
      *  This is called when a child activity of this one attempts to navigate up. 
      *  The default implementation simply calls onNavigateUp() on this activity (the parent).
      */
-    public static final AndroidPossibleEntryPoint onNavigateUpFromChild = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onNavigateUpFromChild",
-             ExecutionOrder.between(
+    public static final AndroidPossibleEntryPoint onNavigateUpFromChild = new AndroidPossibleEntryPoint("onNavigateUpFromChild",
+            ExecutionOrder.between(
                  new AndroidEntryPoint.IExecutionOrder[] {
                     onCreateNavigateUpTaskStack, //No
                      //onBackPressed,     // TODO: Verify
@@ -871,9 +815,8 @@
     /**
      *  This method is called whenever the user chooses to navigate Up within your application's activity hierarchy from the action bar. 
      */
-    public static final AndroidPossibleEntryPoint onNavigateUp = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onNavigateUp",
-             ExecutionOrder.between(
+    public static final AndroidPossibleEntryPoint onNavigateUp = new AndroidPossibleEntryPoint("onNavigateUp",
+            ExecutionOrder.between(
                  new AndroidEntryPoint.IExecutionOrder[] {
                     //onBackPressed,     // TODO: Verify
                     onNavigateUpFromChild
@@ -891,8 +834,7 @@
      *
      *  ..in response to a menu item, search button, or other widgets within your activity.
      */
-    public static final AndroidPossibleEntryPoint  onSearchRequested = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onSearchRequested",
+    public static final AndroidPossibleEntryPoint  onSearchRequested = new AndroidPossibleEntryPoint("onSearchRequested",
             ExecutionOrder.after(
                  new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.MULTIPLE_TIMES_IN_LOOP,
@@ -912,20 +854,17 @@
     /**
      *  Menus may depend on it..
      */
-    public static final AndroidPossibleEntryPoint onActionModeStarted = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onActionModeStarted",
+    public static final AndroidPossibleEntryPoint onActionModeStarted = new AndroidPossibleEntryPoint("onActionModeStarted",
             ExecutionOrder.MULTIPLE_TIMES_IN_LOOP // TODO where to put??
         );
 
-    public static final AndroidPossibleEntryPoint onActionModeFinished = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onActionModeFinished",
+    public static final AndroidPossibleEntryPoint onActionModeFinished = new AndroidPossibleEntryPoint("onActionModeFinished",
             ExecutionOrder.after(onActionModeStarted)
             );
     /**
      * Give the Activity a chance to control the UI for an action mode requested by the system. 
      */
-    public static final AndroidPossibleEntryPoint onWindowStartingActionMode = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onWindowStartingActionMode",
+    public static final AndroidPossibleEntryPoint onWindowStartingActionMode = new AndroidPossibleEntryPoint("onWindowStartingActionMode",
             ExecutionOrder.between(
                 ExecutionOrder.MULTIPLE_TIMES_IN_LOOP, // TODO where to put??
                 onActionModeStarted
@@ -935,8 +874,7 @@
      *  If any configuration change occurs that is not selected to be reported by that attribute, then instead of reporting it the system 
      *  will stop and restart the activity 
      */
-    public static final AndroidPossibleEntryPoint onConfigurationChanged = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onConfigurationChanged",
+    public static final AndroidPossibleEntryPoint onConfigurationChanged = new AndroidPossibleEntryPoint("onConfigurationChanged",
             ExecutionOrder.between( // TODO: Find a nice position
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onStop
@@ -946,8 +884,7 @@
                 }
             ));
 
-    public static final AndroidPossibleEntryPoint onSharedPreferenceChanged = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onSharedPreferenceChanged",
+    public static final AndroidPossibleEntryPoint onSharedPreferenceChanged = new AndroidPossibleEntryPoint("onSharedPreferenceChanged",
             ExecutionOrder.between( // TODO: Find a nice position
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onStop
@@ -960,17 +897,15 @@
     /**
      * This method is called before pausing 
      */
-    public static final AndroidPossibleEntryPoint onCreateDescription = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onCreateDescription",
-             ExecutionOrder.between(
+    public static final AndroidPossibleEntryPoint onCreateDescription = new AndroidPossibleEntryPoint("onCreateDescription",
+            ExecutionOrder.between(
                  onSaveInstanceState,
                  onPause
              ));
     /**
      * This method is called before pausing 
      */
-    public static final AndroidPossibleEntryPoint onCreateThumbnail = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onCreateThumbnail",
+    public static final AndroidPossibleEntryPoint onCreateThumbnail = new AndroidPossibleEntryPoint("onCreateThumbnail",
             ExecutionOrder.directlyBefore(onCreateDescription)
             );
     /**
@@ -979,8 +914,7 @@
      *  Assit is requested by the user.
      *  TODO: WTF is this?
      */
-    public static final AndroidPossibleEntryPoint onProvideAssistData = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onProvideAssistData",
+    public static final AndroidPossibleEntryPoint onProvideAssistData = new AndroidPossibleEntryPoint("onProvideAssistData",
             ExecutionOrder.between(
                 allInitialViewsSetUp,
                 ExecutionOrder.MIDDLE_OF_LOOP
@@ -993,9 +927,8 @@
      *  The function will be called between onStop() and onDestroy().
      *  A new instance of the activity will always be immediately created after this one's onDestroy() is called.
      */
-    public static final AndroidPossibleEntryPoint onRetainNonConfigurationInstance = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onRetainNonConfigurationInstance",
-             ExecutionOrder.between(
+    public static final AndroidPossibleEntryPoint onRetainNonConfigurationInstance = new AndroidPossibleEntryPoint("onRetainNonConfigurationInstance",
+            ExecutionOrder.between(
                     onStop,
                     onDestroy
              ));
@@ -1004,8 +937,7 @@
      * While the exact point at which this will be called is not defined, generally it will happen when all background process have been killed. 
      * That is, before reaching the point of killing processes hosting service and foreground UI that we would like to avoid killing. 
      */
-    public static final AndroidPossibleEntryPoint onLowMemory = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onLowMemory",
+    public static final AndroidPossibleEntryPoint onLowMemory = new AndroidPossibleEntryPoint("onLowMemory",
             ExecutionOrder.between( // TODO: find a nice position
                 ExecutionOrder.END_OF_LOOP,
                 new AndroidEntryPoint.IExecutionOrder[] {
@@ -1018,8 +950,7 @@
      *  This will happen for example when it goes in the background and there is not enough memory to keep as many 
      *  background processes running as desired. 
      */
-    public static final AndroidPossibleEntryPoint onTrimMemory = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onTrimMemory", // TODO: find a nice position
+    public static final AndroidPossibleEntryPoint onTrimMemory = new AndroidPossibleEntryPoint("onTrimMemory",
             ExecutionOrder.directlyBefore(onLowMemory)     // may potentially come before onLowMemory but they are near enough...
             );
     
@@ -1028,15 +959,13 @@
      *
      * this method is called right before the activity's onPause() callback. 
      */
-    public static final AndroidPossibleEntryPoint onUserLeaveHint = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onUserLeaveHint",
+    public static final AndroidPossibleEntryPoint onUserLeaveHint = new AndroidPossibleEntryPoint("onUserLeaveHint",
             ExecutionOrder.directlyBefore(onPause)
             );
     /**
      * This is called whenever the current window attributes change. 
      */
-    public static final AndroidPossibleEntryPoint onWindowAttributesChanged = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onWindowAttributesChanged",
+    public static final AndroidPossibleEntryPoint onWindowAttributesChanged = new AndroidPossibleEntryPoint("onWindowAttributesChanged",
             ExecutionOrder.between( 
                 new AndroidEntryPoint.IExecutionOrder[] {   
                     ExecutionOrder.MULTIPLE_TIMES_IN_LOOP
@@ -1053,8 +982,7 @@
      *  As such, while focus changes will generally have some relation to lifecycle changes, you should not rely on any particular 
      *  order between the callbacks here and those in the other lifecycle methods such as onResume(). 
      */
-    public static final AndroidPossibleEntryPoint onWindowFocusChanged = new AndroidPossibleEntryPoint(AndroidComponent.ACTIVITY,
-            "onWindowFocusChanged",
+    public static final AndroidPossibleEntryPoint onWindowFocusChanged = new AndroidPossibleEntryPoint("onWindowFocusChanged",
             ExecutionOrder.directlyAfter(onResume)    // TODO see above...
             );
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ApplicationEP.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ApplicationEP.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ApplicationEP.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ApplicationEP.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,7 +44,6 @@
 
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint;
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.ExecutionOrder;
-import com.ibm.wala.dalvik.util.AndroidComponent;
 import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoint;
 
 /**
@@ -54,16 +53,15 @@
  *  see: http://developer.android.com/reference/android/app/Application.html
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public final class ApplicationEP {
 
     /**
      * Called when the application is starting, before any activity, service, or receiver objects (excluding content providers) have been created.
      */
-	public static final AndroidPossibleEntryPoint onCreate = new AndroidPossibleEntryPoint(AndroidComponent.APPLICATION, 
-            "onCreate",
-			ExecutionOrder.between(
+	public static final AndroidPossibleEntryPoint onCreate = new AndroidPossibleEntryPoint("onCreate", 
+            ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.AT_FIRST,
                     ProviderEP.onCreate     /* Yes, ContentProviders come before App! */
@@ -80,9 +78,8 @@
      *  Note that, unlike activities, other components are never restarted when a configuration changes: they must always deal with the 
      *  results of the change, such as by re-retrieving resources. 
      */
-	public static final AndroidPossibleEntryPoint onConfigurationChanged = new AndroidPossibleEntryPoint(AndroidComponent.APPLICATION, 
-            "onConfigurationChanged",   // TODO: Position
-			ExecutionOrder.between(
+	public static final AndroidPossibleEntryPoint onConfigurationChanged = new AndroidPossibleEntryPoint("onConfigurationChanged", 
+            ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ActivityEP.onConfigurationChanged,
                     ExecutionOrder.END_OF_LOOP
@@ -97,9 +94,8 @@
      *  While the exact point at which this will be called is not defined, generally it will happen when all background process have been killed.
      *  That is, before reaching the point of killing processes hosting service and foreground UI that we would like to avoid killing. 
      */
-	public static final AndroidPossibleEntryPoint onLowMemory = new AndroidPossibleEntryPoint(AndroidComponent.APPLICATION, 
-            "onLowMemory",  // TODO: Position
-			ExecutionOrder.between(
+	public static final AndroidPossibleEntryPoint onLowMemory = new AndroidPossibleEntryPoint("onLowMemory", 
+            ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.END_OF_LOOP,
                     ActivityEP.onLowMemory
@@ -123,8 +119,7 @@
     /**
      *  Called when the operating system has determined that it is a good time for a process to trim unneeded memory from its process.
      */
-	public static final AndroidPossibleEntryPoint onTrimMemory = new AndroidPossibleEntryPoint(AndroidComponent.APPLICATION, 
-            "onTrimMemory",
+	public static final AndroidPossibleEntryPoint onTrimMemory = new AndroidPossibleEntryPoint("onTrimMemory", 
             ExecutionOrder.directlyBefore(onLowMemory)     // may potentially come before onLowMemory 
             );
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/FragmentEP.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/FragmentEP.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/FragmentEP.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/FragmentEP.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,7 +44,6 @@
 
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint;
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.ExecutionOrder;
-import com.ibm.wala.dalvik.util.AndroidComponent;
 import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoint;
 
 /**
@@ -54,7 +53,7 @@
  *  https://developer.android.com/reference/android/app/Fragment.html
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public final class FragmentEP {
 
@@ -68,8 +67,7 @@
      *
      *  Called before onCreate
      */
-    public static final AndroidPossibleEntryPoint onAttach = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onAttach",
+    public static final AndroidPossibleEntryPoint onAttach = new AndroidPossibleEntryPoint("onAttach",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.AT_FIRST,
@@ -90,8 +88,7 @@
      *  Note that this can be called while the fragment's activity is still in the process of being created. 
      *  once the activity itself is created: onActivityCreated(Bundle).
      */
-    public static final AndroidPossibleEntryPoint onCreate = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onCreate",
+    public static final AndroidPossibleEntryPoint onCreate = new AndroidPossibleEntryPoint("onCreate",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.AT_FIRST,
@@ -109,8 +106,7 @@
      *  This will be called between onCreate(Bundle) and onActivityCreated(Bundle).     XXX: CONTRADICTING DOCUMENTATION!
      *  his is optional, and non-graphical fragments can return null.
      */
-    public static final AndroidPossibleEntryPoint onCreateView = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onCreateView",
+    public static final AndroidPossibleEntryPoint onCreateView = new AndroidPossibleEntryPoint("onCreateView",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.AT_FIRST,
@@ -129,8 +125,7 @@
      *  This is called after onCreateView                                               XXX: CONTRADICTING DOCUMENTATION!
      *  and before onViewStateRestored(Bundle).
      */
-    public static final AndroidPossibleEntryPoint onActivityCreated = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onActivityCreated",
+    public static final AndroidPossibleEntryPoint onActivityCreated = new AndroidPossibleEntryPoint("onActivityCreated",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.AT_FIRST,
@@ -149,8 +144,7 @@
      *  Called when all saved state has been restored into the view hierarchy of the fragment.
      *  This is called after onActivityCreated(Bundle) and before onStart().
      */
-    public static final AndroidPossibleEntryPoint onViewStateRestored = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onViewStateRestored",
+    public static final AndroidPossibleEntryPoint onViewStateRestored = new AndroidPossibleEntryPoint("onViewStateRestored",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.AT_FIRST,    // TODO: Already Part of loop?
@@ -169,8 +163,7 @@
      *  Called when the Fragment is visible to the user. 
      *  This is generally tied to Activity.onStart of the containing Activity's lifecycle. 
      */
-    public static final AndroidPossibleEntryPoint onStart = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onStart",
+    public static final AndroidPossibleEntryPoint onStart = new AndroidPossibleEntryPoint("onStart",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.START_OF_LOOP,
@@ -188,8 +181,7 @@
      *   Called when the fragment is visible to the user and actively running. 
      *   This is generally tied to Activity.onResume of the containing Activity's lifecycle. 
      */
-    public static final AndroidPossibleEntryPoint onResume = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onResume",
+    public static final AndroidPossibleEntryPoint onResume = new AndroidPossibleEntryPoint("onResume",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.START_OF_LOOP,
@@ -215,8 +207,7 @@
      *  Called when the Fragment is no longer resumed. 
      *  This is generally tied to Activity.onPause of the containing Activity's lifecycle. 
      */
-    public static final AndroidPossibleEntryPoint onPause = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onPause",
+    public static final AndroidPossibleEntryPoint onPause = new AndroidPossibleEntryPoint("onPause",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.END_OF_LOOP,
@@ -234,9 +225,8 @@
      * Called when the Fragment is no longer started. 
      * This is generally tied to Activity.onStop of the containing Activity's lifecycle. 
      */
-    public static final AndroidPossibleEntryPoint onStop = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onStop",
-             ExecutionOrder.after(
+    public static final AndroidPossibleEntryPoint onStop = new AndroidPossibleEntryPoint("onStop",
+            ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onPause,
                     ActivityEP.onStop      // TODO: Rather after or before?
@@ -251,8 +241,7 @@
      *
      *  Internally it is called after the view's state has been saved but before it has been removed from its parent. 
      */
-    public static final AndroidPossibleEntryPoint onDestroyView = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onDestroyView",
+    public static final AndroidPossibleEntryPoint onDestroyView = new AndroidPossibleEntryPoint("onDestroyView",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onStop,
@@ -265,8 +254,7 @@
      *
      *  Called when the fragment is no longer in use. This is called after onStop() and before onDetach(). 
      */
-    public static final AndroidPossibleEntryPoint onDestroy = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onDestroy",
+    public static final AndroidPossibleEntryPoint onDestroy = new AndroidPossibleEntryPoint("onDestroy",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onDestroyView,
@@ -279,8 +267,7 @@
      *
      *  Called when the fragment is no longer attached to its activity. This is called after onDestroy(). 
      */
-    public static final AndroidPossibleEntryPoint onDetach = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onDetach",
+    public static final AndroidPossibleEntryPoint onDetach = new AndroidPossibleEntryPoint("onDetach",
             ExecutionOrder.between( 
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.AT_LAST, 
@@ -297,10 +284,9 @@
     //
 
     /**
-     *  @see ActivityEP.onActivityResult
+     *  @see ActivityEP#onActivityResult
      */
-    public static final AndroidPossibleEntryPoint onActivityResult = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onActivityResult",
+    public static final AndroidPossibleEntryPoint onActivityResult = new AndroidPossibleEntryPoint("onActivityResult",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.MULTIPLE_TIMES_IN_LOOP,
@@ -315,24 +301,21 @@
     /**
      *  Unlike activities, other components are never restarted.
      */
-    public static final AndroidPossibleEntryPoint onConfigurationChanged = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onConfigurationChanged",
+    public static final AndroidPossibleEntryPoint onConfigurationChanged = new AndroidPossibleEntryPoint("onConfigurationChanged",
             ExecutionOrder.directlyAfter(ActivityEP.onConfigurationChanged)    // TODO: Verify
             );
 
     /**
      *  This hook is called whenever an item in a context menu is selected. 
      */
-    public static final AndroidPossibleEntryPoint onContextItemSelected = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onContextItemSelected",
+    public static final AndroidPossibleEntryPoint onContextItemSelected = new AndroidPossibleEntryPoint("onContextItemSelected",
             ExecutionOrder.directlyAfter(ActivityEP.onContextItemSelected) // TODO: Verify
             );
 
     /**
      *  Called when a fragment loads an animation. 
      */
-    public static final AndroidPossibleEntryPoint onCreateAnimator = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onCreateAnimator",
+    public static final AndroidPossibleEntryPoint onCreateAnimator = new AndroidPossibleEntryPoint("onCreateAnimator",
             ExecutionOrder.directlyAfter(onResume) // TODO: Here?
             );
 
@@ -341,16 +324,14 @@
      *
      *  Unlike onCreateOptionsMenu, this will be called every time the context menu is about to be shown
      */
-    public static final AndroidPossibleEntryPoint onCreateContextMenu = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onCreateContextMenu",
+    public static final AndroidPossibleEntryPoint onCreateContextMenu = new AndroidPossibleEntryPoint("onCreateContextMenu",
             ExecutionOrder.directlyAfter(ActivityEP.onCreateContextMenu)
             );
 
     /**
      *  Initialize the contents of the Activity's standard options menu. 
      */
-    public static final AndroidPossibleEntryPoint onCreateOptionsMenu = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onCreateOptionsMenu",
+    public static final AndroidPossibleEntryPoint onCreateOptionsMenu = new AndroidPossibleEntryPoint("onCreateOptionsMenu",
             ExecutionOrder.directlyAfter(ActivityEP.onCreateOptionsMenu)
             );
 
@@ -359,8 +340,7 @@
      *  Receiving this call means that the menu needed to be rebuilt, but this fragment's items were not included in the newly 
      *  built menu (its onCreateOptionsMenu was not called). 
      */
-    public static final AndroidPossibleEntryPoint onDestroyOptionsMenu = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onDestroyOptionsMenu",
+    public static final AndroidPossibleEntryPoint onDestroyOptionsMenu = new AndroidPossibleEntryPoint("onDestroyOptionsMenu",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.END_OF_LOOP, // TODO: Here?
@@ -372,9 +352,8 @@
      *
      *  Fragments start out not hidden.
      */
-    public static final AndroidPossibleEntryPoint onHiddenChanged = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onHiddenChanged",
-             ExecutionOrder.after(
+    public static final AndroidPossibleEntryPoint onHiddenChanged = new AndroidPossibleEntryPoint("onHiddenChanged",
+            ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.MIDDLE_OF_LOOP, // TODO: Here?
                 }
@@ -387,9 +366,8 @@
      *  This may be called immediately after the fragment is created from a tag in a layout file. 
      *  Note this is before the fragment's onAttach(Activity) has been called...
      */
-    public static final AndroidPossibleEntryPoint onInflate = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onInflate",
-             ExecutionOrder.between( 
+    public static final AndroidPossibleEntryPoint onInflate = new AndroidPossibleEntryPoint("onInflate",
+            ExecutionOrder.between( 
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.AT_FIRST, 
                     ApplicationEP.onCreate,     // TODO: Here?
@@ -401,36 +379,32 @@
             ));
 
     /**
-     *  @see    ActivityEP.onLowMemory
-     *  @see    ApplicationEP.onLowMemory
+     *  @see    ActivityEP#onLowMemory
+     *  @see    ApplicationEP#onLowMemory
      */
-    public static final AndroidPossibleEntryPoint onLowMemory = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onLowMemory",
+    public static final AndroidPossibleEntryPoint onLowMemory = new AndroidPossibleEntryPoint("onLowMemory",
             ExecutionOrder.directlyBefore(ActivityEP.onLowMemory)
             );
     /**
-     *  @see    ActivityEP.onOptionsItemSelected
+     *  @see    ActivityEP#onOptionsItemSelected
      */
-    public static final AndroidPossibleEntryPoint onOptionsItemSelected = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onOptionsItemSelected",
+    public static final AndroidPossibleEntryPoint onOptionsItemSelected = new AndroidPossibleEntryPoint("onOptionsItemSelected",
             ExecutionOrder.directlyAfter(ActivityEP.onOptionsItemSelected)  // TODO: After? Before?
             );
 
     /**
-     *  @see    ActivityEP.onOptionsMenuClosed
+     *  @see    ActivityEP#onOptionsMenuClosed
      */
-    public static final AndroidPossibleEntryPoint onOptionsMenuClosed = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onOptionsMenuClosed",
+    public static final AndroidPossibleEntryPoint onOptionsMenuClosed = new AndroidPossibleEntryPoint("onOptionsMenuClosed",
             ExecutionOrder.directlyAfter(ActivityEP.onOptionsMenuClosed)  // TODO: After? Before?
             );
     
     /**
      *  This is called right before the menu is shown, every time it is shown. 
      *
-     *  @see    ActivityEP.onPrepareOptionsMenu
+     *  @see    ActivityEP#onPrepareOptionsMenu
      */
-    public static final AndroidPossibleEntryPoint onPrepareOptionsMenu = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onPrepareOptionsMenu",
+    public static final AndroidPossibleEntryPoint onPrepareOptionsMenu = new AndroidPossibleEntryPoint("onPrepareOptionsMenu",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.START_OF_LOOP,
@@ -453,8 +427,7 @@
      *  This method may be called at any time before onDestroy(). There are many situations where a fragment may be mostly torn down, 
      *  but its state will not be saved until its owning activity actually needs to save its state.
      */
-    public static final AndroidPossibleEntryPoint onSaveInstanceState = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onSaveInstanceState",
+    public static final AndroidPossibleEntryPoint onSaveInstanceState = new AndroidPossibleEntryPoint("onSaveInstanceState",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onStop,
@@ -467,18 +440,16 @@
             ));
 
     /**
-     *  @see ActtivityEP.onTrimMemory
+     *  @see ActivityEP#onTrimMemory
      */
-    public static final AndroidPossibleEntryPoint onTrimMemory = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onTrimMemory",
+    public static final AndroidPossibleEntryPoint onTrimMemory = new AndroidPossibleEntryPoint("onTrimMemory",
             ExecutionOrder.directlyBefore(ActivityEP.onTrimMemory)
             );
 
     /**
      *  Called immediately after onCreateView has returned, but before any saved state has been restored in to the view. 
      */
-    public static final AndroidPossibleEntryPoint onViewCreated = new AndroidPossibleEntryPoint(AndroidComponent.FRAGMENT,
-            "onViewCreated",
+    public static final AndroidPossibleEntryPoint onViewCreated = new AndroidPossibleEntryPoint("onViewCreated",
             ExecutionOrder.between(
                 onCreateView,
                 new AndroidEntryPoint.IExecutionOrder[] {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LoaderCB.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LoaderCB.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LoaderCB.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LoaderCB.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,7 +43,6 @@
 import java.util.List;
 
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.ExecutionOrder;
-import com.ibm.wala.dalvik.util.AndroidComponent;
 import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoint;
 
 /**
@@ -53,27 +52,24 @@
  *  AndroidEntryPointLocator are set to include call-backs.
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public final class LoaderCB {
     
     /**
      * Instantiate and return a new Loader for the given ID.
      */
-    public static final AndroidPossibleEntryPoint onCreateLoader = new AndroidPossibleEntryPoint(AndroidComponent.LOADER_CB, "onCreateLoader",
-        ExecutionOrder.AT_FIRST); // TODO: Baaad position
+    public static final AndroidPossibleEntryPoint onCreateLoader = new AndroidPossibleEntryPoint("onCreateLoader", ExecutionOrder.AT_FIRST); // TODO: Baaad position
 
     /**
      *  Called when a previously created loader has finished its load.
      */
-    public static final AndroidPossibleEntryPoint onLoadFinished = new AndroidPossibleEntryPoint(AndroidComponent.LOADER_CB, "onLoadFinished",
-            ExecutionOrder.after(onCreateLoader)); // TODO: Baaad position
+    public static final AndroidPossibleEntryPoint onLoadFinished = new AndroidPossibleEntryPoint("onLoadFinished", ExecutionOrder.after(onCreateLoader)); // TODO: Baaad position
 
     /**
      *  Called when a previously created loader is being reset, and thus making its data unavailable.
      */
-    public static final AndroidPossibleEntryPoint onLoaderReset = new AndroidPossibleEntryPoint(AndroidComponent.LOADER_CB, "onLoaderReset",
-            ExecutionOrder.after(onCreateLoader)); // TODO: Baaad position
+    public static final AndroidPossibleEntryPoint onLoaderReset = new AndroidPossibleEntryPoint("onLoaderReset", ExecutionOrder.after(onCreateLoader)); // TODO: Baaad position
 
     /**
      *  Add the EntryPoint specifications defined in this file to the given list.
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LocationEP.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LocationEP.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LocationEP.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LocationEP.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,7 +43,6 @@
 import java.util.List;
 
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.ExecutionOrder;
-import com.ibm.wala.dalvik.util.AndroidComponent;
 import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoint;
 
 /**
@@ -53,26 +52,20 @@
  *  AndroidEntryPointLocator are set to include call-backs.
  *  
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public final class LocationEP {
-	public static final AndroidPossibleEntryPoint onLocationChanged = new AndroidPossibleEntryPoint(AndroidComponent.LOCATION_LISTENER, "onLocationChanged",
-			ExecutionOrder.MIDDLE_OF_LOOP);
+	public static final AndroidPossibleEntryPoint onLocationChanged = new AndroidPossibleEntryPoint("onLocationChanged", ExecutionOrder.MIDDLE_OF_LOOP);
 
-	public static final AndroidPossibleEntryPoint onProviderDisabled = new AndroidPossibleEntryPoint(AndroidComponent.LOCATION_LISTENER, "onProviderDisabled",
-			ExecutionOrder.MIDDLE_OF_LOOP);
+	public static final AndroidPossibleEntryPoint onProviderDisabled = new AndroidPossibleEntryPoint("onProviderDisabled", ExecutionOrder.MIDDLE_OF_LOOP);
 
-	public static final AndroidPossibleEntryPoint onProviderEnabled =  new AndroidPossibleEntryPoint(AndroidComponent.LOCATION_LISTENER, "onProviderEnabled",
-			ExecutionOrder.MIDDLE_OF_LOOP);
+	public static final AndroidPossibleEntryPoint onProviderEnabled =  new AndroidPossibleEntryPoint("onProviderEnabled", ExecutionOrder.MIDDLE_OF_LOOP);
 
-	public static final AndroidPossibleEntryPoint onStatusChanged =    new AndroidPossibleEntryPoint(AndroidComponent.LOCATION_LISTENER, "onStatusChanged",
-			ExecutionOrder.MIDDLE_OF_LOOP);
+	public static final AndroidPossibleEntryPoint onStatusChanged =    new AndroidPossibleEntryPoint("onStatusChanged", ExecutionOrder.MIDDLE_OF_LOOP);
 
-	public static final AndroidPossibleEntryPoint onGpsStatusChanged = new AndroidPossibleEntryPoint(AndroidComponent.GPS_LISTENER, "onGpsStatusChanged",
-			ExecutionOrder.MIDDLE_OF_LOOP);
+	public static final AndroidPossibleEntryPoint onGpsStatusChanged = new AndroidPossibleEntryPoint("onGpsStatusChanged", ExecutionOrder.MIDDLE_OF_LOOP);
 
-	public static final AndroidPossibleEntryPoint onNmeaReceived =    new AndroidPossibleEntryPoint(AndroidComponent.GPS_NMEA_LISTENER, "onNmeaReceived",
-			ExecutionOrder.MIDDLE_OF_LOOP);
+	public static final AndroidPossibleEntryPoint onNmeaReceived =    new AndroidPossibleEntryPoint("onNmeaReceived", ExecutionOrder.MIDDLE_OF_LOOP);
 
     /**
      *  Add the EntryPoint specifications defined in this file to the given list.
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/package-info.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/package-info.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/package-info.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/package-info.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,6 +52,6 @@
  * adapted to load the specifications.
  *
  * @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- * @author Tobias Blaschke <code@tobiasblaschke.de>
+ * @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 package com.ibm.wala.dalvik.util.androidEntryPoints;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ProviderEP.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ProviderEP.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ProviderEP.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ProviderEP.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,7 +44,6 @@
 
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint;
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.ExecutionOrder;
-import com.ibm.wala.dalvik.util.AndroidComponent;
 import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoint;
 
 /**
@@ -53,53 +52,46 @@
  *  The specifications are read and handled by AndroidEntryPointLocator.
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public final class ProviderEP {
-	public static final AndroidPossibleEntryPoint onCreate = new AndroidPossibleEntryPoint(AndroidComponent.PROVIDER, "onCreate",
-			ExecutionOrder.AT_FIRST);
+	public static final AndroidPossibleEntryPoint onCreate = new AndroidPossibleEntryPoint("onCreate", ExecutionOrder.AT_FIRST);
 
-	public static final AndroidPossibleEntryPoint query = new AndroidPossibleEntryPoint(AndroidComponent.PROVIDER, "query",
-			ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
-				onCreate,
-				//ActivityEP.onResume,
-				ExecutionOrder.START_OF_LOOP
-				} ));
-
-	public static final AndroidPossibleEntryPoint insert = new AndroidPossibleEntryPoint(AndroidComponent.PROVIDER, "insert",
-			ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
-				onCreate,
-				//ActivityEP.onResume,
-				ExecutionOrder.START_OF_LOOP
-				} ));
-
-    public static final AndroidPossibleEntryPoint onConfigurationChanged = new AndroidPossibleEntryPoint(AndroidComponent.PROVIDER, "onConfigurationChanged",
-			ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
-				onCreate,
-				//ActivityEP.onResume,
-				ExecutionOrder.START_OF_LOOP
-				} ));
-
-    public static final AndroidPossibleEntryPoint onLowMemory = new AndroidPossibleEntryPoint(AndroidComponent.PROVIDER, "onLowMemory",
-			ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
-				onCreate,
-				//ActivityEP.onResume,
-				ExecutionOrder.START_OF_LOOP
-				} ));
-
-	public static final AndroidPossibleEntryPoint onTrimMemory = new AndroidPossibleEntryPoint(AndroidComponent.PROVIDER, "onTrimMemory",
-			ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
-				onCreate,
-				//ActivityEP.onResume,
-				ExecutionOrder.START_OF_LOOP
-				} ));
-
-	public static final AndroidPossibleEntryPoint update = new AndroidPossibleEntryPoint(AndroidComponent.PROVIDER, "update",
-			ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
-				onCreate,
-				//ActivityEP.onResume,
-				ExecutionOrder.START_OF_LOOP
-				} ));
+	public static final AndroidPossibleEntryPoint query = new AndroidPossibleEntryPoint("query", ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
+		onCreate,
+		//ActivityEP.onResume,
+		ExecutionOrder.START_OF_LOOP
+		} ));
+
+	public static final AndroidPossibleEntryPoint insert = new AndroidPossibleEntryPoint("insert", ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
+		onCreate,
+		//ActivityEP.onResume,
+		ExecutionOrder.START_OF_LOOP
+		} ));
+
+    public static final AndroidPossibleEntryPoint onConfigurationChanged = new AndroidPossibleEntryPoint("onConfigurationChanged", ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
+		onCreate,
+		//ActivityEP.onResume,
+		ExecutionOrder.START_OF_LOOP
+		} ));
+
+    public static final AndroidPossibleEntryPoint onLowMemory = new AndroidPossibleEntryPoint("onLowMemory", ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
+		onCreate,
+		//ActivityEP.onResume,
+		ExecutionOrder.START_OF_LOOP
+		} ));
+
+	public static final AndroidPossibleEntryPoint onTrimMemory = new AndroidPossibleEntryPoint("onTrimMemory", ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
+		onCreate,
+		//ActivityEP.onResume,
+		ExecutionOrder.START_OF_LOOP
+		} ));
+
+	public static final AndroidPossibleEntryPoint update = new AndroidPossibleEntryPoint("update", ExecutionOrder.after(new AndroidEntryPoint.IExecutionOrder[] {
+		onCreate,
+		//ActivityEP.onResume,
+		ExecutionOrder.START_OF_LOOP
+		} ));
     /**
      *  Add the EntryPoint specifications defined in this file to the given list.
      *
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ServiceEP.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ServiceEP.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ServiceEP.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ServiceEP.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,7 +44,6 @@
 
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint;
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.ExecutionOrder;
-import com.ibm.wala.dalvik.util.AndroidComponent;
 import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoint;
 
 /**
@@ -53,15 +52,14 @@
  *  The specifications are read and handled by AndroidEntryPointLocator.
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public final class ServiceEP {
     /**
      *  Called by the system when the service is first created. 
      */
-    public static final AndroidPossibleEntryPoint onCreate = new AndroidPossibleEntryPoint(AndroidComponent.SERVICE, 
-            "onCreate",
-			ExecutionOrder.after(
+    public static final AndroidPossibleEntryPoint onCreate = new AndroidPossibleEntryPoint("onCreate", 
+            ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.AT_FIRST,
                     ProviderEP.onCreate,
@@ -75,9 +73,8 @@
      *
      *  startService-Services are not informed when they are stopped.
      */
-	public static final AndroidPossibleEntryPoint onStartCommand = new AndroidPossibleEntryPoint(AndroidComponent.SERVICE, 
-            "onStartCommand",
-			ExecutionOrder.after(
+	public static final AndroidPossibleEntryPoint onStartCommand = new AndroidPossibleEntryPoint("onStartCommand", 
+            ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] { 
                     ExecutionOrder.AT_FIRST,
                     onCreate
@@ -88,9 +85,8 @@
     /**
      *  Only for backwards compatibility.
      */
-    public static final AndroidPossibleEntryPoint onStart = new AndroidPossibleEntryPoint(AndroidComponent.SERVICE, 
-            "onStart",
-			ExecutionOrder.after(
+    public static final AndroidPossibleEntryPoint onStart = new AndroidPossibleEntryPoint("onStart", 
+            ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.AT_FIRST,
                     onCreate,
@@ -104,9 +100,8 @@
      *
      * Services started this way can be notified before they get stopped via onUnbind
      */
-	public static final AndroidPossibleEntryPoint onBind = new AndroidPossibleEntryPoint(AndroidComponent.SERVICE, 
-            "onBind",
-			ExecutionOrder.after(
+	public static final AndroidPossibleEntryPoint onBind = new AndroidPossibleEntryPoint("onBind", 
+            ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreate, 
                     ExecutionOrder.BEFORE_LOOP
@@ -117,9 +112,8 @@
      * Called when all clients have disconnected from a particular interface published by the service. 
      * Return true if you would like to have the service's onRebind(Intent) method later called when new clients bind to it. 
      */
-    public static final AndroidPossibleEntryPoint onUnbind = new AndroidPossibleEntryPoint(AndroidComponent.SERVICE, 
-            "onUnbind",
-			ExecutionOrder.after(
+    public static final AndroidPossibleEntryPoint onUnbind = new AndroidPossibleEntryPoint("onUnbind", 
+            ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onBind, 
                     ExecutionOrder.END_OF_LOOP
@@ -130,9 +124,8 @@
      *  Called when new clients have connected to the service, after it had previously been notified that all had disconnected in its 
      *  onUnbind(Intent). This will only be called if the implementation of onUnbind(Intent) was overridden to return true.
      */
-    public static final AndroidPossibleEntryPoint onRebind = new AndroidPossibleEntryPoint(AndroidComponent.SERVICE, 
-            "onRebind",
-			ExecutionOrder.after(
+    public static final AndroidPossibleEntryPoint onRebind = new AndroidPossibleEntryPoint("onRebind", 
+            ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onBind, 
                     onUnbind
@@ -144,9 +137,8 @@
      *  Called by the system to notify a Service that it is no longer used and is being removed. 
      *  Upon return, there will be no more calls in to this Service object and it is effectively dead. 
      */
-    public static final AndroidPossibleEntryPoint onDestroy = new AndroidPossibleEntryPoint(AndroidComponent.SERVICE, 
-            "onDestroy",
-			ExecutionOrder.after(
+    public static final AndroidPossibleEntryPoint onDestroy = new AndroidPossibleEntryPoint("onDestroy", 
+            ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onUnbind, 
                     onStart,
@@ -160,8 +152,7 @@
      *  This is called if the service is currently running and the user has removed a task that comes from the service's application. 
      *  If you have set ServiceInfo.FLAG_STOP_WITH_TASK then you will not receive this callback; instead, the service will simply be stopped.
      */
-    public static final AndroidPossibleEntryPoint onTaskRemoved = new AndroidPossibleEntryPoint(AndroidComponent.SERVICE,
-            "onTaskRemoved",
+    public static final AndroidPossibleEntryPoint onTaskRemoved = new AndroidPossibleEntryPoint("onTaskRemoved",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onUnbind, 
@@ -178,8 +169,7 @@
     /**
      * Called by the system when the device configuration changes while your component is running. 
      */
-    public static final AndroidPossibleEntryPoint onConfigurationChanged = new AndroidPossibleEntryPoint(AndroidComponent.SERVICE,
-            "onConfigurationChanged",
+    public static final AndroidPossibleEntryPoint onConfigurationChanged = new AndroidPossibleEntryPoint("onConfigurationChanged",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {   // TODO: Position
                     onCreate
@@ -192,8 +182,7 @@
     /**
      * This is called when the overall system is running low on memory, and actively running processes should trim their memory usage. 
      */
-    public static final AndroidPossibleEntryPoint onLowMemory = new AndroidPossibleEntryPoint(AndroidComponent.SERVICE,
-            "onLowMemory",
+    public static final AndroidPossibleEntryPoint onLowMemory = new AndroidPossibleEntryPoint("onLowMemory",
             ExecutionOrder.between( // TODO: find a nice position
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.END_OF_LOOP,
@@ -207,8 +196,7 @@
     /**
      * Called when the operating system has determined that it is a good time for a process to trim unneeded memory from its process.
      */
-    public static final AndroidPossibleEntryPoint onTrimMemory = new AndroidPossibleEntryPoint(AndroidComponent.SERVICE,
-            "onTrimMemory",
+    public static final AndroidPossibleEntryPoint onTrimMemory = new AndroidPossibleEntryPoint("onTrimMemory",
             ExecutionOrder.between( // TODO: find a nice position
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.END_OF_LOOP
@@ -219,8 +207,7 @@
                 }
             ));
 
-    public static final AndroidPossibleEntryPoint onHandleIntent = new AndroidPossibleEntryPoint(AndroidComponent.INTENT_SERVICE,
-            "onHandleIntent", 
+    public static final AndroidPossibleEntryPoint onHandleIntent = new AndroidPossibleEntryPoint("onHandleIntent",
             ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreate
@@ -231,64 +218,49 @@
             ));
 
     public static final AndroidPossibleEntryPoint onCreateInputMethodInterface = new AndroidPossibleEntryPoint(
-            AndroidComponent.ABSTRACT_INPUT_METHOD_SERVICE, "onCreateInputMethodInterface",
-            ExecutionOrder.directlyAfter(onCreate));
+            "onCreateInputMethodInterface", ExecutionOrder.directlyAfter(onCreate));
 
     public static final AndroidPossibleEntryPoint onCreateInputMethodSessionInterface = new AndroidPossibleEntryPoint(
-            AndroidComponent.ABSTRACT_INPUT_METHOD_SERVICE, "onCreateInputMethodSessionInterface",
-            ExecutionOrder.after(onCreateInputMethodInterface)); // TODO: Place
+            "onCreateInputMethodSessionInterface", ExecutionOrder.after(onCreateInputMethodInterface)); // TODO: Place
 
     public static final AndroidPossibleEntryPoint onGenericMotionEvent = new AndroidPossibleEntryPoint(
-            AndroidComponent.ABSTRACT_INPUT_METHOD_SERVICE, "onGenericMotionEvent",
-            ExecutionOrder.directlyAfter(ActivityEP.onGenericMotionEvent));
+            "onGenericMotionEvent", ExecutionOrder.directlyAfter(ActivityEP.onGenericMotionEvent));
 
     public static final AndroidPossibleEntryPoint onTrackballEvent = new AndroidPossibleEntryPoint(
-            AndroidComponent.ABSTRACT_INPUT_METHOD_SERVICE, "onTrackballEvent",
-            ActivityEP.onTrackballEvent);
+            "onTrackballEvent", ActivityEP.onTrackballEvent);
 
     public static final AndroidPossibleEntryPoint onAccessibilityEvent = new AndroidPossibleEntryPoint(
-            AndroidComponent.ACCESSIBILITY_SERVICE, "onAccessibilityEvent",
-            ExecutionOrder.after(onTrackballEvent)); // TODO: Place
+            "onAccessibilityEvent", ExecutionOrder.after(onTrackballEvent)); // TODO: Place
 
     public static final AndroidPossibleEntryPoint onInterrupt = new AndroidPossibleEntryPoint(
-            AndroidComponent.ACCESSIBILITY_SERVICE, "onInterrupt",
-            ExecutionOrder.after(onAccessibilityEvent));
+            "onInterrupt", ExecutionOrder.after(onAccessibilityEvent));
    
     public static final AndroidPossibleEntryPoint onActionModeFinished = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onActionModeFinished",
-            ActivityEP.onActionModeFinished);
+            "onActionModeFinished", ActivityEP.onActionModeFinished);
 
     public static final AndroidPossibleEntryPoint onActionModeStarted = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onActionModeStarted",
-            ActivityEP.onActionModeStarted);
+            "onActionModeStarted", ActivityEP.onActionModeStarted);
 
     public static final AndroidPossibleEntryPoint onAttachedToWindow = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onAttachedToWindow",
-            ActivityEP.onAttachedToWindow);
+            "onAttachedToWindow", ActivityEP.onAttachedToWindow);
    
     public static final AndroidPossibleEntryPoint onContentChanged = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onContentChanged",
-            ActivityEP.onContentChanged);
+            "onContentChanged", ActivityEP.onContentChanged);
 
     public static final AndroidPossibleEntryPoint onCreatePanelMenu = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onCreatePanelMenu",
-            ActivityEP.onCreatePanelMenu);
+            "onCreatePanelMenu", ActivityEP.onCreatePanelMenu);
 
     public static final AndroidPossibleEntryPoint onCreatePanelView = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onCreatePanelView",
-            ActivityEP.onCreatePanelView);
+            "onCreatePanelView", ActivityEP.onCreatePanelView);
 
     public static final AndroidPossibleEntryPoint onDetachedFromWindow = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onDetachedFromWindow",
-            ActivityEP.onDetachedFromWindow);
+            "onDetachedFromWindow", ActivityEP.onDetachedFromWindow);
    
     public static final AndroidPossibleEntryPoint onDreamingStarted = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onDreamingStarted",
-            ExecutionOrder.after(onStart)); // TODO: Place
+            "onDreamingStarted", ExecutionOrder.after(onStart)); // TODO: Place
 
     public static final AndroidPossibleEntryPoint onDreamingStopped = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onDreamingStopped",
-            ExecutionOrder.between(
+            "onDreamingStopped", ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {   // TODO: Place
                     onDreamingStarted,
                     onBind,
@@ -300,116 +272,88 @@
                 }));
 
     public static final AndroidPossibleEntryPoint onMenuItemSelected = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onMenuItemSelected",
-            ActivityEP.onMenuItemSelected);
+            "onMenuItemSelected", ActivityEP.onMenuItemSelected);
     
     public static final AndroidPossibleEntryPoint onMenuOpened = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onMenuOpened",
-            ActivityEP.onMenuOpened);
+            "onMenuOpened", ActivityEP.onMenuOpened);
 
     public static final AndroidPossibleEntryPoint onPanelClosed = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onPanelClosed",
-            ActivityEP.onPanelClosed);
+            "onPanelClosed", ActivityEP.onPanelClosed);
 
     public static final AndroidPossibleEntryPoint onPreparePanel = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onPreparePanel",
-            ActivityEP.onPreparePanel);
+            "onPreparePanel", ActivityEP.onPreparePanel);
 
     public static final AndroidPossibleEntryPoint onSearchRequested = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onSearchRequested",
-            ActivityEP.onSearchRequested);
+            "onSearchRequested", ActivityEP.onSearchRequested);
 
     public static final AndroidPossibleEntryPoint onWindowAttributesChanged = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onWindowAttributesChanged",
-            ActivityEP.onWindowAttributesChanged);
+            "onWindowAttributesChanged", ActivityEP.onWindowAttributesChanged);
     
     public static final AndroidPossibleEntryPoint onWindowFocusChanged = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onWindowFocusChanged",
-            ActivityEP.onWindowFocusChanged);
+            "onWindowFocusChanged", ActivityEP.onWindowFocusChanged);
 
     public static final AndroidPossibleEntryPoint onWindowStartingActionMode = new AndroidPossibleEntryPoint(
-            AndroidComponent.DREAM_SERVICE, "onWindowStartingActionMode",
-            ActivityEP.onWindowStartingActionMode);
+            "onWindowStartingActionMode", ActivityEP.onWindowStartingActionMode);
 
     public static final AndroidPossibleEntryPoint onDeactivated = new AndroidPossibleEntryPoint(
-            AndroidComponent.HOST_APDU_SERVICE, "onDeactivated",
-            ExecutionOrder.directlyBefore(ActivityEP.onPause));
+            "onDeactivated", ExecutionOrder.directlyBefore(ActivityEP.onPause));
 
     public static final AndroidPossibleEntryPoint onCreateMediaRouteProvider = new AndroidPossibleEntryPoint(
-            AndroidComponent.MEDIA_ROUTE_PROVIDER_SERVICE, "onCreateMediaRouteProvider",
-            onCreate);
+            "onCreateMediaRouteProvider", onCreate);
 
     public static final AndroidPossibleEntryPoint onNotificationPosted = new AndroidPossibleEntryPoint(
-            AndroidComponent.NOTIFICATION_LISTENER_SERVICE, "onNotificationPosted",
-            ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
+            "onNotificationPosted", ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
 
     public static final AndroidPossibleEntryPoint onNotificationRemoved = new AndroidPossibleEntryPoint(
-            AndroidComponent.NOTIFICATION_LISTENER_SERVICE, "onNotificationRemoved",
-            ExecutionOrder.after(onNotificationPosted));
+            "onNotificationRemoved", ExecutionOrder.after(onNotificationPosted));
 
     public static final AndroidPossibleEntryPoint onConnected = new AndroidPossibleEntryPoint(
-            AndroidComponent.PRINT_SERVICE, "onConnected",
-            ExecutionOrder.after(onStart));
+            "onConnected", ExecutionOrder.after(onStart));
     
     public static final AndroidPossibleEntryPoint onCreatePrinterDiscoverySession = new AndroidPossibleEntryPoint(
-            AndroidComponent.PRINT_SERVICE, "onCreatePrinterDiscoverySession",
-            ExecutionOrder.between(onStart, onConnected));
+            "onCreatePrinterDiscoverySession", ExecutionOrder.between(onStart, onConnected));
     
     public static final AndroidPossibleEntryPoint onDisconnected = new AndroidPossibleEntryPoint(
-            AndroidComponent.PRINT_SERVICE, "onDisconnected",
-            ExecutionOrder.between(onConnected, onDestroy));    // XXX: Section hop
+            "onDisconnected", ExecutionOrder.between(onConnected, onDestroy));    // XXX: Section hop
 
     public static final AndroidPossibleEntryPoint onPrintJobQueued = new AndroidPossibleEntryPoint(
-            AndroidComponent.PRINT_SERVICE, "onPrintJobQueued",
-            ExecutionOrder.between(onConnected, onDisconnected)); // XXX: Section hop
+            "onPrintJobQueued", ExecutionOrder.between(onConnected, onDisconnected)); // XXX: Section hop
 
     public static final AndroidPossibleEntryPoint onRequestCancelPrintJob = new AndroidPossibleEntryPoint(
-            AndroidComponent.PRINT_SERVICE, "onRequestCancelPrintJob",
-            ExecutionOrder.between(onPrintJobQueued, onDisconnected)); // XXX: Section hop
+            "onRequestCancelPrintJob", ExecutionOrder.between(onPrintJobQueued, onDisconnected)); // XXX: Section hop
     
     public static final AndroidPossibleEntryPoint onCancel = new AndroidPossibleEntryPoint(
-            AndroidComponent.RECOGNITION_SERVICE, "onCancel",
-            ExecutionOrder.between(ExecutionOrder.MULTIPLE_TIMES_IN_LOOP, ExecutionOrder.END_OF_LOOP));
+            "onCancel", ExecutionOrder.between(ExecutionOrder.MULTIPLE_TIMES_IN_LOOP, ExecutionOrder.END_OF_LOOP));
    
     public static final AndroidPossibleEntryPoint onStartListening = new AndroidPossibleEntryPoint(
-            AndroidComponent.RECOGNITION_SERVICE, "onStartListening",
-            ExecutionOrder.between(ExecutionOrder.MULTIPLE_TIMES_IN_LOOP, onCancel));
+            "onStartListening", ExecutionOrder.between(ExecutionOrder.MULTIPLE_TIMES_IN_LOOP, onCancel));
 
     public static final AndroidPossibleEntryPoint onStopListening = new AndroidPossibleEntryPoint(
-            AndroidComponent.RECOGNITION_SERVICE, "onStopListening",
-            ExecutionOrder.between(onCancel, ExecutionOrder.END_OF_LOOP));
+            "onStopListening", ExecutionOrder.between(onCancel, ExecutionOrder.END_OF_LOOP));
     
     public static final AndroidPossibleEntryPoint onGetViewFactory = new AndroidPossibleEntryPoint(
-            AndroidComponent.REMOTE_VIEWS_SERVICE, "onGetViewFactory",
-            ExecutionOrder.after(onStart)); // TODO: Position
+            "onGetViewFactory", ExecutionOrder.after(onStart)); // TODO: Position
 
     public static final AndroidPossibleEntryPoint onGetEnabled = new AndroidPossibleEntryPoint(
-            AndroidComponent.SETTING_INJECTOR_SERVICE, "onGetEnabled",
-            ExecutionOrder.after(onStart)); // TODO: Position
+            "onGetEnabled", ExecutionOrder.after(onStart)); // TODO: Position
     
     public static final AndroidPossibleEntryPoint onGetSummary = new AndroidPossibleEntryPoint(
-            AndroidComponent.SETTING_INJECTOR_SERVICE, "onGetSummary",
-            ExecutionOrder.after(onStart)); // TODO: Position
+            "onGetSummary", ExecutionOrder.after(onStart)); // TODO: Position
 
     public static final AndroidPossibleEntryPoint onGetFeaturesForLanguage = new AndroidPossibleEntryPoint(
-            AndroidComponent.TEXT_TO_SPEECH_SERVICE, "onGetFeaturesForLanguage",
-            ExecutionOrder.after(onStart)); // TODO: Position
+            "onGetFeaturesForLanguage", ExecutionOrder.after(onStart)); // TODO: Position
 
     public static final AndroidPossibleEntryPoint onGetLanguage = new AndroidPossibleEntryPoint(
-            AndroidComponent.TEXT_TO_SPEECH_SERVICE, "onGetLanguage",
-            ExecutionOrder.directlyBefore(onGetFeaturesForLanguage));
+            "onGetLanguage", ExecutionOrder.directlyBefore(onGetFeaturesForLanguage));
 
     public static final AndroidPossibleEntryPoint onLoadLanguage = new AndroidPossibleEntryPoint(
-            AndroidComponent.TEXT_TO_SPEECH_SERVICE, "onLoadLanguage",
-            ExecutionOrder.directlyBefore(onGetLanguage));
+            "onLoadLanguage", ExecutionOrder.directlyBefore(onGetLanguage));
 
     public static final AndroidPossibleEntryPoint onIsLanguageAvailable = new AndroidPossibleEntryPoint(
-            AndroidComponent.TEXT_TO_SPEECH_SERVICE, "onIsLanguageAvailable",
-            ExecutionOrder.directlyBefore(onLoadLanguage));
+            "onIsLanguageAvailable", ExecutionOrder.directlyBefore(onLoadLanguage));
 
     public static final AndroidPossibleEntryPoint onSynthesizeText = new AndroidPossibleEntryPoint(
-            AndroidComponent.TEXT_TO_SPEECH_SERVICE, "onSynthesizeText",
-            ExecutionOrder.after(
+            "onSynthesizeText", ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onGetLanguage,
                     onLoadLanguage,
@@ -417,64 +361,53 @@
                 }));
 
     public static final AndroidPossibleEntryPoint onStop = new AndroidPossibleEntryPoint(
-            AndroidComponent.TEXT_TO_SPEECH_SERVICE, "onStop",
-            ExecutionOrder.directlyBefore(ActivityEP.onStop));
+            "onStop", ExecutionOrder.directlyBefore(ActivityEP.onStop));
 
 
     public static final AndroidPossibleEntryPoint onRevoke = new AndroidPossibleEntryPoint(
-            AndroidComponent.VPN_SERVICE, "onRevoke",
-            ExecutionOrder.between(ExecutionOrder.END_OF_LOOP, onDestroy));
+            "onRevoke", ExecutionOrder.between(ExecutionOrder.END_OF_LOOP, onDestroy));
     
     public static final AndroidPossibleEntryPoint onCreateEngine = new AndroidPossibleEntryPoint(
-            AndroidComponent.WALLPAPER_SERVICE, "onCreateEngine",
-            ExecutionOrder.between(onCreate, onStart)); // TODO: Position
+            "onCreateEngine", ExecutionOrder.between(onCreate, onStart)); // TODO: Position
     
     public static final AndroidPossibleEntryPoint onAppPrivateCommand = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onAppPrivateCommand",
-            ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);     // TODO: Position
+            "onAppPrivateCommand", ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);     // TODO: Position
     
     /**
      *  to find out about switching to a new client.
      */
     public static final AndroidPossibleEntryPoint onBindInput = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onBindInput",
-            ExecutionOrder.after(ActivityEP.onResume));
+            "onBindInput", ExecutionOrder.after(ActivityEP.onResume));
 
     /**
      *  Compute the interesting insets into your UI.
      */
     public static final AndroidPossibleEntryPoint onComputeInsets = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onComputeInsets",
-            ExecutionOrder.after(onStart));
+            "onComputeInsets", ExecutionOrder.after(onStart));
 
     public static final AndroidPossibleEntryPoint onConfigureWindow = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onConfigureWindow",
-            ExecutionOrder.after(onComputeInsets));
+            "onConfigureWindow", ExecutionOrder.after(onComputeInsets));
 
     public static final AndroidPossibleEntryPoint onCreateCandidatesView = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onCreateCandidatesView",
-            ExecutionOrder.between(onStart, onComputeInsets));
+            "onCreateCandidatesView", ExecutionOrder.between(onStart, onComputeInsets));
     
     /**
      *  non-demand generation of the UI.
      */
     public static final AndroidPossibleEntryPoint onCreateExtractTextView = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onCreateExtractTextView",
-            ExecutionOrder.after(onCreateCandidatesView));
+            "onCreateExtractTextView", ExecutionOrder.after(onCreateCandidatesView));
 
     /**
      *  non-demand generation of the UI.
      */
     public static final AndroidPossibleEntryPoint onCreateInputView = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onCreateInputView",
-            onCreateExtractTextView);
+            "onCreateInputView", onCreateExtractTextView);
 
     /**
      *  non-demand generation of the UI.
      */
     public static final AndroidPossibleEntryPoint onStartCandidatesView = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onStartCandidatesView",
-            onCreateExtractTextView);
+            "onStartCandidatesView", onCreateExtractTextView);
 
     //public static final AndroidPossibleEntryPoint onCreateInputMethodInterface = new AndroidPossibleEntryPoint(
     //        AndroidComponent.INPUT_METHOD_SERVICE, "onCreateInputMethodInterface",
@@ -485,36 +418,28 @@
     //        ExecutionOrder.directlyAfter(onCreateInputMethodInterface)); 
 
     public static final AndroidPossibleEntryPoint onDisplayCompletions = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onDisplayCompletions",
-            ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
+            "onDisplayCompletions", ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
     
     public static final AndroidPossibleEntryPoint onEvaluateFullscreenMode = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onEvaluateFullscreenMode",
-            ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
+            "onEvaluateFullscreenMode", ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
 
     public static final AndroidPossibleEntryPoint onEvaluateInputViewShown = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onEvaluateInputViewShown",
-            ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
+            "onEvaluateInputViewShown", ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
     
     public static final AndroidPossibleEntryPoint onExtractTextContextMenuItem = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onExtractTextContextMenuItem",
-            ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
+            "onExtractTextContextMenuItem", ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
 
     public static final AndroidPossibleEntryPoint onExtractedCursorMovement = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onExtractedCursorMovement",
-            ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
+            "onExtractedCursorMovement", ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
 
     public static final AndroidPossibleEntryPoint onExtractedSelectionChanged = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onExtractedSelectionChanged",
-            ExecutionOrder.directlyAfter(onExtractedCursorMovement));
+            "onExtractedSelectionChanged", ExecutionOrder.directlyAfter(onExtractedCursorMovement));
 
     public static final AndroidPossibleEntryPoint onExtractedTextClicked = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onExtractedTextClicked",
-            ExecutionOrder.directlyAfter(onExtractedCursorMovement));
+            "onExtractedTextClicked", ExecutionOrder.directlyAfter(onExtractedCursorMovement));
     
     public static final AndroidPossibleEntryPoint onExtractingInputChanged = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onExtractingInputChanged",
-            ExecutionOrder.after(
+            "onExtractingInputChanged", ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onExtractedTextClicked,
                     onExtractedSelectionChanged,
@@ -522,19 +447,16 @@
                 }));
 
     public static final AndroidPossibleEntryPoint onFinishInput = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onFinishInput",
-            ExecutionOrder.after(
+            "onFinishInput", ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onExtractingInputChanged,
                 }));
 
     public static final AndroidPossibleEntryPoint onFinishInputView = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onFinishInputView",
-            ExecutionOrder.after(onFinishInput));
+            "onFinishInputView", ExecutionOrder.after(onFinishInput));
 
     public static final AndroidPossibleEntryPoint onFinishCandidatesView = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onFinishCandidatesView",
-            ExecutionOrder.after(
+            "onFinishCandidatesView", ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onExtractingInputChanged,
                     onFinishInput,
@@ -549,35 +471,28 @@
      *  for user-interface initialization, in particular to deal with configuration changes while the service is running.
      */
     public static final AndroidPossibleEntryPoint onInitializeInterface = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onInitializeInterface",
-            ExecutionOrder.MULTIPLE_TIMES_IN_LOOP); // TODO: Position
+            "onInitializeInterface", ExecutionOrder.MULTIPLE_TIMES_IN_LOOP); // TODO: Position
 
     public static final AndroidPossibleEntryPoint onKeyDown = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onKeyDown",
-            ExecutionOrder.directlyBefore(ActivityEP.onKeyDown));
+            "onKeyDown", ExecutionOrder.directlyBefore(ActivityEP.onKeyDown));
 
     public static final AndroidPossibleEntryPoint onKeyLongPress = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onKeyLongPress",
-            ExecutionOrder.directlyBefore(ActivityEP.onKeyLongPress));
+            "onKeyLongPress", ExecutionOrder.directlyBefore(ActivityEP.onKeyLongPress));
 
     public static final AndroidPossibleEntryPoint onKeyMultiple = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onKeyMultiple",
-            ExecutionOrder.directlyBefore(ActivityEP.onKeyMultiple));
+            "onKeyMultiple", ExecutionOrder.directlyBefore(ActivityEP.onKeyMultiple));
 
     public static final AndroidPossibleEntryPoint onKeyUp = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onKeyUp",
-            ExecutionOrder.directlyBefore(ActivityEP.onKeyUp));
+            "onKeyUp", ExecutionOrder.directlyBefore(ActivityEP.onKeyUp));
     
     public static final AndroidPossibleEntryPoint onShowInputRequested = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onShowInputRequested",
-            ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
+            "onShowInputRequested", ExecutionOrder.MULTIPLE_TIMES_IN_LOOP);
 
     /**
      * deal with an input session starting with the client. 
      */
     public static final AndroidPossibleEntryPoint onStartInput = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onStartInput",
-            ExecutionOrder.after(
+            "onStartInput", ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onCreateInputMethodSessionInterface,
                     ActivityEP.onResume
@@ -587,40 +502,32 @@
      * deal with input starting within the input area of the IME. 
      */
     public static final AndroidPossibleEntryPoint onStartInputView = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onStartInputView",
-            onStartInput);
+            "onStartInputView", onStartInput);
     
     // InputMethodService.onTrackballEvent
     public static final AndroidPossibleEntryPoint onUnbindInput = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onUnbindInput",
-            onUnbind);  // TODO: Position
+            "onUnbindInput", onUnbind);  // TODO: Position
     
     public static final AndroidPossibleEntryPoint onUpdateCursor = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onUpdateCursor",
-            ExecutionOrder.directlyBefore(onGenericMotionEvent));
+            "onUpdateCursor", ExecutionOrder.directlyBefore(onGenericMotionEvent));
     
     /**
      * Called when the application has reported new extracted text to be shown due to changes in its current text state. 
      */
     public static final AndroidPossibleEntryPoint onUpdateExtractedText = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onUpdateExtractedText",
-            ExecutionOrder.directlyAfter(onExtractedTextClicked));
+            "onUpdateExtractedText", ExecutionOrder.directlyAfter(onExtractedTextClicked));
     
     public static final AndroidPossibleEntryPoint onUpdateExtractingViews = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onUpdateExtractingViews",
-            ExecutionOrder.after(onExtractingInputChanged));
+            "onUpdateExtractingViews", ExecutionOrder.after(onExtractingInputChanged));
     
     public static final AndroidPossibleEntryPoint onUpdateExtractingVisibility = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onUpdateExtractingVisibility",
-            ExecutionOrder.after(onUpdateExtractingViews));
+            "onUpdateExtractingVisibility", ExecutionOrder.after(onUpdateExtractingViews));
     
     public static final AndroidPossibleEntryPoint onUpdateSelection = new AndroidPossibleEntryPoint(
-             AndroidComponent.INPUT_METHOD_SERVICE, "onUpdateSelection",
-             ExecutionOrder.after(onExtractedSelectionChanged));
+             "onUpdateSelection", ExecutionOrder.after(onExtractedSelectionChanged));
     
     public static final AndroidPossibleEntryPoint onViewClicked = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onViewClicked",
-            ExecutionOrder.after(
+            "onViewClicked", ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onGenericMotionEvent,
                     onTrackballEvent,
@@ -628,16 +535,14 @@
                 }));
     
     public static final AndroidPossibleEntryPoint onWindowShown = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onWindowShown",
-            ExecutionOrder.after(
+            "onWindowShown", ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onConfigureWindow,
                     onCreateCandidatesView
                 }));
     
     public static final AndroidPossibleEntryPoint onWindowHidden = new AndroidPossibleEntryPoint(
-            AndroidComponent.INPUT_METHOD_SERVICE, "onWindowHidden",
-            ExecutionOrder.between(
+            "onWindowHidden", ExecutionOrder.between(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     onWindowShown,
                 },
@@ -651,8 +556,7 @@
      *
      *  As a BroadcastReceiver is oftain used in conjunction with a service it's defined here...
      */
-    public static final AndroidPossibleEntryPoint onReceive = new AndroidPossibleEntryPoint(AndroidComponent.BROADCAST_RECEIVER,
-            "onReceive", 
+    public static final AndroidPossibleEntryPoint onReceive = new AndroidPossibleEntryPoint("onReceive",
             ExecutionOrder.after(
                 new AndroidEntryPoint.IExecutionOrder[] {
                     ExecutionOrder.AT_FIRST, 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -83,9 +83,9 @@
  *      You will be able to access it using attributesHistory.get(Attr).peek()
  *
  * TODO:
- * @todo    Handle Info in the DATA-Tag correctly!
+ * TODO: Handle Info in the DATA-Tag correctly!
  * @since   2013-10-13
- * @author  Tobias Blaschke <code@tobiasblaschke.de>
+ * @author  Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public class AndroidManifestXMLReader {
     /**
@@ -97,12 +97,12 @@
      */
     private static final Logger logger = LoggerFactory.getLogger(AndroidSettingFactory.class);
 
-    public AndroidManifestXMLReader(File xmlFile) throws IOException {
+    public AndroidManifestXMLReader(File xmlFile) {
         if (xmlFile == null) {
             throw new IllegalArgumentException("xmlFile may not be null");
         }
-        try {
-            readXML(new FileInputStream(xmlFile));
+        try (final FileInputStream in = new FileInputStream(xmlFile)) {
+            readXML(in);
         } catch (Exception e) {
             e.printStackTrace();
             throw new IllegalStateException("Exception was thrown");
@@ -134,69 +134,66 @@
         public Set<Tag> getSubTags();
     }
 
-    private interface HistoryKey {} ;
+    private interface HistoryKey {}
     /**
      *  Only includes relevant tags.
      */
-    @SuppressWarnings("unchecked")
     private enum Tag implements HistoryKey {
         /**
          *  This tag is nat an actual part of the document.
          */
         ROOT("ROOT",
-                new ISubTags() { public Set<Tag> getSubTags() {
+                new ISubTags() { @Override public Set<Tag> getSubTags() {
                     return EnumSet.of(Tag.MANIFEST); }},
                 null,
                 NoOpItem.class),
         MANIFEST("manifest",
-                new ISubTags() { public Set<Tag> getSubTags() {
+                new ISubTags() { @Override public Set<Tag> getSubTags() {
                     return EnumSet.of(Tag.APPLICATION); }},
                 EnumSet.of(Attr.PACKAGE),
                 ManifestItem.class),
         APPLICATION("application", 
-                new ISubTags() { public Set<Tag> getSubTags() {
+                new ISubTags() { @Override public Set<Tag> getSubTags() {
                     return EnumSet.of(Tag.ACTIVITY, Tag.SERVICE, Tag.RECEIVER, Tag.PROVIDER, Tag.ALIAS); }},    // Allowed children..
                 Collections.EMPTY_SET,              // Interesting Attributes
                 NoOpItem.class),                    // Handler
         ACTIVITY("activity", 
-                new ISubTags() { public Set<Tag> getSubTags() { 
+                new ISubTags() { @Override public Set<Tag> getSubTags() {
                     return EnumSet.of(Tag.INTENT); }},
                 EnumSet.of(Attr.NAME, Attr.ENABLED, Attr.PROCESS),
                 ComponentItem.class),
         ALIAS("activity-alias", 
-                new ISubTags() { public Set<Tag> getSubTags() {
+                new ISubTags() { @Override public Set<Tag> getSubTags() {
                     return EnumSet.of(Tag.INTENT); }},
                 EnumSet.of(Attr.ENABLED, Attr.TARGET, Attr.NAME),
-                null),
+                ComponentItem.class),
         SERVICE("service", 
-                new ISubTags() { public Set<Tag> getSubTags() {
+                new ISubTags() { @Override public Set<Tag> getSubTags() {
                     return EnumSet.of(Tag.INTENT); }},
                 EnumSet.of(Attr.ENABLED, Attr.NAME, Attr.PROCESS),
                 ComponentItem.class),
         RECEIVER("receiver", 
-                new ISubTags() { public Set<Tag> getSubTags() {
+                new ISubTags() { @Override public Set<Tag> getSubTags() {
                       return EnumSet.of(Tag.INTENT); }},
                 EnumSet.of(Attr.ENABLED, Attr.NAME, Attr.PROCESS),
                 ComponentItem.class),
         PROVIDER("provider", 
-                new ISubTags() { public Set<Tag> getSubTags() {
+                new ISubTags() { @Override public Set<Tag> getSubTags() {
                     return EnumSet.of(Tag.INTENT); }},
                 EnumSet.of(Attr.ENABLED, Attr.ORDER, Attr.NAME, Attr.PROCESS),
                 ComponentItem.class),
         INTENT("intent-filter",
-                new ISubTags() { public Set<Tag> getSubTags() {
+                new ISubTags() { @Override public Set<Tag> getSubTags() {
                     return EnumSet.of(Tag.ACTION, Tag.DATA); }},
                 Collections.EMPTY_SET,
                 IntentItem.class),
         ACTION("action", 
-                new ISubTags() { public Set<Tag> getSubTags() {
-                    return Collections.EMPTY_SET; }},
+                Collections::emptySet,
                 EnumSet.of(Attr.NAME),
                 FinalItem.class), //(new ITagDweller() {
                     //public Tag getTag() { return Tag.ACTION; }})),
         DATA("data", 
-                new ISubTags() { public Set<Tag> getSubTags() {
-                    return Collections.EMPTY_SET; }},
+                Collections::emptySet,
                 EnumSet.of(Attr.SCHEME, Attr.HOST, Attr.PATH, Attr.MIME),
                 FinalItem.class), //(new ITagDweller() {
                     //public Tag getTag() { return Tag.DATA; }})),
@@ -213,7 +210,7 @@
         private final ISubTags allowedSubTagsHolder;
         private final ParserItem item;
         private Set<Tag> allowedSubTags;    // Delay init
-        private static final Map<String, Tag> reverseMap = new HashMap<String, Tag>();// HashMapFactory.make(9);
+        private static final Map<String, Tag> reverseMap = new HashMap<>();// HashMapFactory.make(9);
         
         Tag (String tagName, ISubTags allowedSubTags, Set<Attr> relevant, Class<? extends ParserItem> item) {
             this.tagName = tagName;
@@ -290,6 +287,7 @@
         /**
          *  All Tags in this Enum but UNIMPORTANT are relevant.
          */
+        @SuppressWarnings("unused")
         public boolean isRelevant() {
             return (this != Tag.UNIMPORTANT);
         }
@@ -315,6 +313,7 @@
         /**
          *  The Tag appears in the XML File using this name.
          */
+        @SuppressWarnings("unused")
         public String getName() {
             return this.tagName;
         }
@@ -345,6 +344,7 @@
             this.attrName = attrName;
         }
 
+        @SuppressWarnings("unused")
         public boolean isRelevantIn(Tag tag) {
             return tag.isRelevant(this);
         }
@@ -361,21 +361,21 @@
      *  That is on the closing Tag or on the closing Tag of a parent: A Item does not remove its 
      *  own Tag from the Stack.
      */
-    private static final Stack<Tag> parserStack = new Stack<Tag>();
+    private static final Stack<Tag> parserStack = new Stack<>();
     
     /**
      *  Contains either Attributes of a child or the evaluation-result of a child-Tag.
      *
      *  The Item that consumes an Attribute has to pop it.
      */
-    private static final Map<HistoryKey, Stack<Object>> attributesHistory = new HashMap<HistoryKey, Stack<Object>>();  // No EnumMap possible :(
+    private static final Map<HistoryKey, Stack<Object>> attributesHistory = new HashMap<>();  // No EnumMap possible :(
 
     static {
         for (Attr attr : Attr.values()) {
-            attributesHistory.put(attr, new Stack<Object>());
+            attributesHistory.put(attr, new Stack<>());
         }
         for (Tag tag : Tag.values()) {
-            attributesHistory.put(tag, new Stack<Object>());
+            attributesHistory.put(tag, new Stack<>());
         }
     }
     
@@ -483,9 +483,6 @@
      *  Attributes.
      */
     private static class FinalItem extends ParserItem {
-        public FinalItem() {
-            super();
-        }
         @Override
         public void leave() {
             final Set<Tag> subs = self.getAllowedSubTags();
@@ -507,18 +504,12 @@
      *  It's like FinalItem but may contain sub-tags.
      */
     private static class NoOpItem extends ParserItem {
-        public NoOpItem() {
-            super();
-        }
     }
 
     /**
      *  The root-element of an AndroidManifest contains the package.
      */
     private static class ManifestItem extends ParserItem {
-        public ManifestItem() {
-            super();
-        }
         @Override
         public void enter(Attributes saxAttrs) {
             super.enter(saxAttrs);
@@ -529,17 +520,14 @@
     /**
      *  Read the specification of an Intent from AndroidManifest.
      *
-     *  @todo   Handle the URI
+     *  TODO: Handle the URI
      */
     private static class IntentItem extends ParserItem {
-        public IntentItem() {
-            super();
-        }
         @Override
         public void leave() {
             Set<Tag> allowedTags = EnumSet.copyOf(self.getAllowedSubTags());
-            Set<String> urls = new HashSet<String>();
-            Set<String> names = new HashSet<String>();
+            Set<String> urls = new HashSet<>();
+            Set<String> names = new HashSet<>();
             while (parserStack.peek() != self) {
                 Tag current = parserStack.pop();
                 if (allowedTags.contains(current)) {
@@ -572,6 +560,7 @@
                 }
             }
 
+            /*
             // Pushing intent...
             final String pack;
             if ((attributesHistory.get(Attr.PACKAGE) != null ) && (!(attributesHistory.get(Attr.PACKAGE).isEmpty()))) {
@@ -580,6 +569,7 @@
                 logger.warn("Empty Package {}", attributesHistory.get(Attr.PACKAGE).peek());
                 pack = null;
             }
+            */
 
             if (!names.isEmpty()) {
                 for (String name : names) {
@@ -591,26 +581,30 @@
                     }
             }
             } else {
-                throw new IllegalStateException("Error in parser implementation! The required attribute 'name' which should have been " +
-                        "defined in ACTION could not be retrieved. This should have been thrown before as it is a required attribute for " +
-                        "ACTION");
+            /**
+             *  Previously, an exception was thrown but in fact there is no need to crash here.
+             *  Actions are required, but if there is no action in a particular intent-filter,
+             *  then no intent will pass the intent filter.
+             *  See also http://developer.android.com/guide/topics/manifest/action-element.html
+             *  So we'll just issue a warning and continue happily with our work...
+             */
+            logger.warn("specified intent without action - this means that no intents will pass the filter...");
             }
         }
     }
 
     private static class ComponentItem extends ParserItem {
-        public ComponentItem() {
-            super();
-        }
         @Override
          public void leave() {
             final Set<Tag> allowedTags = self.getAllowedSubTags();
-            final Set<Intent> overrideTargets = new HashSet<Intent>(); 
+            final Set<Intent> overrideTargets = new HashSet<>(); 
 
             while (parserStack.peek() != self) {
                 Tag current = parserStack.pop();
                 if (allowedTags.contains(current)) {
                     if (current == Tag.INTENT) {
+                    // do not expect item at top of stack if no intent was produced
+                    if (attributesHistory.get(Tag.INTENT).isEmpty()) continue;
                         Object oIntent = attributesHistory.get(Tag.INTENT).peek();
                         if (oIntent == null) {
                              throw new IllegalStateException("The currently parsed Intent did not push a Valid intent to the " +
@@ -638,14 +632,24 @@
                 logger.warn("Empty Package {}", attributesHistory.get(Attr.PACKAGE).peek());
                 pack = null;
             }
-            final String name = (String) attributesHistory.get(Attr.NAME).peek(); // TODO: Verify type!
+
+            final String name;
+            if (self == Tag.ALIAS) {
+                name =  (String) attributesHistory.get(Attr.TARGET).peek(); // TODO: Verify type!
+            } else {
+                name = (String) attributesHistory.get(Attr.NAME).peek(); // TODO: Verify type!
+            }
             final Intent intent = AndroidSettingFactory.intent(pack, name, null);
 
             logger.info("\tRegister: {}", intent);
             AndroidEntryPointManager.MANAGER.registerIntent(intent);
             for (Intent ovr: overrideTargets) {
                 logger.info("\tOverride: {} --> {}", ovr, intent);
-                AndroidEntryPointManager.MANAGER.setOverride(ovr, intent);
+                if (ovr.equals(intent)) {
+                    AndroidEntryPointManager.MANAGER.registerIntent(intent);
+                } else {
+                    AndroidEntryPointManager.MANAGER.setOverride(ovr, intent);
+                }
             }
         }
     }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidPreFlightChecks.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidPreFlightChecks.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidPreFlightChecks.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidPreFlightChecks.java	2019-01-29 17:08:39.000000000 +0000
@@ -46,7 +46,6 @@
 
 import com.ibm.wala.dalvik.ipa.callgraph.androidModel.parameters.IInstantiationBehavior;
 import com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint;
-import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.Selector;
 import com.ibm.wala.types.TypeName;
@@ -60,7 +59,7 @@
  *
  *  These checks may be run before building the CallGraph to verify everything is in place.
  *
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-11-01
  */
 public class AndroidPreFlightChecks {
@@ -68,7 +67,7 @@
 //    private final AnalysisOptions options;
     private final IClassHierarchy cha;
 
-    public AndroidPreFlightChecks(AndroidEntryPointManager manager, AnalysisOptions options, IClassHierarchy cha) {
+    public AndroidPreFlightChecks(AndroidEntryPointManager manager, IClassHierarchy cha) {
         this.manager = manager;
 //        this.options = options;
         this.cha = cha;
@@ -126,10 +125,9 @@
      *
      *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextInterpreter
      *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextSelector
-     *  @see    com.ibm.wala.dalvik.ipa.callgraph.androidModel.stubs.Overrides.StartComponentMethodTargetSelector
      *
      *  @return if check passed
-     *  @todo this doesn't check anything yet
+     *  TODO: this doesn't check anything yet
      */
     public boolean checkOverridesInPlace() {
         boolean pass = true;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidSettingFactory.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidSettingFactory.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidSettingFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidSettingFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,7 +50,7 @@
  *  This is for use by a parser to generate the Objects to place in the AndroidEntryPointManager.
  *
  *  @see    AndroidManifestXMLReader
- *  @author Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  *  @since  2013-10-14
  */
 public class AndroidSettingFactory {
@@ -137,7 +137,7 @@
      *  @param  name    The Action this intent represents
      *  @param  uri     The URI to match may be null
      *  @throws IllegalArgumentException If name was null or starts with a dot and pack is null
-     *  @todo   Check Target-Types
+     *  TODO: Check Target-Types
      */
     public static Intent intent(String pack, String name, String uri) {
         if ((name == null) || (name.isEmpty())) {
@@ -152,10 +152,9 @@
             name = pack + name;
             type = Intent.IntentType.INTERNAL_TARGET;   // TODO Ehhh...
         } else if (!(name.contains("."))) {
-            if ((pack == null) || (pack.isEmpty())) {
-                throw new IllegalArgumentException("The pack is needed to resolve the full name of " + name + ", but it's empty");
+            if ((pack != null) && (!pack.isEmpty())) {
+                name = pack + '.' + name;
             }
-            name = pack + "." + name;
             type = Intent.IntentType.INTERNAL_TARGET;   // TODO Ehhh...
         } else if ((pack != null) && (name.startsWith(pack))) {
             type = Intent.IntentType.INTERNAL_TARGET;   // TODO Ehhh...
@@ -202,10 +201,16 @@
     //
     public static Intent intent(String fullyQualifiedAction, String uri) {
         if (fullyQualifiedAction.startsWith(".")) {
-            throw new IllegalArgumentException("The action " + fullyQualifiedAction + " is not fully qualified! Use " +
+            String pack = AndroidEntryPointManager.MANAGER.getPackage();
+            if (pack != null) {
+                return intent(pack, fullyQualifiedAction, uri);
+            } else {
+            throw new IllegalArgumentException("The action " + fullyQualifiedAction + " is not fully qualified and the application package is unknown! Use " +
                     " intent(String pack, String name, String uri) to build the intent!");
+            }
+        } else {
+            return intent(null, fullyQualifiedAction, uri);
         }
-        return intent(null, fullyQualifiedAction, uri);
     }
 
     public static Intent intent(String fullyQualifiedAction) {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidTypes.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidTypes.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidTypes.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidTypes.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,7 +47,7 @@
 /**
  *  Constants for types used by the AndroidModel
  *
- *  @author     Tobias Blaschke <code@tobiasblaschke.de>
+ *  @author     Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 public final class AndroidTypes {
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/package-info.java wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/package-info.java
--- wala-1.3.9/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/package-info.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/package-info.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,6 +44,6 @@
  * These include mainly locationg and managing EntryPoints. The model howver is
  * built in the androidModel-Package.
  *
- * @author Tobias Blaschke <code@tobiasblaschke.de>
+ * @author Tobias Blaschke &lt;code@tobiasblaschke.de&gt;
  */
 package com.ibm.wala.dalvik.util;
diff -Nru wala-1.3.9/com.ibm.wala.dalvik/src/logback.xml wala-1.5.1/com.ibm.wala.dalvik/src/logback.xml
--- wala-1.3.9/com.ibm.wala.dalvik/src/logback.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik/src/logback.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,3 +1,4 @@
+<!DOCTYPE configuration>
 <configuration>
   <appender name="STDOUT"
     class="ch.qos.logback.core.ConsoleAppender">
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/build.gradle wala-1.5.1/com.ibm.wala.dalvik.test/build.gradle
--- wala-1.3.9/com.ibm.wala.dalvik.test/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,167 @@
+plugins {
+	id 'com.github.hauner.jarTest'
+}
+
+sourceSets.test {
+	java.srcDirs = ['source']
+	resources.srcDirs = [
+		'data',
+		project(':com.ibm.wala.core.testdata').compileTestJava,
+		]
+}
+
+def osName = System.getProperty('os.name')
+ext.isWindows = osName.startsWith('Windows ')
+
+task downloadDroidBench(type: VerifiedDownload) {
+	src 'https://codeload.github.com/secure-software-engineering/DroidBench/zip/DroidBench_2.0'
+	dest "$temporaryDir/DroidBench_2.0.zip"
+	checksum '16726a48329835140e14f18470a1b4a3'
+}
+
+task unpackDroidBench(type: Sync, dependsOn: downloadDroidBench) {
+	from(zipTree(downloadDroidBench.dest)) {
+		eachFile {
+			relativePath new RelativePath(!directory, relativePath.segments[1..-1] as String[])
+		}
+	}
+
+	into '/tmp/DroidBench'
+	includeEmptyDirs false
+}
+
+task downloadAndroidSdk(type: VerifiedDownload) {
+	def sdkOs
+	switch (osName) {
+		case ~/Linux/:
+			sdkOs = 'linux'
+			checksum '444e22ce8ca0f67353bda4b85175ed3731cae3ffa695ca18119cbacef1c1bea0'
+			break
+		case ~/Mac OS X/:
+			sdkOs = 'darwin'
+			checksum '4a81754a760fce88cba74d69c364b05b31c53d57b26f9f82355c61d5fe4b9df9'
+			break
+		case ~/Windows.*/:
+			sdkOs = 'windows'
+			checksum '7f6037d3a7d6789b4fdc06ee7af041e071e9860c51f66f7a4eb5913df9871fd2'
+			break
+	}
+	def archive = "sdk-tools-$sdkOs-3859397.zip"
+	src "https://dl.google.com/android/repository/$archive"
+	dest "$temporaryDir/$archive"
+	algorithm 'SHA-256'
+}
+
+task installAndroidSdk(type: Sync, dependsOn: downloadAndroidSdk) {
+	from zipTree(downloadAndroidSdk.dest)
+	into temporaryDir
+
+	def buildToolsVersion = '26.0.2'
+	ext {
+		components = [
+			'build-tools': buildToolsVersion,
+			'platforms': "android-${buildToolsVersion.tokenize('.')[0]}"
+		]
+	}
+
+	doLast {
+		exec {
+			def shell, shellFlags, yes, semicolon, discard
+			if (project.isWindows) {
+				shell = 'PowerShell'
+				shellFlags = '-Command'
+				yes = 'echo y'
+				semicolon = '`;'
+				discard = '$null'
+			} else {
+				shell = 'sh'
+				shellFlags = '-ceu'
+				yes = 'yes 2>/dev/null'
+				semicolon = /\;/
+				discard = '/dev/null'
+			}
+
+			def componentArgs = components.collect { "$it.key$semicolon$it.value" }.join ' '
+			commandLine shell, shellFlags, "$yes | $temporaryDir/tools/bin/sdkmanager $componentArgs >$discard"
+		}
+	}
+	outputs.cacheIf { true }
+}
+
+task copyDxJar(type: Sync, dependsOn: installAndroidSdk) {
+	from "${files(installAndroidSdk).singleFile}/build-tools/${installAndroidSdk.components['build-tools']}/lib/dx.jar"
+	into 'lib'
+}
+
+clean.dependsOn cleanCopyDxJar
+
+compileTestJava.dependsOn copyDxJar
+afterEclipseBuildshipImport.dependsOn copyDxJar
+prepareIntelliJIDEA.dependsOn copyDxJar
+
+task copyAndroidJar(type: Sync, dependsOn: installAndroidSdk) {
+	from "${installAndroidSdk.destinationDir}/platforms/${installAndroidSdk.components['platforms']}/android.jar"
+	into temporaryDir
+}
+
+task downloadSampleCup(type: VerifiedDownload) {
+	src 'http://www.cc.gatech.edu/gvu/people/faculty/hudson/java_cup/classes.v0.9e/java_cup/parser.cup'
+	dest 'data/sample.cup'
+	checksum '76b549e7c6e802b811a374248175ecf4'
+}
+
+clean.dependsOn cleanDownloadSampleCup
+
+task downloadSampleLex(type: VerifiedDownload) {
+	src 'https://www.cs.princeton.edu/~appel/modern/java/JLex/current/sample.lex'
+	dest 'data/sample.lex'
+	checksum 'ae887758b2657981d023a72a165da830'
+}
+
+clean.dependsOn cleanDownloadSampleLex
+
+publishing.publications {
+	mavenJava(MavenPublication) {
+		artifact jarTest
+	}
+}
+
+dependencies {
+	testCompile(
+		'junit:junit:4.12',
+		'org.osgi:org.osgi.core:4.2.0',
+		files("${copyDxJar.destinationDir}/dx.jar"),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.dalvik'),
+		project(':com.ibm.wala.shrike'),
+		project(':com.ibm.wala.util'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
+		)
+	testRuntime files("${copyAndroidJar.destinationDir}/android.jar")
+}
+
+processTestResources {
+	from copyAndroidJar
+	from downloadSampleCup
+	from downloadSampleLex
+	from project(':com.ibm.wala.core.testdata').collectTestDataA
+}
+
+if (isWindows)
+	test.exclude '**/droidbench/**'
+else
+	processTestResources.dependsOn unpackDroidBench
+
+test {
+	maxHeapSize = '800M'
+}
+
+task cleanTestExtras(type: Delete) {
+	delete(
+			'parser.java',
+			'report',
+			'sym.java',
+	)
+}
+
+cleanTest.dependsOn cleanTestExtras
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/build.properties wala-1.5.1/com.ibm.wala.dalvik.test/build.properties
--- wala-1.3.9/com.ibm.wala.dalvik.test/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -2,6 +2,10 @@
            data/
 output.. = bin/
 bin.includes = META-INF/,\
-	       lib/dx.jar
+	       .,\
+               lib/dx.jar,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
 jars.extra.classpath = lib/dx.jar
-jre.compilation.profile = JavaSE-1.7
+jre.compilation.profile = JavaSE-1.8
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/build.xml wala-1.5.1/com.ibm.wala.dalvik.test/build.xml
--- wala-1.3.9/com.ibm.wala.dalvik.test/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/build.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project>
 <project name="com.ibm.wala.dalvik.test" default="getJars" basedir=".">
 
 	<property name="basews" value="${ws}"/>
@@ -12,8 +13,8 @@
 	<property name="javacVerbose" value="false"/>
 	<property name="logExtension" value=".log"/>
 	<property name="compilerArg" value=""/>
-	<property name="javacSource" value="1.5"/>
-	<property name="javacTarget" value="1.5"/>
+	<property name="javacSource" value="1.8"/>
+	<property name="javacTarget" value="1.8"/>
 	<!-- This property has been updated to correspond to the paths used by the latest Java update
 	on Mac OS X 10.6 (Java version 1.6.0_22).  If you are not using this version of Mac OS X or Java,
 	try changing the value of the property to "${java.home}/../../../Classes" -->
@@ -35,6 +36,11 @@
 	<property name="bundleJavacTarget" value="${javacTarget}"/>
 	<property name="bundleBootClasspath" value="${bootclasspath}"/>
 
+	<property environment="env" /> 
+	<condition property="androiddir" value="${env.ANDROID_HOME}"> 
+          <isset property="env.ANDROID_HOME" /> 
+	</condition> 
+
      <target name="sampleLexPresent" depends="init">
         <available file="${plugin.destination}/data/sample.lex" property="sample.lex.present"/>
      </target>
@@ -59,7 +65,14 @@
      <available file="${plugin.destination}/data/android.jar" property="android.jar.present"/>
    </target>
 
-   <target name="getJars" depends="fetchSampleLex,fetchSampleCup,fetchAndroidJar" />
+	<target name="fetchDxJar">
+		<mkdir dir="${basedir}/lib/"/>
+		<copy
+		    file="${androiddir}/build-tools/26.0.2/lib/dx.jar"
+		    tofile="${basedir}/lib/dx.jar" force="true"/>
+	</target>
+
+	<target name="getJars" depends="fetchSampleLex,fetchSampleCup,fetchAndroidJar,fetchDxJar" />
 
 	<target name="init" depends="properties">
 		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/.classpath wala-1.5.1/com.ibm.wala.dalvik.test/.classpath
--- wala-1.3.9/com.ibm.wala.dalvik.test/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="source"/>
-	<classpathentry kind="src" path="data"/>
-	<classpathentry kind="lib" path="lib/dx.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/.gitignore wala-1.5.1/com.ibm.wala.dalvik.test/.gitignore
--- wala-1.3.9/com.ibm.wala.dalvik.test/.gitignore	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/.gitignore	2019-01-29 17:08:39.000000000 +0000
@@ -1 +1,2 @@
 /lib/
+/test_jar.jar
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,18 +1,25 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WalaDalvikBytecodeTests
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.dalvik.test
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Bundle-Activator: com.ibm.wala.dalvik.test.Activator
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
  com.ibm.wala.core.testdata;bundle-version="1.3.4",
  com.ibm.wala.core.tests;bundle-version="1.3.4",
  com.ibm.wala.dalvik;bundle-version="1.0.0",
  com.ibm.wala.core;bundle-version="1.3.4",
  com.ibm.wala.shrike;bundle-version="1.3.4",
- org.junit;bundle-version="4.11.0"
+ org.junit;bundle-version="4.12.0"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,
  lib/dx.jar
+Export-Package: com.ibm.wala.dalvik.drivers,
+ com.ibm.wala.dalvik.test,
+ com.ibm.wala.dalvik.test.callGraph,
+ com.ibm.wala.dalvik.test.callGraph.droidbench,
+ com.ibm.wala.dalvik.test.ir,
+ com.ibm.wala.dalvik.test.cha,
+ com.ibm.wala.dalvik.test.util
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.dalvik.test/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.dalvik.test/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.dalvik.test
+Bundle-Vendor = IBM
+Bundle-Name = WalaDalvikBytecodeTests
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/pom.xml wala-1.5.1/com.ibm.wala.dalvik.test/pom.xml
--- wala-1.3.9/com.ibm.wala.dalvik.test/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
   <parent>
       <groupId>com.ibm.wala</groupId>
       <artifactId>WALA</artifactId>
-      <version>1.3.9</version>
+      <version>1.5.1</version>
   </parent>
   <artifactId>com.ibm.wala.dalvik.test</artifactId>
   <packaging>eclipse-plugin</packaging>
@@ -40,7 +40,9 @@
               <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
               <argLine>-Xmx800M -ea</argLine>
               <redirectTestOutputToFile>true</redirectTestOutputToFile>
-            </configuration>
+  	      <forkCount>2</forkCount>
+	      <reuseForks>false</reuseForks>
+          </configuration>
             <goals>
               <goal>test</goal>
             </goals>
@@ -54,9 +56,24 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.smali</groupId>
+      <artifactId>dexlib2</artifactId>
+      <version>2.2.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.smali</groupId>
+      <artifactId>util</artifactId>
+      <version>2.2.5</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>22.0</version>
+    </dependency>
   </dependencies>
-
+  
 </project>
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/.project wala-1.5.1/com.ibm.wala.dalvik.test/.project
--- wala-1.3.9/com.ibm.wala.dalvik.test/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.dalvik.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.dalvik.test/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.dalvik.test/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,68 +1,125 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=error
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.dalvik.test/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.dalvik.test/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.dalvik.test/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.dalvik.test/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude09113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T02111contentType133org.eclipse.jdt.junit.JUnitResultF04file122target/p2artifacts.xmlT0304file120target/p2content.xmlT0304file128target/antrun/build-main.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/drivers/APKCallGraphDriver.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/drivers/APKCallGraphDriver.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/drivers/APKCallGraphDriver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/drivers/APKCallGraphDriver.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,7 +1,6 @@
 package com.ibm.wala.dalvik.drivers;
 
 import java.io.File;
-import java.net.URI;
 import java.util.Collections;
 import java.util.Set;
 
@@ -12,10 +11,14 @@
 import com.ibm.wala.ipa.callgraph.AnalysisOptions.ReflectionOptions;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
+import com.ibm.wala.ipa.slicer.SDG;
+import com.ibm.wala.ipa.slicer.Slicer.ControlDependenceOptions;
+import com.ibm.wala.ipa.slicer.Slicer.DataDependenceOptions;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.functions.VoidFunction;
+import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.io.FileUtil;
 
 public class APKCallGraphDriver {
@@ -24,23 +27,6 @@
   
   private static int timeout = -1;
 
-  private static URI[] libs() {
-    File f = new File("libs");
-    if (f.exists() && f.isDirectory()) {
-      Set<URI> libs = HashSetFactory.make();
-      for(File l : f.listFiles()) {
-        String name = l.getName();
-        if (name.endsWith("jar") || name.endsWith("dex")) {
-          libs.add(l.toURI());
-        }
-      }
-      
-      return libs.toArray(new URI[ libs.size() ]);
-    }
-    
-    return Util.androidLibs();
-  }
-  
   public static void main(String[] args) {
 	  File apk = new File(args[0]);
 	  try {
@@ -49,100 +35,93 @@
 	  } catch (Throwable e) {
 		  // no timeout specified
 	  }
-	  FileUtil.recurseFiles(new VoidFunction<File>() {
+	  FileUtil.recurseFiles(apk1 -> {
+      System.gc();
+      System.err.println("Analyzing " + apk1 + "...");
+      try {
+        long time = System.currentTimeMillis();
+        Pair<CallGraph, PointerAnalysis<InstanceKey>> CG;
+        final long startTime = System.currentTimeMillis();
+        IProgressMonitor pm = new IProgressMonitor() {
+          private boolean cancelled = false;
+
+          @Override
+          public void beginTask(String task, int totalWork) {
+            // TODO Auto-generated method stub	
+          }
+
+          @Override
+          public void subTask(String subTask) {
+            // TODO Auto-generated method stub
+          }
+
+          @Override
+          public void cancel() {
+            cancelled = true;
+          }
+
+          @Override
+          public boolean isCanceled() {
+            if (System.currentTimeMillis() - startTime > timeout) {
+              cancelled = true;
+            }
+            return cancelled;
+          }
+
+          @Override
+          public void done() {
+            // TODO Auto-generated method stub					
+          }
+
+          @Override
+          public void worked(int units) {
+            // TODO Auto-generated method stub
+          }
+
+          @Override
+          public String getCancelMessage() {
+            return "timeout";
+          }	
+        };
+        CG = DalvikCallGraphTestBase.makeAPKCallGraph(null, Util.androidJavaLib(), apk1.getAbsolutePath(), pm, ReflectionOptions.NONE);
+        System.err.println("Analyzed " + apk1 + " in " + (System.currentTimeMillis() - time));
+
+        System.err.println(new SDG<>(CG.fst, CG.snd, DataDependenceOptions.NO_BASE_NO_HEAP_NO_EXCEPTIONS, ControlDependenceOptions.NONE));
+        
+        if (dumpIR) {
+          for(CGNode n1 : CG.fst) {
+            System.err.println(n1.getIR());
+            System.err.println();
+          }	          
+        } else {
+          Set<IMethod> code = HashSetFactory.make();
+          for(CGNode n2 : CG.fst) {
+            code.add(n2.getMethod());
+          }
+
+          if (addAbstract) {
+            for(IClass cls : CG.fst.getClassHierarchy()) {
+              for(IMethod m1 : cls.getDeclaredMethods()) {
+                if (m1.isAbstract() && !Collections.disjoint(CG.fst.getClassHierarchy().getPossibleTargets(m1.getReference()), code)) {
+                  code.add(m1);
+                }
+              }
+            }
+          }
+
+          System.err.println("reachable methods for " + apk1);
+          for(IMethod m2 : code) {
+            System.err.println(m2.getDeclaringClass().getName() + " " + m2.getName() + m2.getDescriptor());
 
-	    @Override
-	    public void apply(File apk) {
-	      System.gc();
-	      System.err.println("Analyzing " + apk + "...");
-	      try {
-	        long time = System.currentTimeMillis();
-	        CallGraph CG;
-	        final long startTime = System.currentTimeMillis();
-	        IProgressMonitor pm = new IProgressMonitor() {
-	          private boolean cancelled = false;
-
-	          @Override
-	          public void beginTask(String task, int totalWork) {
-	            // TODO Auto-generated method stub	
-	          }
-
-	          @Override
-	          public void subTask(String subTask) {
-	            // TODO Auto-generated method stub
-	          }
-
-	          @Override
-	          public void cancel() {
-	            cancelled = true;
-	          }
-
-	          @Override
-	          public boolean isCanceled() {
-	            if (System.currentTimeMillis() - startTime > timeout) {
-	              cancelled = true;
-	            }
-	            return cancelled;
-	          }
-
-	          @Override
-	          public void done() {
-	            // TODO Auto-generated method stub					
-	          }
-
-	          @Override
-	          public void worked(int units) {
-	            // TODO Auto-generated method stub
-	          }
-
-	          @Override
-	          public String getCancelMessage() {
-	            return "timeout";
-	          }	
-	        };
-	        CG = DalvikCallGraphTestBase.makeAPKCallGraph(libs(), null, apk.getAbsolutePath(), pm, ReflectionOptions.NONE).fst;
-	        System.err.println("Analyzed " + apk + " in " + (System.currentTimeMillis() - time));
-
-	        if (dumpIR) {
-	          for(CGNode n : CG) {
-	            System.err.println(n.getIR());
-	            System.err.println();
-	          }	          
-	        } else {
-	          Set<IMethod> code = HashSetFactory.make();
-	          for(CGNode n : CG) {
-	            code.add(n.getMethod());
-	          }
-
-	          if (addAbstract) {
-	            for(IClass cls : CG.getClassHierarchy()) {
-	              for(IMethod m : cls.getDeclaredMethods()) {
-	                if (m.isAbstract() && !Collections.disjoint(CG.getClassHierarchy().getPossibleTargets(m.getReference()), code)) {
-	                  code.add(m);
-	                }
-	              }
-	            }
-	          }
-
-	          System.err.println("reachable methods for " + apk);
-	          for(IMethod m : code) {
-	            System.err.println("" + m.getDeclaringClass().getName() + " " + m.getName() + m.getDescriptor());
-
-	          }
-	          System.err.println("end of methods");
-	        }
-
-	      } catch (Throwable e) {
-	        e.printStackTrace(System.err);
-	      }
-	    }	
-	  }, 
-	  new Predicate<File>() {
-	    @Override
-	    public boolean test(File file) {
-	      return file.getName().endsWith("apk");
-	    }  
-	  },
+          }
+          System.err.println("end of methods");
+        }
+
+      } catch (Throwable e) {
+        e.printStackTrace(System.err);
+      }
+    }, 
+	  file -> file.getName().endsWith("apk"),
 	  apk);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DalvikCallGraphTestBase.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DalvikCallGraphTestBase.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DalvikCallGraphTestBase.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DalvikCallGraphTestBase.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,57 +10,57 @@
  *******************************************************************************/
 package com.ibm.wala.dalvik.test.callGraph;
 
+import static com.ibm.wala.dalvik.test.util.Util.makeDalvikScope;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Predicate;
 
 import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.classLoader.NewSiteReference;
 import com.ibm.wala.core.tests.shrike.DynamicCallGraphTestBase;
 import com.ibm.wala.dalvik.classLoader.DexIRFactory;
 import com.ibm.wala.dalvik.util.AndroidEntryPointLocator;
 import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.LocatorFlags;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions.ReflectionOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Util;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
 import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.propagation.cfa.DefaultSSAInterpreter;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.shrikeBT.analysis.Analyzer.FailureException;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
-import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.ssa.SSANewInstruction;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.MapIterator;
 import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.io.TemporaryFile;
 
-import static com.ibm.wala.dalvik.test.util.Util.makeDalvikScope;
-
 public class DalvikCallGraphTestBase extends DynamicCallGraphTestBase {
 	
 	protected static <T> Set<T> processCG(CallGraph cg, Predicate<CGNode> filter, Function<CGNode,T> map) {
@@ -75,23 +75,16 @@
 	
 	protected static Set<MethodReference> applicationMethods(CallGraph cg) {
 		return processCG(cg,
-			new Predicate<CGNode>() {
-				@Override
-				public boolean test(CGNode t) {
-					return t.getMethod().getReference().getDeclaringClass().getClassLoader().equals(ClassLoaderReference.Application);
-				}
-			},
-			new Function<CGNode,MethodReference>() {
-				@Override
-				public MethodReference apply(CGNode object) {
-					return object.getMethod().getReference();
-				}
-			});
+			t -> t.getMethod().getReference().getDeclaringClass().getClassLoader().equals(ClassLoaderReference.Application),
+			object -> object.getMethod().getReference());
 	}
 	
 
-	public void dynamicCG(File javaJarPath, String mainClass, String... args) throws FileNotFoundException, IOException, ClassNotFoundException, InvalidClassFileException, FailureException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException, InterruptedException {
-		File F = TemporaryFile.streamToFile(new File("test_jar.jar"), new FileInputStream(javaJarPath));
+	public void dynamicCG(File javaJarPath, String mainClass, String... args) throws FileNotFoundException, IOException, ClassNotFoundException, InvalidClassFileException, FailureException, SecurityException, IllegalArgumentException, InterruptedException {
+		File F;
+		try (final FileInputStream in = new FileInputStream(javaJarPath)) {
+		  F = TemporaryFile.streamToFile(new File("test_jar.jar"), in);
+		}
 		F.deleteOnExit();
 		instrument(F.getAbsolutePath());
 		run(mainClass.substring(1).replace('/', '.'), "LibraryExclusions.txt", args);
@@ -99,26 +92,16 @@
 
 
 	@SuppressWarnings("unused")
-  private static SSAContextInterpreter makeDefaultInterpreter(AnalysisOptions options, AnalysisCache cache) {
+  private static SSAContextInterpreter makeDefaultInterpreter(AnalysisOptions options, IAnalysisCacheView cache) {
 		return new DefaultSSAInterpreter(options, cache) {
 			@Override
 			public Iterator<NewSiteReference> iterateNewSites(CGNode node) {
 				return 
-					new MapIterator<SSAInstruction,NewSiteReference>(
-						new FilterIterator<SSAInstruction>(
+					new MapIterator<>(
+						new FilterIterator<>(
 								node.getIR().iterateAllInstructions(), 
-								new Predicate<SSAInstruction>() {
-									@Override
-									public boolean test(SSAInstruction t) {
-										return t instanceof SSANewInstruction;
-									} 
-								}), 
-						new Function<SSAInstruction,NewSiteReference>() {
-							@Override
-							public NewSiteReference apply(SSAInstruction object) {
-								return ((SSANewInstruction)object).getNewSite();
-							} 
-						}
+								SSANewInstruction.class::isInstance), 
+						object -> ((SSANewInstruction)object).getNewSite()
 					);
 			}
 		};
@@ -127,16 +110,11 @@
 	public static Pair<CallGraph, PointerAnalysis<InstanceKey>> makeAPKCallGraph(URI[] androidLibs, File androidAPIJar, String apkFileName, IProgressMonitor monitor, ReflectionOptions policy) throws IOException, ClassHierarchyException, IllegalArgumentException, CancelException {
 		AnalysisScope scope = makeDalvikScope(androidLibs, androidAPIJar, apkFileName);
 
-		final IClassHierarchy cha = ClassHierarchy.make(scope);
+		final IClassHierarchy cha = ClassHierarchyFactory.make(scope);
 
-		AnalysisCache cache = new AnalysisCache(new DexIRFactory());
+		IAnalysisCacheView cache = new AnalysisCacheImpl(new DexIRFactory());
 
-		Set<LocatorFlags> flags = HashSetFactory.make();
-		flags.add(LocatorFlags.INCLUDE_CALLBACKS);
-		flags.add(LocatorFlags.EP_HEURISTIC);
-		flags.add(LocatorFlags.CB_HEURISTIC);
-		AndroidEntryPointLocator eps = new AndroidEntryPointLocator(flags);
-		List<? extends Entrypoint> es = eps.getEntryPoints(cha);
+		List<? extends Entrypoint> es = getEntrypoints(cha);
 
 		assert ! es.isEmpty();
 		
@@ -144,7 +122,7 @@
 		options.setReflectionOptions(policy);
 		
 		// SSAPropagationCallGraphBuilder cgb = Util.makeZeroCFABuilder(options, cache, cha, scope, null, makeDefaultInterpreter(options, cache));
-		SSAPropagationCallGraphBuilder cgb = Util.makeZeroCFABuilder(options, cache, cha, scope);
+		SSAPropagationCallGraphBuilder cgb = Util.makeZeroCFABuilder(Language.JAVA, options, cache, cha, scope);
   
 		CallGraph callGraph = cgb.makeCallGraph(options, monitor);
 		
@@ -152,11 +130,21 @@
 		
 		return Pair.make(callGraph, ptrAnalysis);
 	}
+
+  public static List<? extends Entrypoint> getEntrypoints(final IClassHierarchy cha) {
+    Set<LocatorFlags> flags = HashSetFactory.make();
+		flags.add(LocatorFlags.INCLUDE_CALLBACKS);
+		flags.add(LocatorFlags.EP_HEURISTIC);
+		flags.add(LocatorFlags.CB_HEURISTIC);
+		AndroidEntryPointLocator eps = new AndroidEntryPointLocator(flags);
+		List<? extends Entrypoint> es = eps.getEntryPoints(cha);
+    return es;
+  }
 	
 	public static Pair<CallGraph, PointerAnalysis<InstanceKey>> makeDalvikCallGraph(URI[] androidLibs, File androidAPIJar, String mainClassName, String dexFileName) throws IOException, ClassHierarchyException, IllegalArgumentException, CancelException {
 		AnalysisScope scope = makeDalvikScope(androidLibs, androidAPIJar, dexFileName);
 		
-		final IClassHierarchy cha = ClassHierarchy.make(scope);
+		final IClassHierarchy cha = ClassHierarchyFactory.make(scope);
 
 		TypeReference mainClassRef = TypeReference.findOrCreate(ClassLoaderReference.Application, mainClassName);
 		IClass mainClass = cha.lookupClass(mainClassRef);
@@ -166,11 +154,11 @@
 		
 		Iterable<Entrypoint> entrypoints = Util.makeMainEntrypoints(scope, cha, mainClassName);
 		
-		AnalysisCache cache = new AnalysisCache(new DexIRFactory());
+		IAnalysisCacheView cache = new AnalysisCacheImpl(new DexIRFactory());
 
 		AnalysisOptions options = new AnalysisOptions(scope, entrypoints);
 
-		SSAPropagationCallGraphBuilder cgb = Util.makeZeroCFABuilder(options, cache, cha, scope);
+		SSAPropagationCallGraphBuilder cgb = Util.makeZeroCFABuilder(Language.JAVA, options, cache, cha, scope);
   
 		CallGraph callGraph = cgb.makeCallGraph(options);
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/AliasingTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/AliasingTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/AliasingTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/AliasingTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 package com.ibm.wala.dalvik.test.callGraph.droidbench;
 
+import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -13,8 +15,6 @@
 import com.ibm.wala.dalvik.test.callGraph.DroidBenchCGTest;
 import com.ibm.wala.types.MethodReference;
 
-import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
-
 @RunWith(Parameterized.class)
 public class AliasingTest extends DroidBenchCGTest {
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/AndroidSpecificTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/AndroidSpecificTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/AndroidSpecificTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/AndroidSpecificTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 package com.ibm.wala.dalvik.test.callGraph.droidbench;
 
+import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -13,8 +15,6 @@
 import com.ibm.wala.dalvik.test.callGraph.DroidBenchCGTest;
 import com.ibm.wala.types.MethodReference;
 
-import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
-
 @RunWith(Parameterized.class)
 public class AndroidSpecificTest extends DroidBenchCGTest {
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/CallbacksTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/CallbacksTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/CallbacksTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/CallbacksTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 package com.ibm.wala.dalvik.test.callGraph.droidbench;
 
+import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -13,8 +15,6 @@
 import com.ibm.wala.dalvik.test.callGraph.DroidBenchCGTest;
 import com.ibm.wala.types.MethodReference;
 
-import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
-
 @RunWith(Parameterized.class)
 public class CallbacksTest extends DroidBenchCGTest {
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/EmulatorDetectionTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/EmulatorDetectionTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/EmulatorDetectionTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/EmulatorDetectionTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 package com.ibm.wala.dalvik.test.callGraph.droidbench;
 
+import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -13,8 +15,6 @@
 import com.ibm.wala.dalvik.test.callGraph.DroidBenchCGTest;
 import com.ibm.wala.types.MethodReference;
 
-import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
-
 @RunWith(Parameterized.class)
 public class EmulatorDetectionTest extends DroidBenchCGTest {
   public EmulatorDetectionTest(URI[] androidLibs, File androidJavaJar, String apkFile, Set<MethodReference> uncalled) {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/FieldAndObjectSensitivityTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/FieldAndObjectSensitivityTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/FieldAndObjectSensitivityTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/FieldAndObjectSensitivityTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 package com.ibm.wala.dalvik.test.callGraph.droidbench;
 
+import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -13,8 +15,6 @@
 import com.ibm.wala.dalvik.test.callGraph.DroidBenchCGTest;
 import com.ibm.wala.types.MethodReference;
 
-import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
-
 @RunWith(Parameterized.class)
 public class FieldAndObjectSensitivityTest extends DroidBenchCGTest {
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/GeneralJavaTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/GeneralJavaTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/GeneralJavaTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/GeneralJavaTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 package com.ibm.wala.dalvik.test.callGraph.droidbench;
 
+import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -13,8 +15,6 @@
 import com.ibm.wala.dalvik.test.callGraph.DroidBenchCGTest;
 import com.ibm.wala.types.MethodReference;
 
-import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
-
 
 @RunWith(Parameterized.class)
 public class GeneralJavaTest extends DroidBenchCGTest {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/ImplicitFlowsTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/ImplicitFlowsTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/ImplicitFlowsTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/ImplicitFlowsTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 package com.ibm.wala.dalvik.test.callGraph.droidbench;
 
+import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -13,8 +15,6 @@
 import com.ibm.wala.dalvik.test.callGraph.DroidBenchCGTest;
 import com.ibm.wala.types.MethodReference;
 
-import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
-
 @RunWith(Parameterized.class)
 public class ImplicitFlowsTest extends DroidBenchCGTest {
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/InterAppCommunicationTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/InterAppCommunicationTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/InterAppCommunicationTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/InterAppCommunicationTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 package com.ibm.wala.dalvik.test.callGraph.droidbench;
 
+import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -13,8 +15,6 @@
 import com.ibm.wala.dalvik.test.callGraph.DroidBenchCGTest;
 import com.ibm.wala.types.MethodReference;
 
-import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
-
 @RunWith(Parameterized.class)
 public class InterAppCommunicationTest extends DroidBenchCGTest {
    public InterAppCommunicationTest(URI[] androidLibs, File androidJavaJar, String apkFile, Set<MethodReference> uncalled) {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/InterComponentCommunicationTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/InterComponentCommunicationTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/InterComponentCommunicationTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/InterComponentCommunicationTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 package com.ibm.wala.dalvik.test.callGraph.droidbench;
 
+import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -13,8 +15,6 @@
 import com.ibm.wala.dalvik.test.callGraph.DroidBenchCGTest;
 import com.ibm.wala.types.MethodReference;
 
-import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
-
 @RunWith(Parameterized.class)
 public class InterComponentCommunicationTest extends DroidBenchCGTest {
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/LifecycleTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/LifecycleTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/LifecycleTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/LifecycleTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 package com.ibm.wala.dalvik.test.callGraph.droidbench;
 
+import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -13,8 +15,6 @@
 import com.ibm.wala.dalvik.test.callGraph.DroidBenchCGTest;
 import com.ibm.wala.types.MethodReference;
 
-import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
-
 @RunWith(Parameterized.class)
 public class LifecycleTest extends DroidBenchCGTest {
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/ReflectionTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/ReflectionTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/ReflectionTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/ReflectionTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 package com.ibm.wala.dalvik.test.callGraph.droidbench;
 
+import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -13,8 +15,6 @@
 import com.ibm.wala.dalvik.test.callGraph.DroidBenchCGTest;
 import com.ibm.wala.types.MethodReference;
 
-import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
-
 @RunWith(Parameterized.class)
 public class ReflectionTest extends DroidBenchCGTest {
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/ThreadingTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/ThreadingTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/ThreadingTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/droidbench/ThreadingTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,7 @@
 package com.ibm.wala.dalvik.test.callGraph.droidbench;
 
+import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -13,8 +15,6 @@
 import com.ibm.wala.dalvik.test.callGraph.DroidBenchCGTest;
 import com.ibm.wala.types.MethodReference;
 
-import static com.ibm.wala.dalvik.test.util.Util.androidJavaLib;
-
 @RunWith(Parameterized.class)
 public class ThreadingTest extends DroidBenchCGTest {
 
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,11 +10,12 @@
  *******************************************************************************/
 package com.ibm.wala.dalvik.test.callGraph;
 
+import static com.ibm.wala.dalvik.test.util.Util.walaProperties;
+
 import java.io.File;
 import java.net.URI;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -29,20 +30,16 @@
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
-import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.NullProgressMonitor;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.functions.VoidFunction;
 import com.ibm.wala.util.io.FileUtil;
 
-import static com.ibm.wala.dalvik.test.util.Util.walaProperties;
-
 public abstract class DroidBenchCGTest extends DalvikCallGraphTestBase {
 
 	private static MethodReference ref(String type, String name, String sig) {
@@ -81,12 +78,10 @@
 		 uncalledFunctions.put("VirtualDispatch2.apk",  x);
 	}
 	
-	public static Set<IMethod> assertUserCodeReachable(CallGraph cg, Set<MethodReference> uncalled) throws InvalidClassFileException {
+	public static Set<IMethod> assertUserCodeReachable(CallGraph cg, Set<MethodReference> uncalled) {
 		Set<IMethod> result = HashSetFactory.make();
-	  for(Iterator<IClass> clss = cg.getClassHierarchy().getLoader(ClassLoaderReference.Application).iterateAllClasses();
-			clss.hasNext(); ) 
+	  for(IClass cls : Iterator2Iterable.make(cg.getClassHierarchy().getLoader(ClassLoaderReference.Application).iterateAllClasses())) 
 		{
-			IClass cls = clss.next();
 			if (cls.isInterface()) {
 				continue;
 			}
@@ -149,33 +144,31 @@
 	}
 
   public static Collection<Object[]> generateData(final URI[] androidLibs, final File androidJavaJar, final String filter) {
-    String f = walaProperties.getProperty("droidbench.root");
-    if (f == null || !new File(f).exists()) {
-      f = "/tmp/DroidBench";       
-    }
-  
-    System.err.println("Use " + f + " as droid bench root");
-    assert new File(f).exists() : "Use " + f + " as droid bench root";
-    assert new File(f + "/apk/").exists() : "Use " + f + " as droid bench root";
-    return generateData(f, androidLibs, androidJavaJar, filter);
+
+    return generateData(getDroidBenchRoot(), androidLibs, androidJavaJar, filter);
+  }
+
+  public static String getDroidBenchRoot(){
+      String f = walaProperties.getProperty("droidbench.root");
+      if (f == null || !new File(f).exists()) {
+          f = "/tmp/DroidBench";
+      }
+
+      System.err.println("Use " + f + " as droid bench root");
+      assert new File(f).exists() : "Use " + f + " as droid bench root";
+      assert new File(f + "/apk/").exists() : "Use " + f + " as droid bench root";
+      return f;
   }
   
 	public static Collection<Object[]> generateData(String droidBenchRoot, final URI[] androidLibs, final File androidJavaJar, final String filter) {
-	  final List<Object[]> files = new LinkedList<Object[]>();
-	  FileUtil.recurseFiles(new VoidFunction<File>() {
-	    @Override
-	    public void apply(File f) {
-	      Set<MethodReference> uncalled = uncalledFunctions.get(f.getName());
-	      if (uncalled == null) {
-	        uncalled = Collections.emptySet();
-	      }
-	      files.add(new Object[]{ androidLibs, androidJavaJar, f.getAbsolutePath(), uncalled }); 
-	    }
-	  }, new Predicate<File>() {
-	    @Override
-	    public boolean test(File t) {
-	      return (filter == null || t.getAbsolutePath().contains(filter)) && t.getName().endsWith("apk") && ! skipTests.contains(t.getName().toString());
-	    } }, new File(droidBenchRoot + "/apk/"));
+	  final List<Object[]> files = new LinkedList<>();
+	  FileUtil.recurseFiles(f -> {
+      Set<MethodReference> uncalled = uncalledFunctions.get(f.getName());
+      if (uncalled == null) {
+        uncalled = Collections.emptySet();
+      }
+      files.add(new Object[]{ androidLibs, androidJavaJar, f.getAbsolutePath(), uncalled }); 
+    }, t -> (filter == null || t.getAbsolutePath().contains(filter)) && t.getName().endsWith("apk") && ! skipTests.contains(t.getName()), new File(droidBenchRoot + "/apk/"));
 	  return files;
 	}
 }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DynamicDalvikComparisonJavaLibsTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DynamicDalvikComparisonJavaLibsTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DynamicDalvikComparisonJavaLibsTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DynamicDalvikComparisonJavaLibsTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -2,8 +2,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
 import org.junit.Test;
 
 import com.ibm.wala.core.tests.util.TestConstants;
@@ -15,13 +13,13 @@
 public class DynamicDalvikComparisonJavaLibsTest extends DynamicDalvikComparisonTest {
 
   @Test
-  public void testJLex() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException, ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InvalidClassFileException, FailureException {
+  public void testJLex() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException, ClassNotFoundException, SecurityException, InvalidClassFileException, FailureException {
     File inputFile = testFile("sample.lex");
     test(null, TestConstants.JLEX_MAIN, TestConstants.JLEX, inputFile.getAbsolutePath());
   }
 
   @Test
-  public void testJavaCup() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException, ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InvalidClassFileException, FailureException {
+  public void testJavaCup() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException, ClassNotFoundException, SecurityException, InvalidClassFileException, FailureException {
     File inputFile = testFile("sample.cup");
     test(null, TestConstants.JAVA_CUP_MAIN, TestConstants.JAVA_CUP, inputFile.getAbsolutePath());
   }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DynamicDalvikComparisonTestForAndroidLibs.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DynamicDalvikComparisonTestForAndroidLibs.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DynamicDalvikComparisonTestForAndroidLibs.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DynamicDalvikComparisonTestForAndroidLibs.java	2019-01-29 17:08:39.000000000 +0000
@@ -4,7 +4,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 
 import org.junit.Test;
@@ -22,13 +21,13 @@
   }
   
   @Test
-  public void testJLex() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException, ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InvalidClassFileException, FailureException {
+  public void testJLex() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException, ClassNotFoundException, SecurityException, InvalidClassFileException, FailureException {
     File inputFile = testFile("sample.lex");
     test(providedAndroidLibs(), TestConstants.JLEX_MAIN, TestConstants.JLEX, inputFile.getAbsolutePath());
   }
 
   @Test
-  public void testJavaCup() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException, ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InvalidClassFileException, FailureException {
+  public void testJavaCup() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException, ClassNotFoundException, SecurityException, InvalidClassFileException, FailureException {
     File inputFile = testFile("sample.cup");
     test(providedAndroidLibs(), TestConstants.JAVA_CUP_MAIN, TestConstants.JAVA_CUP, inputFile.getAbsolutePath());
   }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DynamicDalvikComparisonTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DynamicDalvikComparisonTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DynamicDalvikComparisonTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DynamicDalvikComparisonTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,7 +15,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
@@ -27,15 +26,13 @@
 import com.ibm.wala.shrikeBT.analysis.Analyzer.FailureException;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.util.CancelException;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.io.TemporaryFile;
 
 public abstract class DynamicDalvikComparisonTest extends DalvikCallGraphTestBase {
 
-	protected void test(URI[] androidLibs, String mainClass, String javaScopeFile, String... args) throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException, ClassNotFoundException, SecurityException, NoSuchMethodException, IllegalAccessException, InvocationTargetException, InvalidClassFileException, FailureException {
+	protected void test(URI[] androidLibs, String mainClass, String javaScopeFile, String... args) throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException, ClassNotFoundException, SecurityException, InvalidClassFileException, FailureException {
 		AnalysisScope javaScope = CallGraphTestUtil.makeJ2SEAnalysisScope(javaScopeFile, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
 		String javaJarPath = getJavaJar(javaScope);
 		File androidDex = convertJarToDex(javaJarPath);
@@ -43,12 +40,7 @@
 
 		dynamicCG(new File(javaJarPath), mainClass, args);
 		
-		checkEdges(android.fst, new Predicate<MethodReference>() {
-		  @Override
-		  public boolean test(MethodReference t) {
-		    return t.getDeclaringClass().getClassLoader().equals(ClassLoaderReference.Application);
-		  }
-		});
+		checkEdges(android.fst, t -> t.getDeclaringClass().getClassLoader().equals(ClassLoaderReference.Application));
 	}
 	
   protected File testFile(String file) throws IOException {
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/JVMLDalvikComparisonTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/JVMLDalvikComparisonTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/JVMLDalvikComparisonTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/JVMLDalvikComparisonTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,9 +21,10 @@
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.util.TestConstants;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -38,6 +39,8 @@
 import com.ibm.wala.ipa.callgraph.propagation.cfa.ExceptionReturnValueKey;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.HashSetFactory;
@@ -49,20 +52,24 @@
 
 	private static Pair<CallGraph,PointerAnalysis<InstanceKey>> makeJavaBuilder(String scopeFile, String mainClass) throws IOException, ClassHierarchyException, IllegalArgumentException, CancelException {
 		AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(scopeFile, CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-		ClassHierarchy cha = ClassHierarchy.make(scope);
+		ClassHierarchy cha = ClassHierarchyFactory.make(scope);
 		Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha, mainClass);
 		AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-		SSAPropagationCallGraphBuilder builder = Util.makeZeroCFABuilder(options, new AnalysisCache(), cha, scope);
+		SSAPropagationCallGraphBuilder builder = Util.makeZeroCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope);
 		CallGraph CG = builder.makeCallGraph(options);
 		return Pair.make(CG, builder.getPointerAnalysis());
 	}
 	
-	private static Set<Pair<CGNode,CGNode>> edgeDiff(CallGraph from, CallGraph to) {
+	private static Set<Pair<CGNode,CGNode>> edgeDiff(CallGraph from, CallGraph to, boolean userOnly) {
 		Set<Pair<CGNode,CGNode>> result = HashSetFactory.make();
 		for(CGNode f : from) {
-			if (! f.getMethod().isSynthetic()) {
+			if (! f.getMethod().isWalaSynthetic()) {
 			outer: for(CGNode t : from) {
-				if (!t.getMethod().isSynthetic() && from.hasEdge(f, t)) {
+				if (!t.getMethod().isWalaSynthetic() &&
+				    from.hasEdge(f, t) && 
+				    (!userOnly || 
+				     !t.getMethod().getDeclaringClass().getClassLoader().getReference().equals(ClassLoaderReference.Primordial))) 
+				{
 					Set<CGNode> fts = to.getNodes(f.getMethod().getReference());
 					Set<CGNode> tts = to.getNodes(t.getMethod().getReference());
 					for(CGNode x : fts) {
@@ -80,7 +87,7 @@
 		return result;
 	}
 	
-	private static void test(String mainClass, String javaScopeFile) throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException {
+	private static void test(String mainClass, String javaScopeFile) throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException {
 		Pair<CallGraph, PointerAnalysis<InstanceKey>> java = makeJavaBuilder(javaScopeFile, mainClass);
 
 		AnalysisScope javaScope = java.fst.getClassHierarchy().getScope();
@@ -90,10 +97,18 @@
 	
 		Set<MethodReference> androidMethods = applicationMethods(android.fst);
 		Set<MethodReference> javaMethods = applicationMethods(java.fst);
+				
+    Iterator<Pair<CGNode, CGNode>> javaExtraEdges = edgeDiff(java.fst, android.fst, false).iterator();
+		Assert.assertFalse(checkEdgeDiff(android, androidMethods, javaMethods, javaExtraEdges));
 		
-		Iterator<Pair<CGNode, CGNode>> javaExtraEdges = edgeDiff(java.fst, android.fst).iterator();
-		boolean fail = false;
-		if (javaExtraEdges.hasNext()) {
+		Iterator<Pair<CGNode, CGNode>> androidExtraEdges = edgeDiff(android.fst, java.fst, true).iterator();
+		Assert.assertFalse(checkEdgeDiff(java, javaMethods, androidMethods, androidExtraEdges));
+	}
+
+  private static boolean checkEdgeDiff(Pair<CallGraph, PointerAnalysis<InstanceKey>> android, Set<MethodReference> androidMethods,
+      Set<MethodReference> javaMethods, Iterator<Pair<CGNode, CGNode>> javaExtraEdges) {
+    boolean fail = false;
+    if (javaExtraEdges.hasNext()) {
 			fail = true;
 			Set<MethodReference> javaExtraNodes = HashSetFactory.make(javaMethods);
 			javaExtraNodes.removeAll(androidMethods);		
@@ -120,22 +135,21 @@
 				}
 			}
 		}
-		
-		Assert.assertTrue(!fail);		
-	}
+    return fail;
+  }
 	
 	@Test
-	public void testJLex() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException {
+	public void testJLex() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException {
 		test(TestConstants.JLEX_MAIN, TestConstants.JLEX);
 	}
 
 	@Test
-	public void testJavaCup() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException {
+	public void testJavaCup() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException {
 		test(TestConstants.JAVA_CUP_MAIN, TestConstants.JAVA_CUP);
 	}
 
 	@Test
-	public void testBCEL() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, InterruptedException {
+	public void testBCEL() throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException {
 		test(TestConstants.BCEL_VERIFIER_MAIN, TestConstants.BCEL);
 	}
 }
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/cha/MultiDexScopeTest.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/cha/MultiDexScopeTest.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/cha/MultiDexScopeTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/cha/MultiDexScopeTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,146 @@
+package com.ibm.wala.dalvik.test.cha;
+
+import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.dalvik.classLoader.DexFileModule;
+import com.ibm.wala.dalvik.test.callGraph.DroidBenchCGTest;
+import com.ibm.wala.dalvik.test.util.Util;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
+import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.util.config.AnalysisScopeReader;
+import org.jf.dexlib2.DexFileFactory;
+import org.jf.dexlib2.Opcodes;
+import org.jf.dexlib2.dexbacked.DexBackedDexFile;
+import org.jf.dexlib2.iface.MultiDexContainer;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+public class MultiDexScopeTest {
+
+    private static void addAPKtoScope(ClassLoaderReference loader, AnalysisScope scope, String fileName){
+        File apkFile = new File(fileName);
+        MultiDexContainer<? extends DexBackedDexFile> multiDex = null;
+        try {
+            multiDex = DexFileFactory.loadDexContainer(apkFile, Opcodes.forApi(24));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        try{
+            for (String dexEntry : multiDex.getDexEntryNames()) {
+                System.out.println("Adding dex file: " +dexEntry + " of file:" + fileName);
+                scope.addToScope(loader, new DexFileModule(apkFile, dexEntry,24));
+            }
+        }catch (IOException e){
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static AnalysisScope setUpTestScope(String apkName, String exclusions, ClassLoader loader) throws IOException {
+        AnalysisScope scope;
+        scope = AnalysisScopeReader.readJavaScope("primordial.txt", new File(exclusions), loader);
+        scope.setLoaderImpl(ClassLoaderReference.Application,
+                "com.ibm.wala.dalvik.classLoader.WDexClassLoaderImpl");
+
+        addAPKtoScope(ClassLoaderReference.Application, scope, apkName);
+        return scope;
+    }
+
+    private static int getNumberOfAppClasses(ClassHierarchy cha){
+        Iterator<IClass> classes = cha.iterator();
+        int numberOfClasses = 0;
+        while(classes.hasNext()){
+            if(classes.next().getClassLoader().getName().toString().equals("Application"))
+                numberOfClasses++;
+        }
+        return  numberOfClasses;
+    }
+
+    @Test
+    public void testAPK() throws ClassHierarchyException, IOException {
+        AnalysisScope scope, scope2;
+        ClassHierarchy cha, cha2;
+        String testAPK = DroidBenchCGTest.getDroidBenchRoot() + "/apk/Aliasing/Merge1.apk";
+
+        scope = setUpTestScope(testAPK,"", MultiDexScopeTest.class.getClassLoader());
+        cha = ClassHierarchyFactory.make(scope);
+        
+        scope2 = Util.makeDalvikScope(null,null, testAPK);
+        cha2 = ClassHierarchyFactory.make(scope2);
+
+        Assert.assertEquals(Integer.valueOf(getNumberOfAppClasses(cha)), Integer.valueOf(getNumberOfAppClasses(cha2)));
+    }
+
+    @Test
+    public void testMultiDex() throws ClassHierarchyException, IOException {
+        AnalysisScope scope, scope2;
+        ClassHierarchy cha, cha2;
+        String multidexApk =  "data/multidex-test.apk";
+
+        scope = AnalysisScopeReader.readJavaScope("primordial.txt", new File(""), MultiDexScopeTest.class.getClassLoader());
+        scope.setLoaderImpl(ClassLoaderReference.Application,
+                "com.ibm.wala.dalvik.classLoader.WDexClassLoaderImpl");
+
+        try {
+            // extract dex files to disk and add them manually to scope
+            File dexTmpDir = new File(System.getProperty("java.io.tmpdir"));
+            extractDexFiles(multidexApk, dexTmpDir);
+
+            File dex1 = new File(dexTmpDir + File.separator + "classes.dex");
+            scope.addToScope(ClassLoaderReference.Application, DexFileModule.make(dex1));
+            dex1.delete();
+
+            File dex2 = new File(dexTmpDir + File.separator + "classes2.dex");
+            scope.addToScope(ClassLoaderReference.Application, DexFileModule.make(dex2));
+            dex2.delete();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        cha = ClassHierarchyFactory.make(scope);
+
+        // use setUpAndroidAnalysisScope
+        scope2 = Util.makeDalvikScope(null,null, multidexApk);
+        cha2 = ClassHierarchyFactory.make(scope2);
+
+        Assert.assertEquals(Integer.valueOf(getNumberOfAppClasses(cha)),Integer.valueOf(5));
+        Assert.assertEquals(Integer.valueOf(getNumberOfAppClasses(cha)), Integer.valueOf(getNumberOfAppClasses(cha2)));
+
+    }
+
+    private static void extractDexFiles(String apkFileName, File outDir) throws IOException {
+        try (ZipInputStream zis = new ZipInputStream(new FileInputStream(new File(apkFileName)))) {
+            ZipEntry entry;
+
+            while ((entry = zis.getNextEntry()) != null) {
+                if (!entry.isDirectory()) {
+                    if (entry.getName().startsWith("classes") && entry.getName().endsWith(".dex")) {
+                        extractFile(zis, outDir + File.separator + entry.getName());
+                    }
+                }
+                zis.closeEntry();
+            }
+        }
+    }
+
+    private static void extractFile(ZipInputStream zipIn, String outFileName) throws IOException {
+        try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(new File(outFileName)))) {
+            byte[] buffer = new byte[4096];
+            int read;
+
+            while ((read = zipIn.read(buffer)) != -1) {
+                bos.write(buffer, 0, read);
+            }
+        }
+    }
+}
diff -Nru wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/util/Util.java wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/util/Util.java
--- wala-1.3.9/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/util/Util.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/util/Util.java	2019-01-29 17:08:39.000000000 +0000
@@ -4,8 +4,6 @@
 import static com.ibm.wala.properties.WalaProperties.ANDROID_RT_JAVA_JAR;
 
 import java.io.File;
-import java.io.FileFilter;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
@@ -19,8 +17,8 @@
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.dalvik.util.AndroidAnalysisScope;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.properties.WalaProperties;
 import com.ibm.wala.types.ClassLoaderReference;
@@ -75,33 +73,29 @@
   }
   
   public static URI[] androidLibs() {
-    List<URI> libs = new ArrayList<URI>();
-    if (walaProperties != null && walaProperties.getProperty(ANDROID_RT_DEX_DIR) != null) {
-      for(File lib : new File(walaProperties.getProperty(ANDROID_RT_DEX_DIR)).listFiles(new FilenameFilter() {
-        @Override
-        public boolean accept(File dir, String name) {
-          return name.endsWith("dex") || name.endsWith("jar") || name.endsWith("apk");
-        } 
-      })) {
+    List<URI> libs = new ArrayList<>();
+    if (System.getenv("ANDROID_BOOT_OAT") != null) {
+      libs.add(new File(System.getenv("ANDROID_CORE_OAT")).toURI());
+      libs.add(new File(System.getenv("ANDROID_BOOT_OAT")).toURI());
+   
+    } else if (walaProperties != null && walaProperties.getProperty(ANDROID_RT_DEX_DIR) != null) {
+      for(File lib : new File(walaProperties.getProperty(ANDROID_RT_DEX_DIR)).listFiles((dir, name) -> name.startsWith("boot") && name.endsWith("oat"))) {
         libs.add(lib.toURI());
       }
     } else {
       assert "Dalvik".equals(System.getProperty("java.vm.name"));
-      for(File f : new File("/system/framework/").listFiles(new FileFilter() {
-        @Override
-        public boolean accept(File pathname) {
-          String name = pathname.getName();
-          return 
-              (name.startsWith("core") || name.startsWith("framework")) && 
-              (name.endsWith("jar") || name.endsWith("apk"));
-        } 
+      for(File f : new File("/system/framework/").listFiles(pathname -> {
+        String name = pathname.getName();
+        return 
+            (name.startsWith("core") || name.startsWith("framework")) && 
+            (name.endsWith("jar") || name.endsWith("apk"));
       })) 
       {
         System.out.println("adding " + f);
         libs.add(f.toURI());
       }
     }
-    return libs.toArray(new URI[ libs.size() ]);
+    return libs.toArray(new URI[0]);
   }
 
   public static AnalysisScope makeDalvikScope(URI[] androidLibs, File androidAPIJar, String dexFileName) throws IOException {
@@ -132,7 +126,7 @@
     TemporaryFile.urlToFile(F, (new FileProvider()).getResource("com.ibm.wala.core.testdata_1.0.0a.jar"));
     File androidDex = convertJarToDex(F.getAbsolutePath());
     AnalysisScope dalvikScope = makeDalvikScope(null, null, androidDex.getAbsolutePath());
-    return ClassHierarchy.make(dalvikScope);    
+    return ClassHierarchyFactory.make(dalvikScope);    
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala_feature/build.properties wala-1.5.1/com.ibm.wala_feature/build.properties
--- wala-1.3.9/com.ibm.wala_feature/build.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala_feature/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties
diff -Nru wala-1.3.9/com.ibm.wala_feature/feature.properties wala-1.5.1/com.ibm.wala_feature/feature.properties
--- wala-1.3.9/com.ibm.wala_feature/feature.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala_feature/feature.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,9 @@
+
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_VAR
+
+#
+# Feature details
+#
+featureName = WALA Bundles
+providerName = IBM
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala_feature/feature.xml wala-1.5.1/com.ibm.wala_feature/feature.xml
--- wala-1.3.9/com.ibm.wala_feature/feature.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala_feature/feature.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.ibm.wala_feature"
+      label="%featureName"
+      version="1.5.1"
+      provider-name="%providerName">
+
+   <plugin
+         id="com.ibm.wala.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.ibm.wala.shrike"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.ibm.wala.cast"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.ibm.wala.cast.java"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.ibm.wala.util"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff -Nru wala-1.3.9/com.ibm.wala_feature/pom.xml wala-1.5.1/com.ibm.wala_feature/pom.xml
--- wala-1.3.9/com.ibm.wala_feature/pom.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala_feature/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>WALA</artifactId>
+    <groupId>com.ibm.wala</groupId>
+    <version>1.5.1</version>
+  </parent>
+  <artifactId>com.ibm.wala_feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
diff -Nru wala-1.3.9/com.ibm.wala_feature/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala_feature/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala_feature/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala_feature/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude08113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T02111contentType131org.eclipse.pde.featureManifestF04file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala-feature/build.properties wala-1.5.1/com.ibm.wala-feature/build.properties
--- wala-1.3.9/com.ibm.wala-feature/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala-feature/build.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties
diff -Nru wala-1.3.9/com.ibm.wala-feature/feature.properties wala-1.5.1/com.ibm.wala-feature/feature.properties
--- wala-1.3.9/com.ibm.wala-feature/feature.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala-feature/feature.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-
-# NLS_ENCODING=UTF-8
-# NLS_MESSAGEFORMAT_VAR
-
-#
-# Feature details
-#
-featureName = WALA Bundles
-providerName = IBM
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala-feature/feature.xml wala-1.5.1/com.ibm.wala-feature/feature.xml
--- wala-1.3.9/com.ibm.wala-feature/feature.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala-feature/feature.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.ibm.wala-feature"
-      label="%featureName"
-      version="1.3.9"
-      provider-name="%providerName">
-
-   <plugin
-         id="com.ibm.wala.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.ibm.wala.shrike"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.ibm.wala.cast"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.ibm.wala.cast.java"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.ibm.wala.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff -Nru wala-1.3.9/com.ibm.wala-feature/pom.xml wala-1.5.1/com.ibm.wala-feature/pom.xml
--- wala-1.3.9/com.ibm.wala-feature/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala-feature/pom.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>WALA</artifactId>
-    <groupId>com.ibm.wala</groupId>
-    <version>1.3.9</version>
-  </parent>
-  <artifactId>com.ibm.wala-feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
diff -Nru wala-1.3.9/com.ibm.wala-feature/.project wala-1.5.1/com.ibm.wala-feature/.project
--- wala-1.3.9/com.ibm.wala-feature/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala-feature/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.ide/build.gradle wala-1.5.1/com.ibm.wala.ide/build.gradle
--- wala-1.3.9/com.ibm.wala.ide/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,25 @@
+plugins {
+	id 'eclipse'
+}
+
+eclipse.project.natures 'org.eclipse.pde.PluginNature'
+
+sourceSets.main.java.srcDirs = ['src']
+
+dependencies {
+	compile(
+		'eclipse-deps:org.eclipse.core.commands:+',
+		'eclipse-deps:org.eclipse.core.jobs:+',
+		'eclipse-deps:org.eclipse.core.resources:+',
+		'eclipse-deps:org.eclipse.core.runtime:+',
+		'eclipse-deps:org.eclipse.equinox.common:+',
+		'eclipse-deps:org.eclipse.jdt.core:+',
+		'eclipse-deps:org.eclipse.jface:+',
+		'eclipse-deps:org.eclipse.osgi:+',
+		'eclipse-deps:org.eclipse.pde.core:+',
+		'eclipse-deps:org.eclipse.swt.${osgi.platform}:+',
+		'eclipse-deps:org.eclipse.ui.workbench:+',
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.util'),
+		)
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide/build.properties wala-1.5.1/com.ibm.wala.ide/build.properties
--- wala-1.3.9/com.ibm.wala.ide/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -3,4 +3,5 @@
                plugin.properties
 jars.compile.order = .
 source.. = src/
-output.. = bin/
+output.. = bin/main
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.ide/.classpath wala-1.5.1/com.ibm.wala.ide/.classpath
--- wala-1.3.9/com.ibm.wala.ide/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.ide/.cvsignore wala-1.5.1/com.ibm.wala.ide/.cvsignore
--- wala-1.3.9/com.ibm.wala.ide/.cvsignore	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/.cvsignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-build
-shrike.jar
-domo-trace.txt*
-com.ibm.shrike_*.jar
diff -Nru wala-1.3.9/com.ibm.wala.ide/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.ide/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.ide/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -3,7 +3,7 @@
 Eclipse-LazyStart: true
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.ibm.wala.ide
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Bundle-Activator: com.ibm.wala.ide.plugin.CorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -20,9 +20,10 @@
  org.eclipse.jdt.launching,
  org.eclipse.e4.ui.workbench;bundle-version="1.2.2";resolution:=optional
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: com.ibm.wala.ide.classloader,
  com.ibm.wala.ide.client,
  com.ibm.wala.ide.plugin,
  com.ibm.wala.ide.ui,
  com.ibm.wala.ide.util
+Automatic-Module-Name: com.ibm.wala.ide
diff -Nru wala-1.3.9/com.ibm.wala.ide/plugin.properties wala-1.5.1/com.ibm.wala.ide/plugin.properties
--- wala-1.3.9/com.ibm.wala.ide/plugin.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/plugin.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,4 @@
-PLUGINNAME= WALA analysis engine - IDE support
+pluginName= WALA analysis engine - IDE support
 VENDORNAME=IBM
 providerName =IBM
 
diff -Nru wala-1.3.9/com.ibm.wala.ide/pom.xml wala-1.5.1/com.ibm.wala.ide/pom.xml
--- wala-1.3.9/com.ibm.wala.ide/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
   <artifactId>com.ibm.wala.ide</artifactId>
   <packaging>eclipse-plugin</packaging>
diff -Nru wala-1.3.9/com.ibm.wala.ide/.project wala-1.5.1/com.ibm.wala.ide/.project
--- wala-1.3.9/com.ibm.wala.ide/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.ide</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.ide/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.ide/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.ide/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,78 +1,126 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.ide/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.ide/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.ide/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.ide/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.ide/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.ide/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/classloader/EclipseSourceDirectoryTreeModule.java wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/classloader/EclipseSourceDirectoryTreeModule.java
--- wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/classloader/EclipseSourceDirectoryTreeModule.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/classloader/EclipseSourceDirectoryTreeModule.java	2019-01-29 17:08:39.000000000 +0000
@@ -29,7 +29,7 @@
   private final Pattern[] excludePatterns;
   
   private static Pattern interpretPattern(IPath pattern) {
-    return Pattern.compile("^" + pattern.toString().replace(".",  "\\.").replace("**", "~~~").replace("*", "[^/]*").replace("~~~",  ".*") + "$");
+    return Pattern.compile('^' + pattern.toString().replace(".",  "\\.").replace("**", "~~~").replace("*", "[^/]*").replace("~~~",  ".*") + '$');
   }
   
   private static Pattern[] interpretExcludes(IPath[] excludes) {
diff -Nru wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/client/EclipseProjectAnalysisEngine.java wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/client/EclipseProjectAnalysisEngine.java
--- wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/client/EclipseProjectAnalysisEngine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/client/EclipseProjectAnalysisEngine.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,15 +21,16 @@
 
 import com.ibm.wala.client.AbstractAnalysisEngine;
 import com.ibm.wala.ide.util.EclipseProjectPath;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.util.config.FileOfClasses;
 import com.ibm.wala.util.io.FileProvider;
 
-abstract public class EclipseProjectAnalysisEngine<P> extends AbstractAnalysisEngine {
+abstract public class EclipseProjectAnalysisEngine<P, I extends InstanceKey> extends AbstractAnalysisEngine<I, CallGraphBuilder<I>, Void> {
 
   protected final P project;
   
@@ -37,8 +38,7 @@
 
   protected EclipseProjectPath<?,P> ePath;
 
-  public EclipseProjectAnalysisEngine(P project) throws IOException, CoreException {
-    super();
+  public EclipseProjectAnalysisEngine(P project) {
     this.project = project;
     this.workspaceRootPath = ResourcesPlugin.getWorkspace().getRoot().getLocation();
     assert project != null;
@@ -48,7 +48,7 @@
   abstract protected EclipseProjectPath<?,P> createProjectPath(P project) throws IOException, CoreException;
 
   @Override
-  abstract protected CallGraphBuilder getCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, AnalysisCache cache);
+  abstract protected CallGraphBuilder<? super I> getCallGraphBuilder(IClassHierarchy cha, AnalysisOptions options, IAnalysisCacheView cache);
 
   abstract protected AnalysisScope makeAnalysisScope();
   
@@ -58,8 +58,9 @@
       ePath = createProjectPath(project);
       super.scope = ePath.toAnalysisScope(makeAnalysisScope());
       if (getExclusionsFile() != null) {
-        InputStream is = new File(getExclusionsFile()).exists()? new FileInputStream(getExclusionsFile()): FileProvider.class.getClassLoader().getResourceAsStream(getExclusionsFile());
-        scope.setExclusions(new FileOfClasses(is));
+        try (final InputStream is = new File(getExclusionsFile()).exists()? new FileInputStream(getExclusionsFile()): FileProvider.class.getClassLoader().getResourceAsStream(getExclusionsFile())) {
+          scope.setExclusions(new FileOfClasses(is));
+        }
       }
     } catch (CoreException e) {
       assert false : e.getMessage();
diff -Nru wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/client/EclipseProjectSourceAnalysisEngine.java wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/client/EclipseProjectSourceAnalysisEngine.java
--- wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/client/EclipseProjectSourceAnalysisEngine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/client/EclipseProjectSourceAnalysisEngine.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,13 +12,12 @@
 
 import java.io.IOException;
 
-import org.eclipse.core.runtime.CoreException;
-
 import com.ibm.wala.ide.plugin.CorePlugin;
 import com.ibm.wala.ide.util.EclipseFileProvider;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ssa.SSAOptions;
 import com.ibm.wala.ssa.SymbolTable;
 import com.ibm.wala.types.ClassLoaderReference;
@@ -28,7 +27,7 @@
 /**
  * An {@link EclipseProjectAnalysisEngine} specialized for source code analysis
  */
-abstract public class EclipseProjectSourceAnalysisEngine<P> extends EclipseProjectAnalysisEngine<P> {
+abstract public class EclipseProjectSourceAnalysisEngine<P, I extends InstanceKey> extends EclipseProjectAnalysisEngine<P, I> {
 
   public static final String defaultFileExt = "java";
 
@@ -37,11 +36,11 @@
    */
   final String fileExt;
 
-  public EclipseProjectSourceAnalysisEngine(P project) throws IOException, CoreException {
+  public EclipseProjectSourceAnalysisEngine(P project) {
     this(project, defaultFileExt);
   }
 
-  public EclipseProjectSourceAnalysisEngine(P project, String fileExt) throws IOException, CoreException {
+  public EclipseProjectSourceAnalysisEngine(P project, String fileExt) {
     super(project);
     this.fileExt = fileExt;
     try {
@@ -62,7 +61,7 @@
    * introducing a dependence on com.ibm.wala.cast from this project
    */
   @Override
-  public abstract AnalysisCache makeDefaultCache();
+  public abstract IAnalysisCacheView makeDefaultCache();
   
   protected abstract ClassLoaderReference getSourceLoader();
 
@@ -71,12 +70,7 @@
     AnalysisOptions options = new AnalysisOptions(getScope(), entrypoints);
 
     SSAOptions ssaOptions = new SSAOptions();
-    ssaOptions.setDefaultValues(new SSAOptions.DefaultValues() {
-      @Override
-      public int getDefaultValue(SymbolTable symtab, int valueNumber) {
-        return symtab.getDefaultValue(valueNumber);
-      }
-    });
+    ssaOptions.setDefaultValues(SymbolTable::getDefaultValue);
 
     options.setSSAOptions(ssaOptions);
 
diff -Nru wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/AbstractJFaceRunner.java wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/AbstractJFaceRunner.java
--- wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/AbstractJFaceRunner.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/AbstractJFaceRunner.java	2019-01-29 17:08:39.000000000 +0000
@@ -46,12 +46,6 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (applicationWindow: ");
-    result.append(applicationWindow);
-    result.append(", blockInput: ");
-    result.append(blockInput);
-    result.append(')');
-    return result.toString();
+    return super.toString() + " (applicationWindow: " + applicationWindow + ", blockInput: " + blockInput + ')';
   }
 } 
diff -Nru wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/IFDSExplorer.java wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/IFDSExplorer.java
--- wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/IFDSExplorer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/IFDSExplorer.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,7 +52,7 @@
     viewIFDS(r, roots, null);
   }
 
-  public static <T, P, F> void viewIFDS(TabulationResult<T, P, F> r, Collection<? extends P> roots, NodeDecorator labels)
+  public static <T, P, F> void viewIFDS(TabulationResult<T, P, F> r, Collection<? extends P> roots, NodeDecorator<T> labels)
       throws WalaException {
     Properties p = null;
     try {
@@ -65,7 +65,7 @@
     viewIFDS(r, roots, labels, scratch);
   }
 
-  public static <T, P, F> void viewIFDS(TabulationResult<T, P, F> r, Collection<? extends P> roots, NodeDecorator labels,
+  public static <T, P, F> void viewIFDS(TabulationResult<T, P, F> r, Collection<? extends P> roots, NodeDecorator<T> labels,
       String scratchDirectory) throws WalaException {
     if (r == null) {
       throw new IllegalArgumentException("r is null");
@@ -77,19 +77,7 @@
       System.err.println("Domain:\n" + r.getProblem().getDomain().toString());
     }
 
-    String irFileName = null;
-    switch (DotUtil.getOutputType()) {
-    case PDF:
-      irFileName = "ir.pdf";
-      break;
-    case PS:
-    case EPS:
-      irFileName = "ir.ps";
-      break;
-    case SVG:
-      irFileName = "ir.svg";
-      break;
-    }
+    String irFileName = "ir." + DotUtil.getOutputType().suffix;
     String outputFile = scratchDirectory + File.separatorChar + irFileName;
     String dotFile = scratchDirectory + File.separatorChar + "ir.dt";
 
@@ -98,15 +86,15 @@
     v.setGraphInput(g);
     v.setBlockInput(true);
     v.setRootsInput(roots);
-    ViewIFDSLocalAction<T, P, F> action = (labels == null ? new ViewIFDSLocalAction<T, P, F>(v, r, outputFile, dotFile, dotExe,
-        viewerExe) : new ViewIFDSLocalAction<T, P, F>(v, r, outputFile, dotFile, dotExe, viewerExe, labels));
+    ViewIFDSLocalAction<T, P, F> action = (labels == null ? new ViewIFDSLocalAction<>(v, r, outputFile, dotFile, dotExe,
+        viewerExe) : new ViewIFDSLocalAction<>(v, r, outputFile, dotFile, dotExe, viewerExe, labels));
     v.getPopUpActions().add(action);
     v.run();
 
   }
 
   /**
-   * Calls {@link #viewIFDS(TabulationResult)} with roots computed by {@link InferGraphRoots}.
+   * Calls {@link #viewIFDS(TabulationResult, Collection)} with roots computed by {@link InferGraphRoots}.
    */
   public static <T, P, F> void viewIFDS(TabulationResult<T, P, F> r) throws WalaException {
     if (r == null) {
diff -Nru wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/SWTTreeViewer.java wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/SWTTreeViewer.java
--- wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/SWTTreeViewer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/SWTTreeViewer.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,6 @@
 package com.ibm.wala.ide.ui;
 
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -30,6 +29,7 @@
 
 import com.ibm.wala.util.PlatformUtil;
 import com.ibm.wala.util.WalaException;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.viz.NodeDecorator;
@@ -46,7 +46,7 @@
 
   protected NodeDecorator nodeDecoratorInput = null;
 
-  final protected List<IAction> popUpActions = new LinkedList<IAction>();
+  final protected List<IAction> popUpActions = new LinkedList<>();
 
   public SWTTreeViewer() {
     super();
@@ -82,17 +82,8 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(", graphInput: ");
-    result.append(graphInput);
-    result.append(", rootsInput: ");
-    result.append(rootsInput);
-    result.append(", NodeDecoratorInput: ");
-    result.append(nodeDecoratorInput);
-    result.append(", popUpActions: ");
-    result.append(popUpActions);
-    result.append(')');
-    return result.toString();
+    return super.toString() + ", graphInput: " + graphInput + ", rootsInput: " + rootsInput
+            + ", NodeDecoratorInput: " + nodeDecoratorInput + ", popUpActions: " + popUpActions + ')';
   }
 
   public void run() throws WalaException {
@@ -108,14 +99,11 @@
     if (PlatformUI.isWorkbenchRunning()) {
       // run the code on the UI thread
       Display d = PlatformUI.getWorkbench().getDisplay();
-      Runnable r = new Runnable() {
-        @Override
-        public void run() {
-          try {
-            w.open();
-          } catch (Exception e) {
-            e.printStackTrace();
-          }
+      Runnable r = () -> {
+        try {
+          w.open();
+        } catch (Exception e) {
+          e.printStackTrace();
         }
       };
       if (isBlockInput()) {
@@ -130,12 +118,9 @@
         w.open();
         Display.getCurrent().dispose();
       } else {
-        Runnable r = new Runnable() {
-          @Override
-          public void run() {
-            w.open();
-            Display.getCurrent().dispose();
-          }
+        Runnable r = () -> {
+          w.open();
+          Display.getCurrent().dispose();
         };
         Thread t = new Thread(r);
         t.start();
@@ -150,9 +135,6 @@
     }
   }
 
-  /**
-   * @throws IllegalStateException
-   */
   public IStructuredSelection getSelection() throws IllegalStateException {
     GraphViewer viewer = (GraphViewer) getApplicationWindow();
     if (viewer == null || viewer.treeViewer == null) {
@@ -171,17 +153,14 @@
     /**
      * Graph to visualize
      */
-    private final Graph graph;
+    private final Graph<Object> graph;
 
     /**
      * JFace component implementing the tree viewer
      */
     private TreeViewer treeViewer;
 
-    /**
-     * @throws WalaException
-     */
-    public GraphViewer(Graph graph) throws WalaException {
+    public GraphViewer(Graph<Object> graph) throws WalaException {
       super(null);
       this.graph = graph;
       if (graph == null) {
@@ -203,8 +182,8 @@
       if (getPopUpActions().size() > 0) {
         MenuManager mm = new MenuManager();
         treeViewer.getTree().setMenu(mm.createContextMenu(treeViewer.getTree()));
-        for (Iterator<IAction> it = getPopUpActions().iterator(); it.hasNext();) {
-          mm.add(it.next());
+        for (IAction iAction : getPopUpActions()) {
+          mm.add(iAction);
         }
       }
       return treeViewer.getTree();
@@ -242,8 +221,8 @@
 
         Object[] result = new Object[graph.getSuccNodeCount(parentElement)];
         int i = 0;
-        for (Iterator it = graph.getSuccNodes(parentElement); it.hasNext();) {
-          result[i++] = it.next();
+        for (Object o : Iterator2Iterable.make(graph.getSuccNodes(parentElement))) {
+          result[i++] = o;
         }
         return result;
       }
diff -Nru wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/ViewIFDSLocalAction.java wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/ViewIFDSLocalAction.java
--- wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/ViewIFDSLocalAction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/ViewIFDSLocalAction.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.ide.ui;
 
-import java.util.Iterator;
+import java.util.function.Predicate;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -24,7 +24,7 @@
 import com.ibm.wala.ssa.SSAPhiInstruction;
 import com.ibm.wala.ssa.analysis.IExplodedBasicBlock;
 import com.ibm.wala.util.WalaException;
-import com.ibm.wala.util.Predicate;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.GraphSlicer;
@@ -69,10 +69,10 @@
    */
   private final String pdfViewExe;
 
-  private final NodeDecorator labels;
+  private final NodeDecorator<T> labels;
 
   public ViewIFDSLocalAction(SWTTreeViewer viewer, TabulationResult<T, P, F> result, String pdfFile, String dotFile, String dotExe,
-      String pdfViewExe, NodeDecorator labels) {
+      String pdfViewExe, NodeDecorator<T> labels) {
     if (result == null) {
       throw new IllegalArgumentException("null result");
     }
@@ -97,11 +97,11 @@
     this.dotFile = dotFile;
     this.dotExe = dotExe;
     this.pdfViewExe = gvExe;
-    this.labels = new Labels<T, P, F>(result);
+    this.labels = new Labels<>(result);
     setText("View Local Supergraph");
   }
 
-  private static class Labels<T, P, F> implements NodeDecorator {
+  private static class Labels<T, P, F> implements NodeDecorator<T> {
     private TabulationResult<T, P, F> result;
 
     Labels(TabulationResult<T, P, F> result) {
@@ -116,15 +116,15 @@
         BasicBlockInContext bb = (BasicBlockInContext) t;
         if (bb.getDelegate() instanceof IExplodedBasicBlock) {
           IExplodedBasicBlock delegate = (IExplodedBasicBlock) bb.getDelegate();
-          String s = delegate.getNumber() + " " + result.getResult(t) + "\\n" + stringify(delegate.getInstruction());
-          for (Iterator<SSAPhiInstruction> phis = delegate.iteratePhis(); phis.hasNext();) {
-            SSAPhiInstruction phi = phis.next();
-            s += " " + phi;
+          final StringBuilder s = new StringBuilder(delegate.getNumber()).append(' ').append(result.getResult(t))
+                  .append("\\n").append(stringify(delegate.getInstruction()));
+          for (SSAPhiInstruction phi : Iterator2Iterable.make(delegate.iteratePhis())) {
+            s.append(' ').append(phi);
           }
           if (delegate.isCatchBlock()) {
-            s += " " + delegate.getCatchInstruction();
+            s.append(' ').append(delegate.getCatchInstruction());
           }
-          return s;
+          return s.toString();
         }
       }
       return t + " " + result.getResult(t);
@@ -141,26 +141,26 @@
     if (s instanceof SSAAbstractInvokeInstruction) {
       SSAAbstractInvokeInstruction call = (SSAAbstractInvokeInstruction) s;
       String def = call.hasDef() ? Integer.valueOf(call.getDef()) + "=" : "";
-      String result = def + "call " + call.getDeclaredTarget().getDeclaringClass().getName().getClassName() + "."
-          + call.getDeclaredTarget().getName();
-      result += " exc:" + call.getException();
+      final StringBuilder result = new StringBuilder(def).append("call ")
+              .append(call.getDeclaredTarget().getDeclaringClass().getName().getClassName()).append('.')
+              .append(call.getDeclaredTarget().getName());
+      result.append(" exc:").append(call.getException());
       for (int i = 0; i < s.getNumberOfUses(); i++) {
-        result += " ";
-        result += s.getUse(i);
+        result.append(' ').append(s.getUse(i));
       }
-      return result;
+      return result.toString();
     }
     if (s instanceof SSAGetInstruction) {
       SSAGetInstruction g = (SSAGetInstruction) s;
       String fieldName = g.getDeclaredField().getName().toString();
 
-      StringBuffer result = new StringBuffer();
+      StringBuilder result = new StringBuilder();
       result.append(g.getDef());
       result.append(":=");
       result.append(g.isStatic() ? "getstatic " : "getfield ");
       result.append(fieldName);
       if (!g.isStatic()) {
-        result.append(" ");
+        result.append(' ');
         result.append(g.getUse(0));
       }
       return result.toString();
@@ -176,11 +176,7 @@
 
     try {
       final P proc = getProcedureForSelection();
-      Predicate<T> filter = new Predicate<T>() {
-        @Override public boolean test(T o) {
-          return supergraph.getProcOf(o).equals(proc);
-        }
-      };
+      Predicate<T> filter = o -> supergraph.getProcOf(o).equals(proc);
       Graph<T> localGraph = GraphSlicer.prune(supergraph, filter);
 
       // spawn the viewer
@@ -231,4 +227,4 @@
   protected String getPsFile() {
     return pdfFile;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/ViewIRAction.java wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/ViewIRAction.java
--- wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/ViewIRAction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/ui/ViewIRAction.java	2019-01-29 17:08:39.000000000 +0000
@@ -135,4 +135,4 @@
   protected String getPsFile() {
     return psFile;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseAnalysisScopeReader.java wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseAnalysisScopeReader.java
--- wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseAnalysisScopeReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseAnalysisScopeReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,9 +25,9 @@
   public static AnalysisScope readJavaScopeFromPlugin(String scopeFileName, File exclusionsFile, ClassLoader javaLoader) throws IOException {
     return readJavaScopeFromPlugin(scopeFileName, exclusionsFile, javaLoader, CorePlugin.getDefault());
   }
-  public static AnalysisScope readJavaScopeFromPlugin(String scopeFileName, File exclusionsFile, ClassLoader javaLoader, Plugin plugIn) throws IOException {
+  public static AnalysisScope readJavaScopeFromPlugin(String scopeFileName, File exclusionsFile, ClassLoader javaLoader, @SuppressWarnings("unused") Plugin plugIn) throws IOException {
     AnalysisScope scope = AnalysisScope.createJavaAnalysisScope();
-    return read(scope, scopeFileName, exclusionsFile, javaLoader, new EclipseFileProvider(plugIn));
+    return read(scope, scopeFileName, exclusionsFile, javaLoader);
   }
 
   public static AnalysisScope makePrimordialScopeFromPlugin(File exclusionsFile) throws IOException {
@@ -35,12 +35,11 @@
   }
   /**
    * @param exclusionsFile file holding class hierarchy exclusions. may be null
-   * @throws IOException 
    * @throws IllegalStateException if there are problmes reading wala properties
    */
-  public static AnalysisScope makePrimordialScopeFromPlugin(File exclusionsFile, Plugin plugIn) throws IOException {
+  public static AnalysisScope makePrimordialScopeFromPlugin(File exclusionsFile, @SuppressWarnings("unused") Plugin plugIn) throws IOException {
     return read(AnalysisScope.createJavaAnalysisScope(), BASIC_FILE, exclusionsFile,
-        EclipseAnalysisScopeReader.class.getClassLoader(), new EclipseFileProvider(plugIn));
+        EclipseAnalysisScopeReader.class.getClassLoader());
   }
 
   public static AnalysisScope makeJavaBinaryAnalysisScopeFromPlugin(String classPath, File exclusionsFile) throws IOException {
@@ -50,7 +49,6 @@
   /**
    * @param classPath class path to analyze, delimited by File.pathSeparator
    * @param exclusionsFile file holding class hierarchy exclusions. may be null
-   * @throws IOException 
    * @throws IllegalStateException if there are problems reading wala properties
    */
   public static AnalysisScope makeJavaBinaryAnalysisScopeFromPlugin(String classPath, File exclusionsFile, Plugin plugIn) throws IOException {
diff -Nru wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseFileProvider.java wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseFileProvider.java
--- wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseFileProvider.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseFileProvider.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,7 +34,7 @@
 public class EclipseFileProvider extends FileProvider {
 
   /**
-   * the plug-in to use.  If <code>null</code>, {@link CorePlugin#getDefault()} is used.
+   * the plug-in to use.  If {@code null}, {@link CorePlugin#getDefault()} is used.
    */
   private final Plugin plugIn;
   
@@ -75,7 +75,9 @@
 
         IPath path = new Path(fileName);
         if (workspaceRoot_getFile.invoke(workspaceRoot, path) != null) {
-          return new JarFileModule(new JarFile(fileName, false));
+          try (final JarFile jar = new JarFile(fileName, false)) {
+            return new JarFileModule(jar);
+          }
         }
       } catch (Exception e) {
       }
@@ -99,13 +101,15 @@
   }
   
   /**
-   * @param fileName
    * @return the jar file packaged with this plug-in of the given name, or null
    *         if not found.
    */
   private JarFileModule getFromPlugin(Plugin p, String fileName) throws IOException {
     URL url = getFileURLFromPlugin(p, fileName);
-    return (url == null) ? null : new JarFileModule(new JarFile(filePathFromURL(url)));
+    if (url == null) return null;
+    try (final JarFile jar = new JarFile(filePathFromURL(url))) {
+      return new JarFileModule(jar);
+    }
   }
   
   /**
@@ -113,10 +117,9 @@
    * 
    * @param fileName
    *          the file name
-   * @return the URL, or <code>null</code> if the file is not found
-   * @throws IOException
+   * @return the URL, or {@code null} if the file is not found
    */
-  private  URL getFileURLFromPlugin(Plugin p, String fileName) throws IOException {
+  private static URL getFileURLFromPlugin(Plugin p, String fileName) throws IOException {
     try {
       URL url = FileLocator.find(p.getBundle(), new Path(fileName), null);
       if (url == null) {
@@ -143,7 +146,7 @@
       url = fixupFileURLSpaces(url);
       return url;
     } catch (ExceptionInInitializerError e) {
-      throw new IOException("failure to get file URL for " + fileName);
+      throw new IOException("failure to get file URL for " + fileName, e);
     }
   }
 
@@ -151,12 +154,12 @@
    * escape spaces in a URL, primarily to work around a bug in
    * {@link File#toURL()}
    * 
-   * @param url
    * @return an escaped version of the URL
    */
-  private URL fixupFileURLSpaces(URL url) {
+  @SuppressWarnings("javadoc")
+  private static URL fixupFileURLSpaces(URL url) {
     String urlString = url.toExternalForm();
-    StringBuffer fixedUpUrl = new StringBuffer();
+    StringBuilder fixedUpUrl = new StringBuilder();
     int lastIndex = 0;
     while (true) {
       int spaceIndex = urlString.indexOf(' ', lastIndex);
@@ -166,7 +169,7 @@
         break;
       }
 
-      fixedUpUrl.append(urlString.substring(lastIndex, spaceIndex));
+      fixedUpUrl.append(urlString, lastIndex, spaceIndex);
       fixedUpUrl.append("%20");
       lastIndex = spaceIndex + 1;
     }
@@ -180,7 +183,7 @@
   }
   
   @Override
-  public URL getResource(String fileName, ClassLoader loader) throws IOException {
+  public URL getResource(String fileName, ClassLoader loader) {
     if (fileName == null) {
       throw new IllegalArgumentException("null fileName");
     }
@@ -207,7 +210,6 @@
   }
   
   /**
-   * @param fileName
    * @return the jar file packaged with this plug-in of the given name, or null
    *         if not found.
    * @throws IllegalArgumentException
diff -Nru wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseProjectPath.java wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseProjectPath.java
--- wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseProjectPath.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/util/EclipseProjectPath.java	2019-01-29 17:08:39.000000000 +0000
@@ -60,7 +60,6 @@
  * SOURCE_FOR_PROJ_AND_LINKED_PROJS is specified.
  * </ul>
  */
-@SuppressWarnings("restriction")
 public abstract class EclipseProjectPath<E, P> {
 
   protected abstract P makeProject(IProject p);
@@ -74,7 +73,7 @@
 
   public interface ILoader {
     ClassLoaderReference ref();
-  };
+  }
   
   /**
    * Eclipse projects are modeled with 3 loaders, as described above.
@@ -93,7 +92,7 @@
     public ClassLoaderReference ref() {
       return ref;
     }
-  };
+  }
 
   public enum AnalysisScopeType {
     NO_SOURCE, SOURCE_FOR_PROJ, SOURCE_FOR_PROJ_AND_LINKED_PROJS
@@ -106,7 +105,7 @@
 
   // SJF: Intentionally do not use HashMapFactory, since the Loader keys in the following must use
   // identityHashCode. TODO: fix this source of non-determinism?
-  protected final Map<ILoader, List<Module>> modules = new HashMap<ILoader, List<Module>>();
+  protected final Map<ILoader, List<Module>> modules = new HashMap<>();
 
   /**
    * Classpath entries that have already been resolved and added to the scope.
@@ -118,7 +117,7 @@
    */
   private final AnalysisScopeType scopeType;
 
-  protected EclipseProjectPath(AnalysisScopeType scopeType) throws IOException, CoreException {
+  protected EclipseProjectPath(AnalysisScopeType scopeType) {
     this.scopeType = scopeType;
     for (ILoader loader : Loader.values()) {
       MapUtil.findOrCreateList(modules, loader);
@@ -126,7 +125,6 @@
   }
     
   public EclipseProjectPath create(IProject project) throws CoreException, IOException {
-    assert project != null;
     if (project == null) {
       throw new IllegalArgumentException("null project");
     }
@@ -154,7 +152,7 @@
       // should ignore directories as well..
       return;
     }
-    if (isPrimordialJarFile(j)) {
+    if (isPrimordialJarFile()) {
       List<Module> s = MapUtil.findOrCreateList(modules, loader);
       s.add(file.isDirectory() ? (Module) new BinaryDirectoryTreeModule(file) : (Module) new JarFileModule(j));
     }
@@ -171,7 +169,7 @@
     }
   }
 
-  protected void resolveProjectPathEntry(ILoader loader, boolean includeSource, IPath p) {
+  protected void resolveProjectPathEntry(boolean includeSource, IPath p) {
     IPath projectPath = makeAbsolute(p);
     IWorkspace ws = ResourcesPlugin.getWorkspace();
     IWorkspaceRoot root = ws.getRoot();
@@ -241,7 +239,7 @@
     bundlesProcessed.add(bd.getName());
 
     // handle the classpath entries for bd
-    ArrayList<IClasspathEntry> l = new ArrayList<IClasspathEntry>();
+    ArrayList<IClasspathEntry> l = new ArrayList<>();
     ClasspathUtilCore.addLibraries(findModel(bd), l);
     resolveClasspathEntries(project, l, loader, includeSource, false);
 
@@ -267,7 +265,7 @@
   /**
    * Is javaProject a plugin project?
    */
-  private boolean isPluginProject(IProject project) {
+  private static boolean isPluginProject(IProject project) {
     IPluginModelBase model = findModel(project);
     if (model == null) {
       return false;
@@ -282,7 +280,7 @@
    * @return true if the given jar file should be handled by the Primordial loader. If false, other provisions should be made to add
    *         the jar file to the appropriate component of the AnalysisScope. Subclasses can override this method.
    */
-  protected boolean isPrimordialJarFile(JarFile j) {
+  protected boolean isPrimordialJarFile() {
     return true;
   }
 
@@ -308,8 +306,6 @@
   
   /**
    * Convert this path to a WALA analysis scope
-   * 
-   * @throws IOException
    */
   public AnalysisScope toAnalysisScope(ClassLoader classLoader, File exclusionsFile) throws IOException {
     AnalysisScope scope = AnalysisScopeReader.readJavaScope(AbstractAnalysisEngine.SYNTHETIC_J2SE_MODEL, exclusionsFile,
@@ -319,9 +315,9 @@
 
   public AnalysisScope toAnalysisScope(AnalysisScope scope) {
 
-    for (ILoader loader : modules.keySet()) {
-      for (Module m : modules.get(loader)) {
-        scope.addToScope(loader.ref(), m);
+    for (Map.Entry<ILoader, List<Module>> entry : modules.entrySet()) {
+      for (Module m : entry.getValue()) {
+        scope.addToScope(entry.getKey().ref(), m);
       }
     }
     return scope;
@@ -336,7 +332,7 @@
     return toAnalysisScope(getClass().getClassLoader(), null);
   }
 
-  public Collection<Module> getModules(ILoader loader, boolean binary) {
+  public Collection<Module> getModules(ILoader loader) {
     return Collections.unmodifiableCollection(modules.get(loader));
   }
 
@@ -350,13 +346,13 @@
     }
   }
 
-  private IPluginModelBase findModel(IProject p) {
+  private static IPluginModelBase findModel(IProject p) {
     // PluginRegistry is specific to Eclipse 3.3+. Use PDECore for compatibility with 3.2
     // return PluginRegistry.findModel(p);
     return PDECore.getDefault().getModelManager().findModel(p);
   }
 
-  private IPluginModelBase findModel(BundleDescription bd) {
+  private static IPluginModelBase findModel(BundleDescription bd) {
     // PluginRegistry is specific to Eclipse 3.3+. Use PDECore for compatibility with 3.2
     // return PluginRegistry.findModel(bd);
     return PDECore.getDefault().getModelManager().findModel(bd);
diff -Nru wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/util/HeadlessUtil.java wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/util/HeadlessUtil.java
--- wala-1.3.9/com.ibm.wala.ide/src/com/ibm/wala/ide/util/HeadlessUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide/src/com/ibm/wala/ide/util/HeadlessUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,6 +14,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.function.Function;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -24,7 +25,6 @@
 import com.ibm.wala.classLoader.ModuleEntry;
 import com.ibm.wala.ide.classloader.EclipseSourceFileModule;
 import com.ibm.wala.util.debug.Assertions;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.io.CommandLine;
 
 public class HeadlessUtil {
@@ -73,21 +73,21 @@
     return null;
   }
 
-  public interface EclipseCompiler<Unit,CompiledUnit> {
+  public interface EclipseCompiler<Unit> {
     Unit getCompilationUnit(IFile file);
     
-    Parser<Unit,CompiledUnit> getParser();
+    Parser<Unit> getParser();
   }
   
-  public interface Parser<Unit, CompiledUnit> {
+  public interface Parser<Unit> {
     void setProject(IProject project);
     
     void processASTs(Map<Unit,EclipseSourceFileModule> files, Function<Object[], Boolean> errors);
   }
     
-  public static <Unit, CompiledUnit> void parseModules(Set<ModuleEntry> modules, EclipseCompiler<Unit, CompiledUnit> compiler) {
+  public static <Unit> void parseModules(Set<ModuleEntry> modules, EclipseCompiler<Unit> compiler) {
     // sort files into projects
-    Map<IProject, Map<Unit,EclipseSourceFileModule>> projectsFiles = new HashMap<IProject, Map<Unit,EclipseSourceFileModule>>();
+    Map<IProject, Map<Unit,EclipseSourceFileModule>> projectsFiles = new HashMap<>();
     for (ModuleEntry m : modules) {
       if (m instanceof EclipseSourceFileModule) {
         EclipseSourceFileModule entry = (EclipseSourceFileModule) m;
@@ -99,28 +99,25 @@
       }
     }
 
-  final Parser<Unit,CompiledUnit> parser = compiler.getParser();
+  final Parser<Unit> parser = compiler.getParser();
 
   for (final Map.Entry<IProject,Map<Unit,EclipseSourceFileModule>> proj : projectsFiles.entrySet()) {
     parser.setProject(proj.getKey());
-    parser.processASTs(proj.getValue(), new Function<Object[],Boolean>() {
-      @Override
-      public Boolean apply(Object[] problems) {
-        int length = problems.length;
-        if (length > 0) {
-          StringBuffer buffer = new StringBuffer();
-          for (int i = 0; i < length; i++) {
-            buffer.append(problems[i].toString());
-            buffer.append('\n');
-          }
-          if (length != 0) {
-            System.err.println(buffer.toString());
-            return true;
-          }
+    parser.processASTs(proj.getValue(), problems -> {
+      int length = problems.length;
+      if (length > 0) {
+        StringBuilder buffer = new StringBuilder();
+        for (int i = 0; i < length; i++) {
+          buffer.append(problems[i].toString());
+          buffer.append('\n');
         }
-        return false;
-     }    
-    });
+        if (length != 0) {
+          System.err.println(buffer.toString());
+          return true;
+        }
+      }
+      return false;
+   });
   }
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.ide_feature/build.properties wala-1.5.1/com.ibm.wala.ide_feature/build.properties
--- wala-1.3.9/com.ibm.wala.ide_feature/build.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide_feature/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties
diff -Nru wala-1.3.9/com.ibm.wala.ide_feature/feature.properties wala-1.5.1/com.ibm.wala.ide_feature/feature.properties
--- wala-1.3.9/com.ibm.wala.ide_feature/feature.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide_feature/feature.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+
+
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_VAR
+
+#
+# Feature details
+#
+featureName = WALA IDE Bundles
+providerName = IBM
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.ide_feature/feature.xml wala-1.5.1/com.ibm.wala.ide_feature/feature.xml
--- wala-1.3.9/com.ibm.wala.ide_feature/feature.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide_feature/feature.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.ibm.wala.ide_feature"
+      label="%featureName"
+      version="1.5.1"
+      provider-name="%providerName">
+
+   <plugin
+         id="com.ibm.wala.ide"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff -Nru wala-1.3.9/com.ibm.wala.ide_feature/pom.xml wala-1.5.1/com.ibm.wala.ide_feature/pom.xml
--- wala-1.3.9/com.ibm.wala.ide_feature/pom.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide_feature/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>WALA</artifactId>
+        <groupId>com.ibm.wala</groupId>
+        <version>1.5.1</version>
+    </parent>
+  <artifactId>com.ibm.wala.ide_feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
diff -Nru wala-1.3.9/com.ibm.wala.ide_feature/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.ide_feature/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.ide_feature/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide_feature/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude08113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T02111contentType131org.eclipse.pde.featureManifestF04file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.ide-feature/build.properties wala-1.5.1/com.ibm.wala.ide-feature/build.properties
--- wala-1.3.9/com.ibm.wala.ide-feature/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide-feature/build.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties
diff -Nru wala-1.3.9/com.ibm.wala.ide-feature/feature.properties wala-1.5.1/com.ibm.wala.ide-feature/feature.properties
--- wala-1.3.9/com.ibm.wala.ide-feature/feature.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide-feature/feature.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-
-
-# NLS_ENCODING=UTF-8
-# NLS_MESSAGEFORMAT_VAR
-
-#
-# Feature details
-#
-featureName = WALA IDE Bundles
-providerName = IBM
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.ide-feature/feature.xml wala-1.5.1/com.ibm.wala.ide-feature/feature.xml
--- wala-1.3.9/com.ibm.wala.ide-feature/feature.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide-feature/feature.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.ibm.wala.ide-feature"
-      label="%featureName"
-      version="1.3.9"
-      provider-name="%providerName">
-
-   <plugin
-         id="com.ibm.wala.ide"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff -Nru wala-1.3.9/com.ibm.wala.ide-feature/pom.xml wala-1.5.1/com.ibm.wala.ide-feature/pom.xml
--- wala-1.3.9/com.ibm.wala.ide-feature/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide-feature/pom.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>WALA</artifactId>
-        <groupId>com.ibm.wala</groupId>
-        <version>1.3.9</version>
-    </parent>
-  <artifactId>com.ibm.wala.ide-feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.ide-feature/.project wala-1.5.1/com.ibm.wala.ide-feature/.project
--- wala-1.3.9/com.ibm.wala.ide-feature/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide-feature/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.ide-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/build.gradle wala-1.5.1/com.ibm.wala.ide.jdt/build.gradle
--- wala-1.3.9/com.ibm.wala.ide.jdt/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,22 @@
+sourceSets.main.java.srcDirs = ['source']
+
+dependencies {
+	compile(
+		'eclipse-deps:org.eclipse.core.jobs:+',
+		'eclipse-deps:org.eclipse.core.resources:+',
+		'eclipse-deps:org.eclipse.core.runtime:+',
+		'eclipse-deps:org.eclipse.equinox.app:+',
+		'eclipse-deps:org.eclipse.equinox.common:+',
+		'eclipse-deps:org.eclipse.jdt.core:+',
+		'eclipse-deps:org.eclipse.jface:+',
+		'eclipse-deps:org.eclipse.osgi:+',
+		'eclipse-deps:org.eclipse.ui.workbench:+',
+		'org.osgi:org.osgi.core:4.2.0',
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.cast.java'),
+		project(':com.ibm.wala.cast.java.ecj'),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.ide'),
+		project(':com.ibm.wala.util'),
+		)
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/build.properties wala-1.5.1/com.ibm.wala.ide.jdt/build.properties
--- wala-1.3.9/com.ibm.wala.ide.jdt/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,7 @@
 source.. = source/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/.classpath wala-1.5.1/com.ibm.wala.ide.jdt/.classpath
--- wala-1.3.9/com.ibm.wala.ide.jdt/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="source"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WALA IDE JDT components
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.ide.jdt
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Bundle-Activator: com.ibm.wala.ide.jdt.Activator
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  com.ibm.wala.cast,
@@ -18,10 +18,13 @@
  org.eclipse.pde.core,
  org.eclipse.ui.ide,
  org.eclipse.jdt.launching,
- org.eclipse.jdt
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ org.eclipse.jdt,
+ com.ibm.wala.cast.java.ecj
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Export-Package: com.ibm.wala.cast.java.client,
  com.ibm.wala.cast.java.translator.jdt,
+ com.ibm.wala.eclipse.headless,
+ com.ibm.wala.ide,
  com.ibm.wala.ide.jdt,
  com.ibm.wala.ide.util
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.ide.jdt/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.ide.jdt/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.ide.jdt
+Bundle-Vendor = IBM
+Bundle-Name = WALA IDE JDT components
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/pom.xml wala-1.5.1/com.ibm.wala.ide.jdt/pom.xml
--- wala-1.3.9/com.ibm.wala.ide.jdt/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
   <artifactId>com.ibm.wala.ide.jdt</artifactId>
   <packaging>eclipse-plugin</packaging>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/.project wala-1.5.1/com.ibm.wala.ide.jdt/.project
--- wala-1.3.9/com.ibm.wala.ide.jdt/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.ide.jdt</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.ide.jdt/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.ide.jdt/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,79 +1,128 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=ignore
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.ide.jdt/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.ide.jdt/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.ide.jdt/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.ide.jdt/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/client/EJCJavaSourceAnalysisEngine.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/client/EJCJavaSourceAnalysisEngine.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/client/EJCJavaSourceAnalysisEngine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/client/EJCJavaSourceAnalysisEngine.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package com.ibm.wala.cast.java.client;
-
-import com.ibm.wala.cast.java.translator.jdt.ejc.EJCClassLoaderFactory;
-import com.ibm.wala.classLoader.ClassLoaderFactory;
-import com.ibm.wala.util.config.SetOfClasses;
-
-public class EJCJavaSourceAnalysisEngine extends JavaSourceAnalysisEngine {
-
-  @Override
-  protected ClassLoaderFactory getClassLoaderFactory(SetOfClasses exclusions) {
-    return new EJCClassLoaderFactory(exclusions);
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/client/JDTJavaSourceAnalysisEngine.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/client/JDTJavaSourceAnalysisEngine.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/client/JDTJavaSourceAnalysisEngine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/client/JDTJavaSourceAnalysisEngine.java	2019-01-29 17:08:39.000000000 +0000
@@ -53,22 +53,24 @@
 import com.ibm.wala.ide.util.EclipseProjectPath.AnalysisScopeType;
 import com.ibm.wala.ide.util.JavaEclipseProjectPath;
 import com.ibm.wala.ide.util.JdtUtil;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.util.config.SetOfClasses;
 
-public class JDTJavaSourceAnalysisEngine extends EclipseProjectSourceAnalysisEngine<IJavaProject> {
+public class JDTJavaSourceAnalysisEngine<I extends InstanceKey> extends EclipseProjectSourceAnalysisEngine<IJavaProject, I> {
   private boolean dump;
   
-  public JDTJavaSourceAnalysisEngine(IJavaProject project) throws IOException, CoreException {
+  public JDTJavaSourceAnalysisEngine(IJavaProject project) {
     super(project);
   }
 
-  public JDTJavaSourceAnalysisEngine(String projectName) throws IOException, CoreException {
+  public JDTJavaSourceAnalysisEngine(String projectName) {
     this(JdtUtil.getNamedProject(projectName));
   }
 
@@ -92,8 +94,8 @@
   }
 
   @Override
-  public AnalysisCache makeDefaultCache() {
-    return new AnalysisCache(AstIRFactory.makeDefaultFactory());
+  public IAnalysisCacheView makeDefaultCache() {
+    return new AnalysisCacheImpl(AstIRFactory.makeDefaultFactory());
   }
 
   @Override
@@ -104,9 +106,9 @@
   }
 
   @Override
-  protected CallGraphBuilder getCallGraphBuilder(IClassHierarchy cha,
-		  AnalysisOptions options, AnalysisCache cache) {
-	    return new ZeroCFABuilderFactory().make(options, cache, cha, scope, false);
+  protected CallGraphBuilder<? super I> getCallGraphBuilder(IClassHierarchy cha,
+		  AnalysisOptions options, IAnalysisCacheView cache) {
+	    return new ZeroCFABuilderFactory().make(options, cache, cha, scope);
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCClassLoaderFactory.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCClassLoaderFactory.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCClassLoaderFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCClassLoaderFactory.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-package com.ibm.wala.cast.java.translator.jdt.ejc;
-
-import java.io.IOException;
-
-import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl;
-import com.ibm.wala.cast.java.translator.jdt.JDTClassLoaderFactory;
-import com.ibm.wala.classLoader.IClassLoader;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.util.config.SetOfClasses;
-
-public class EJCClassLoaderFactory extends JDTClassLoaderFactory {
-
-  public EJCClassLoaderFactory(SetOfClasses exclusions) {
-    super(exclusions);
-  }
-
-  @Override
-  protected JavaSourceLoaderImpl makeSourceLoader(ClassLoaderReference classLoaderReference, IClassHierarchy cha, IClassLoader parent)
-      throws IOException {
-    return new EJCSourceLoaderImpl(classLoaderReference, parent, getExclusions(), cha, dump);
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCSourceLoaderImpl.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCSourceLoaderImpl.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCSourceLoaderImpl.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCSourceLoaderImpl.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-/*
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html.
- * 
- * This file is a derivative of code released by the University of
- * California under the terms listed below.  
- *
- * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
- * University of California (Regents). Provided that this notice and
- * the following two paragraphs are included in any distribution of
- * Refinement Analysis Tools or its derivative work, Regents agrees
- * not to assert any of Regents' copyright rights in Refinement
- * Analysis Tools against recipient for recipient's reproduction,
- * preparation of derivative works, public display, public
- * performance, distribution or sublicensing of Refinement Analysis
- * Tools and derivative works, in source code and object code form.
- * This agreement not to assert does not confer, by implication,
- * estoppel, or otherwise any license or rights in any intellectual
- * property of Regents, including, but not limited to, any patents
- * of Regents or Regents' employees.
- * 
- * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
- * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
- * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
- * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *   
- * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
- * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
- * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
- * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
- * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-package com.ibm.wala.cast.java.translator.jdt.ejc;
-
-import java.io.IOException;
-
-import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl;
-import com.ibm.wala.cast.java.translator.SourceModuleTranslator;
-import com.ibm.wala.classLoader.ArrayClassLoader;
-import com.ibm.wala.classLoader.IClassLoader;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.util.config.SetOfClasses;
-
-public class EJCSourceLoaderImpl extends JavaSourceLoaderImpl {
-  private final boolean dump;
-
-  public EJCSourceLoaderImpl(ClassLoaderReference loader, ArrayClassLoader arrayClassLoader, IClassLoader parent,
-      SetOfClasses exclusions, IClassHierarchy cha) throws IOException {
-    this(loader, parent, exclusions, cha);
-  }
-
-  public EJCSourceLoaderImpl(ClassLoaderReference loaderRef, IClassLoader parent, SetOfClasses exclusions, IClassHierarchy cha) throws IOException {
-    this(loaderRef, parent, exclusions, cha, false);
-  }
-  
-  public EJCSourceLoaderImpl(ClassLoaderReference loaderRef, IClassLoader parent, SetOfClasses exclusions, IClassHierarchy cha, boolean dump) throws IOException {
-    super(loaderRef, parent, exclusions, cha);
-    this.dump = dump;
-  }
-
-  @Override
-  protected SourceModuleTranslator getTranslator() {
-    return new EJCSourceModuleTranslator(cha.getScope(), this, dump);
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCSourceModuleTranslator.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCSourceModuleTranslator.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCSourceModuleTranslator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/ejc/EJCSourceModuleTranslator.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,201 +0,0 @@
-/*
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html.
- * 
- * This file is a derivative of code released by the University of
- * California under the terms listed below.  
- *
- * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
- * University of California (Regents). Provided that this notice and
- * the following two paragraphs are included in any distribution of
- * Refinement Analysis Tools or its derivative work, Regents agrees
- * not to assert any of Regents' copyright rights in Refinement
- * Analysis Tools against recipient for recipient's reproduction,
- * preparation of derivative works, public display, public
- * performance, distribution or sublicensing of Refinement Analysis
- * Tools and derivative works, in source code and object code form.
- * This agreement not to assert does not confer, by implication,
- * estoppel, or otherwise any license or rights in any intellectual
- * property of Regents, including, but not limited to, any patents
- * of Regents or Regents' employees.
- * 
- * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
- * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
- * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
- * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *   
- * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
- * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
- * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
- * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
- * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-package com.ibm.wala.cast.java.translator.jdt.ejc;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.FileASTRequestor;
-
-import com.ibm.wala.cast.java.translator.Java2IRTranslator;
-import com.ibm.wala.cast.java.translator.SourceModuleTranslator;
-import com.ibm.wala.cast.java.translator.jdt.JDTJava2CAstTranslator;
-import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
-import com.ibm.wala.cast.tree.impl.RangePosition;
-import com.ibm.wala.classLoader.DirectoryTreeModule;
-import com.ibm.wala.classLoader.JarFileModule;
-import com.ibm.wala.classLoader.Module;
-import com.ibm.wala.classLoader.ModuleEntry;
-import com.ibm.wala.classLoader.SourceFileModule;
-import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.util.collections.HashMapFactory;
-import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.debug.Assertions;
-
-/**
- * A SourceModuleTranslator whose implementation of loadAllSources() uses the PolyglotFrontEnd pseudo-compiler to generate DOMO IR
- * for the sources in the compile-time classpath.
- * 
- * @author rfuhrer
- */
-// remove me comment: Jdt little-case = not OK, upper case = OK
-public class EJCSourceModuleTranslator implements SourceModuleTranslator {
-  private final class EjcAstToIR extends FileASTRequestor {
-    private final Map<String, ModuleEntry> sourceMap;
-    
-    public EjcAstToIR(Map<String, ModuleEntry> sourceMap) {
-     this.sourceMap = sourceMap;
-    }
-
-    @Override
-    public void acceptAST(String source, CompilationUnit ast) {
-      JDTJava2CAstTranslator jdt2cast = makeCAstTranslator(ast, source);
-      final Java2IRTranslator java2ir = makeIRTranslator();
-      java2ir.translate(sourceMap.get(source), jdt2cast.translateToCAst());
- 
-      if (! "true".equals(System.getProperty("wala.jdt.quiet"))) {
-        IProblem[] problems = ast.getProblems();
-        int length = problems.length;
-        if (length > 0) {
-          StringBuffer buffer = new StringBuffer();
-          for (int i = 0; i < length; i++) {
-            buffer.append(problems[i].getMessage());
-            buffer.append('\n');
-          }
-          if (length != 0)
-            System.err.println("Unexpected problems in " + source + "\n " + buffer.toString());
-        }
-      }
-    }
-  }
-
-  protected boolean dump;
-  protected EJCSourceLoaderImpl sourceLoader;
-  private final String[] sources;
-  private final String[] libs;
-  
-  public EJCSourceModuleTranslator(AnalysisScope scope, EJCSourceLoaderImpl sourceLoader) {
-    this(scope, sourceLoader, false);
-  }
-
-  public EJCSourceModuleTranslator(AnalysisScope scope, EJCSourceLoaderImpl sourceLoader, boolean dump) {
-    this.sourceLoader = sourceLoader;
-    this.dump = dump;
-    
-    Pair<String[], String[]> paths = computeClassPath(scope);
-    sources = paths.fst;
-    libs = paths.snd;
-  }
-
-  private Pair<String[],String[]> computeClassPath(AnalysisScope scope) {
-    List<String> sources = new LinkedList<String>();
-    List<String> libs = new LinkedList<String>();
-    
-    ClassLoaderReference cl = scope.getApplicationLoader();
-
-    while (cl != null) {
-      List<Module> modules = scope.getModules(cl);
-
-      for (Iterator<Module> iter = modules.iterator(); iter.hasNext();) {
-        Module m = iter.next();
-
-        if (m instanceof JarFileModule) {
-          JarFileModule jarFileModule = (JarFileModule) m;
-
-          libs.add(jarFileModule.getAbsolutePath());
-        } else if (m instanceof DirectoryTreeModule) {
-          DirectoryTreeModule directoryTreeModule = (DirectoryTreeModule) m;
-
-          sources.add(directoryTreeModule.getPath());
-        } else
-          Assertions.UNREACHABLE("Module entry is neither jar file nor directory");
-      }
-      cl = cl.getParent();
-    }
-    
-    return Pair.make(sources.toArray(new String[ sources.size() ]),  libs.toArray(new String[ libs.size() ]));
-  }
-  
-  /*
-   * 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>();
-    Map<String, ModuleEntry> sourceMap = HashMapFactory.make();
-    for(ModuleEntry m : modules) {
-      if (m.isSourceFile()) {
-        SourceFileModule s = (SourceFileModule)m;
-        sourceMap.put(s.getAbsolutePath(), s);
-        sources.add(s.getAbsolutePath());
-      }
-    }
-    
-    String[] sourceFiles = sources.toArray(new String[ sources.size() ]);
-    final ASTParser parser = ASTParser.newParser(AST.JLS8);
-    parser.setResolveBindings(true);
-    parser.setEnvironment(libs, null, null, false);
-    Hashtable options = JavaCore.getOptions();
-    options.put(JavaCore.COMPILER_SOURCE, "1.8");
-    parser.setCompilerOptions(options);
-    parser.createASTs(sourceFiles, null, new String[0], new EjcAstToIR(sourceMap), new NullProgressMonitor());
-  }
-
-  protected Java2IRTranslator makeIRTranslator() {
-    return new Java2IRTranslator(sourceLoader);
-  }
-
-  protected JDTJava2CAstTranslator makeCAstTranslator(CompilationUnit cu, String fullPath) {
-    return new JDTJava2CAstTranslator<Position>(sourceLoader, cu, fullPath, false, dump) {
-      @Override
-      public Position makePosition(int start, int end) {
-        try {
-          return new RangePosition(new URL("file://" + fullPath), this.cu.getLineNumber(start), start, end);
-        } catch (MalformedURLException e) {
-          throw new RuntimeException("bad file: " + fullPath, e);
-        }
-      }
-    };
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/FakeExceptionTypeBinding.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/FakeExceptionTypeBinding.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/FakeExceptionTypeBinding.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/FakeExceptionTypeBinding.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,461 +0,0 @@
-/*
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html.
- * 
- * This file is a derivative of code released by the University of
- * California under the terms listed below.  
- *
- * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
- * University of California (Regents). Provided that this notice and
- * the following two paragraphs are included in any distribution of
- * Refinement Analysis Tools or its derivative work, Regents agrees
- * not to assert any of Regents' copyright rights in Refinement
- * Analysis Tools against recipient for recipient's reproduction,
- * preparation of derivative works, public display, public
- * performance, distribution or sublicensing of Refinement Analysis
- * Tools and derivative works, in source code and object code form.
- * This agreement not to assert does not confer, by implication,
- * estoppel, or otherwise any license or rights in any intellectual
- * property of Regents, including, but not limited to, any patents
- * of Regents or Regents' employees.
- * 
- * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
- * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
- * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
- * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *   
- * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
- * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
- * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
- * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
- * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-package com.ibm.wala.cast.java.translator.jdt;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.dom.IAnnotationBinding;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.IPackageBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.IVariableBinding;
-
-import com.ibm.wala.util.debug.Assertions;
-
-/**
- * This is a hack to get around the fact that AST.resolveWellKnownTypes() doesn't know about some implicitly declared exceptions,
- * such as ArithmeticException (implicitly thrown in a division operation) and NullPointerException (implicitly thrown in a field
- * access). We need to know the lineage of these types to determine possible catch targets.
- * 
- * @author evan
- * 
- */
-public class FakeExceptionTypeBinding implements ITypeBinding {
-
-  static public final FakeExceptionTypeBinding arithmetic = new FakeExceptionTypeBinding("Ljava/lang/ArithmeticException;");
-
-  static public final FakeExceptionTypeBinding nullPointer = new FakeExceptionTypeBinding("Ljava/lang/NullPointerException;");
-
-  static public final FakeExceptionTypeBinding classCast = new FakeExceptionTypeBinding("Ljava/lang/ClassCastException;");
-
-  static public final FakeExceptionTypeBinding noClassDef = new FakeExceptionTypeBinding("Ljava/lang/NoClassDefFoundError;");
-
-  static public final FakeExceptionTypeBinding initException = new FakeExceptionTypeBinding(
-      "Ljava/lang/ExceptionInInitializerError;");
-
-  static public final FakeExceptionTypeBinding outOfMemory = new FakeExceptionTypeBinding("Ljava/lang/OutOfMemoryError;");
-
-  private final String exceptionBinaryName;
-
-  private FakeExceptionTypeBinding(String exceptionBinaryName) {
-    this.exceptionBinaryName = exceptionBinaryName;
-  }
-
-  @Override
-  public boolean isAssignmentCompatible(ITypeBinding variableType) {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o instanceof FakeExceptionTypeBinding)
-      return this == o;
-    if (o instanceof ITypeBinding)
-      return ((ITypeBinding) o).getBinaryName().equals(exceptionBinaryName);
-    return false;
-  }
-
-  // --- rest not needed
-
-  @Override
-  public ITypeBinding createArrayType(int dimension) {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding createArrayType");
-    return null;
-  }
-
-  @Override
-  public String getBinaryName() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public ITypeBinding getBound() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public ITypeBinding getComponentType() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public IVariableBinding[] getDeclaredFields() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public IMethodBinding[] getDeclaredMethods() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public int getDeclaredModifiers() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return 0;
-  }
-
-  @Override
-  public ITypeBinding[] getDeclaredTypes() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public ITypeBinding getDeclaringClass() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public IMethodBinding getDeclaringMethod() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public int getDimensions() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return 0;
-  }
-
-  @Override
-  public ITypeBinding getElementType() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public ITypeBinding getErasure() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public ITypeBinding[] getInterfaces() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public int getModifiers() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return 0;
-  }
-
-  @Override
-  public String getName() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public IPackageBinding getPackage() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public String getQualifiedName() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public ITypeBinding getSuperclass() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public ITypeBinding[] getTypeArguments() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public ITypeBinding[] getTypeBounds() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public ITypeBinding getTypeDeclaration() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public ITypeBinding[] getTypeParameters() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public ITypeBinding getWildcard() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public boolean isAnnotation() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isAnonymous() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isArray() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isCapture() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isCastCompatible(ITypeBinding type) {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isClass() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isEnum() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isFromSource() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isGenericType() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isInterface() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isLocal() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isMember() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isNested() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isNullType() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isParameterizedType() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isPrimitive() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isRawType() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isSubTypeCompatible(ITypeBinding type) {
-    String name = type.getBinaryName();
-    if (exceptionBinaryName.endsWith("Error;")) {
-      if (name.equals("Ljava/lang/Throwable;") || name.equals("Ljava/lang/Error;") || name.equals(exceptionBinaryName)) {
-        return true;
-      }
-
-    } else {
-      if (name.equals("Ljava/lang/Throwable;") || name.equals("Ljava/lang/Exception;")
-          || name.equals("Ljava/lang/RuntimeException;") || name.equals(exceptionBinaryName)) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  @Override
-  public boolean isTopLevel() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isTypeVariable() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isUpperbound() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isWildcardType() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public IAnnotationBinding[] getAnnotations() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public IJavaElement getJavaElement() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public String getKey() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public int getKind() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return 0;
-  }
-
-  @Override
-  public boolean isDeprecated() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isEqualTo(IBinding binding) {
-    return this.equals(binding);
-  }
-
-  @Override
-  public boolean isRecovered() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public boolean isSynthetic() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return false;
-  }
-
-  @Override
-  public ITypeBinding getGenericTypeOfWildcardType() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  @Override
-  public int getRank() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return 0;
-  }
-
-  // do not put @Override here, to avoid breaking compilation on Juno
-  public IMethodBinding getFunctionalInterfaceMethod() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  // do not put @Override here, to avoid breaking compilation on Juno
-  public IAnnotationBinding[] getTypeAnnotations() {
-    Assertions.UNREACHABLE("FakeExceptionTypeBinding ");
-    return null;
-  }
-
-  // do not put @Override here, to avoid breaking compilation on older Eclipse versions
-  public IBinding getDeclaringMember() {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDT2CAstUtils.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDT2CAstUtils.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDT2CAstUtils.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDT2CAstUtils.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,327 +0,0 @@
-/*
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html.
- * 
- * This file is a derivative of code released by the University of
- * California under the terms listed below.  
- *
- * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
- * University of California (Regents). Provided that this notice and
- * the following two paragraphs are included in any distribution of
- * Refinement Analysis Tools or its derivative work, Regents agrees
- * not to assert any of Regents' copyright rights in Refinement
- * Analysis Tools against recipient for recipient's reproduction,
- * preparation of derivative works, public display, public
- * performance, distribution or sublicensing of Refinement Analysis
- * Tools and derivative works, in source code and object code form.
- * This agreement not to assert does not confer, by implication,
- * estoppel, or otherwise any license or rights in any intellectual
- * property of Regents, including, but not limited to, any patents
- * of Regents or Regents' employees.
- * 
- * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
- * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
- * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
- * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *   
- * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
- * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
- * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
- * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
- * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-package com.ibm.wala.cast.java.translator.jdt;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
-import org.eclipse.jdt.core.dom.Assignment;
-import org.eclipse.jdt.core.dom.Assignment.Operator;
-import org.eclipse.jdt.core.dom.EnumDeclaration;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.InfixExpression;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-
-import com.ibm.wala.cast.tree.CAstQualifier;
-import com.ibm.wala.cast.tree.CAstSymbol;
-import com.ibm.wala.cast.tree.impl.CAstOperator;
-import com.ibm.wala.util.debug.Assertions;
-
-public class JDT2CAstUtils {
-  public static Collection<CAstQualifier> mapModifiersToQualifiers(int modifiers, boolean isInterface, boolean isAnnotation) {
-    Set<CAstQualifier> quals = new LinkedHashSet<CAstQualifier>();
-
-    if (isInterface)
-      quals.add(CAstQualifier.INTERFACE);
-
-    if (isAnnotation)
-      quals.add(CAstQualifier.ANNOTATION);
-    
-    if ((modifiers & Modifier.ABSTRACT) != 0)
-      quals.add(CAstQualifier.ABSTRACT);
-    if ((modifiers & Modifier.FINAL) != 0)
-      quals.add(CAstQualifier.FINAL);
-    if ((modifiers & Modifier.NATIVE) != 0)
-      quals.add(CAstQualifier.NATIVE);
-    // if (flags.isPackage()) quals.add(CAstQualifier.PACKAGE);
-    if ((modifiers & Modifier.PRIVATE) != 0)
-      quals.add(CAstQualifier.PRIVATE);
-    if ((modifiers & Modifier.PROTECTED) != 0)
-      quals.add(CAstQualifier.PROTECTED);
-    if ((modifiers & Modifier.PUBLIC) != 0)
-      quals.add(CAstQualifier.PUBLIC);
-    if ((modifiers & Modifier.STATIC) != 0)
-      quals.add(CAstQualifier.STATIC);
-    if ((modifiers & Modifier.STRICTFP) != 0)
-      quals.add(CAstQualifier.STRICTFP);
-    if ((modifiers & Modifier.SYNCHRONIZED) != 0)
-      quals.add(CAstQualifier.SYNCHRONIZED);
-    if ((modifiers & Modifier.TRANSIENT) != 0)
-      quals.add(CAstQualifier.TRANSIENT);
-    if ((modifiers & Modifier.VOLATILE) != 0)
-      quals.add(CAstQualifier.VOLATILE);
-
-    return quals;
-  }
-
-  public static CAstOperator mapAssignOperator(Operator op) {
-    if (op == Assignment.Operator.PLUS_ASSIGN)
-      return CAstOperator.OP_ADD;
-    else if (op == Assignment.Operator.BIT_AND_ASSIGN)
-      return CAstOperator.OP_BIT_AND;
-    else if (op == Assignment.Operator.BIT_OR_ASSIGN)
-      return CAstOperator.OP_BIT_OR;
-    else if (op == Assignment.Operator.BIT_XOR_ASSIGN)
-      return CAstOperator.OP_BIT_XOR;
-    else if (op == Assignment.Operator.DIVIDE_ASSIGN)
-      return CAstOperator.OP_DIV;
-    else if (op == Assignment.Operator.REMAINDER_ASSIGN)
-      return CAstOperator.OP_MOD;
-    else if (op == Assignment.Operator.TIMES_ASSIGN)
-      return CAstOperator.OP_MUL;
-    else if (op == Assignment.Operator.LEFT_SHIFT_ASSIGN)
-      return CAstOperator.OP_LSH;
-    else if (op == Assignment.Operator.RIGHT_SHIFT_SIGNED_ASSIGN)
-      return CAstOperator.OP_RSH;
-    else if (op == Assignment.Operator.MINUS_ASSIGN)
-      return CAstOperator.OP_SUB;
-    else if (op == Assignment.Operator.RIGHT_SHIFT_UNSIGNED_ASSIGN)
-      return CAstOperator.OP_URSH;
-    Assertions.UNREACHABLE("Unknown assignment operator");
-    return null;
-  }
-
-  protected static CAstOperator mapBinaryOpcode(InfixExpression.Operator operator) {
-    if (operator == InfixExpression.Operator.PLUS)
-      return CAstOperator.OP_ADD;
-    // separate bitwise and logical AND / OR ? '&' / '|' ?
-    if (operator == InfixExpression.Operator.AND)
-      return CAstOperator.OP_BIT_AND;
-    if (operator == InfixExpression.Operator.OR)
-      return CAstOperator.OP_BIT_OR;
-    if (operator == InfixExpression.Operator.XOR)
-      return CAstOperator.OP_BIT_XOR;
-
-    // TODO: shouldn't get here (conditional and handled differently); however should separate bitwise & logical '&' / '|', maybe.
-    if (operator == InfixExpression.Operator.CONDITIONAL_AND)
-      return CAstOperator.OP_REL_AND;
-    if (operator == InfixExpression.Operator.CONDITIONAL_OR)
-      return CAstOperator.OP_REL_OR;
-
-    if (operator == InfixExpression.Operator.DIVIDE)
-      return CAstOperator.OP_DIV;
-    if (operator == InfixExpression.Operator.EQUALS)
-      return CAstOperator.OP_EQ;
-    if (operator == InfixExpression.Operator.GREATER_EQUALS)
-      return CAstOperator.OP_GE;
-    if (operator == InfixExpression.Operator.GREATER)
-      return CAstOperator.OP_GT;
-    if (operator == InfixExpression.Operator.LESS_EQUALS)
-      return CAstOperator.OP_LE;
-    if (operator == InfixExpression.Operator.LESS)
-      return CAstOperator.OP_LT;
-    if (operator == InfixExpression.Operator.REMAINDER)
-      return CAstOperator.OP_MOD;
-    if (operator == InfixExpression.Operator.TIMES)
-      return CAstOperator.OP_MUL;
-    if (operator == InfixExpression.Operator.NOT_EQUALS)
-      return CAstOperator.OP_NE;
-    if (operator == InfixExpression.Operator.LEFT_SHIFT)
-      return CAstOperator.OP_LSH;
-    if (operator == InfixExpression.Operator.RIGHT_SHIFT_SIGNED)
-      return CAstOperator.OP_RSH;
-    if (operator == InfixExpression.Operator.MINUS)
-      return CAstOperator.OP_SUB;
-    if (operator == InfixExpression.Operator.RIGHT_SHIFT_UNSIGNED)
-      return CAstOperator.OP_URSH;
-    Assertions.UNREACHABLE("Java2CAstTranslator.JavaTranslatingVisitorImpl.mapBinaryOpcode(): unrecognized binary operator.");
-    return null;
-  }
-
-  /**
-   * Returns true if type is char, byte, short, int, or long. Return false otherwise (including boolean!)
-   * 
-   * @param type
-   * @return
-   */
-  public static boolean isLongOrLess(ITypeBinding type) {
-    String t = type.getBinaryName();
-    return t.equals("C") || t.equals("B") || t.equals("S") || t.equals("I") || t.equals("J");
-  }
-
-  /**
-   * If isLongOrLess(type), returns Integer(0). If a float or double, returns Double(0.0) Otherwise (including boolean), returns
-   * CAstSymbol.NULL_DEFAULT_VALUE.
-   * 
-   * @param type
-   * @return
-   */
-  public static Object defaultValueForType(ITypeBinding type) {
-    if (isLongOrLess(type))
-      return new Integer(0);
-    else if (type.getBinaryName().equals("D") || type.getBinaryName().equals("F"))
-      return new Double(0.0);
-    else
-      return CAstSymbol.NULL_DEFAULT_VALUE;
-  }
-
-  public static ITypeBinding promoteTypes(ITypeBinding t1, ITypeBinding t2, AST ast) {
-    // JLS 5.6.2
-    ITypeBinding doble = ast.resolveWellKnownType("double");
-    if (t1.equals(doble) || t2.equals(doble))
-      return doble;
-    ITypeBinding flotando = ast.resolveWellKnownType("float");
-    if (t1.equals(flotando) || t2.equals(flotando))
-      return flotando;
-    ITypeBinding largo = ast.resolveWellKnownType("long");
-    if (t1.equals(largo) || t2.equals(largo))
-      return largo;
-    return ast.resolveWellKnownType("int");
-  }
-
-  public static ITypeBinding getDeclaringClassOfNode(ASTNode n) {
-    ASTNode current = n;
-    while (current != null) {
-      if (current instanceof TypeDeclaration)
-        return ((TypeDeclaration) current).resolveBinding();
-      else if (current instanceof AnonymousClassDeclaration)
-        return ((AnonymousClassDeclaration) current).resolveBinding();
-      else if (current instanceof EnumDeclaration)
-        return ((EnumDeclaration) current).resolveBinding();
-      current = current.getParent();
-    }
-    Assertions.UNREACHABLE("Couldn't find declaring class of node");
-    return null;
-  }
-
-  static String anonTypeName(ITypeBinding ct) {
-    String binName = ct.getBinaryName();
-    String dollarSignNumber = binName.substring(binName.indexOf('$'));
-    return "<anonymous subclass of " + ct.getSuperclass().getBinaryName() + ">" + dollarSignNumber;
-  }
-
-  /**
-   * If a type variable, return the bound (getTypeVariablesBase()). If a parameterized type, return the generic type.
-   * 
-   * @param returnType
-   * @param ast
-   * @return
-   */
-  public static ITypeBinding getErasedType(ITypeBinding returnType, AST ast) {
-    if (returnType.isTypeVariable() || returnType.isCapture())
-      return getTypesVariablesBase(returnType, ast);
-    return returnType.getTypeDeclaration(); // Things like "Collection<? extends Bla>" are parameterized types...
-  }
-
-  public static ITypeBinding getTypesVariablesBase(ITypeBinding returnType, AST ast) {
-    assert returnType.isTypeVariable() || returnType.isCapture();
-    if (returnType.getTypeBounds().length > 0)
-      return returnType.getTypeBounds()[0]; // TODO: why is there more than one bound?
-    else
-      return ast.resolveWellKnownType("java.lang.Object");
-  }
-
-  public static InfixExpression.Operator mapAssignOperatorToInfixOperator(Assignment.Operator op) {
-    if (op == Assignment.Operator.PLUS_ASSIGN)
-      return InfixExpression.Operator.PLUS;
-    else if (op == Assignment.Operator.BIT_AND_ASSIGN)
-      return InfixExpression.Operator.AND;
-    else if (op == Assignment.Operator.BIT_OR_ASSIGN)
-      return InfixExpression.Operator.OR;
-    else if (op == Assignment.Operator.BIT_XOR_ASSIGN)
-      return InfixExpression.Operator.XOR;
-    else if (op == Assignment.Operator.DIVIDE_ASSIGN)
-      return InfixExpression.Operator.DIVIDE;
-    else if (op == Assignment.Operator.REMAINDER_ASSIGN)
-      return InfixExpression.Operator.REMAINDER;
-    else if (op == Assignment.Operator.TIMES_ASSIGN)
-      return InfixExpression.Operator.TIMES;
-    else if (op == Assignment.Operator.LEFT_SHIFT_ASSIGN)
-      return InfixExpression.Operator.LEFT_SHIFT;
-    else if (op == Assignment.Operator.RIGHT_SHIFT_SIGNED_ASSIGN)
-      return InfixExpression.Operator.RIGHT_SHIFT_SIGNED;
-    else if (op == Assignment.Operator.MINUS_ASSIGN)
-      return InfixExpression.Operator.MINUS;
-    else if (op == Assignment.Operator.RIGHT_SHIFT_UNSIGNED_ASSIGN)
-      return InfixExpression.Operator.RIGHT_SHIFT_UNSIGNED;
-    Assertions.UNREACHABLE("Unknown assignment operator");
-    return null;
-  }
-
-  private static void getMethodInClassOrSuperclass(IMethodBinding met, ITypeBinding klass, boolean superclassonly,
-      HashMap<ITypeBinding, IMethodBinding> overridden) {
-    if (!superclassonly) {
-      for (IMethodBinding ourmet : klass.getDeclaredMethods())
-        if (met.overrides(ourmet)) {
-          overridden.put(ourmet.getMethodDeclaration().getReturnType(), ourmet.getMethodDeclaration());
-          break; // there can only be one per class so don't bother looking for more
-        }
-    }
-
-    for (ITypeBinding iface : klass.getInterfaces())
-      getMethodInClassOrSuperclass(met, iface, false, overridden);
-
-    ITypeBinding superclass = klass.getSuperclass();
-    if (superclass != null)
-      getMethodInClassOrSuperclass(met, superclass, false, overridden);
-  }
-
-  public static Collection<IMethodBinding> getOverriddenMethod(IMethodBinding met) {
-    HashMap<ITypeBinding, IMethodBinding> overridden = new HashMap<ITypeBinding, IMethodBinding>();
-    if (met == null)
-      return null;
-    getMethodInClassOrSuperclass(met, met.getDeclaringClass(), true, overridden);
-    if (overridden.size() == 0)
-      return null;
-    return overridden.values();
-  }
-
-  public static boolean sameErasedSignatureAndReturnType(IMethodBinding met1, IMethodBinding met2) {
-    if (!met1.getReturnType().getErasure().isEqualTo(met2.getReturnType().getErasure()))
-      return false;
-
-    ITypeBinding[] params1 = met1.getParameterTypes();
-    ITypeBinding[] params2 = met2.getParameterTypes();
-    if (params1.length != params2.length)
-      return false;
-
-    for (int i = 0; i < params1.length; i++)
-      if (!params1[i].getErasure().isEqualTo(params2[i].getErasure()))
-        return false;
-
-    return true;
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTClassLoaderFactory.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTClassLoaderFactory.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTClassLoaderFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTClassLoaderFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -73,8 +73,7 @@
     }
   }
 
-  protected JavaSourceLoaderImpl makeSourceLoader(ClassLoaderReference classLoaderReference, IClassHierarchy cha, IClassLoader parent)
-      throws IOException {
-    return new JDTSourceLoaderImpl(classLoaderReference, parent, getExclusions(), cha, dump);
+  protected JavaSourceLoaderImpl makeSourceLoader(ClassLoaderReference classLoaderReference, IClassHierarchy cha, IClassLoader parent) {
+    return new JDTSourceLoaderImpl(classLoaderReference, parent, cha, dump);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTIdentityMapper.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTIdentityMapper.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTIdentityMapper.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTIdentityMapper.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,224 +0,0 @@
-/*
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html.
- * 
- * This file is a derivative of code released by the University of
- * California under the terms listed below.  
- *
- * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
- * University of California (Regents). Provided that this notice and
- * the following two paragraphs are included in any distribution of
- * Refinement Analysis Tools or its derivative work, Regents agrees
- * not to assert any of Regents' copyright rights in Refinement
- * Analysis Tools against recipient for recipient's reproduction,
- * preparation of derivative works, public display, public
- * performance, distribution or sublicensing of Refinement Analysis
- * Tools and derivative works, in source code and object code form.
- * This agreement not to assert does not confer, by implication,
- * estoppel, or otherwise any license or rights in any intellectual
- * property of Regents, including, but not limited to, any patents
- * of Regents or Regents' employees.
- * 
- * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
- * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
- * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
- * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *   
- * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
- * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
- * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
- * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
- * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-package com.ibm.wala.cast.java.translator.jdt;
-
-import java.util.Map;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.IVariableBinding;
-
-import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.types.Descriptor;
-import com.ibm.wala.types.FieldReference;
-import com.ibm.wala.types.MethodReference;
-import com.ibm.wala.types.Selector;
-import com.ibm.wala.types.TypeName;
-import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.collections.HashMapFactory;
-import com.ibm.wala.util.debug.Assertions;
-import com.ibm.wala.util.strings.Atom;
-
-/**
- * Class responsible for mapping JDT type system objects representing types, methods and fields to the corresponding WALA
- * TypeReferences, MethodReferences and FieldReferences. Used during translation and by clients to help correlate WALA analysis
- * results to the various AST nodes.
- * 
- * In English: keeps a hashtable of WALA "type references", "field references", etc. which describe types, fields, etc. Creates
- * these from their JDT equivalents and keeps the hashtable linking the two representations.
- * 
- * @author rfuhrer
- */
-public class JDTIdentityMapper {
-  private final Map<String, TypeReference> fTypeMap = HashMapFactory.make();
-
-  private final Map<String, FieldReference> fFieldMap = HashMapFactory.make();
-
-  private final Map<String, MethodReference> fMethodMap = HashMapFactory.make();
-
-  private final ClassLoaderReference fClassLoaderRef; // TAGALONG
-
-  private final AST fAst;
-
-  public JDTIdentityMapper(ClassLoaderReference clr, AST ast) {
-    fClassLoaderRef = clr;
-    fAst = ast;
-  }
-
-  // TYPES
-
-  /**
-   * Create (or reuse) a TypeReference for the given JDT Type Binding.<br>
-   * This method canonicalizes the TypeReferences
-   */
-  public TypeReference getTypeRef(ITypeBinding type) {
-    type = JDT2CAstUtils.getErasedType((ITypeBinding) type, fAst); // GENERICS: erasure...
-
-    if (!fTypeMap.containsKey(type.getKey())) {
-      TypeName typeName = TypeName.string2TypeName(typeToTypeID(type));
-      TypeReference ref = TypeReference.findOrCreate(fClassLoaderRef, typeName);
-
-      fTypeMap.put(type.getKey(), ref);
-      return ref;
-    }
-    return fTypeMap.get(type.getKey());
-  }
-
-  /**
-   * Translates the given Polyglot type to a name suitable for use in a DOMO TypeReference (i.e. a bytecode-compliant type name).
-   */
-  public String typeToTypeID(ITypeBinding type) {
-    if (type.isPrimitive())
-      return type.getBinaryName();
-    else if (type.isArray())
-      // arrays' binary names in JDT are like "[Ljava.lang.String;"
-      return type.getBinaryName().replace('.', '/').replace(";", "");
-    else if (type.isLocal() || type.isAnonymous())
-      return anonLocalTypeToTypeID(type);
-    else if (type.isClass() || type.isEnum() || type.isInterface()) // in polyglot interfaces are classes too. not in JDT
-      // class binary names in JDT are like "java.lang.String"
-      return 'L' + type.getBinaryName().replace('.', '/'); // TODO:
-    else if (type.isTypeVariable()) {
-      return typeToTypeID(JDT2CAstUtils.getTypesVariablesBase(type, fAst));
-    }
-    Assertions.UNREACHABLE("typeToTypeID() encountered the type " + type + " that is neither primitive, array, nor class!");
-    return null;
-  }
-
-  public String anonLocalTypeToTypeID(ITypeBinding type) {
-    String outerTypeID = typeToTypeID(type.getDeclaringClass());
-
-    String metSelectorName;
-    IMethodBinding metBinding = type.getDeclaringMethod();
-    if (metBinding == null) // anonymous class declared in initializer or static initializer (rare case...)
-      metSelectorName = "<init>";
-    else
-      metSelectorName = getMethodRef(metBinding).getSelector().toString();
-
-    String shortName = (type.isAnonymous()) ? JDT2CAstUtils.anonTypeName(type) : type.getName();
-
-    return outerTypeID + '/' + metSelectorName + '/' + shortName;
-  }
-
-  // FIELDS
-
-  public FieldReference getFieldRef(IVariableBinding field) {
-    if (!fFieldMap.containsKey(field.getKey())) {
-      // create one
-      ITypeBinding targetType = field.getDeclaringClass();
-      TypeReference targetTypeRef = TypeReference.findOrCreate(fClassLoaderRef, typeToTypeID(targetType));
-      ITypeBinding fieldType = field.getType();
-      TypeReference fieldTypeRef = TypeReference.findOrCreate(fClassLoaderRef, typeToTypeID(fieldType));
-      Atom fieldName = Atom.findOrCreateUnicodeAtom(field.getName());
-      FieldReference ref = FieldReference.findOrCreate(targetTypeRef, fieldName, fieldTypeRef);
-
-      fFieldMap.put(field.getKey(), ref);
-      return ref;
-    }
-    return fFieldMap.get(field.getKey());
-  }
-
-  public MethodReference fakeMethodRefNoArgs(String key, String typeID, String metName, String returnTypeID) {
-    if (!fMethodMap.containsKey(key)) {
-      // create one
-      TypeName ownerType = TypeName.string2TypeName(typeID);
-      TypeReference ownerTypeRef = TypeReference.findOrCreate(fClassLoaderRef, ownerType);
-
-      // FAKE SELECTOR
-      Atom name = Atom.findOrCreateUnicodeAtom(metName);
-      TypeName[] argTypeNames = null;
-      TypeName retTypeName = TypeName.string2TypeName(returnTypeID);
-      Descriptor desc = Descriptor.findOrCreate(argTypeNames, retTypeName);
-      Selector selector = new Selector(name, desc);
-
-      MethodReference ref = MethodReference.findOrCreate(ownerTypeRef, selector);
-
-      fMethodMap.put(key, ref);
-      return ref;
-    }
-    return fMethodMap.get(key);
-  }
-
-  // METHODS
-  public MethodReference getMethodRef(IMethodBinding met) {
-    if (!fMethodMap.containsKey(met.getKey())) {
-      // create one
-      TypeName ownerType = TypeName.string2TypeName(typeToTypeID(met.getDeclaringClass()));
-      TypeReference ownerTypeRef = TypeReference.findOrCreate(fClassLoaderRef, ownerType);
-      MethodReference ref = MethodReference.findOrCreate(ownerTypeRef, selectorForMethod(met));
-
-      fMethodMap.put(met.getKey(), ref);
-      return ref;
-    }
-    return fMethodMap.get(met.getKey());
-  }
-
-  private Selector selectorForMethod(IMethodBinding met) {
-    // TODO: have to handle default constructors?
-    // TODO: generics...
-    Atom name = (met.isConstructor()) ? MethodReference.initAtom : Atom.findOrCreateUnicodeAtom(met.getName());
-
-    TypeName[] argTypeNames = null;
-    ITypeBinding[] formalTypes = met.getParameterTypes();
-
-    int length = formalTypes.length;
-
-    // ENUMS: hidden name and ID in constructor
-    if (met.isConstructor() && met.getDeclaringClass().isEnum())
-      length += 2;
-
-    // Descriptor prefers null to an empty array
-    if (length > 0) {
-      argTypeNames = new TypeName[length];
-      int i = 0;
-      if (met.isConstructor() && met.getDeclaringClass().isEnum()) {
-        argTypeNames[0] = TypeName.string2TypeName(typeToTypeID(fAst.resolveWellKnownType("java.lang.String")));
-        argTypeNames[1] = TypeName.string2TypeName(typeToTypeID(fAst.resolveWellKnownType("int")));
-        i = 2;
-      }
-      for (ITypeBinding argType : formalTypes)
-        argTypeNames[i++] = TypeName.string2TypeName(typeToTypeID(argType));
-    }
-
-    TypeName retTypeName = TypeName.string2TypeName(typeToTypeID(met.getReturnType()));
-    Descriptor desc = Descriptor.findOrCreate(argTypeNames, retTypeName);
-
-    return new Selector(name, desc);
-  }
-}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,3624 +0,0 @@
-/*
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html.
- * 
- * This file is a derivative of code released by the University of
- * California under the terms listed below.  
- *
- * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
- * University of California (Regents). Provided that this notice and
- * the following two paragraphs are included in any distribution of
- * Refinement Analysis Tools or its derivative work, Regents agrees
- * not to assert any of Regents' copyright rights in Refinement
- * Analysis Tools against recipient for recipient's reproduction,
- * preparation of derivative works, public display, public
- * performance, distribution or sublicensing of Refinement Analysis
- * Tools and derivative works, in source code and object code form.
- * This agreement not to assert does not confer, by implication,
- * estoppel, or otherwise any license or rights in any intellectual
- * property of Regents, including, but not limited to, any patents
- * of Regents or Regents' employees.
- * 
- * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
- * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
- * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
- * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *   
- * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
- * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
- * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
- * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
- * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-package com.ibm.wala.cast.java.translator.jdt;
-
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
-import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration;
-import org.eclipse.jdt.core.dom.AnonymousClassDeclaration;
-import org.eclipse.jdt.core.dom.ArrayAccess;
-import org.eclipse.jdt.core.dom.ArrayCreation;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.AssertStatement;
-import org.eclipse.jdt.core.dom.Assignment;
-import org.eclipse.jdt.core.dom.Block;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.BreakStatement;
-import org.eclipse.jdt.core.dom.CastExpression;
-import org.eclipse.jdt.core.dom.CatchClause;
-import org.eclipse.jdt.core.dom.CharacterLiteral;
-import org.eclipse.jdt.core.dom.ClassInstanceCreation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ConditionalExpression;
-import org.eclipse.jdt.core.dom.ConstructorInvocation;
-import org.eclipse.jdt.core.dom.ContinueStatement;
-import org.eclipse.jdt.core.dom.DoStatement;
-import org.eclipse.jdt.core.dom.EmptyStatement;
-import org.eclipse.jdt.core.dom.EnhancedForStatement;
-import org.eclipse.jdt.core.dom.EnumConstantDeclaration;
-import org.eclipse.jdt.core.dom.EnumDeclaration;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.ExpressionStatement;
-import org.eclipse.jdt.core.dom.FieldAccess;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.ForStatement;
-import org.eclipse.jdt.core.dom.IAnnotationBinding;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.IMemberValuePairBinding;
-import org.eclipse.jdt.core.dom.IMethodBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.IVariableBinding;
-import org.eclipse.jdt.core.dom.IfStatement;
-import org.eclipse.jdt.core.dom.InfixExpression;
-import org.eclipse.jdt.core.dom.Initializer;
-import org.eclipse.jdt.core.dom.InstanceofExpression;
-import org.eclipse.jdt.core.dom.LabeledStatement;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.MethodInvocation;
-import org.eclipse.jdt.core.dom.Modifier;
-import org.eclipse.jdt.core.dom.NullLiteral;
-import org.eclipse.jdt.core.dom.NumberLiteral;
-import org.eclipse.jdt.core.dom.PackageDeclaration;
-import org.eclipse.jdt.core.dom.ParenthesizedExpression;
-import org.eclipse.jdt.core.dom.PostfixExpression;
-import org.eclipse.jdt.core.dom.PrefixExpression;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jdt.core.dom.ReturnStatement;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SimpleType;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.Statement;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.SuperConstructorInvocation;
-import org.eclipse.jdt.core.dom.SuperFieldAccess;
-import org.eclipse.jdt.core.dom.SuperMethodInvocation;
-import org.eclipse.jdt.core.dom.SwitchCase;
-import org.eclipse.jdt.core.dom.SwitchStatement;
-import org.eclipse.jdt.core.dom.SynchronizedStatement;
-import org.eclipse.jdt.core.dom.ThisExpression;
-import org.eclipse.jdt.core.dom.ThrowStatement;
-import org.eclipse.jdt.core.dom.TryStatement;
-import org.eclipse.jdt.core.dom.Type;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclarationStatement;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-import org.eclipse.jdt.core.dom.VariableDeclarationExpression;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
-import org.eclipse.jdt.core.dom.WhileStatement;
-
-import com.ibm.wala.analysis.typeInference.JavaPrimitiveType;
-import com.ibm.wala.cast.ir.translator.AstTranslator.InternalCAstSymbol;
-import com.ibm.wala.cast.ir.translator.TranslatorToCAst;
-import com.ibm.wala.cast.ir.translator.TranslatorToCAst.DoLoopTranslator;
-import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl;
-import com.ibm.wala.cast.java.loader.Util;
-import com.ibm.wala.cast.java.translator.JavaProcedureEntity;
-import com.ibm.wala.cast.tree.CAst;
-import com.ibm.wala.cast.tree.CAstAnnotation;
-import com.ibm.wala.cast.tree.CAstControlFlowMap;
-import com.ibm.wala.cast.tree.CAstEntity;
-import com.ibm.wala.cast.tree.CAstNode;
-import com.ibm.wala.cast.tree.CAstNodeTypeMap;
-import com.ibm.wala.cast.tree.CAstQualifier;
-import com.ibm.wala.cast.tree.CAstSourcePositionMap;
-import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
-import com.ibm.wala.cast.tree.CAstType;
-import com.ibm.wala.cast.tree.impl.CAstControlFlowRecorder;
-import com.ibm.wala.cast.tree.impl.CAstImpl;
-import com.ibm.wala.cast.tree.impl.CAstNodeTypeMapRecorder;
-import com.ibm.wala.cast.tree.impl.CAstOperator;
-import com.ibm.wala.cast.tree.impl.CAstSourcePositionRecorder;
-import com.ibm.wala.cast.tree.impl.CAstSymbolImpl;
-import com.ibm.wala.cast.util.CAstPrinter;
-import com.ibm.wala.classLoader.CallSiteReference;
-import com.ibm.wala.shrikeBT.IInvokeInstruction;
-import com.ibm.wala.types.FieldReference;
-import com.ibm.wala.types.MethodReference;
-import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.collections.EmptyIterator;
-import com.ibm.wala.util.collections.HashMapFactory;
-import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.debug.Assertions;
-
-// TOTEST:
-// "1/0" surrounded by catch ArithmeticException & RunTimeException (TryCatchContext.getCatchTypes"
-// another subtype of ArithmeticException surrounded by catch ArithmeticException
-// binary ops with all kinds of type conversions
-// simplenames: fields of this, fields of an enclosing class, fields of an enclosing method, static fields, fully qualified fields w/ package stuff
-// exceptional CFG edges, somehow. call nodes, new nodes, division by zero in binary ops, null pointer in field accesses, etc.   
-// implicit constructors
-
-// FIXME 1.4: thing about / ask agout TAGALONG (JDT stuff tagging along in memory cos we keep it).
-// FIXME 1.4: find LEFTOUT and find out why polyglot has extra code / infrastructure, if it's used and what for, etc.
-
-// Java 1.6:
-// * type parameters/generics: see getArgumentTypes in ProcedureEntity$anon. also anywhere we use ITypeBinding.equals() may be affected
-//   see anywhere in code labeled GENERICS for present "treat as raw types"/"pretend it's 1.4 and casts" solution.
-// * boxing (YUCK). see resolveBoxing()
-// * enums (probably in simplename or something. but using resolveConstantExpressionValue() possible)
-
-@SuppressWarnings("unchecked")
-public abstract class JDTJava2CAstTranslator<T extends Position> {
-  protected boolean dump = false;
-  
-  protected final CAst fFactory = new CAstImpl();
-
-  // ///////////////////////////////////////////
-  // / HANDLINGS OF VARIOUS THINGS //
-  // ///////////////////////////////////////////
-  protected final AST ast; // TAGALONG
-
-  protected final JDTIdentityMapper fIdentityMapper; // TAGALONG
-
-  protected final JDTTypeDictionary fTypeDict;
-
-  protected final JavaSourceLoaderImpl fSourceLoader;
-
-  protected final ITypeBinding fDivByZeroExcType;
-
-  protected final ITypeBinding fNullPointerExcType;
-
-  protected final ITypeBinding fClassCastExcType;
-
-  protected final ITypeBinding fRuntimeExcType;
-
-  protected final ITypeBinding NoClassDefFoundError;
-
-  protected final ITypeBinding ExceptionInInitializerError;
-
-  protected final ITypeBinding OutOfMemoryError;
-
-  protected final DoLoopTranslator doLoopTranslator;
-  
-  protected final String fullPath;
-  
-  protected final CompilationUnit cu;
-
-  //
-  // COMPILATION UNITS & TYPES
-  //
-
-  public JDTJava2CAstTranslator(JavaSourceLoaderImpl sourceLoader, CompilationUnit astRoot, String fullPath, boolean replicateForDoLoops) {
-    this(sourceLoader, astRoot, fullPath, replicateForDoLoops, false);
-  }
-
-  public JDTJava2CAstTranslator(JavaSourceLoaderImpl sourceLoader, CompilationUnit astRoot, String fullPath, boolean replicateForDoLoops, boolean dump) {
-    fDivByZeroExcType = FakeExceptionTypeBinding.arithmetic;
-    fNullPointerExcType = FakeExceptionTypeBinding.nullPointer;
-    fClassCastExcType = FakeExceptionTypeBinding.classCast;
-    NoClassDefFoundError = FakeExceptionTypeBinding.noClassDef;
-    ExceptionInInitializerError = FakeExceptionTypeBinding.initException;
-    OutOfMemoryError = FakeExceptionTypeBinding.outOfMemory;
-
-    this.fSourceLoader = sourceLoader;
-    this.cu = astRoot;
-
-    this.fullPath = fullPath;
-    this.ast = astRoot.getAST();
-
-    this.doLoopTranslator = new DoLoopTranslator(replicateForDoLoops, fFactory);
-
-    this.dump = dump;
-    
-    // FIXME: we might need one AST (-> "Object" class) for all files.
-    fIdentityMapper = new JDTIdentityMapper(fSourceLoader.getReference(), ast);
-    fTypeDict = new JDTTypeDictionary(ast, fIdentityMapper);
-
-    fRuntimeExcType = ast.resolveWellKnownType("java.lang.RuntimeException");
-    assert fRuntimeExcType != null;
-  }
-
-  public CAstEntity translateToCAst() {
-
-    List<CAstEntity> declEntities = new ArrayList<CAstEntity>();
-
-    for (Iterator<CAstEntity> iter = cu.types().iterator(); iter.hasNext();) {
-      AbstractTypeDeclaration decl = (AbstractTypeDeclaration) iter.next();
-      // can be of type AnnotationTypeDeclaration, EnumDeclaration, TypeDeclaration
-      declEntities.add(visit(decl, new RootContext()));
-    }
-
-    if (dump) {
-      for(CAstEntity d : declEntities) {
-        CAstPrinter.printTo(d, new PrintWriter(System.err));
-      }
-    }
-    
-    return new CompilationUnitEntity(cu.getPackage(), declEntities);
-  }
-
-  //
-  // TYPES
-  //
-
-  protected final class ClassEntity implements CAstEntity {
-    // TAGALONG (not static, will keep reference to ast, fIdentityMapper, etc)
-
-    private final String fName;
-
-    private final Collection<CAstQualifier> fQuals;
-
-    private final Collection<CAstEntity> fEntities;
-
-    private final ITypeBinding fJdtType; // TAGALONG
-
-    private final T fSourcePosition;
-
-    private final Set<CAstAnnotation> annotations;
-    
-    public ClassEntity(ITypeBinding jdtType, String name, Collection<CAstQualifier> quals, Collection<CAstEntity> entities,
-        T pos, Set<CAstAnnotation> annotations) {
-      fName = name;
-      fQuals = quals;
-      fEntities = entities;
-      fJdtType = jdtType;
-      fSourcePosition = pos;
-      this.annotations = annotations;
-    }
-
-    @Override
-	public Collection<CAstAnnotation> getAnnotations() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-
-	@Override
-  public int getKind() {
-      return TYPE_ENTITY;
-    }
-
-    @Override
-    public String getName() {
-      return fName; // unqualified?
-    }
-
-    @Override
-    public String getSignature() {
-      return "L" + fName.replace('.', '/') + ";";
-    }
-
-    @Override
-    public String[] getArgumentNames() {
-      return new String[0];
-    }
-
-    @Override
-    public CAstNode[] getArgumentDefaults() {
-      return new CAstNode[0];
-    }
-
-    @Override
-    public int getArgumentCount() {
-      return 0;
-    }
-
-    @Override
-    public CAstNode getAST() {
-      // This entity has no AST nodes, really.
-      return null;
-    }
-
-    @Override
-    public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
-      return Collections.singletonMap(null, fEntities);
-    }
-
-    @Override
-    public Iterator getScopedEntities(CAstNode construct) {
-      Assertions.UNREACHABLE("Non-AST-bearing entity (ClassEntity) asked for scoped entities related to a given AST node");
-      return null;
-    }
-
-    @Override
-    public CAstControlFlowMap getControlFlow() {
-      // This entity has no AST nodes, really.
-      return null;
-    }
-
-    @Override
-    public CAstSourcePositionMap getSourceMap() {
-      // This entity has no AST nodes, really.
-      return null;
-    }
-
-    @Override
-    public CAstSourcePositionMap.Position getPosition() {
-      return fSourcePosition;
-    }
-
-    @Override
-    public CAstNodeTypeMap getNodeTypeMap() {
-      // This entity has no AST nodes, really.
-      return new CAstNodeTypeMap() {
-        @Override
-        public CAstType getNodeType(CAstNode node) {
-          throw new UnsupportedOperationException();
-        }
-
-		@Override
-    public Collection<CAstNode> getMappedNodes() {
-			throw new UnsupportedOperationException();
-		}
-      };
-    }
-
-    @Override
-    public Collection getQualifiers() {
-      return fQuals;
-    }
-
-    @Override
-    public CAstType getType() {
-      // return new JdtJavaType(fCT, getTypeDict(), fTypeSystem);
-      return fTypeDict.new JdtJavaType(fJdtType);
-    }
-
-  }
-
-  private boolean isInterface(AbstractTypeDeclaration decl) {
-    return decl instanceof AnnotationTypeDeclaration ||
-      (decl instanceof TypeDeclaration && ((TypeDeclaration)decl).isInterface());
-  }
-  
-  private CAstEntity visitTypeDecl(AbstractTypeDeclaration n, WalkContext context) {
-    return createClassDeclaration(n, n.bodyDeclarations(), null, n.resolveBinding(), n.getName().getIdentifier(), n.getModifiers(),
-        isInterface(n), n instanceof AnnotationTypeDeclaration, context);
-  }
-
-  /**
-   * 
-   * @param n
-   * @param bodyDecls
-   * @param enumConstants
-   * @param typeBinding
-   * @param name Used in creating default constructor, and passed into new ClassEntity()
-   * @param context
-   * @return
-   */
-  private CAstEntity createClassDeclaration(ASTNode n, List/* <BodyDeclaration> */bodyDecls,
-      List/* EnumConstantDeclaration */enumConstants, ITypeBinding typeBinding, String name, int modifiers, 
-      boolean isInterface, boolean isAnnotation, WalkContext context) {
-    final List<CAstEntity> memberEntities = new ArrayList<CAstEntity>();
-
-    // find and collect all initializers (type Initializer) and field initializers (type VariableDeclarationFragment).
-    // instance initializer code will be inserted into each constructors.
-    // all static initializer code will be grouped together in its own entity.
-    ArrayList<ASTNode> inits = new ArrayList<ASTNode>();
-    ArrayList<ASTNode> staticInits = new ArrayList<ASTNode>();
-
-    if (enumConstants != null) {
-      for (Object decl : enumConstants) {
-        EnumConstantDeclaration ecd = (EnumConstantDeclaration) decl;
-        staticInits.add(ecd); // always (implicitly) static,final (actually, no modifiers allowed)
-      }
-    }
-
-    for (Object decl : bodyDecls) {
-      if (decl instanceof Initializer) {
-        Initializer initializer = (Initializer) decl;
-        boolean isStatic = ((initializer.getModifiers() & Modifier.STATIC) != 0);
-        (isStatic ? staticInits : inits).add(initializer);
-      } else if (decl instanceof FieldDeclaration) {
-        FieldDeclaration fd = (FieldDeclaration) decl;
-
-        for (Object f : fd.fragments()) {
-          VariableDeclarationFragment frag = (VariableDeclarationFragment) f;
-          if (frag.getInitializer() != null) {
-            boolean isStatic = ((fd.getModifiers() & Modifier.STATIC) != 0);
-            (isStatic ? staticInits : inits).add(frag);
-          }
-        }
-      }
-    }
-
-    // process entities. initializers will be folded in here.
-    if (enumConstants != null) {
-      for (Object decl : enumConstants) {
-        memberEntities.add(visit((EnumConstantDeclaration) decl, context));
-      }
-    }
-
-    for (Object d : bodyDecls) {
-      BodyDeclaration decl = (BodyDeclaration) d;
-      if (decl instanceof FieldDeclaration) {
-        FieldDeclaration fieldDecl = (FieldDeclaration) decl;
-        Collection<CAstQualifier> quals = JDT2CAstUtils.mapModifiersToQualifiers(fieldDecl.getModifiers(), false, false);
-        for (Object f : fieldDecl.fragments()) {
-          VariableDeclarationFragment fieldFrag = (VariableDeclarationFragment) f;
-          IVariableBinding fieldBinding = fieldFrag.resolveBinding();
-		memberEntities.add(new FieldEntity(fieldFrag.getName().getIdentifier(), fieldBinding.getType(), quals,
-              makePosition(fieldFrag.getStartPosition(), fieldFrag.getStartPosition() + fieldFrag.getLength()),
-              handleAnnotations(fieldBinding)));
-        }
-      } else if (decl instanceof Initializer) {
-        // Initializers are inserted into constructors when making constructors.
-      } else if (decl instanceof MethodDeclaration) {
-        MethodDeclaration metDecl = (MethodDeclaration) decl;
-
-        if (typeBinding.isEnum() && metDecl.isConstructor())
-          memberEntities.add(createEnumConstructorWithParameters(metDecl.resolveBinding(), metDecl, context, inits, metDecl));
-        else {
-          memberEntities.add(visit(metDecl, typeBinding, context, inits));
-
-          // /////////////// Java 1.5 "overridden with subtype" thing (covariant return type) ///////////
-          Collection<IMethodBinding> overriddenMets = JDT2CAstUtils.getOverriddenMethod(metDecl.resolveBinding());
-          if (overriddenMets != null) {
-            for (IMethodBinding overridden : overriddenMets)
-              if (!JDT2CAstUtils.sameErasedSignatureAndReturnType(metDecl.resolveBinding(), overridden))
-                memberEntities.add(makeSyntheticCovariantRedirect(metDecl, metDecl.resolveBinding(), overridden, context));
-          }
-        }
-      } else if (decl instanceof AbstractTypeDeclaration) {
-        memberEntities.add(visit((AbstractTypeDeclaration) decl, context));
-      } else if (decl instanceof AnnotationTypeMemberDeclaration) {
-        // TODO: need to decide what to do with these
-      } else {
-        Assertions.UNREACHABLE("BodyDeclaration not Field, Initializer, or Method");
-      }
-    }
-
-    // add default constructor(s) if necessary
-    // most default constructors have no parameters; however, those created by anonymous classes will have parameters
-    // (they just call super with those parameters)
-    for (Object m : typeBinding.getDeclaredMethods()) {
-      IMethodBinding met = (IMethodBinding) m;
-      if (met.isDefaultConstructor()) {
-        if (typeBinding.isEnum())
-          memberEntities.add(createEnumConstructorWithParameters(met, n, context, inits, null));
-        else if (met.getParameterTypes().length > 0)
-          memberEntities.add(createDefaultConstructorWithParameters(met, n, context, inits));
-        else
-          memberEntities.add(createDefaultConstructor(name, typeBinding, context, inits, n));
-      }
-    }
-
-    if (typeBinding.isEnum() && !typeBinding.isAnonymous())
-      doEnumHiddenEntities(typeBinding, staticInits, memberEntities, context);
-
-    // collect static inits
-    if (!staticInits.isEmpty()) {
-      Map<CAstNode, CAstEntity> childEntities = HashMapFactory.make();
-      final MethodContext newContext = new MethodContext(context, childEntities);
-      // childEntities is the same one as in the ProcedureEntity. later visit(New), etc. may add to this.
-
-      CAstNode[] bodyNodes = new CAstNode[staticInits.size()];
-      for (int i = 0; i < staticInits.size(); i++)
-        bodyNodes[i] = visitFieldInitNode(staticInits.get(i), newContext);
-      CAstNode staticInitAst = makeNode(newContext, fFactory, n, CAstNode.BLOCK_STMT, bodyNodes);
-      memberEntities.add(new ProcedureEntity(staticInitAst, typeBinding, childEntities, newContext, null));
-    }
-
-    Collection<CAstQualifier> quals = JDT2CAstUtils.mapModifiersToQualifiers(modifiers, isInterface, isAnnotation);
-
-    Set<CAstAnnotation> annotations = handleAnnotations(typeBinding);
-
-    return new ClassEntity(typeBinding, name, quals, memberEntities, makePosition(n), annotations);
-  }
-
-  private CAstEntity visit(AnonymousClassDeclaration n, WalkContext context) {
-    return createClassDeclaration(n, n.bodyDeclarations(), null, n.resolveBinding(),
-        JDT2CAstUtils.anonTypeName(n.resolveBinding()), 0 /* no modifiers */, false, false, context);
-  }
-
-  private CAstNode visit(TypeDeclarationStatement n, WalkContext context) {
-    // TODO 1.6: enums of course...
-    AbstractTypeDeclaration decl = n.getDeclaration();
-    assert decl instanceof TypeDeclaration : "Local enum declaration not yet supported";
-    CAstEntity classEntity = visitTypeDecl((TypeDeclaration) decl, context);
-
-    // these statements doin't actually do anything, just define a type
-    final CAstNode lcdNode = makeNode(context, fFactory, n, CAstNode.EMPTY);
-
-    // so define it!
-    context.addScopedEntity(lcdNode, classEntity);
-    return lcdNode;
-  }
-
-  // ////////////////////////////////
-  // METHODS
-  // ////////////////////////////////
-
-  /**
-   * @param n for positioning.
-   *
-   * Make a constructor with parameters that calls super(...) with parameters. Used for anonymous classes with arguments to a
-   * constructor, like new Foo(arg1,arg2) { }
-   */
-  private CAstEntity createDefaultConstructorWithParameters(IMethodBinding ctor, ASTNode n, WalkContext oldContext,
-      ArrayList<ASTNode> inits) {
-    // PART I: find super ctor to call
-    ITypeBinding newType = ctor.getDeclaringClass();
-    ITypeBinding superType = newType.getSuperclass();
-    IMethodBinding superCtor = null;
-
-    for (IMethodBinding m : superType.getDeclaredMethods())
-      if (m.isConstructor() && Arrays.equals(m.getParameterTypes(), ctor.getParameterTypes()))
-        superCtor = m;
-
-    assert superCtor != null : "couldn't find constructor for anonymous class";
-
-    // PART II: make ctor with simply "super(a,b,c...)"
-    final Map<CAstNode, CAstEntity> memberEntities = new LinkedHashMap<CAstNode, CAstEntity>();
-    final MethodContext context = new MethodContext(oldContext, memberEntities);
-    MethodDeclaration fakeCtor = ast.newMethodDeclaration();
-    fakeCtor.setConstructor(true);
-    fakeCtor.setSourceRange(n.getStartPosition(), n.getLength());
-    fakeCtor.setBody(ast.newBlock());
-
-    // PART IIa: make a fake JDT constructor method with the proper number of args
-    // Make fake args that will be passed
-    String[] fakeArguments = new String[superCtor.getParameterTypes().length + 1];
-    ArrayList<CAstType> paramTypes = new ArrayList<CAstType>(superCtor.getParameterTypes().length);
-    for (int i = 0; i < fakeArguments.length; i++)
-      fakeArguments[i] = (i == 0) ? "this" : ("argument" + i); // TODO: change to invalid name and don't use
-                                                               // singlevariabledeclaration below
-    for (int i = 1; i < fakeArguments.length; i++) {
-      // the name
-      SingleVariableDeclaration svd = ast.newSingleVariableDeclaration();
-      svd.setName(ast.newSimpleName(fakeArguments[i]));
-      fakeCtor.parameters().add(svd);
-
-      // the type
-      paramTypes.add(fTypeDict.getCAstTypeFor(ctor.getParameterTypes()[i - 1]));
-    }
-
-    // PART IIb: create the statements in the constructor
-    // one super() call plus the inits
-    CAstNode[] bodyNodes = new CAstNode[inits.size() + 1];
-
-    // make super(...) call
-    // this, call ref, args
-    CAstNode[] children = new CAstNode[fakeArguments.length + 1];
-    children[0] = makeNode(context, fFactory, n, CAstNode.SUPER);
-    CallSiteReference callSiteRef = CallSiteReference.make(0, fIdentityMapper.getMethodRef(superCtor),
-        IInvokeInstruction.Dispatch.SPECIAL);
-    children[1] = fFactory.makeConstant(callSiteRef);
-    for (int i = 1; i < fakeArguments.length; i++) {
-      CAstNode argName = fFactory.makeConstant(fakeArguments[i]);
-      CAstNode argType = fFactory.makeConstant(paramTypes.get(i-1));
-      children[i + 1] = makeNode(context, fFactory, n, CAstNode.VAR, argName, argType);
-    }
-    bodyNodes[0] = makeNode(context, fFactory, n, CAstNode.CALL, children);
-    // QUESTION: no handleExceptions?
-
-    for (int i = 0; i < inits.size(); i++)
-      bodyNodes[i + 1] = visitFieldInitNode(inits.get(i), context);
-
-    // finally, make the procedure entity
-    CAstNode ast = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, bodyNodes);
-    return new ProcedureEntity(ast, fakeCtor, newType, memberEntities, context, paramTypes, null, null);
-
-  }
-
-  private CAstEntity createDefaultConstructor(String className, ITypeBinding classBinding, WalkContext oldContext,
-      ArrayList<ASTNode> inits, ASTNode positioningNode) {
-    MethodDeclaration fakeCtor = ast.newMethodDeclaration();
-    fakeCtor.setConstructor(true);
-    // fakeCtor.setName(ast.newSimpleName(className)); will crash on anonymous types...
-    fakeCtor.setSourceRange(positioningNode.getStartPosition(), positioningNode.getLength());
-    fakeCtor.setBody(ast.newBlock());
-
-    return visit(fakeCtor, classBinding, oldContext, inits);
-  }
-
-  private IMethodBinding findDefaultCtor(ITypeBinding superClass) {
-    for (IMethodBinding met : superClass.getDeclaredMethods()) {
-      if (met.isConstructor() && met.getParameterTypes().length == 0)
-        return met;
-    }
-    Assertions.UNREACHABLE("Couldn't find default ctor");
-    return null;
-  }
-
-  /**
-   * Setup constructor body. Here we add the initializer code (both initalizer blocks and initializers in field declarations). We
-   * may also need to add an implicit super() call.
-   * 
-   * @param n
-   * @param classBinding Used so we can use this with fake MethodDeclaration nodes, as in the case of creating a default
-   *          constructor.
-   * @param context
-   * @param inits
-   * @return
-   */
-  private CAstNode createConstructorBody(MethodDeclaration n, ITypeBinding classBinding, WalkContext context,
-      ArrayList<ASTNode> inits) {
-    // three possibilites: has super(), has this(), has neither.
-
-    Statement firstStatement = null;
-    if (!n.getBody().statements().isEmpty())
-      firstStatement = (Statement) n.getBody().statements().get(0);
-    if (firstStatement instanceof SuperConstructorInvocation) {
-      // Split at call to super:
-      // super();
-      // field initializer code
-      // remainder of ctor body
-      ArrayList<CAstNode> origStatements = createBlock(n.getBody(), context);
-      CAstNode[] bodyNodes = new CAstNode[inits.size() + origStatements.size()];
-      int idx = 0;
-      bodyNodes[idx++] = origStatements.get(0);
-      for (ASTNode init : inits)
-        bodyNodes[idx++] = visitFieldInitNode(init, context); // visit each in this constructor's context, ensuring
-      // proper handling of exceptions (we can't just reuse the
-      // CAstNodes)
-      for (int i = 1; i < origStatements.size(); i++)
-        bodyNodes[idx++] = origStatements.get(i);
-
-      return makeNode(context, fFactory, n.getBody(), CAstNode.BLOCK_STMT, bodyNodes); // QUESTION: why no LOCAL_SCOPE?
-      // that's the way it is in
-      // polyglot.
-    } else if (firstStatement instanceof ConstructorInvocation) {
-      return visitNode(n.getBody(), context); // has this(...) call; initializers will be set somewhere else.
-    } else {
-      // add explicit call to default super()
-      // QUESTION their todo: following superClass lookup of default ctor won't work if we
-      // process Object in source...
-
-      ITypeBinding superType = classBinding.getSuperclass();
-      
-      // find default constructor. IT is an error to have a constructor
-      // without super() when the default constructor of the superclass does not exist.
-      IMethodBinding defaultSuperCtor = findDefaultCtor(superType);
-      CallSiteReference callSiteRef = CallSiteReference.make(0, fIdentityMapper.getMethodRef(defaultSuperCtor),
-          IInvokeInstruction.Dispatch.SPECIAL);
-
-      // QUESTION: why isn't first arg this like in visit(ConstructorInvocation) ?
-      // why don't we handle exceptions like in visit(ConstructorInvocation) ? (these two things are same in polyglot
-      // implementation)
-
-      CAstNode superCall = makeNode(context, fFactory, n.getBody(), CAstNode.CALL, makeNode(context, fFactory, n.getBody(),
-          CAstNode.SUPER), fFactory.makeConstant(callSiteRef));
-      Object mapper = new Object(); // dummy used for mapping this node in CFG
-      handleThrowsFromCall(defaultSuperCtor, mapper, context);
-      context.cfg().map(mapper, superCall);
-
-      ArrayList<CAstNode> origStatements = createBlock(n.getBody(), context);
-      CAstNode[] bodyNodes = new CAstNode[inits.size() + origStatements.size() + 1];
-      // superCall, inits, ctor body
-      int idx = 0;
-      bodyNodes[idx++] = superCall;
-      for (ASTNode init : inits)
-        bodyNodes[idx++] = visitFieldInitNode(init, context);
-      for (int i = 0; i < origStatements.size(); i++)
-        bodyNodes[idx++] = origStatements.get(i);
-      return makeNode(context, fFactory, n.getBody(), CAstNode.BLOCK_STMT, bodyNodes);
-    }
-  }
-
-  /**
-   * Make a "fake" function (it doesn't exist in source code but it does in bytecode) for covariant return types.
-   * 
-   * @param overriding Declaration of the overriding method.
-   * @param overridden Binding of the overridden method, in a a superclass or implemented interface.
-   * @param oldContext
-   * @return
-   */
-  private CAstEntity makeSyntheticCovariantRedirect(MethodDeclaration overriding, IMethodBinding overridingBinding,
-      IMethodBinding overridden, WalkContext oldContext) {
-    // SuperClass foo(A, B, C...)
-    // SubClass foo(A,B,C...)
-    //
-    // add a method exactly like overridden that calls overriding
-
-    final Map<CAstNode, CAstEntity> memberEntities = new LinkedHashMap<CAstNode, CAstEntity>();
-    final MethodContext context = new MethodContext(oldContext, memberEntities);
-
-    CAstNode calltarget;
-    if ((overridingBinding.getModifiers() & Modifier.STATIC) == 0)
-      calltarget = makeNode(context, fFactory, null, CAstNode.SUPER);
-    else
-      calltarget = makeNode(context, fFactory, null, CAstNode.VOID);
-
-    ITypeBinding paramTypes[] = overridden.getParameterTypes();
-
-    ArrayList<CAstNode> arguments = new ArrayList<CAstNode>();
-    int i = 0;
-    for (Object o : overriding.parameters()) {
-      SingleVariableDeclaration svd = (SingleVariableDeclaration) o;
-      CAstNode varNode = makeNode(context, fFactory, null, CAstNode.VAR, fFactory.makeConstant(svd.getName().getIdentifier()));
-      ITypeBinding fromType = JDT2CAstUtils.getErasedType(paramTypes[i], ast);
-      ITypeBinding toType = JDT2CAstUtils.getErasedType(overridingBinding.getParameterTypes()[i], ast);
-      if (fromType.equals(toType)) {
-        arguments.add(varNode);
-      } else {
-        arguments.add(createCast(null, varNode, fromType, toType, context));
-      }
-      i++;
-    }
-    CAstNode callnode = createMethodInvocation(null, overridingBinding, calltarget, arguments, context);
-    CAstNode mdast = makeNode(context, fFactory, null, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, null, CAstNode.BLOCK_STMT,
-        makeNode(context, fFactory, null, CAstNode.RETURN, callnode)));
-
-    // make parameters to new synthetic method
-    // use RETURN TYPE of overridden, everything else from overriding (including parameter names)
-    ArrayList<CAstType> paramCAstTypes = new ArrayList<CAstType>(overridden.getParameterTypes().length);
-    for (ITypeBinding paramType : overridden.getParameterTypes())
-      paramCAstTypes.add(fTypeDict.getCAstTypeFor(paramType));
-    return new ProcedureEntity(mdast, overriding, overridingBinding.getDeclaringClass(), memberEntities, context, paramCAstTypes,
-        overridden.getReturnType(), null);
-  }
-
-  /**
-   * @param inits Instance intializers & field initializers. Only used if method is a constructor, in which case the initializers
-   *          will be inserted in.
-   */
-  private CAstEntity visit(MethodDeclaration n, ITypeBinding classBinding, WalkContext oldContext, ArrayList<ASTNode> inits) {
-
-    // pass in memberEntities to the context, later visit(New) etc. may add classes
-    final Map<CAstNode, CAstEntity> memberEntities = new LinkedHashMap<CAstNode, CAstEntity>();
-    final MethodContext context = new MethodContext(oldContext, memberEntities); // LEFTOUT: in polyglot there is a
-    // class context in between method and
-    // root
-
-    CAstNode mdast;
-
-    if (n.isConstructor())
-      mdast = createConstructorBody(n, classBinding, context, inits);
-    else if ((n.getModifiers() & Modifier.ABSTRACT) != 0) // abstract
-      mdast = null;
-    else if (n.getBody() == null || n.getBody().statements().size() == 0) // empty
-      mdast = makeNode(context, fFactory, n, CAstNode.RETURN);
-    else
-      mdast = visitNode(n.getBody(), context);
-    // Polyglot comment: Presumably the MethodContext's parent is a ClassContext,
-    // and he has the list of initializers. Hopefully the following
-    // will glue that stuff in the right place in any constructor body.
-    
-    Set<CAstAnnotation> annotations = null;
-    if (n.resolveBinding() != null) {
-    	annotations = handleAnnotations(n.resolveBinding());
-    }
-    
-    return new ProcedureEntity(mdast, n, classBinding, memberEntities, context, annotations);
-  }
-
-  private Set<CAstAnnotation> handleAnnotations(IBinding binding) {
-    IAnnotationBinding[] annotations = binding.getAnnotations();
-    
-    if(annotations == null || annotations.length == 0) {
-    	return null;
-    }
-    
-    Set<CAstAnnotation> castAnnotations = HashSetFactory.make();
-    for(IAnnotationBinding annotation : annotations) {
-    	ITypeBinding annotationTypeBinding = annotation.getAnnotationType();
-    	final CAstType annotationType = fTypeDict.getCAstTypeFor(annotationTypeBinding);
-    	final Map<String,Object> args = HashMapFactory.make();
-    	for(IMemberValuePairBinding mvpb : annotation.getAllMemberValuePairs()) {
-    		String name = mvpb.getName();
-    		Object value = mvpb.getValue();
-    		args.put(name, value);
-    	}
-    	castAnnotations.add(new CAstAnnotation() {
-			@Override
-			public CAstType getType() {
-				return annotationType;
-			}
-			@Override
-			public Map<String, Object> getArguments() {
-				return args;
-			}
-			@Override
-			public String toString() {
-				return annotationType.getName() + args;
-			}
-    	});
-    }
-    
-    return castAnnotations;
-}
-
-  protected final class ProcedureEntity implements JavaProcedureEntity { // TAGALONG (make static, access ast)
-
-    // From Code Body Entity
-    private final Map<CAstNode, Collection<CAstEntity>> fEntities;
-
-    @Override
-    public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
-      return Collections.unmodifiableMap(fEntities);
-    }
-
-    @Override
-    public Iterator getScopedEntities(CAstNode construct) {
-      if (fEntities.containsKey(construct)) {
-        return (fEntities.get(construct)).iterator();
-      } else {
-        return EmptyIterator.instance();
-      }
-    }
-
-    @Override
-    public String getSignature() {
-      return Util.methodEntityToSelector(this).toString();
-    }
-
-    private final CAstNode fAst;
-
-    MethodDeclaration fDecl; // TAGALONG serious tagalong...
-
-    private String[] fParameterNames; // INCLUDING this
-
-    private ArrayList<CAstType> fParameterTypes;
-
-    private MethodContext fContext; // possibly TAGALONG, maybe not
-
-    private ITypeBinding fType; // TAGALONG
-
-    protected ITypeBinding fReturnType;
-
-    private int fModifiers;
-
-    private final Set<CAstAnnotation> annotations;
-
-    // can be method, constructor, "fake" default constructor, or null decl = static initializer
-    /**
-     * For a static initializer, pass a null decl.
-     */
-    // FIXME: get rid of decl and pass in everything instead of having to do two different things with parameters
-    // regular case
-    private ProcedureEntity(CAstNode mdast, MethodDeclaration decl, ITypeBinding type, Map<CAstNode, CAstEntity> entities,
-        MethodContext context, Set<CAstAnnotation> annotations) {
-      this(mdast, decl, type, entities, context, null, null, decl.getModifiers(), annotations);
-    }
-
-    // static init
-    private ProcedureEntity(CAstNode mdast, ITypeBinding type, Map<CAstNode, CAstEntity> entities, MethodContext context, Set<CAstAnnotation> annotations) {
-      this(mdast, null, type, entities, context, null, null, 0, annotations);
-    }
-
-    private ProcedureEntity(CAstNode mdast, MethodDeclaration decl, ITypeBinding type, Map<CAstNode, CAstEntity> entities,
-        MethodContext context, ArrayList<CAstType> parameterTypes, ITypeBinding returnType, Set<CAstAnnotation> annotations) {
-      this(mdast, decl, type, entities, context, parameterTypes, returnType, decl.getModifiers(), annotations);
-    }
-
-    private ProcedureEntity(CAstNode mdast, MethodDeclaration decl, ITypeBinding type, Map<CAstNode, CAstEntity> entities,
-        MethodContext context, ArrayList<CAstType> parameterTypes, ITypeBinding returnType, int modifiers, Set<CAstAnnotation> annotations) {
-      // TypeSystem system, CodeInstance pd, String[] argumentNames,
-      // }
-      // Map<CAstNode, CAstEntity> entities, MethodContext mc) {
-      fDecl = decl;
-      fAst = mdast; // "procedure decl ast"
-      fContext = context;
-      fType = type;
-      fReturnType = returnType;
-      fModifiers = modifiers;
-      this.annotations = annotations;
-
-      // from CodeBodyEntity
-      fEntities = new LinkedHashMap<CAstNode, Collection<CAstEntity>>();
-      for (Iterator keys = entities.keySet().iterator(); keys.hasNext();) {
-        CAstNode key = (CAstNode) keys.next();
-        fEntities.put(key, Collections.singleton(entities.get(key)));
-      }
-
-      if (fDecl != null) {
-        int i = 0; // index to start filling up with real params
-        if ((fModifiers & Modifier.STATIC) != 0) {
-          fParameterNames = new String[fDecl.parameters().size()];
-          i = 0;
-        } else {
-          fParameterNames = new String[fDecl.parameters().size() + 1];
-          fParameterNames[0] = "this";
-          i = 1;
-        }
-
-        if (parameterTypes == null) {
-          fParameterTypes = new ArrayList<CAstType>(fDecl.parameters().size());
-          for (Object p : fDecl.parameters()) {
-            fParameterNames[i++] = ((SingleVariableDeclaration) p).getName().getIdentifier();
-            fParameterTypes.add(fTypeDict.getCAstTypeFor(((SingleVariableDeclaration) p).resolveBinding().getType()));
-          }
-        } else {
-          // currently this is only used in making a default constructor with arguments (anonymous classes).
-          // this is because we cannot synthesize bindings.
-          fParameterTypes = parameterTypes;
-          for (Object p : fDecl.parameters()) {
-            fParameterNames[i++] = ((SingleVariableDeclaration) p).getName().getIdentifier();
-          }
-        }
-      } else {
-        fParameterNames = new String[0];
-        fParameterTypes = new ArrayList<CAstType>(0); // static initializer
-      }
-    }
-
-    @Override
-	public Collection<CAstAnnotation> getAnnotations() {
-		return annotations;
-	}
-
-	@Override
-  public String toString() {
-      return fDecl == null ? "<clinit>" : fDecl.toString();
-    }
-
-    @Override
-    public int getKind() {
-      return CAstEntity.FUNCTION_ENTITY;
-    }
-
-    @Override
-    public String getName() {
-      if (fDecl == null)
-        return MethodReference.clinitName.toString();
-      else if (fDecl.isConstructor())
-        return MethodReference.initAtom.toString();
-      else
-        return fDecl.getName().getIdentifier();
-    }
-
-    /**
-     * INCLUDING first parameter 'this' (for non-static methods)
-     */
-    @Override
-    public String[] getArgumentNames() {
-      return fParameterNames;
-    }
-
-    @Override
-    public CAstNode[] getArgumentDefaults() {
-      return new CAstNode[0];
-    }
-
-    /**
-     * INCLUDING first parameter 'this' (for non-static methods)
-     */
-    @Override
-    public int getArgumentCount() {
-      return fParameterNames.length;
-    }
-
-    @Override
-    public CAstNode getAST() {
-      return fAst;
-    }
-
-    @Override
-    public CAstControlFlowMap getControlFlow() {
-      return fContext.cfg();
-    }
-
-    @Override
-    public CAstSourcePositionMap getSourceMap() {
-      return fContext.pos();
-    }
-
-    @Override
-    public CAstSourcePositionMap.Position getPosition() {
-      return fDecl==null? getSourceMap().getPosition(fAst): makePosition(fDecl);
-    }
-
-    @Override
-    public CAstNodeTypeMap getNodeTypeMap() {
-      return fContext.getNodeTypeMap();
-    }
-
-    @Override
-    public Collection getQualifiers() {
-      if (fDecl == null)
-        return JDT2CAstUtils.mapModifiersToQualifiers(Modifier.STATIC, false, false); // static init
-      else
-        return JDT2CAstUtils.mapModifiersToQualifiers(fModifiers, false, false);
-    }
-
-    @Override
-    public CAstType getType() {
-      return new CAstType.Method() {
-        private Collection<CAstType> fExceptionTypes = null;
-
-        @Override
-        @SuppressWarnings("deprecation")
-        public CAstType getReturnType() {
-          if (fReturnType != null)
-            return fTypeDict.getCAstTypeFor(fReturnType);
-          Type type = fDecl == null ? null : (ast.apiLevel() == 2 ? fDecl.getReturnType() : fDecl.getReturnType2());
-          if (type == null)
-            return fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("void"));
-          else
-            return fTypeDict.getCAstTypeFor(type.resolveBinding());
-        }
-
-        /**
-         * NOT INCLUDING first parameter 'this' (for non-static methods)
-         */
-        @Override
-        public List getArgumentTypes() {
-          return fParameterTypes;
-        }
-
-        /**
-         * NOT INCLUDING first parameter 'this' (for non-static methods)
-         */
-        @Override
-        public int getArgumentCount() {
-          return fDecl == null ? 0 : fParameterTypes.size();
-        }
-
-        @Override
-        public String getName() {
-          Assertions.UNREACHABLE("CAstType.FunctionImpl#getName() called???");
-          return "?";
-        }
-
-        @Override
-        public Collection getSupertypes() {
-          Assertions.UNREACHABLE("CAstType.FunctionImpl#getSupertypes() called???");
-          return null;
-        }
-
-        @Override
-        public Collection/* <CAstType> */getExceptionTypes() {
-          if (fExceptionTypes == null) {
-            fExceptionTypes = new LinkedHashSet<CAstType>();
-            if (fDecl != null)
-              for (Object exception : fDecl.thrownExceptionTypes())
-                
-                fExceptionTypes.add(fTypeDict.getCAstTypeFor(((SimpleType) exception).resolveBinding()));
-          }
-          return fExceptionTypes;
-        }
-
-        @Override
-        public CAstType getDeclaringType() {
-          return fTypeDict.getCAstTypeFor(fType);
-        }
-      };
-    }
-  }
-
-  // ////////////////////////////////////
-  // FIELDS ////////////////////////////
-  // ////////////////////////////////////
-
-  // FIELDS ADDED DIRECTLY IN visit(TypeDeclaration,WalkContext)
-
-  private CAstNode visitFieldInitNode(ASTNode node, WalkContext context) {
-    // there are gathered by createClassDeclaration and can only be of two types:
-    if (node instanceof Initializer) {
-      return visitNode(((Initializer) node).getBody(), context);
-    } else if (node instanceof VariableDeclarationFragment) {
-      VariableDeclarationFragment f = (VariableDeclarationFragment) node; // this is guaranteed to have an initializer
-
-      // Generate CAST node for the initializer (init())
-      // Type targetType = f.memberInstance().container();
-      // Type fieldType = f.type().type();
-      FieldReference fieldRef = fIdentityMapper.getFieldRef(f.resolveBinding());
-      // We use null to indicate an OBJECT_REF to a static field, as the
-      // FieldReference doesn't
-      // hold enough info to determine this. In this case, (unlike field ref)
-      // we don't have a
-      // target expr to evaluate.
-      boolean isStatic = ((f.resolveBinding().getModifiers() & Modifier.STATIC) != 0);
-      CAstNode thisNode = isStatic ? makeNode(context, fFactory, null, CAstNode.VOID) : makeNode(context, fFactory, f,
-          CAstNode.THIS);
-      CAstNode lhsNode = makeNode(context, fFactory, f, CAstNode.OBJECT_REF, thisNode, fFactory.makeConstant(fieldRef));
-
-      Expression init = f.getInitializer();
-      CAstNode rhsNode = visitNode(init, context);
-      CAstNode assNode = makeNode(context, fFactory, f, CAstNode.ASSIGN, lhsNode, rhsNode);
-
-      return assNode; // their naming, not mine
-
-    } else if (node instanceof EnumConstantDeclaration) {
-      return createEnumConstantDeclarationInit((EnumConstantDeclaration) node, context);
-    } else {
-      Assertions.UNREACHABLE("invalid init node gathered by createClassDeclaration");
-      return null;
-    }
-  }
-
-  protected final class FieldEntity implements CAstEntity {
-    private final ITypeBinding type;
-
-    private final String name;
-
-    private final Collection<CAstQualifier> quals;
-
-    private final T position;
-
-    private final Set<CAstAnnotation> annotations;
-
-    private FieldEntity(String name, ITypeBinding type, Collection<CAstQualifier> quals, T position, Set<CAstAnnotation> annotations) {
-      super();
-      this.type = type;
-      this.quals = quals;
-      this.name = name;
-      this.position = position;
-      this.annotations = annotations;
-    }
-
-    
-    @Override
-	public Collection<CAstAnnotation> getAnnotations() {
-		return annotations;
-	}
-
-	@Override
-  public int getKind() {
-      return CAstEntity.FIELD_ENTITY;
-    }
-
-    @Override
-    public String getName() {
-      return name;
-    }
-
-    @Override
-    public String getSignature() {
-      return name + fIdentityMapper.typeToTypeID(type);
-    }
-
-    @Override
-    public String[] getArgumentNames() {
-      return new String[0];
-    }
-
-    @Override
-    public CAstNode[] getArgumentDefaults() {
-      return new CAstNode[0];
-    }
-
-    @Override
-    public int getArgumentCount() {
-      return 0;
-    }
-
-    @Override
-    public Iterator getScopedEntities(CAstNode construct) {
-      return EmptyIterator.instance();
-    }
-
-    @Override
-    public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
-      return Collections.emptyMap();
-    }
-
-    @Override
-    public CAstNode getAST() {
-      // No AST for a field decl; initializers folded into
-      // constructor processing...
-      return null;
-    }
-
-    @Override
-    public CAstControlFlowMap getControlFlow() {
-      // No AST for a field decl; initializers folded into
-      // constructor processing...
-      return null;
-    }
-
-    @Override
-    public CAstSourcePositionMap getSourceMap() {
-      // No AST for a field decl; initializers folded into
-      // constructor processing...
-      return null;
-    }
-
-    @Override
-    public CAstSourcePositionMap.Position getPosition() {
-      return position;
-    }
-
-    @Override
-    public CAstNodeTypeMap getNodeTypeMap() {
-      // No AST for a field decl; initializers folded into
-      // constructor processing...
-      return null;
-    }
-
-    @Override
-    public Collection getQualifiers() {
-      return quals;
-    }
-
-    @Override
-    public CAstType getType() {
-      return fTypeDict.getCAstTypeFor(type);
-    }
-  }
-
-  // /////////////////////////////////////
-  // / NODES /////////////////////////////
-  // /////////////////////////////////////
-
-  /**
-   * Visit all the statements in the block and return an arraylist of the statements. Some statements
-   * (VariableDeclarationStatements) may expand to more than one CAstNode.
-   */
-  private ArrayList<CAstNode> createBlock(Block n, WalkContext context) {
-    ArrayList<CAstNode> stmtNodes = new ArrayList<CAstNode>();
-    for (Object s : n.statements())
-      visitNodeOrNodes((ASTNode) s, context, stmtNodes);
-    return stmtNodes;
-  }
-
-  private CAstNode visit(Block n, WalkContext context) {
-    ArrayList<CAstNode> stmtNodes = createBlock(n, context);
-    CAstNode stmtNodesArray[] = stmtNodes.toArray(new CAstNode[stmtNodes.size()]);
-    return makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, stmtNodesArray));
-  }
-
-  private CAstNode visit(VariableDeclarationFragment n, WalkContext context) {
-    int modifiers;
-    if (n.getParent() instanceof VariableDeclarationStatement)
-      modifiers = ((VariableDeclarationStatement) n.getParent()).getModifiers();
-    else if (n.getParent() instanceof VariableDeclarationExpression)
-      modifiers = ((VariableDeclarationExpression) n.getParent()).getModifiers();
-    else
-      modifiers = ((FieldDeclaration) n.getParent()).getModifiers();
-    boolean isFinal = (modifiers & Modifier.FINAL) != 0;
-    ITypeBinding type = n.resolveBinding().getType();
-    Expression init = n.getInitializer();
-    CAstNode initNode;
-
-    String t = type.getBinaryName();
-    if (init == null) {
-      if (JDT2CAstUtils.isLongOrLess(type)) // doesn't include boolean
-        initNode = fFactory.makeConstant(0);
-      else if (t.equals("D") || t.equals("F"))
-        initNode = fFactory.makeConstant(0.0);
-      else
-        initNode = fFactory.makeConstant(null);
-    } else
-      initNode = visitNode(init, context);
-
-    Object defaultValue = JDT2CAstUtils.defaultValueForType(type);
-    return makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory.makeConstant(new CAstSymbolImpl(n.getName().getIdentifier(), fTypeDict.getCAstTypeFor(type),
-        isFinal, defaultValue)), initNode);
-  }
-
-  /*
-   * One VariableDeclarationStatement represents more than one CAstNode statement.
-   */
-  private ArrayList<CAstNode> visit(VariableDeclarationStatement n, WalkContext context) {
-    ArrayList<CAstNode> result = new ArrayList<CAstNode>();
-
-    for (Object o : n.fragments())
-      result.add(visit((VariableDeclarationFragment) o, context));
-    return result;
-  }
-
-  private CAstNode visit(ArrayInitializer n, WalkContext context) {
-    ITypeBinding type = n.resolveTypeBinding();
-    assert type != null : "Could not determine type of ArrayInitializer";
-    TypeReference newTypeRef = fIdentityMapper.getTypeRef(type);
-    CAstNode[] eltNodes = new CAstNode[n.expressions().size() + 1];
-    int idx = 0;
-
-    eltNodes[idx++] = makeNode(context, fFactory, n, CAstNode.NEW, fFactory.makeConstant(newTypeRef), fFactory.makeConstant(n
-        .expressions().size()));
-    for (Iterator iter = n.expressions().iterator(); iter.hasNext(); idx++) {
-      Expression element = (Expression) iter.next();
-      eltNodes[idx] = visitNode(element, context);
-      if (eltNodes[idx] == null)
-        assert eltNodes[idx] != null : element.toString();
-    }
-
-    return makeNode(context, fFactory, n, CAstNode.ARRAY_LITERAL, eltNodes);
-  }
-
-  private CAstNode visit(ClassInstanceCreation n, WalkContext context) {
-    return createClassInstanceCreation(n, n.arguments(), n.resolveConstructorBinding(), n.getExpression(), n
-        .getAnonymousClassDeclaration(), context);
-  }
-
-  private CAstNode createClassInstanceCreation(ASTNode nn, List/* Expression or CAstNode */arguments, IMethodBinding ctorBinding,
-      Expression qual, AnonymousClassDeclaration anonDecl, WalkContext context) {
-    // a new instruction is actually two things: a NEW object and a CALL to a constructor
-    CAstNode newNode;
-    CAstNode callNode;
-    final String tmpName = "ctor temp";
-    // this name is an illegal Java identifier. this var will hold the new object so we can call the constructor on it
-
-    // GENERICS getMethodDeclaration()
-    ctorBinding = ctorBinding.getMethodDeclaration(); // unlike polyglot, this will
-    // point to a default
-    // constructor in the anon class
-    MethodReference ctorRef = fIdentityMapper.getMethodRef(ctorBinding);
-
-    // ////////////// PART I: make the NEW expression ///////////////////////////////////////////////////////
-
-    ITypeBinding newType = ctorBinding.getDeclaringClass();
-    TypeReference newTypeRef = fIdentityMapper.getTypeRef(newType);
-
-    // new nodes with an explicit enclosing argument, e.g. "outer.new Inner()". They are mostly treated the same, except
-    // in JavaCAst2IRTranslator.doNewObject
-    CAstNode qualNode = null;
-
-    if (qual == null && newType.getDeclaringClass() != null && ((newType.getModifiers() & Modifier.STATIC) == 0)
-        && !newType.isLocal()) {
-      // "new X()" expanded into "new this.X()" or "new MyClass.this.X"
-      // check isLocal because anonymous classes and local classes are not included.
-      ITypeBinding plainThisType = JDT2CAstUtils.getDeclaringClassOfNode(nn); // type of "this"
-      ITypeBinding implicitThisType = findClosestEnclosingClassSubclassOf(plainThisType, newType.getDeclaringClass(), ((newType
-          .getModifiers() & Modifier.PRIVATE) != 0));
-      if (implicitThisType.isEqualTo(plainThisType))
-        qualNode = makeNode(context, fFactory, nn, CAstNode.THIS); // "new this.X()"
-      else
-        qualNode = makeNode(context, fFactory, nn, CAstNode.THIS, fFactory.makeConstant(fIdentityMapper
-            .getTypeRef(implicitThisType))); // "new Bla.this.X()"
-    } else if (qual != null)
-      qualNode = visitNode(qual, context);
-
-    if (qualNode != null)
-      newNode = makeNode(context, fFactory, nn, CAstNode.NEW_ENCLOSING, fFactory.makeConstant(newTypeRef), qualNode);
-    else
-      newNode = makeNode(context, fFactory, nn, CAstNode.NEW, fFactory.makeConstant(newTypeRef));
-
-    ITypeBinding[] newExceptions = new ITypeBinding[] { NoClassDefFoundError, ExceptionInInitializerError, OutOfMemoryError };
-    context.cfg().map(newNode, newNode);
-    for (ITypeBinding exp : newExceptions) {
-      for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(exp)) {
-        context.cfg().add(newNode, catchTarget.snd, catchTarget.fst);
-      }
-    }
-
-    // ANONYMOUS CLASSES
-    // ctor already points to right place, so should type ref, so all we have to do is make the entity
-    if (anonDecl != null)
-      context.addScopedEntity(newNode, visit(anonDecl, context));
-
-    // ////////////// PART II: make the CALL expression ///////////////////////////////////////////////////////
-    // setup args & handle exceptions
-
-    CAstNode[] argNodes = new CAstNode[arguments.size() + 2];
-    int idx = 0; // args: [ this, callsiteref, <actual args> ]
-
-    // arg 0: this
-    argNodes[idx++] = makeNode(context, fFactory, nn, CAstNode.VAR, fFactory.makeConstant(tmpName), fFactory.makeConstant(fTypeDict.getCAstTypeFor(newType)));
-    // contains output from newNode (see part III)
-
-    // arg 1: call site ref (WHY?)
-    int dummyPC = 0; // Just want to wrap the kind of call; the "rear end" won't care about anything else
-    CallSiteReference callSiteRef = CallSiteReference.make(dummyPC, ctorRef, IInvokeInstruction.Dispatch.SPECIAL);
-    argNodes[idx++] = fFactory.makeConstant(callSiteRef);
-
-    // rest of args
-    for (Iterator iter = arguments.iterator(); iter.hasNext();) {
-      Object arg = iter.next();
-      argNodes[idx++] = (arg instanceof CAstNode) ? ((CAstNode) arg) : visitNode((Expression) arg, context);
-    }
-    callNode = makeNode(context, fFactory, nn, CAstNode.CALL, argNodes);
-    context.cfg().map(nn, callNode);
-
-    handleThrowsFromCall(ctorBinding, nn, context);
-
-    // PART III: make a node with both NEW and CALL
-    // Make a LOCAL_SCOPE with a BLOCK_EXPR node child which does three things:
-    // 1) declare a temporary variable and assign the new object to it (LOCAL_SCOPE is needed to chain this new variable
-    // to this block)
-    // 2) CALL the constructor on the new variable
-    // 3) access this temporary variable. Since the value of the block is the last thing in the block, the resultant
-    // value will be the variable
-    return makeNode(context, fFactory, nn, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, nn, CAstNode.BLOCK_EXPR, makeNode(
-        context, fFactory, nn, CAstNode.DECL_STMT, fFactory.makeConstant(new InternalCAstSymbol(tmpName, fTypeDict.getCAstTypeFor(newType), true)), newNode),
-        callNode, makeNode(context, fFactory, nn, CAstNode.VAR, fFactory.makeConstant(tmpName))));
-  }
-
-  /**
-   * 
-   * @param met
-   * @param mappedAstNode An AST node or object mapped in the CFG: we will call context.cfg().add() on it. Caller must worry about
-   *          mapping it with context.cfg().map().
-   * @param context
-   */
-  private void handleThrowsFromCall(IMethodBinding met, Object mappedAstNode, WalkContext context) {
-    ITypeBinding[] throwTypes = met.getExceptionTypes();
-    for (ITypeBinding thrownType : throwTypes) {
-      Collection<Pair<ITypeBinding, Object>> catchTargets = context.getCatchTargets(thrownType);
-      for (Pair<ITypeBinding, Object> catchTarget : catchTargets)
-        context.cfg().add(mappedAstNode, catchTarget.snd, catchTarget.fst);
-    }
-    // can also throw runtime exception
-    for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(fRuntimeExcType))
-      context.cfg().add(mappedAstNode, catchTarget.snd, catchTarget.fst);
-  }
-
-  private CAstNode visit(ExpressionStatement n, WalkContext context) {
-    return visitNode(n.getExpression(), context);
-  }
-
-  private CAstNode visit(SuperMethodInvocation n, WalkContext context) {
-    CAstNode target;
-    if (n.getQualifier() == null)
-      target = makeNode(context, fFactory, n, CAstNode.SUPER);
-    else {
-      TypeReference owningTypeRef = fIdentityMapper.getTypeRef(n.getQualifier().resolveTypeBinding());
-      target = makeNode(context, fFactory, n, CAstNode.SUPER, fFactory.makeConstant(owningTypeRef));
-    }
-    // GENERICS getMethodDeclaration()
-    return createMethodInvocation(n, n.resolveMethodBinding().getMethodDeclaration(), target, n.arguments(), context);
-  }
-
-  // FIXME: implicit this
-  private CAstNode visit(MethodInvocation n, WalkContext context) {
-    // GENERICS getMethodDeclaration()
-    IMethodBinding binding = n.resolveMethodBinding().getMethodDeclaration();
-    if ((binding.getModifiers() & Modifier.STATIC) != 0) {
-      CAstNode target;
-
-      // JLS says: evaluate qualifier & throw away unless of course it's just a class name (or null),
-      // in which case we replace the EMPTY with a VOID
-      // of course, "this" has no side effects either.
-      target = visitNode(n.getExpression(), context);
-      if (target.getKind() == CAstNode.EMPTY || target.getKind() == CAstNode.THIS)
-        return createMethodInvocation(n, binding, makeNode(context, fFactory, null, CAstNode.VOID), n.arguments(), context);
-      else
-        return makeNode(context, fFactory, n, CAstNode.BLOCK_EXPR, target, createMethodInvocation(n, binding, makeNode(context,
-            fFactory, null, CAstNode.VOID), n.arguments(), context));
-      // target is evaluated but thrown away, and only result of method invocation is kept
-
-    } else {
-      CAstNode target;
-      if (n.getExpression() != null) {
-        target = visitNode(n.getExpression(), context);
-      } else {
-        ITypeBinding typeOfThis = JDT2CAstUtils.getDeclaringClassOfNode(n);
-
-        boolean methodIsPrivate = (binding.getModifiers() & Modifier.PRIVATE) != 0;
-
-        // how could it be in the subtype and private? this only happens the supertype is also an
-        // enclosing type. in that case the variable refers to the field in the enclosing instance.
-        // NOTE: method may be defined in MyClass's superclass, but we still want to expand
-        // this into MyClass, so we have to find the enclosing class which defines this function.
-
-        ITypeBinding implicitThisClass = findClosestEnclosingClassSubclassOf(typeOfThis, binding.getDeclaringClass(),
-            methodIsPrivate);
-        if (typeOfThis.isEqualTo(implicitThisClass))
-          // "foo = 5" -> "this.foo = 5": expand into THIS + class
-          target = makeNode(context, fFactory, n, CAstNode.THIS);
-        else
-          // "foo = 5" -> "MyClass.this.foo = 5" -- inner class: expand into THIS + class
-          target = makeNode(context, fFactory, n, CAstNode.THIS, fFactory.makeConstant(fIdentityMapper
-              .getTypeRef(implicitThisClass)));
-        // NOTE: method may be defined in MyClass's superclass, but we still want to expand
-        // this into MyClass, so we have to find the enclosing class which defines this function.
-      }
-      CAstNode node = createMethodInvocation(n, binding, target, n.arguments(), context);
-      // TODO: maybe not exactly right... what if it's a capture? we may have to cast it down a little bit.
-      if (binding.getReturnType().isTypeVariable()) {
-        // GENERICS: add a cast
-        ITypeBinding realtype = JDT2CAstUtils.getErasedType(n.resolveMethodBinding().getReturnType(), ast);
-        ITypeBinding fromtype = JDT2CAstUtils.getTypesVariablesBase(binding.getReturnType(), ast);
-        if (!realtype.isEqualTo(fromtype))
-          return createCast(n, node, fromtype, realtype, context);
-      }
-      return node;
-    }
-  }
-
-  private CAstNode createMethodInvocation(ASTNode pos, IMethodBinding methodBinding, CAstNode target,
-      List/* Expression or CAstNode */arguments, WalkContext context) {
-    // MethodMethodInstance methodInstance = n.methodInstance();
-    boolean isStatic = (methodBinding.getModifiers() & Modifier.STATIC) != 0;
-    ITypeBinding methodOwner = methodBinding.getDeclaringClass();
-
-    if (!(methodOwner.isInterface() || methodOwner.isClass() || methodOwner.isEnum())) {
-      assert false : "owner " + methodOwner + " of " + methodBinding + " is not a class";
-    }
-
-    // POPULATE PARAMETERS
-    // this (or void for static), method reference, rest of args
-    int nFormals = methodBinding.getParameterTypes().length;
-    CAstNode[] children = new CAstNode[2 + nFormals];
-
-    // this (or void for static)
-    assert target != null : "no receiver for " + methodBinding;
-    children[0] = target;
-
-    // method reference
-    // unlike polyglot, expression will never be super here. this is handled in SuperMethodInvocation.
-    IInvokeInstruction.IDispatch dispatchType;
-    if (isStatic)
-      dispatchType = IInvokeInstruction.Dispatch.STATIC;
-    else if (methodOwner.isInterface())
-      dispatchType = IInvokeInstruction.Dispatch.INTERFACE;
-    else if ((methodBinding.getModifiers() & Modifier.PRIVATE) != 0 || target.getKind() == CAstNode.SUPER)
-      // only one possibility, not a virtual call (I guess?)
-      dispatchType = IInvokeInstruction.Dispatch.SPECIAL;
-    else
-      dispatchType = IInvokeInstruction.Dispatch.VIRTUAL;
-    // pass 0 for dummyPC: Just want to wrap the kind of call; the "rear end" won't care about anything else...
-    CallSiteReference callSiteRef = CallSiteReference.make(0, fIdentityMapper.getMethodRef(methodBinding), dispatchType);
-
-    children[1] = fFactory.makeConstant(callSiteRef);
-
-    populateArguments(children, methodBinding, arguments, context);
-
-    Object fakeCfgMap = new Object();
-
-    handleThrowsFromCall(methodBinding, fakeCfgMap, context);
-
-    CAstNode result = makeNode(context, fFactory, pos, CAstNode.CALL, children);
-    context.cfg().map(fakeCfgMap, result);
-    return result;
-  }
-
-  /**
-   * Populate children, starting at index 2, for the invocation of methodBinding. If varargs are used this function will collapse
-   * the proper arguments into an array.
-   * 
-   * If the number of actuals equals the number of formals and the function is varargs, we have to check the type of the last
-   * argument to see if we should "box" it in an array. If the arguments[arguments.length-1] is not an Expression, we cannot get the
-   * type, so we do not box it. (Making covariant varargs functions require this behavior)
-   * 
-   * @param children
-   * @param methodBinding
-   * @param arguments
-   * @param context
-   */
-  private void populateArguments(CAstNode[] children, IMethodBinding methodBinding, List/* CAstNode or Expression */arguments,
-      WalkContext context) {
-    int nFormals = methodBinding.getParameterTypes().length;
-    assert children.length == nFormals + 2;
-    int nActuals = arguments.size();
-
-    ITypeBinding lastArgType = null;
-    if (nActuals > 0 && arguments.get(nActuals - 1) instanceof Expression)
-      lastArgType = ((Expression) arguments.get(nActuals - 1)).resolveTypeBinding();
-    // if the # of actuals equals the # of formals, AND the function is varargs, we have to check
-    // to see if the lastArgType is subtype compatible with the type of last parameter (which will be an array).
-    // If it is, we pass this array in directly. Otherwise this it is wrapped in an array init.
-    // Example: 'void foo(int... x)' can be run via 'foo(5)' or 'foo(new int[] { 5, 6 })' -- both have one argument so we must check
-    // the type
-
-    if (nActuals == nFormals
-        && (!methodBinding.isVarargs() || lastArgType == null || lastArgType
-            .isSubTypeCompatible(methodBinding.getParameterTypes()[nFormals - 1]))) {
-      int i = 2;
-      for (Object arg : arguments)
-        children[i++] = (arg instanceof CAstNode) ? ((CAstNode) arg) : visitNode((Expression) arg, context);
-    } else {
-      assert nActuals >= (nFormals - 1) && methodBinding.isVarargs() : "Invalid number of parameters for constructor call";
-      for (int i = 0; i < nFormals - 1; i++) {
-        Object arg = arguments.get(i);
-        children[i + 2] = (arg instanceof CAstNode) ? ((CAstNode) arg) : visitNode((Expression) arg, context);
-      }
-
-      CAstNode subargs[] = new CAstNode[nActuals - nFormals + 2];
-      // nodes for args and one extra for NEW expression
-      TypeReference newTypeRef = fIdentityMapper.getTypeRef(methodBinding.getParameterTypes()[nFormals - 1]);
-      subargs[0] = makeNode(context, fFactory, null, CAstNode.NEW, fFactory.makeConstant(newTypeRef), fFactory
-          .makeConstant(subargs.length - 1));
-      for (int j = 1; j < subargs.length; j++) {
-        Object arg = arguments.get(j + nFormals - 2);
-        subargs[j] = (arg instanceof CAstNode) ? ((CAstNode) arg) : visitNode((Expression) arg, context);
-      }
-      children[nFormals + 1] = makeNode(context, fFactory, (ASTNode) null, CAstNode.ARRAY_LITERAL, subargs);
-    }
-  }
-
-  private CAstNode visit(ReturnStatement r, WalkContext context) {
-    Expression retExpr = r.getExpression();
-    if (retExpr == null)
-      return makeNode(context, fFactory, r, CAstNode.RETURN);
-    else
-      return makeNode(context, fFactory, r, CAstNode.RETURN, visitNode(retExpr, context));
-  }
-
-  private CAstNode visit(Assignment n, WalkContext context) {
-    if (n.getOperator() == Assignment.Operator.ASSIGN)
-      return makeNode(context, fFactory, n, CAstNode.ASSIGN, visitNode(n.getLeftHandSide(), new AssignmentContext(context)),
-          visitNode(n.getRightHandSide(), context));
-    else {
-      CAstNode left = visitNode(n.getLeftHandSide(), context);
-      // GENERICs lvalue for pre op hack
-      if (left.getKind() == CAstNode.CAST) {
-        return doFunkyGenericAssignPreOpHack(n, context);
-      }
-
-      // +=, %=, &=, etc.
-      CAstNode result = makeNode(context, fFactory, n, CAstNode.ASSIGN_PRE_OP, left, visitNode(n.getRightHandSide(), context),
-          JDT2CAstUtils.mapAssignOperator(n.getOperator()));
-
-      // integer division by zero
-      if (JDT2CAstUtils.isLongOrLess(n.resolveTypeBinding())
-          && (n.getOperator() == Assignment.Operator.DIVIDE_ASSIGN || n.getOperator() == Assignment.Operator.REMAINDER_ASSIGN)) {
-        Collection<Pair<ITypeBinding, Object>> excTargets = context.getCatchTargets(fDivByZeroExcType);
-        if (!excTargets.isEmpty()) {
-          for (Pair<ITypeBinding, Object> catchPair : excTargets)
-            context.cfg().add(result, catchPair.snd, fDivByZeroExcType);
-        } else {
-          context.cfg().add(result, CAstControlFlowMap.EXCEPTION_TO_EXIT, fDivByZeroExcType);
-        }
-      }
-
-      return result;
-    }
-  }
-
-  /**
-   * Consider the case:
-   * 
-   * <pre>
-   * String real_oneheyya = (((returnObjectWithSideEffects().y))+=&quot;hey&quot;)+&quot;ya&quot;
-   * </pre>
-   * 
-   * where field 'y' is parameterized to type string. then += is not defined for type 'object'. This function is a hack that expands
-   * the code into an assignment and binary operation.
-   * 
-   * @param leftCast this is the left cast in the original expression. We throw most of it away, although we use the "Cast from" and
-   *          "cast to"
-   * @param left
-   * @param context
-   * @return
-   */
-  private CAstNode doFunkyGenericAssignPreOpHack(Assignment assign, WalkContext context) {
-    Expression left = assign.getLeftHandSide();
-    Expression right = assign.getRightHandSide();
-
-    // consider the case:
-    // String real_oneheyya = (((returnObjectWithSideEffects().y))+="hey")+"ya"; // this is going to be a MAJOR pain...
-    // where field 'y' is parameterized to type string. then += is not defined for type 'object'. we want to transform
-    // it kind of like this, except we have to define temp.
-    // String real_oneheyya = (String)((temp=cg2WithSideEffects()).y = (String)temp.y + "hey")+"ya";
-    // ----------------------------------------------------------------
-    //
-    // we are responsible for underlined portion
-    // CAST(LOCAL SCOPE(BLOCK EXPR(DECL STMT(temp,
-    // left.target),ASSIGN(OBJECT_REF(temp,y),BINARY_EXPR(CAST(OBJECT_REF(Temp,y)),RIGHT)))))
-    // yeah, I know, it's cheating, LOCAL SCOPE / DECL STMT inside an expression ... will it work?
-
-    while (left instanceof ParenthesizedExpression)
-      left = ((ParenthesizedExpression) left).getExpression();
-    assert left instanceof FieldAccess : "Cast in assign pre-op but no field access?!";
-
-    FieldAccess field = (FieldAccess) left;
-    InfixExpression.Operator infixop = JDT2CAstUtils.mapAssignOperatorToInfixOperator(assign.getOperator());
-
-    // DECL_STMT: temp = ...;
-    final String tmpName = "temp generic preop hack"; // illegal Java identifier
-    CAstNode exprNode = visitNode(field.getExpression(), context);
-    CAstNode tmpDeclNode = makeNode(context, fFactory, left, CAstNode.DECL_STMT, fFactory.makeConstant(new InternalCAstSymbol(
-        tmpName, fTypeDict.getCAstTypeFor(field.getExpression().resolveTypeBinding()), true)), exprNode);
-
-    // need two object refndoes "temp.y"
-    CAstNode obref1 = createFieldAccess(makeNode(context, fFactory, left, CAstNode.VAR, fFactory.makeConstant(tmpName), fFactory.makeConstant(fTypeDict.getCAstTypeFor(field.resolveFieldBinding().getType()))), field
-        .getName().getIdentifier(), field.resolveFieldBinding(), left, new AssignmentContext(context));
-
-    CAstNode obref2 = createFieldAccess(makeNode(context, fFactory, left, CAstNode.VAR, fFactory.makeConstant(tmpName), fFactory.makeConstant(fTypeDict.getCAstTypeFor(field.resolveFieldBinding().getType()))), field
-        .getName().getIdentifier(), field.resolveFieldBinding(), left, context);
-    ITypeBinding realtype = JDT2CAstUtils.getErasedType(field.resolveFieldBinding().getType(), ast);
-    ITypeBinding fromtype = JDT2CAstUtils
-        .getTypesVariablesBase(field.resolveFieldBinding().getVariableDeclaration().getType(), ast);
-    CAstNode castedObref = obref2;// createCast(left, obref2, fromtype, realtype, context);
-
-    // put it all together
-    // CAST(LOCAL SCOPE(BLOCK EXPR(DECL STMT(temp,
-    // left.target),ASSIGN(OBJECT_REF(temp,y),BINARY_EXPR(CAST(OBJECT_REF(Temp,y)),RIGHT)))))
-    CAstNode result = makeNode(context, fFactory, assign, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, assign,
-        CAstNode.BLOCK_EXPR, tmpDeclNode, makeNode(context, fFactory, assign, CAstNode.ASSIGN, obref1, createInfixExpression(
-            infixop, realtype, left.getStartPosition(), left.getLength(), castedObref, right, context))));
-
-    return createCast(assign, result, fromtype, realtype, context);
-  }
-
-  private CAstNode visit(ParenthesizedExpression n, WalkContext context) {
-    return visitNode(n.getExpression(), context);
-  }
-
-  private CAstNode visit(BooleanLiteral n, WalkContext context) {
-    return fFactory.makeConstant(n.booleanValue());
-  }
-
-  private CAstNode visit(CharacterLiteral n, WalkContext context) {
-    return fFactory.makeConstant(n.charValue());
-  }
-
-  private CAstNode visit(NullLiteral n, WalkContext context) {
-    return fFactory.makeConstant(null);
-  }
-
-  private CAstNode visit(StringLiteral n, WalkContext context) {
-    return fFactory.makeConstant(n.getLiteralValue());
-  }
-
-  private CAstNode visit(TypeLiteral n, WalkContext context) {
-    String typeName = fIdentityMapper.typeToTypeID(n.resolveTypeBinding());
-    return makeNode(context, fFactory, n, CAstNode.TYPE_LITERAL_EXPR, fFactory.makeConstant(typeName));
-  }
-
-  private CAstNode visit(NumberLiteral n, WalkContext context) {
-    return fFactory.makeConstant(n.resolveConstantExpressionValue());
-  }
-
-  /**
-   * SimpleName can be a field access, local, or class name (do nothing case)
-   * 
-   * @param n
-   * @param context
-   * @return
-   */
-  private CAstNode visit(SimpleName n, WalkContext context) {
-    // class name, handled above in either method invocation, qualified name, or qualified this
-    if (n.resolveBinding() instanceof ITypeBinding)
-      return makeNode(context, fFactory, null, CAstNode.EMPTY);
-
-    assert n.resolveBinding() instanceof IVariableBinding : "SimpleName's binding is not a variable or a type binding!";
-
-    IVariableBinding binding = (IVariableBinding) n.resolveBinding();
-    binding = binding.getVariableDeclaration(); // ignore weird generic stuff
-
-    // TODO: enum constants
-    if (binding.isField()) {
-      // enum constants ...
-
-      // implicit field access -- implicit this or class
-      CAstNode targetNode;
-
-      if ((binding.getModifiers() & Modifier.STATIC) != 0) {
-        // "foo = 5" -> "MyClass.foo = 5" or "SomeEnclosingClass.foo" = 5
-        targetNode = makeNode(context, fFactory, null, CAstNode.EMPTY); // we will get type from binding. no side
-        // effects in evaluating a class name, so NOP
-        // here.
-      } else {
-        ITypeBinding typeOfThis = JDT2CAstUtils.getDeclaringClassOfNode(n);
-
-        boolean fieldIsPrivate = (binding.getModifiers() & Modifier.PRIVATE) != 0;
-
-        // how could it be in the subtype and private? this only happens the supertype is also an
-        // enclosing type. in that case the variable refers to the field in the enclosing instance.
-        // NOTE: method may be defined in MyClass's superclass, but we still want to expand
-        // this into MyClass, so we have to find the enclosing class which defines this function.
-
-        ITypeBinding implicitThisClass = findClosestEnclosingClassSubclassOf(typeOfThis, binding.getDeclaringClass(),
-            fieldIsPrivate);
-        if (typeOfThis.isEqualTo(implicitThisClass))
-          // "foo = 5" -> "this.foo = 5": expand into THIS + class
-          targetNode = makeNode(context, fFactory, n, CAstNode.THIS);
-        else
-          // "foo = 5" -> "MyClass.this.foo = 5" -- inner class: expand into THIS + class
-          targetNode = makeNode(context, fFactory, n, CAstNode.THIS, fFactory.makeConstant(fIdentityMapper
-              .getTypeRef(implicitThisClass)));
-        // NOTE: method may be defined in MyClass's superclass, but we still want to expand
-        // this into MyClass, so we have to find the enclosing class which defines this function.
-        // fFactory.makeConstant(owningTypeRef));
-      }
-      return createFieldAccess(targetNode, n.getIdentifier(), binding, n, context);
-
-    } else {
-      // local
-      CAstType t = fTypeDict.getCAstTypeFor(((IVariableBinding)n.resolveBinding()).getType());
-      return makeNode(context, fFactory, n, CAstNode.VAR, fFactory.makeConstant(n.getIdentifier()), fFactory.makeConstant(t));
-    }
-
-  }
-
-  /**
-   * Sees if a field defined in owningTypeRef is contained & accessible to a type of typeOfThis. That is, if owningTypeRef ==
-   * typeOfThis or typeOfThis is a subtype and isPrivate is false. If this is not that case, looks in the enclosing class of
-   * typeOfThis and tries again, and its enclosing class, ...
-   * 
-   * Essentially if we have a field/method referenced only by name and we know its type (owningTypeRef), this function will return
-   * owningTypeRef or the subtype that the field is accessed thru, for expanding "f = 5" into "TheClass.this.f = 5".
-   * 
-   * @param typeOfThis
-   * @param owningTypeRef
-   * @param isPrivate
-   * @return
-   */
-  private ITypeBinding findClosestEnclosingClassSubclassOf(ITypeBinding typeOfThis, ITypeBinding owningType, boolean isPrivate) {
-    // GENERICS
-//    if (owningType.isParameterizedType())
-//      owningType = owningType.getTypeDeclaration();
-//    if (typeOfThis.isParameterizedType())
-//      typeOfThis = typeOfThis.getTypeDeclaration();
-//    // typeOfThis.getTypeDeclaration()
-    owningType = owningType.getErasure();
-
-    ITypeBinding current = typeOfThis;
-    while (current != null) {
-      current = current.getErasure();
-      // Walk the hierarchy rather than using isSubTypeCompatible to handle
-      // generics -- we need to perform erasure of super types
-      boolean isInSubtype = false;//current.isSubTypeCompatible(owningType);
-      ITypeBinding supertp = current;
-      while (supertp != null){
-        supertp = supertp.getErasure();
-        // Use isSubTypeCompatible even though we are manually walking type hierarchy --
-        // that way interfaces are handled without us having to do it manually.
-        if (supertp.isSubTypeCompatible(owningType)){
-          isInSubtype = true;
-          break;
-        }
-        supertp = supertp.getSuperclass();
-      }
-
-      // how could it be in the subtype and private? this only happens the supertype is also an
-      // enclosing type. in that case the variable refers to the field in the enclosing instance.
-
-      if (current.isEqualTo(owningType) || (isInSubtype && !isPrivate))
-        return current;
-
-      current = current.getDeclaringClass();
-    }
-
-    Assertions.UNREACHABLE("Couldn't find field in class or enclosing class or superclasses of these");
-    return null;
-  }
-
-  /**
-   * Process a field access. Semantics differ for static and instance fields. Fields can throw null pointer exceptions so we must
-   * connect proper exceptional edges in the CFG.
-   * 
-   * @param n
-   * @param context
-   * @return
-   */
-  private CAstNode visit(FieldAccess n, WalkContext context) {
-    CAstNode targetNode = visitNode(n.getExpression(), context);
-    return createFieldAccess(targetNode, n.getName().getIdentifier(), n.resolveFieldBinding(), n, context);
-  }
-
-  /**
-   * Used by visit(FieldAccess) and visit(SimpleName) -- implicit "this" / static field access. things from 'this' cannot throw an
-   * exception. maybe handle this in here as a special case? i don't know... or check if targetNode is THIS, that should even work
-   * for this.x = 5 and (this).x = 5
-   * 
-   * @param target Used to evaluate the field access. In the case of static field accesses, this is included in the first part of a
-   *          block -- thus it is evaluated for any side effects but thrown away.
-   * @param fieldName Name of the field.
-   * @param fieldBinding This is used to determine the field's class.
-   * @param positioningNode Used only for making a JdtPosition.
-   * @param context
-   * @return
-   */
-  private CAstNode createFieldAccess(CAstNode targetNode, String fieldName, IVariableBinding possiblyParameterizedBinding,
-      ASTNode positioningNode, WalkContext context) {
-
-    IVariableBinding fieldBinding = possiblyParameterizedBinding.getVariableDeclaration();
-
-    ITypeBinding targetType = fieldBinding.getDeclaringClass();
-
-    if (targetType == null) { // array
-      assert fieldName.equals("length") : "null targetType but not aray length access";
-      return makeNode(context, fFactory, positioningNode, CAstNode.ARRAY_LENGTH, targetNode);
-    }
-
-    assert fieldBinding.isField() : "Field binding is not a field?!"; // we can probably safely delete this
-    // check
-
-    // translate JDT field ref to WALA field ref
-    FieldReference fieldRef = fIdentityMapper.getFieldRef(fieldBinding);
-
-    if ((fieldBinding.getModifiers() & Modifier.STATIC) != 0) {
-      // JLS says: evaluate the target of the field ref and throw it away.
-      // Hence the following block expr, whose 2 children are the target
-      // evaluation
-      // followed by the OBJECT_REF with a null target child (which the
-      // "back-end"
-      // CAst -> IR translator interprets as a static ref).
-      // TODO: enum constants
-
-      // don't worry about generics (can't declare static fields with type variables)
-      if (fieldBinding.getConstantValue() != null) {
-        return makeNode(context, fFactory, positioningNode, CAstNode.BLOCK_EXPR, targetNode, fFactory.makeConstant(fieldBinding
-            .getConstantValue()));
-      } else {
-        return makeNode(context, fFactory, positioningNode, CAstNode.BLOCK_EXPR, targetNode,
-            makeNode(context, fFactory, positioningNode, CAstNode.OBJECT_REF, makeNode(context, fFactory, null, CAstNode.VOID),
-                fFactory.makeConstant(fieldRef)));
-      }
-    } else {
-      CAstNode refNode = makeNode(context, fFactory, positioningNode, CAstNode.OBJECT_REF, targetNode, fFactory
-          .makeConstant(fieldRef));
-
-      if (targetNode.getKind() != CAstNode.THIS) { // this.x will never throw a null pointer exception, because this
-        // can never be null
-        Collection excTargets = context.getCatchTargets(fNullPointerExcType);
-        if (!excTargets.isEmpty()) {
-          // connect NPE exception edge to relevant catch targets
-          // (presumably only one)
-          for (Iterator iterator = excTargets.iterator(); iterator.hasNext();) {
-            Pair catchPair = (Pair) iterator.next();
-            context.cfg().add(refNode, catchPair.snd, fNullPointerExcType);
-          }
-        } else {
-          // connect exception edge to exit
-          context.cfg().add(refNode, CAstControlFlowMap.EXCEPTION_TO_EXIT, fNullPointerExcType);
-        }
-
-        context.cfg().map(refNode, refNode);
-      }
-
-      if (fieldBinding.getConstantValue() != null) {
-        // don't have to worry about generics, a constant of generic type can only be null
-        return makeNode(context, fFactory, positioningNode, CAstNode.BLOCK_EXPR, refNode,
-        // evaluating 'refNode' can have side effects, so we must still evaluate it!
-            fFactory.makeConstant(fieldBinding.getConstantValue()));
-      } else {
-        if (fieldBinding.getType().isTypeVariable() && !context.needLValue()) {
-          // GENERICS: add a cast
-          ITypeBinding realtype = JDT2CAstUtils.getErasedType(possiblyParameterizedBinding.getType(), ast);
-          ITypeBinding fromtype = JDT2CAstUtils.getTypesVariablesBase(fieldBinding.getType(), ast);
-          if (!realtype.isEqualTo(fromtype))
-            return createCast(positioningNode, refNode, fromtype, realtype, context);
-        }
-        return refNode;
-      }
-    }
-
-  }
-
-  private CAstNode visit(ThisExpression n, WalkContext context) {
-    if (n.getQualifier() != null) {
-      ITypeBinding owningType = n.getQualifier().resolveTypeBinding();
-      TypeReference owningTypeRef = fIdentityMapper.getTypeRef(owningType);
-      return makeNode(context, fFactory, n, CAstNode.THIS, fFactory.makeConstant(owningTypeRef));
-    } else
-      return makeNode(context, fFactory, n, CAstNode.THIS);
-  }
-
-  /**
-   * QualifiedNames may be: 1) static of non-static field accesses -- we handle this case here 2) type names used in the context of:
-   * a) field access (QualifiedName) b) method invocation c) qualifier of "this" in these cases we get the binding info in each of
-   * these three functions and use them there, thus we return an EMPTY (no-op) here. 3) package names used in the context of a
-   * QualifiedName class we return a EMPTY (no-op) here.
-   * 
-   * @param n
-   * @param context
-   * @return
-   */
-  private CAstNode visit(QualifiedName n, WalkContext context) {
-    // "package.Class" is a QualifiedName, but also is "Class.staticField"
-    // only handle if it's a "Class.staticField" ("Field" in polyglot AST)
-
-    if (n.resolveBinding() instanceof IVariableBinding) {
-      IVariableBinding binding = (IVariableBinding) n.resolveBinding();
-      assert binding.isField() : "Non-field variable QualifiedName!";
-
-      // if field access is static, visitNode(n.getQualifier()) will come back here
-      // and we will return an EMPTY node
-      return createFieldAccess(visitNode(n.getQualifier(), context), n.getName().getIdentifier(), binding, n, context);
-    } else
-      return makeNode(context, fFactory, null, CAstNode.EMPTY);
-    // type name, handled in surrounding context
-  }
-
-  private CAstNode visit(InfixExpression n, WalkContext context) {
-    Expression left = n.getLeftOperand();
-    ITypeBinding leftType = left.resolveTypeBinding();
-    int leftStartPosition = left.getStartPosition();
-
-    CAstNode leftNode = visitNode(left, context);
-
-    int leftLength = n.getLeftOperand().getLength();
-    CAstNode result = createInfixExpression(n.getOperator(), leftType, leftStartPosition, leftLength, leftNode,
-        n.getRightOperand(), context);
-
-    if (n.hasExtendedOperands()) {
-      // keep on adding operands on the right side
-
-      leftLength = n.getRightOperand().getStartPosition() + n.getRightOperand().getLength() - leftStartPosition;
-      for (Object o : n.extendedOperands()) {
-        Expression operand = (Expression) o;
-        result = createInfixExpression(n.getOperator(), leftType, leftStartPosition, leftLength, result, operand, context);
-
-        if (leftType.isPrimitive() && operand.resolveTypeBinding().isPrimitive())
-          leftType = JDT2CAstUtils.promoteTypes(leftType, operand.resolveTypeBinding(), ast); // TODO: boxing
-        else
-          leftType = operand.resolveTypeBinding();
-
-        // leftStartPosition doesn't change, beginning is always the first operand
-        leftLength = operand.getStartPosition() + operand.getLength() - leftStartPosition;
-      }
-    }
-
-    return result;
-  }
-
-  private CAstNode createInfixExpression(InfixExpression.Operator op, ITypeBinding leftType, int leftStartPosition, int leftLength,
-      CAstNode leftNode, Expression right, WalkContext context) {
-    CAstNode rightNode = visitNode(right, context);
-
-    int start = leftStartPosition;
-    int end = right.getStartPosition() + right.getLength();
-    T pos = makePosition(start, end);
-    T rightPos = makePosition(leftStartPosition, leftStartPosition + leftLength);
-    T leftPos = makePosition(right.getStartPosition(), right.getStartPosition() + right.getLength());
-
-    if (op == InfixExpression.Operator.CONDITIONAL_AND) {
-      return makeNode(context, fFactory, pos, CAstNode.IF_EXPR, leftNode, rightNode, fFactory.makeConstant(false));
-    } else if (op == InfixExpression.Operator.CONDITIONAL_OR) {
-      return makeNode(context, fFactory, pos, CAstNode.IF_EXPR, leftNode, fFactory.makeConstant(true), rightNode);
-    } else {
-      ITypeBinding rightType = right.resolveTypeBinding();
-      if (leftType.isPrimitive() && rightType.isPrimitive()) {
-        // TODO: boxing
-        ITypeBinding result = JDT2CAstUtils.promoteTypes(leftType, rightType, ast);
-
-        // cast to proper type
-        if (!result.isEqualTo(leftType))
-          leftNode = makeNode(context, fFactory, leftPos, CAstNode.CAST, fFactory.makeConstant(fTypeDict.getCAstTypeFor(result)),
-              leftNode, fFactory.makeConstant(fTypeDict.getCAstTypeFor(leftType)));
-        if (!result.isEqualTo(rightType))
-          rightNode = makeNode(context, fFactory, rightPos, CAstNode.CAST, fFactory.makeConstant(fTypeDict.getCAstTypeFor(result)),
-              rightNode, fFactory.makeConstant(fTypeDict.getCAstTypeFor(rightType)));
-
-        CAstNode opNode = makeNode(context, fFactory, pos, CAstNode.BINARY_EXPR, JDT2CAstUtils.mapBinaryOpcode(op), leftNode,
-            rightNode);
-
-        // divide by zero exception implicitly thrown
-        if (JDT2CAstUtils.isLongOrLess(leftType)
-            && JDT2CAstUtils.isLongOrLess(rightType)
-            && (JDT2CAstUtils.mapBinaryOpcode(op) == CAstOperator.OP_DIV || JDT2CAstUtils.mapBinaryOpcode(op) == CAstOperator.OP_MOD)) {
-          Collection excTargets = context.getCatchTargets(fDivByZeroExcType);
-          if (!excTargets.isEmpty()) {
-            for (Iterator iterator = excTargets.iterator(); iterator.hasNext();) {
-              Pair catchPair = (Pair) iterator.next();
-              context.cfg().add(op, catchPair.snd, fDivByZeroExcType);
-            }
-          } else {
-            context.cfg().add(op, CAstControlFlowMap.EXCEPTION_TO_EXIT, fDivByZeroExcType);
-          }
-        }
-
-        return opNode;
-
-      } else {
-        return makeNode(context, fFactory, pos, CAstNode.BINARY_EXPR, JDT2CAstUtils.mapBinaryOpcode(op), leftNode, rightNode);
-      }
-    }
-  }
-
-  private CAstNode visit(ConstructorInvocation n, WalkContext context) {
-    // GENERICS getMethodDeclaration()
-    return createConstructorInvocation(n.resolveConstructorBinding().getMethodDeclaration(), n.arguments(), n, context, false);
-  }
-
-  private CAstNode visit(SuperConstructorInvocation n, WalkContext context) {
-    // FIXME: use expression?! polyglot doesn't handle it and it seems to be a very rare case.
-    // class E { class X {} }
-    // class Y extends E.X { Y(E e) { e.super(); } }
-    // GENERICS getMethodDeclaration()
-    return createConstructorInvocation(n.resolveConstructorBinding().getMethodDeclaration(), n.arguments(), n, context, true);
-  }
-
-  private CAstNode visit(SuperFieldAccess n, WalkContext context) {
-    CAstNode targetNode;
-    if (n.getQualifier() == null)
-      targetNode = makeNode(context, fFactory, n, CAstNode.SUPER);
-    else {
-      TypeReference owningTypeRef = fIdentityMapper.getTypeRef(n.getQualifier().resolveTypeBinding());
-      targetNode = makeNode(context, fFactory, n, CAstNode.SUPER, fFactory.makeConstant(owningTypeRef));
-    }
-    return createFieldAccess(targetNode, n.getName().getIdentifier(), n.resolveFieldBinding(), n, context);
-  }
-
-  /**
-   * callerNode: used for positioning and also in CFG (handleThrowsFrom Call)
-   */
-  private CAstNode createConstructorInvocation(IMethodBinding ctorBinding, List/* <Expression> */arguments, ASTNode callerNode,
-      WalkContext context, boolean isSuper) {
-    ITypeBinding ctorType = ctorBinding.getDeclaringClass();
-    assert ctorType.isClass();
-
-    // dummy PC = 0 -- Just want to wrap the kind of call; the "rear end"
-    // won't care about anything else...
-    CallSiteReference callSiteRef = CallSiteReference.make(0, fIdentityMapper.getMethodRef(ctorBinding),
-        IInvokeInstruction.Dispatch.SPECIAL);
-
-    int nFormals = ctorBinding.getParameterTypes().length;
-    CAstNode[] children = new CAstNode[2 + nFormals];
-    // this, call site ref, args
-
-    CAstNode targetNode = makeNode(context, fFactory, callerNode, isSuper ? CAstNode.SUPER : CAstNode.THIS);
-
-    children[0] = targetNode;
-    children[1] = fFactory.makeConstant(callSiteRef);
-
-    populateArguments(children, ctorBinding, arguments, context);
-
-    handleThrowsFromCall(ctorBinding, callerNode, context);
-
-    CAstNode result = makeNode(context, fFactory, callerNode, CAstNode.CALL, children);
-    context.cfg().map(context, result);
-    return result;
-
-  }
-
-  private CAstNode visit(IfStatement n, WalkContext context) {
-    return makeNode(context, fFactory, n, CAstNode.IF_STMT, visitNode(n.getExpression(), context), visitNode(n.getThenStatement(),
-        context), visitNode(n.getElseStatement(), context));
-  }
-
-  private CAstNode visit(InstanceofExpression n, WalkContext context) {
-    return makeNode(context, fFactory, n, CAstNode.INSTANCEOF, fFactory.makeConstant(fTypeDict.getCAstTypeFor(n.getRightOperand()
-        .resolveBinding())), visitNode(n.getLeftOperand(), context));
-  }
-
-  private CAstNode visit(CastExpression n, WalkContext context) {
-    Expression arg = n.getExpression();
-    ITypeBinding castedFrom = arg.resolveTypeBinding();
-    ITypeBinding castedTo = n.getType().resolveBinding();
-    return createCast(n, visitNode(arg, context), castedFrom, castedTo, context);
-  }
-
-  private CAstNode createCast(ASTNode pos, CAstNode argNode, ITypeBinding castedFrom, ITypeBinding castedTo, WalkContext context) {
-    Object cfgMapDummy = new Object(); // safer as 'pos' may be used for another purpose (i.e., this could be an implicit cast)
-
-    // null can go into anything (e.g. in "((Foobar) null)" null can be assumed to be of type Foobar already)
-    if (castedFrom.isNullType())
-      castedFrom = castedTo;
-
-    CAstNode ast = makeNode(context, fFactory, pos, CAstNode.CAST, fFactory.makeConstant(fTypeDict.getCAstTypeFor(castedTo)),
-        argNode, fFactory.makeConstant(fTypeDict.getCAstTypeFor(castedFrom)));
-
-    Collection excTargets = context.getCatchTargets(fClassCastExcType);
-    if (!excTargets.isEmpty()) {
-      // connect ClassCastException exception edge to relevant catch targets
-      // (presumably only one)
-      for (Iterator iterator = excTargets.iterator(); iterator.hasNext();) {
-        Pair catchPair = (Pair) iterator.next();
-        context.cfg().add(cfgMapDummy, catchPair.snd, fClassCastExcType);
-      }
-    } else {
-      // connect exception edge to exit
-      context.cfg().add(cfgMapDummy, CAstControlFlowMap.EXCEPTION_TO_EXIT, fClassCastExcType);
-    }
-
-    context.cfg().map(cfgMapDummy, ast);
-    return ast;
-  }
-
-  private CAstNode visit(ConditionalExpression n, WalkContext context) {
-    return makeNode(context, fFactory, n, CAstNode.IF_EXPR, visitNode(n.getExpression(), context), visitNode(n.getThenExpression(),
-        context), visitNode(n.getElseExpression(), context));
-  }
-
-  private CAstNode visit(PostfixExpression n, WalkContext context) {
-    CAstOperator op = (n.getOperator() == PostfixExpression.Operator.DECREMENT) ? CAstOperator.OP_SUB : CAstOperator.OP_ADD;
-    return makeNode(context, fFactory, n, CAstNode.ASSIGN_POST_OP, visitNode(n.getOperand(), context), fFactory.makeConstant(1), op);
-  }
-
-  private CAstNode visit(PrefixExpression n, WalkContext context) {
-    PrefixExpression.Operator op = n.getOperator();
-
-    if (op == PrefixExpression.Operator.DECREMENT || op == PrefixExpression.Operator.INCREMENT) {
-      CAstOperator castOp = (n.getOperator() == PrefixExpression.Operator.DECREMENT) ? CAstOperator.OP_SUB : CAstOperator.OP_ADD;
-      return makeNode(context, fFactory, n, CAstNode.ASSIGN_PRE_OP, visitNode(n.getOperand(), context), fFactory.makeConstant(1),
-          castOp);
-    } else if (op == PrefixExpression.Operator.PLUS) {
-      return visitNode(n.getOperand(), context); // drop useless unary plus operator
-    } else if (op == PrefixExpression.Operator.MINUS) {
-      CAstNode zero;
-      if (JDT2CAstUtils.isLongOrLess(n.getOperand().resolveTypeBinding()))
-        zero = fFactory.makeConstant(0L);
-      else
-        zero = fFactory.makeConstant(0.0);
-      return makeNode(context, fFactory, n, CAstNode.BINARY_EXPR, CAstOperator.OP_SUB, zero, visitNode(n.getOperand(), context));
-    } else { // ! and ~
-      CAstOperator castOp = (n.getOperator() == PrefixExpression.Operator.NOT) ? CAstOperator.OP_NOT : CAstOperator.OP_BITNOT;
-      return makeNode(context, fFactory, n, CAstNode.UNARY_EXPR, castOp, visitNode(n.getOperand(), context));
-    }
-  }
-
-  private CAstNode visit(EmptyStatement n, WalkContext context) {
-    CAstNode result = makeNode(context, fFactory, n, CAstNode.EMPTY);
-    context.cfg().map(n, result); // why is this necessary? for break / continue targets? (they use an empty statement)
-    return result;
-  }
-
-  private CAstNode visit(AssertStatement n, WalkContext context) {
-    return makeNode(context, fFactory, n, CAstNode.ASSERT, visitNode(n.getExpression(), context));
-  }
-
-  // ////////////////
-  // LOOPS -- special handling of for and continue
-  // ////////////////
-
-  private CAstNode visit(LabeledStatement n, WalkContext context) {
-
-    // find the first non-block statement ant set-up the label map (useful for breaking many fors)
-    ASTNode stmt = n.getBody();
-    while (stmt instanceof Block)
-      stmt = (ASTNode) ((Block) stmt).statements().iterator().next();
-
-    if (n.getParent() != null)
-      // if not a synthetic node from a break/continue -- don't pollute namespace with label, we get it thru the context
-      context.getLabelMap().put(stmt, n.getLabel().getIdentifier());
-
-    CAstNode result;
-    if (!(n.getBody() instanceof EmptyStatement)) {
-      ASTNode breakTarget = makeBreakOrContinueTarget(n, n.getLabel().getIdentifier());
-      CAstNode breakNode = visitNode(breakTarget, context);
-      WalkContext child = new BreakContext(context, n.getLabel().getIdentifier(), breakTarget);
-
-      result = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, makeNode(context, fFactory, n, CAstNode.LABEL_STMT, fFactory
-          .makeConstant(n.getLabel().getIdentifier()), visitNode(n.getBody(), child)), breakNode);
-    } else {
-      result = makeNode(context, fFactory, n, CAstNode.LABEL_STMT, fFactory.makeConstant(n.getLabel().getIdentifier()), visitNode(n
-          .getBody(), context));
-    }
-
-    context.cfg().map(n, result);
-
-    if (n.getParent() != null)
-      // if not a synthetic node from a break/continue -- don't pollute namespace with label, we get it thru the context
-      context.getLabelMap().remove(stmt);
-
-    return result;
-  }
-
-  /**
-   * Make a fake labeled node with no body, as an anchor to go to
-   */
-  private ASTNode makeBreakOrContinueTarget(ASTNode loop, String name) {
-    LabeledStatement labeled = ast.newLabeledStatement();
-    labeled.setBody(ast.newEmptyStatement());
-    labeled.setSourceRange(loop.getStartPosition(), loop.getLength());
-    labeled.setLabel(ast.newSimpleName(name)); // we don't have to worry about namespace conflicts as it is only
-    // definedwithin
-    return labeled;
-  }
-
-  private CAstNode visit(BreakStatement n, WalkContext context) {
-    String label = n.getLabel() == null ? null : n.getLabel().getIdentifier();
-    ASTNode target = context.getBreakFor(label);
-    assert target != null;
-    CAstNode result = makeNode(context, fFactory, n, CAstNode.GOTO);
-    context.cfg().map(n, result);
-    context.cfg().add(n, target, null);
-    return result;
-  }
-
-  private CAstNode visit(ContinueStatement n, WalkContext context) {
-    String label = n.getLabel() == null ? null : n.getLabel().getIdentifier();
-    ASTNode target = context.getContinueFor(label);
-    assert target != null;
-    CAstNode result = makeNode(context, fFactory, n, CAstNode.GOTO);
-    context.cfg().map(n, result);
-    context.cfg().add(n, target, null);
-    return result;
-  }
-
-  private CAstNode visit(WhileStatement n, WalkContext context) {
-    Expression cond = n.getExpression();
-    Statement body = n.getBody();
-
-    ASTNode breakTarget = makeBreakOrContinueTarget(n, "breakLabel" + n.getStartPosition());
-    CAstNode breakNode = visitNode(breakTarget, context);
-
-    ASTNode continueTarget = makeBreakOrContinueTarget(n, "continueLabel" + n.getStartPosition());
-    CAstNode continueNode = visitNode(continueTarget, context);
-
-    String loopLabel = (String) context.getLabelMap().get(n);
-    LoopContext lc = new LoopContext(context, loopLabel, breakTarget, continueTarget);
-
-    /*
-     * The following loop is created sligtly differently than in jscore. It doesn't have a specific target for continue.
-     */
-    return makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, makeNode(context, fFactory, n, CAstNode.LOOP, visitNode(cond,
-        context), makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, visitNode(body, lc), continueNode)),
-        breakNode);
-  }
-
-  private CAstNode getSwitchCaseConstant(SwitchCase n, WalkContext context) {
-    // TODO: enums
-    Expression expr = n.getExpression();
-    Object constant = (expr == null) ? new Integer(0) : expr.resolveConstantExpressionValue(); // default case label of
-    // "0" (what polyglot
-    // does). we also set
-    // SWITCH_DEFAULT
-    // somewhere else
-    // polyglot converts all labels to longs. why? who knows...
-    if (constant instanceof Character)
-      constant = new Long(((Character) constant).charValue());
-    else if (constant instanceof Byte)
-      constant = new Long(((Byte) constant).longValue());
-    else if (constant instanceof Integer)
-      constant = new Long(((Integer) constant).longValue());
-    else if (constant instanceof Short)
-      constant = new Long(((Short) constant).longValue());
-
-    if (constant != null) {
-      return fFactory.makeConstant(constant);
-    } else if (expr instanceof SimpleName) {
-      // enum constant
-      return visit((SimpleName) expr, context);
-    } else {
-      Assertions.UNREACHABLE("null constant for non-enum switch case!");
-      return null;
-    }
-  }
-
-  private CAstNode visit(SwitchCase n, WalkContext context) {
-    CAstNode label = makeNode(context, fFactory, n, CAstNode.LABEL_STMT, getSwitchCaseConstant(n, context));
-
-    context.cfg().map(n, label);
-    return label;
-  }
-
-  private CAstNode visit(SwitchStatement n, WalkContext context) {
-    ASTNode breakTarget = makeBreakOrContinueTarget(n, "breakLabel" + n.getStartPosition());
-    CAstNode breakAst = visitNode(breakTarget, context);
-    String loopLabel = (String) context.getLabelMap().get(n); // set by labeled statement (if there is one before this
-    // switch statement)
-    WalkContext childContext = new BreakContext(context, loopLabel, breakTarget);
-    Expression cond = n.getExpression();
-    List/* <Statement> */cases = n.statements();
-
-    // First compute the control flow edges for the various case labels
-    for (int i = 0; i < cases.size(); i++) {
-      Statement se = (Statement) cases.get(i);
-      if (se instanceof SwitchCase) {
-        SwitchCase c = (SwitchCase) se;
-
-        if (c.isDefault())
-          context.cfg().add(n, c, CAstControlFlowMap.SWITCH_DEFAULT);
-        else
-          context.cfg().add(n, c, getSwitchCaseConstant(c, context));
-        // if we don't do this, we may not get a constant but a
-        // block expression or something else
-      }
-    }
-
-    ArrayList<CAstNode> caseNodes = new ArrayList<CAstNode>();
-
-    // polyglot bundles all statements in between two statements into a block.
-    // this is temporary place to hold current bundle of nodes.
-    ArrayList<CAstNode> currentBlock = new ArrayList<CAstNode>();
-
-    // Now produce the CAst representation for each case
-    for (Object o : cases) {
-      Statement s = (Statement) o;
-      if (s instanceof SwitchCase) {
-        if (!currentBlock.isEmpty()) {
-          // bundle up statements before this case
-          CAstNode stmtNodes[] = currentBlock.toArray(new CAstNode[currentBlock.size()]);
-          // make position from start of first statement to end of last statement
-          T positionOfAll = makePosition(childContext.pos().getPosition(stmtNodes[0]).getFirstOffset(), childContext
-              .pos().getPosition(stmtNodes[stmtNodes.length - 1]).getLastOffset());
-          caseNodes.add(makeNode(childContext, fFactory, positionOfAll, CAstNode.BLOCK_STMT, stmtNodes));
-          currentBlock.clear();
-        }
-        caseNodes.add(visitNode(s, childContext));
-      } else {
-        visitNodeOrNodes(s, childContext, currentBlock);
-      }
-    }
-    if (!currentBlock.isEmpty()) {
-      // bundle up statements before this case
-      CAstNode stmtNodes[] = currentBlock.toArray(new CAstNode[currentBlock.size()]);
-      // make position from start of first statement to end of last statement
-      T positionOfAll = makePosition(childContext.pos().getPosition(stmtNodes[0]).getFirstOffset(), childContext.pos()
-          .getPosition(stmtNodes[stmtNodes.length - 1]).getLastOffset());
-      caseNodes.add(makeNode(childContext, fFactory, positionOfAll, CAstNode.BLOCK_STMT, stmtNodes));
-    }
-
-    // Now produce the switch stmt itself
-    CAstNode switchAst = makeNode(context, fFactory, n, CAstNode.SWITCH, visitNode(cond, context), makeNode(context, fFactory, n,
-        CAstNode.BLOCK_STMT, caseNodes.toArray(new CAstNode[caseNodes.size()])));
-
-    context.cfg().map(n, switchAst);
-
-    // Finally, wrap the entire switch in a block so that we have a
-    // well-defined place to 'break' to.
-    return makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, switchAst, breakAst);
-
-  }
-
-  private CAstNode visit(DoStatement n, WalkContext context) {
-    String loopLabel = context.getLabelMap().get(n); // set by visit(LabeledStatement)
-    String token = loopLabel==null? "at_" + n.getStartPosition(): loopLabel;
-    
-    ASTNode breakTarget = makeBreakOrContinueTarget(n, "breakLabel_" + token);
-    CAstNode breakNode = visitNode(breakTarget, context);
-
-    ASTNode continueTarget = makeBreakOrContinueTarget(n, "continueLabel_" + token);
-    CAstNode continueNode = visitNode(continueTarget, context);
- 
-    CAstNode loopTest = visitNode(n.getExpression(), context);
-
-    WalkContext loopContext = new LoopContext(context, loopLabel, breakTarget, continueTarget);
-    CAstNode loopBody = visitNode(n.getBody(), loopContext);
-
-    return doLoopTranslator.translateDoLoop(loopTest, loopBody, continueNode, breakNode, context);  
-  }
-
-  /**
-   * Expands the form: for ( [final] Type var: iterable ) { ... } Into something equivalent to: for ( Iterator iter =
-   * iterable.iter(); iter.hasNext(); ) { [final] Type var = (Type) iter.next(); ... } Or, in the case of an array: for ( int idx =
-   * 0; i < iterable.length; i++ ) { [final] Type var = iterable[idx]; ... } Except that the expression "iterable" is only evaluate
-   * once (or is it?)
-   * 
-   * @param n
-   * @param context
-   * @return
-   */
-  private CAstNode visit(EnhancedForStatement n, WalkContext context) {
-    if (n.getExpression().resolveTypeBinding().isArray())
-      return makeArrayEnhancedForLoop(n, context);
-    else
-      return makeIteratorEnhancedForLoop(n, context);
-  }
-
-  private CAstNode makeIteratorEnhancedForLoop(EnhancedForStatement n, WalkContext context) {
-    // case 1: iterator
-    CAstNode exprNode = visitNode(n.getExpression(), context);
-    SingleVariableDeclaration svd = n.getParameter();
-    Statement body = n.getBody();
-
-    // expand into:
-
-    // typical for loop:
-    // { [inits]; while (cond) { [body]; [label continueTarget]; iters } [label breakTarget]
-    // BLOCK(BLOCK(init1,init2,...),LOOP(cond,BLOCK(bodyblock,continuetarget,BLOCK(iter1,iter2,...))),breaktarget
-
-    // in our case:
-    // the only init is "Iterator iter = iterable.iter()"
-    // cond is "iter.hasNext()"
-    // bodyblock should be prepended with "[final] Type var = iter.next()" (put in the block that body belongs to)
-    // iter is null
-    // continuetarget and breaktarget are the same as in a regular for loop
-    // BLOCK(iterassign,LOOP(cond,BLOCK(paramassign,bodyblock,continuetarget)),breaktarget)
-
-    final String tmpName = "iter tmp"; // this is an illegal Java identifier, we will use this variable to hold the "invisible"
-                                       // iterator
-
-    /*-------- make "iter = iterator.iter()" ---------*/
-    // make a fake method ref
-    MethodReference iterMethodRef = fIdentityMapper.fakeMethodRefNoArgs("Ljava/lang/Iterable;.iterator()Ljava/util/Iterator<TT;>;",
-        "Ljava/lang/Iterable", "iterator", "Ljava/util/Iterator");
-    CAstNode iterCallSiteRef = fFactory.makeConstant(CallSiteReference
-        .make(0, iterMethodRef, IInvokeInstruction.Dispatch.INTERFACE));
-    // Iterable.iter() throws no exceptions.
-
-    CAstNode iterCallNode = makeNode(context, fFactory, n, CAstNode.CALL, exprNode, iterCallSiteRef);
-    // handle runtimeexception
-    Object o1 = new Object(); // dummy object used for mapping / exceptions
-    for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(fRuntimeExcType))
-      context.cfg().add(o1, catchTarget.snd, catchTarget.fst);
-    context.cfg().map(o1, iterCallNode); // TODO: this might not work, lots of calls in this one statement.
-
-    CAstNode iterAssignNode = makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory.makeConstant(new InternalCAstSymbol(
-        tmpName, fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("int")), true)), iterCallNode);
-
-    // MATCHUP: wrap in a block
-    iterAssignNode = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, iterAssignNode);
-
-    // TODO: TOTEST: using this and Iterable.hasNext() explicitly in same file.
-
-    /*---------- cond: iter.hasNext(); -----------*/
-    MethodReference hasNextMethodRef = fIdentityMapper.fakeMethodRefNoArgs("Ljava/util/Iterator;.hasNext()Z",
-        "Ljava/util/Iterator", "hasNext", "Z");
-    CAstNode iterVar = makeNode(context, fFactory, n, CAstNode.VAR, fFactory.makeConstant(tmpName));
-    CAstNode hasNextCallSiteRef = fFactory.makeConstant(CallSiteReference.make(0, hasNextMethodRef,
-        IInvokeInstruction.Dispatch.INTERFACE));
-
-    // throws no exceptions.
-    CAstNode hasNextCallNode = makeNode(context, fFactory, n, CAstNode.CALL, iterVar, hasNextCallSiteRef);
-    // handle runtimeexception
-    Object o2 = new Object(); // dummy object used for mapping / exceptions
-    for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(fRuntimeExcType))
-      context.cfg().add(o2, catchTarget.snd, catchTarget.fst);
-    context.cfg().map(o2, hasNextCallNode); // TODO: this might not work, lots of calls in this one statement.
-
-    /*---------- paramassign: var = (Type) iter.next() ---------*/
-    MethodReference nextMethodRef = fIdentityMapper.fakeMethodRefNoArgs("Ljava/util/Iterator;.next()TE;", "Ljava/util/Iterator",
-        "next", "Ljava/lang/Object");
-    CAstNode nextCallSiteRef = fFactory.makeConstant(CallSiteReference
-        .make(0, nextMethodRef, IInvokeInstruction.Dispatch.INTERFACE));
-    // throws no exceptions.
-    CAstNode iterVar2 = makeNode(context, fFactory, n, CAstNode.VAR, fFactory.makeConstant(tmpName));
-    CAstNode nextCallNode = makeNode(context, fFactory, n, CAstNode.CALL, iterVar2, nextCallSiteRef);
-    for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(fRuntimeExcType))
-      context.cfg().add(svd, catchTarget.snd, catchTarget.fst);
-    context.cfg().map(svd, nextCallNode);
-
-    // TODO: another cfg edge associated with svd! is this okay? prolly not... associate it with the cast, somehow...
-    CAstNode castedNode = createCast(svd, nextCallNode, ast.resolveWellKnownType("java.lang.Object"), svd.resolveBinding()
-        .getType(), context);
-
-    Object defaultValue = JDT2CAstUtils.defaultValueForType(svd.resolveBinding().getType());
-    CAstNode nextAssignNode = makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory.makeConstant(new CAstSymbolImpl(svd
-        .getName().getIdentifier(), fTypeDict.getCAstTypeFor(svd.resolveBinding().getType()), (svd.getModifiers() & Modifier.FINAL) != 0, defaultValue)), castedNode);
-
-    /*----------- put it all together ----------*/
-    ASTNode breakTarget = makeBreakOrContinueTarget(n, "breakLabel" + n.getStartPosition());
-    ASTNode continueTarget = makeBreakOrContinueTarget(n, "continueLabel" + n.getStartPosition());
-    String loopLabel = context.getLabelMap().get(n);
-    WalkContext loopContext = new LoopContext(context, loopLabel, breakTarget, continueTarget);
-
-    // LOCAL_SCOPE(BLOCK(iterassign,LOOP(cond,BLOCK(BLOCK(paramassign,bodyblock),continuetarget,BLOCK())),breaktarget))
-    return makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, iterAssignNode,
-        makeNode(context, fFactory, n, CAstNode.LOOP, hasNextCallNode, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT,
-            makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT,
-                nextAssignNode, visitNode(body, loopContext))), visitNode(continueTarget, context), makeNode(context, fFactory, n,
-                CAstNode.BLOCK_STMT))), visitNode(breakTarget, context)));
-  }
-
-  private CAstNode makeArrayEnhancedForLoop(EnhancedForStatement n, WalkContext context) {
-    // ********* BEFORE:
-    // for ( String x: doSomething() ) { ... }
-    // ********* AFTER:
-    // {
-    // String tmparray[] = doSomething();
-    // for ( int tmpindex = 0; i < tmparray.length; tmpindex++ ) {
-    // String x = tmparray[tmpindex];
-    // ...
-    // }
-    // }
-    // simplest:
-    // LOCAL_SCOPE(BLOCK(arrayDecl,indexDecl,LOOP(cond,BLOCK(nextAssign,bodyblock,continuetarget,iter)),breaktarget))
-    // match up exactly:
-    // LOCAL_SCOPE(BLOCK(arrayDecl,LOCAL_SCOPE(BLOCK(BLOCK(indexDecl),LOOP(cond,BLOCK(LOCAL_SCOPE(BLOCK(nextAssign,bodyblock)),continuetarget,BLOCK(iter))),breaktarget))))
-
-    /*------ arrayDecl --------- String tmparray[] = doSomething() ------*/
-    final String tmpArrayName = "for temp array"; // illegal java identifier
-    CAstNode exprNode = visitNode(n.getExpression(), context);
-    CAstNode arrayDeclNode = makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory.makeConstant(new InternalCAstSymbol(
-        tmpArrayName, fTypeDict.getCAstTypeFor(n.getExpression().resolveTypeBinding()), true)), exprNode);
-
-    /*------ indexDecl --------- int tmpindex = 0 ------*/
-    final String tmpIndexName = "for temp index";
-    CAstNode indexDeclNode = makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory.makeConstant(new InternalCAstSymbol(
-        tmpIndexName, fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("int")), true)), fFactory.makeConstant(new Integer(0)));
-
-    /*------ cond ------------- tmpindex < tmparray.length ------*/
-    CAstNode tmpArrayLengthNode = makeNode(context, fFactory, n, CAstNode.ARRAY_LENGTH, makeNode(context, fFactory, n,
-        CAstNode.VAR, fFactory.makeConstant(tmpArrayName), fFactory.makeConstant(fTypeDict.getCAstTypeFor(n.getExpression().resolveTypeBinding()))));
-    CAstNode condNode = makeNode(context, fFactory, n, CAstNode.BINARY_EXPR, CAstOperator.OP_LT, makeNode(context, fFactory, n,
-        CAstNode.VAR, fFactory.makeConstant(tmpIndexName), fFactory.makeConstant(JavaPrimitiveType.INT)), tmpArrayLengthNode);
-
-    /*------ tmpIndexInc -------- tmpindex++ ------*/
-    CAstNode tmpArrayIncNode = makeNode(context, fFactory, n, CAstNode.ASSIGN_POST_OP, makeNode(context, fFactory, n, CAstNode.VAR,
-        fFactory.makeConstant(tmpIndexName)), fFactory.makeConstant(1), CAstOperator.OP_ADD);
-
-    /*------ tmpArrayAccess ----- String x = tmparray[tmpindex] ------*/
-    CAstNode tmpArrayAccessNode = makeNode(context, fFactory, n, CAstNode.ARRAY_REF, makeNode(context, fFactory, n, CAstNode.VAR,
-        fFactory.makeConstant(tmpArrayName)), fFactory.makeConstant(fIdentityMapper.getTypeRef(n.getExpression()
-        .resolveTypeBinding().getComponentType())), makeNode(context, fFactory, n, CAstNode.VAR, fFactory
-        .makeConstant(tmpIndexName)));
-
-    SingleVariableDeclaration svd = n.getParameter();
-    Object defaultValue = JDT2CAstUtils.defaultValueForType(svd.resolveBinding().getType());
-    CAstNode nextAssignNode = makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory.makeConstant(new CAstSymbolImpl(svd
-        .getName().getIdentifier(), fTypeDict.getCAstTypeFor(n.getExpression()
-        .resolveTypeBinding().getComponentType()), (svd.getModifiers() & Modifier.FINAL) != 0, defaultValue)), tmpArrayAccessNode);
-
-    // LOCAL_SCOPE(BLOCK(arrayDecl,LOCAL_SCOPE(BLOCK(BLOCK(indexDecl),LOOP(cond,BLOCK(LOCAL_SCOPE(BLOCK(nextAssign,bodyblock)),continuetarget,BLOCK(iter))),breaktarget))))
-    // more complicated than it has to be, but it matches up exactly with the Java expansion above.
-
-    ASTNode breakTarget = makeBreakOrContinueTarget(n, "breakLabel" + n.getStartPosition());
-    ASTNode continueTarget = makeBreakOrContinueTarget(n, "continueLabel" + n.getStartPosition());
-    String loopLabel = (String) context.getLabelMap().get(n);
-    WalkContext loopContext = new LoopContext(context, loopLabel, breakTarget, continueTarget);
-
-    return makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE,
-        makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, arrayDeclNode, makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE,
-            makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, indexDeclNode),
-                makeNode(context, fFactory, n, CAstNode.LOOP, condNode, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT,
-                    makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT,
-                        nextAssignNode, visitNode(n.getBody(), loopContext))), visitNode(continueTarget, context), makeNode(
-                        context, fFactory, n, CAstNode.BLOCK_STMT, tmpArrayIncNode))), visitNode(breakTarget, context)))));
-
-  }
-
-  private CAstNode visit(ForStatement n, WalkContext context) {
-    ASTNode breakTarget = makeBreakOrContinueTarget(n, "breakLabel" + n.getStartPosition());
-    ASTNode continueTarget = makeBreakOrContinueTarget(n, "continueLabel" + n.getStartPosition());
-    String loopLabel = (String) context.getLabelMap().get(n);
-    WalkContext loopContext = new LoopContext(context, loopLabel, breakTarget, continueTarget);
-
-    ArrayList<CAstNode> inits = new ArrayList<CAstNode>();
-    for (int i = 0; i < n.initializers().size(); i++) {
-      ASTNode init = (ASTNode) n.initializers().get(i);
-      if (init instanceof VariableDeclarationExpression) {
-        for (Object o : ((VariableDeclarationExpression) init).fragments())
-          inits.add(visitNode((ASTNode) o, context));
-      } else
-        inits.add(visitNode(init, context));
-    }
-
-    CAstNode[] iters = new CAstNode[n.updaters().size()];
-    for (int i = 0; i < iters.length; i++)
-      iters[i] = visitNode((ASTNode) n.updaters().get(i), context);
-
-    CAstNode initsBlock = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, inits.toArray(new CAstNode[inits.size()]));
-    CAstNode itersBlock = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, iters);
-
-    // { [inits]; while (cond) { [body]; [label continueTarget]; iters } [label breakTarget]
-    return makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, initsBlock,
-        makeNode(context, fFactory, n, CAstNode.LOOP, visitNode(n.getExpression(), context), makeNode(context, fFactory, n,
-            CAstNode.BLOCK_STMT, visitNode(n.getBody(), loopContext), visitNode(continueTarget, context), itersBlock)), visitNode(
-            breakTarget, context)));
-
-  }
-
-  private CAstNode visit(TryStatement n, WalkContext context) {
-    List/* <CatchClause> */catchBlocks = n.catchClauses();
-    Block finallyBlock = n.getFinally();
-    Block tryBlock = n.getBody();
-
-    // try/finally
-    if (catchBlocks.isEmpty()) {
-      return makeNode(context, fFactory, n, CAstNode.UNWIND, visitNode(tryBlock, context), visitNode(finallyBlock, context));
-
-      // try/catch/[finally]
-    } else {
-      TryCatchContext tc = new TryCatchContext(context, n);
-
-      CAstNode tryNode = visitNode(tryBlock, tc);
-      for (Iterator iter = catchBlocks.iterator(); iter.hasNext();) {
-        tryNode = makeNode(context, fFactory, n, CAstNode.TRY, tryNode, visitNode((CatchClause) iter.next(), context));
-      }
-
-      // try/catch
-      if (finallyBlock == null) {
-        return tryNode;
-
-        // try/catch/finally
-      } else {
-        return makeNode(context, fFactory, n, CAstNode.UNWIND, tryNode, visitNode(finallyBlock, context));
-      }
-    }
-
-  }
-
-  private CAstNode visit(CatchClause n, WalkContext context) {
-    Block body = n.getBody();
-    SingleVariableDeclaration formal = n.getException();
-
-    CAstNode excDecl = makeNode(context, fFactory, n, CAstNode.CATCH, fFactory.makeConstant(formal.getName().getIdentifier()),
-        visitNode(body, context));
-    CAstNode localScope = makeNode(context, fFactory, n, CAstNode.LOCAL_SCOPE, excDecl);
-
-    context.cfg().map(n, excDecl);
-    context.getNodeTypeMap().add(excDecl, fTypeDict.getCAstTypeFor(n.getException().resolveBinding().getType()));
-    return localScope;
-  }
-
-  private CAstNode visit(ThrowStatement n, WalkContext context) {
-    CAstNode result = makeNode(context, fFactory, n, CAstNode.THROW, visitNode(n.getExpression(), context));
-    ITypeBinding label = n.getExpression().resolveTypeBinding();
-
-    context.cfg().map(n, result);
-
-    Collection/* <Pair<Type,Node>> */catchNodes = context.getCatchTargets(label);
-
-    for (Iterator iter = catchNodes.iterator(); iter.hasNext();) {
-      Pair/* <Type,Node> */catchNode = (Pair/* <Type,Node> */) iter.next();
-
-      context.cfg().add(n, catchNode.snd, catchNode.fst);
-    }
-
-    return result;
-  }
-
-  private void hookUpNPETargets(ASTNode n, WalkContext wc) {
-    Collection excTargets = wc.getCatchTargets(fNullPointerExcType);
-    if (!excTargets.isEmpty()) {
-      // connect NPE exception edge to relevant catch targets
-      // (presumably only one)
-      for (Iterator iterator = excTargets.iterator(); iterator.hasNext();) {
-        Pair catchPair = (Pair) iterator.next();
-        wc.cfg().add(n, catchPair.snd, fNullPointerExcType);
-      }
-    } else {
-      // connect exception edge to exit
-      wc.cfg().add(n, CAstControlFlowMap.EXCEPTION_TO_EXIT, fNullPointerExcType);
-    }
-  }
-
-  //
-  // ARRAYS
-  //
-
-  private CAstNode visit(ArrayAccess n, WalkContext context) {
-    TypeReference eltTypeRef = fIdentityMapper.getTypeRef(n.resolveTypeBinding());
-
-    CAstNode cast = makeNode(context, fFactory, n, CAstNode.ARRAY_REF, visitNode(n.getArray(), context), fFactory.makeConstant(eltTypeRef),
-        visitNode(n.getIndex(), context));
-
-    hookUpNPETargets(n, context);
-    
-    context.cfg().map(n, cast);
-    
-    return cast;
-  }
-
-  // FIXME: inner classes here, probably too...
-  private CAstNode visit(ArrayCreation n, WalkContext context) {
-    ITypeBinding newType = n.resolveTypeBinding();
-    ArrayInitializer ai = n.getInitializer();
-    assert newType.isArray();
-
-    if (ai != null) {
-      return visitNode(ai, context);
-    } else {
-      TypeReference arrayTypeRef = fIdentityMapper.getTypeRef(newType);
-
-      List/* <Expression> */dims = n.dimensions();
-      CAstNode[] args = new CAstNode[dims.size() + 1];
-
-      int idx = 0;
-      args[idx++] = fFactory.makeConstant(arrayTypeRef);
-      for (Iterator iter = dims.iterator(); iter.hasNext();) {
-        Expression dimExpr = (Expression) iter.next();
-        args[idx++] = visitNode(dimExpr, context);
-      }
-      return makeNode(context, fFactory, n, CAstNode.NEW, args);
-    }
-  }
-
-  private CAstNode visit(SynchronizedStatement n, WalkContext context) {
-    CAstNode exprNode = visitNode(n.getExpression(), context);
-    String exprName = fFactory.makeUnique();
-    CAstNode declStmt = makeNode(context, fFactory, n, CAstNode.DECL_STMT, fFactory
-        .makeConstant(new CAstSymbolImpl(exprName, fTypeDict.getCAstTypeFor(n.getExpression().resolveTypeBinding()), true)), exprNode);
-
-    CAstNode monitorEnterNode = makeNode(context, fFactory, n, CAstNode.MONITOR_ENTER, makeNode(context, fFactory, n, CAstNode.VAR,
-        fFactory.makeConstant(exprName)));
-    context.cfg().map(monitorEnterNode, monitorEnterNode);
-    for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(fNullPointerExcType))
-      context.cfg().add(monitorEnterNode, catchTarget.snd, catchTarget.fst);
-
-    CAstNode bodyNodes = visitNode(n.getBody(), context);
-
-    CAstNode monitorExitNode = makeNode(context, fFactory, n, CAstNode.MONITOR_EXIT, makeNode(context, fFactory, n, CAstNode.VAR,
-        fFactory.makeConstant(exprName)));
-    context.cfg().map(monitorExitNode, monitorExitNode);
-    for (Pair<ITypeBinding, Object> catchTarget : context.getCatchTargets(fNullPointerExcType))
-      context.cfg().add(monitorExitNode, catchTarget.snd, catchTarget.fst);
-
-    CAstNode tryBody = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, monitorEnterNode, bodyNodes);
-    CAstNode bigBody = makeNode(context, fFactory, n, CAstNode.UNWIND, tryBody, monitorExitNode);
-
-    return makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, declStmt, bigBody);
-  }
-
-  // ///////////////////////////////////////////
-  // / THE GIANT SWITCH STATEMENT ( BORING ) ///
-  // ///////////////////////////////////////////
-
-  /**
-   * Giant switch statement.
-   * 
-   * @param n
-   * @return
-   */
-  private CAstEntity visit(AbstractTypeDeclaration n, WalkContext context) {
-    // handling of compilationunit in translate()
-    if (n instanceof TypeDeclaration) {
-      return visitTypeDecl(n, context);
-    } else if (n instanceof EnumDeclaration) {
-      return visit((EnumDeclaration) n, context);
-    } else if (n instanceof AnnotationTypeDeclaration) {
-      return visitTypeDecl(n, context);
-    } else {
-      Assertions.UNREACHABLE("Unhandled type declaration type");
-      return null;
-    }
-  }
-
-  /**
-   * Giant switch statement, part deux
-   * 
-   * @param body
-   * @param context
-   * @return
-   */
-  private CAstNode visitNode(ASTNode n, WalkContext context) {
-    if (n == null)
-      return makeNode(context, fFactory, null, CAstNode.EMPTY);
-
-    if (n instanceof ArrayAccess) {
-      return visit((ArrayAccess) n, context);
-    } else if (n instanceof ArrayCreation) {
-      return visit((ArrayCreation) n, context);
-    } else if (n instanceof ArrayInitializer) {
-      return visit((ArrayInitializer) n, context);
-    } else if (n instanceof AssertStatement) {
-      return visit((AssertStatement) n, context);
-    } else if (n instanceof Assignment) {
-      return visit((Assignment) n, context);
-    } else if (n instanceof Block) {
-      return visit((Block) n, context);
-    } else if (n instanceof BooleanLiteral) {
-      return visit((BooleanLiteral) n, context);
-    } else if (n instanceof BreakStatement) {
-      return visit((BreakStatement) n, context);
-    } else if (n instanceof CastExpression) {
-      return visit((CastExpression) n, context);
-    } else if (n instanceof CatchClause) {
-      return visit((CatchClause) n, context);
-    } else if (n instanceof CharacterLiteral) {
-      return visit((CharacterLiteral) n, context);
-    } else if (n instanceof ClassInstanceCreation) {
-      return visit((ClassInstanceCreation) n, context);
-    } else if (n instanceof ConditionalExpression) {
-      return visit((ConditionalExpression) n, context);
-    } else if (n instanceof ConstructorInvocation) {
-      return visit((ConstructorInvocation) n, context);
-    } else if (n instanceof ContinueStatement) {
-      return visit((ContinueStatement) n, context);
-    } else if (n instanceof DoStatement) {
-      return visit((DoStatement) n, context);
-    } else if (n instanceof EmptyStatement) {
-      return visit((EmptyStatement) n, context);
-    } else if (n instanceof EnhancedForStatement) {
-      return visit((EnhancedForStatement) n, context);
-    } else if (n instanceof ExpressionStatement) {
-      return visit((ExpressionStatement) n, context);
-    } else if (n instanceof FieldAccess) {
-      return visit((FieldAccess) n, context);
-    } else if (n instanceof ForStatement) {
-      return visit((ForStatement) n, context);
-    } else if (n instanceof IfStatement) {
-      return visit((IfStatement) n, context);
-    } else if (n instanceof InfixExpression) {
-      return visit((InfixExpression) n, context);
-    } else if (n instanceof InstanceofExpression) {
-      return visit((InstanceofExpression) n, context);
-    } else if (n instanceof LabeledStatement) {
-      return visit((LabeledStatement) n, context);
-    } else if (n instanceof MethodInvocation) {
-      return visit((MethodInvocation) n, context);
-    } else if (n instanceof NumberLiteral) {
-      return visit((NumberLiteral) n, context);
-    } else if (n instanceof NullLiteral) {
-      return visit((NullLiteral) n, context);
-    } else if (n instanceof ParenthesizedExpression) {
-      return visit((ParenthesizedExpression) n, context);
-    } else if (n instanceof PostfixExpression) {
-      return visit((PostfixExpression) n, context);
-    } else if (n instanceof PrefixExpression) {
-      return visit((PrefixExpression) n, context);
-    } else if (n instanceof QualifiedName) {
-      return visit((QualifiedName) n, context);
-    } else if (n instanceof ReturnStatement) {
-      return visit((ReturnStatement) n, context);
-    } else if (n instanceof SimpleName) {
-      return visit((SimpleName) n, context);
-    } else if (n instanceof StringLiteral) {
-      return visit((StringLiteral) n, context);
-    } else if (n instanceof SuperConstructorInvocation) {
-      return visit((SuperConstructorInvocation) n, context);
-    } else if (n instanceof SuperFieldAccess) {
-      return visit((SuperFieldAccess) n, context);
-    } else if (n instanceof SuperMethodInvocation) {
-      return visit((SuperMethodInvocation) n, context);
-    } else if (n instanceof SynchronizedStatement) {
-      return visit((SynchronizedStatement) n, context);
-    } else if (n instanceof SwitchStatement) {
-      return visit((SwitchStatement) n, context);
-    } else if (n instanceof SwitchCase) {
-      return visit((SwitchCase) n, context);
-    } else if (n instanceof ThisExpression) {
-      return visit((ThisExpression) n, context);
-    } else if (n instanceof TypeLiteral) {
-      return visit((TypeLiteral) n, context);
-    } else if (n instanceof ThrowStatement) {
-      return visit((ThrowStatement) n, context);
-    } else if (n instanceof TryStatement) {
-      return visit((TryStatement) n, context);
-    } else if (n instanceof TypeDeclarationStatement) {
-      return visit((TypeDeclarationStatement) n, context);
-    } else if (n instanceof VariableDeclarationFragment) {
-      return visit((VariableDeclarationFragment) n, context);
-    } else if (n instanceof WhileStatement) {
-      return visit((WhileStatement) n, context);
-    }
-
-    // VariableDeclarationStatement handled as special case (returns multiple statements)
-
-    Assertions.UNREACHABLE("Unhandled JDT node type " + n.getClass().getCanonicalName());
-
-    return null;
-  }
-
-  private void visitNodeOrNodes(ASTNode n, WalkContext context, Collection<CAstNode> coll) {
-    if (n instanceof VariableDeclarationStatement)
-      coll.addAll(visit((VariableDeclarationStatement) n, context));
-    else
-      coll.add(visitNode(n, context));
-  }
-
-  // /////////////////////////////////////////
-  // SPECIALIZED CASTENTITYs AND CASTNODEs //
-  // /////////////////////////////////////////
-
-  protected static final class CompilationUnitEntity implements CAstEntity {
-    private final String fName;
-
-    private final Collection<CAstEntity> fTopLevelDecls;
-
-    public CompilationUnitEntity(PackageDeclaration packageDeclaration, List<CAstEntity> topLevelDecls) {
-      fName = (packageDeclaration == null) ? "" : packageDeclaration.getName().getFullyQualifiedName().replace('.', '/');
-      fTopLevelDecls = topLevelDecls;
-    }
-
-    @Override
-	public Collection<CAstAnnotation> getAnnotations() {
-		return null;
-	}
-
-	@Override
-  public int getKind() {
-      return FILE_ENTITY;
-    }
-
-    @Override
-    public String getName() {
-      return fName;
-    }
-
-    @Override
-    public String getSignature() {
-      Assertions.UNREACHABLE();
-      return null;
-    }
-
-    @Override
-    public String[] getArgumentNames() {
-      return new String[0];
-    }
-
-    @Override
-    public CAstNode[] getArgumentDefaults() {
-      return new CAstNode[0];
-    }
-
-    @Override
-    public int getArgumentCount() {
-      return 0;
-    }
-
-    @Override
-    public Map<CAstNode, Collection<CAstEntity>> getAllScopedEntities() {
-      return Collections.singletonMap(null, fTopLevelDecls);
-    }
-
-    @Override
-    public Iterator getScopedEntities(CAstNode construct) {
-      Assertions.UNREACHABLE("CompilationUnitEntity asked for AST-related entities, but it has no AST.");
-      return null;
-    }
-
-    @Override
-    public CAstNode getAST() {
-      return null;
-    }
-
-    @Override
-    public CAstControlFlowMap getControlFlow() {
-      Assertions.UNREACHABLE("CompilationUnitEntity.getControlFlow()");
-      return null;
-    }
-
-    @Override
-    public CAstSourcePositionMap getSourceMap() {
-      Assertions.UNREACHABLE("CompilationUnitEntity.getSourceMap()");
-      return null;
-    }
-
-    @Override
-    public CAstSourcePositionMap.Position getPosition() {
-      return null;
-    }
-
-    @Override
-    public CAstNodeTypeMap getNodeTypeMap() {
-      Assertions.UNREACHABLE("CompilationUnitEntity.getNodeTypeMap()");
-      return null;
-    }
-
-    @Override
-    public Collection getQualifiers() {
-      return Collections.EMPTY_LIST;
-    }
-
-    @Override
-    public CAstType getType() {
-      Assertions.UNREACHABLE("CompilationUnitEntity.getType()");
-      return null;
-    }
-  }
-
-  // /////////////////////////////
-  // WALK CONTEXTS
-  // WHY????
-  // ////////////////////////////////
-
-  /**
-   * Contains things needed by in the visit() of some nodes to process the nodes. For example, pos() contains the source position
-   * mapping which each node registers
-   */
-  public static interface WalkContext extends TranslatorToCAst.WalkContext<WalkContext, ASTNode> {
-
-    public Collection<Pair<ITypeBinding, Object>> getCatchTargets(ITypeBinding type);
-
-    public Map<ASTNode, String> getLabelMap();
-
-    public boolean needLValue();
-  }
-
-  /**
-   * Default context functions. When one context doesn't handle something, it the next one up does. For example, there is only one
-   * source pos. mapping per MethodContext, so loop contexts delegate it up.
-   */
-  public static class DelegatingContext extends TranslatorToCAst.DelegatingContext<WalkContext, ASTNode> implements WalkContext {
-
-    public DelegatingContext(WalkContext parent) {
-      super(parent);
-    }
-
-    @Override
-    public Collection<Pair<ITypeBinding, Object>> getCatchTargets(ITypeBinding type) {
-      return parent.getCatchTargets(type);
-    }
-
-    @Override
-    public Map<ASTNode, String> getLabelMap() {
-      return parent.getLabelMap();
-    }
-
-     @Override
-    public boolean needLValue() {
-      return parent.needLValue();
-    }
-  }
-
-  /*
-   * Root context. Doesn't do anything.
-   */
-  public static class RootContext extends TranslatorToCAst.RootContext<WalkContext, ASTNode> implements WalkContext {
-     @Override
-    public Collection<Pair<ITypeBinding, Object>> getCatchTargets(ITypeBinding type) {
-      Assertions.UNREACHABLE("RootContext.getCatchTargets()");
-      return null;
-    }
-
-    @Override
-    public Map<ASTNode, String> getLabelMap() {
-      Assertions.UNREACHABLE("RootContext.getLabelMap()");
-      return null;
-    }
-
-    @Override
-    public boolean needLValue() {
-      Assertions.UNREACHABLE("Rootcontext.needLValue()");
-      return false;
-    }
-  }
-
-  private class AssignmentContext extends DelegatingContext {
-
-    protected AssignmentContext(WalkContext parent) {
-      super(parent);
-    }
-
-    @Override
-    public boolean needLValue() {
-      return true;
-    }
-  }
-
-  private static class TryCatchContext extends DelegatingContext {
-    Collection<Pair<ITypeBinding, Object>> fCatchNodes = new ArrayList<Pair<ITypeBinding, Object>>();
-
-    TryCatchContext(WalkContext parent, TryStatement tryNode) {
-      super(parent);
-
-      for (Iterator catchIter = tryNode.catchClauses().iterator(); catchIter.hasNext();) {
-        CatchClause c = (CatchClause) catchIter.next();
-        Pair<ITypeBinding, Object> p = Pair.make(c.getException().resolveBinding().getType(), (Object) c);
-
-        fCatchNodes.add(p);
-      }
-    }
-
-    @Override
-    public Collection<Pair<ITypeBinding, Object>> getCatchTargets(ITypeBinding label) {
-      // Look for all matching targets for this thrown type:
-      // if supertpe match, then return only matches at this catch
-      // if subtype match, then matches here and parent matches
-      Collection<Pair<ITypeBinding, Object>> catchNodes = new ArrayList<Pair<ITypeBinding, Object>>();
-
-      for (Iterator<Pair<ITypeBinding, Object>> iter = fCatchNodes.iterator(); iter.hasNext();) {
-        Pair<ITypeBinding, Object> p = (Pair<ITypeBinding, Object>) iter.next();
-        ITypeBinding catchType = (ITypeBinding) p.fst;
-
-        // catchType here should NEVER be FakeExceptionTypeBinary, because these can only be thrown (not caught) by
-        // "1/0", implicit null pointer exceptions, etc.
-        assert !(catchNodes instanceof FakeExceptionTypeBinding) : "catchNodes instanceof FakeExceptionTypeBinary!";
-
-        if (label.isSubTypeCompatible(catchType) || label.isEqualTo(catchType)) {
-          catchNodes.add(p);
-          return catchNodes;
-          // _might_ get caught
-        } else if (catchType.isSubTypeCompatible(label)) {
-          catchNodes.add(p);
-          continue;
-        }
-      }
-      catchNodes.addAll(parent.getCatchTargets(label));
-      return catchNodes;
-    }
-  }
-
-  private class BreakContext extends DelegatingContext {
-    protected final String label;
-
-    private final ASTNode breakTo;
-
-    BreakContext(WalkContext parent, String label, ASTNode breakTo) {
-      super(parent);
-      this.label = label;
-      this.breakTo = breakTo;
-    }
-
-    @Override
-    public ASTNode getBreakFor(String label) {
-      return (label == null || label.equals(this.label)) ? breakTo : super.getBreakFor(label);
-    }
-  }
-
-  private class LoopContext extends BreakContext {
-    private final ASTNode continueTo;
-
-    protected LoopContext(WalkContext parent, String label, ASTNode breakTo, ASTNode continueTo) {
-      super(parent, label, breakTo);
-      this.continueTo = continueTo;
-    }
-
-    @Override
-    public ASTNode getContinueFor(String label) {
-      return (label == null || label.equals(this.label)) ? continueTo : super.getContinueFor(label);
-    }
-  }
-
-  public class MethodContext extends DelegatingContext {
-    private final Map<CAstNode, CAstEntity> fEntities;
-
-    private final Map<ASTNode, String> labelMap = HashMapFactory.make(2);
-
-    public MethodContext(WalkContext parent, Map<CAstNode, CAstEntity> entities) {
-      // constructor did take: pd.procedureInstance(), memberEntities, context
-      super(parent);
-      fEntities = entities;
-    }
-
-    @Override
-    public Map<ASTNode, String> getLabelMap() {
-      return labelMap; // labels are kept within a method.
-    }
-
-    final CAstSourcePositionRecorder fSourceMap = new CAstSourcePositionRecorder();
-
-    final CAstControlFlowRecorder fCFG = new CAstControlFlowRecorder(fSourceMap);
-
-    final CAstNodeTypeMapRecorder fNodeTypeMap = new CAstNodeTypeMapRecorder();
-
-    @Override
-    public CAstControlFlowRecorder cfg() {
-      return fCFG;
-    }
-
-    @Override
-    public void addScopedEntity(CAstNode node, CAstEntity entity) {
-      fEntities.put(node, entity);
-    }
-
-    @Override
-    public CAstSourcePositionRecorder pos() {
-      return fSourceMap;
-    }
-
-    @Override
-    public CAstNodeTypeMapRecorder getNodeTypeMap() {
-      return fNodeTypeMap;
-    }
-
-    @Override
-    public Collection<Pair<ITypeBinding, Object>> getCatchTargets(ITypeBinding label) {
-      // TAGALONG (need fRuntimeExcType)
-      // Why do we seemingly catch a RuntimeException in every method? this won't catch the RuntimeException above where
-      // it is supposed to be caught?
-      Collection<Pair<ITypeBinding, Object>> result = Collections.singleton(Pair.<ITypeBinding, Object> make(fRuntimeExcType,
-          CAstControlFlowMap.EXCEPTION_TO_EXIT));
-      return result;
-    }
-
-    @Override
-    public boolean needLValue() {
-      return false;
-    }
-
-  }
-
-  // ////////////////////////////////////
-  // MAKE NODE VARIATIONS & POSITIONS (BORING)
-  // maybe moved to different file.
-  // makeNode() simply calls Ast.makeNode() and sets the position for the node
-  // ////////////////////////////////////
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, ASTNode n, int kind) {
-    CAstNode cn = Ast.makeNode(kind);
-    setPos(wc, cn, n);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, ASTNode n, int kind, CAstNode c[]) {
-    CAstNode cn = Ast.makeNode(kind, c);
-    setPos(wc, cn, n);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, T pos, int kind, CAstNode c[]) {
-    CAstNode cn = Ast.makeNode(kind, c);
-    wc.pos().setPosition(cn, pos);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, ASTNode n, int kind, CAstNode c1, CAstNode c2) {
-    CAstNode cn = Ast.makeNode(kind, c1, c2);
-    setPos(wc, cn, n);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, ASTNode n, int kind, CAstNode c) {
-    CAstNode cn = Ast.makeNode(kind, c);
-    setPos(wc, cn, n);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, ASTNode n, int kind, CAstNode c1, CAstNode c2, CAstNode c3) {
-    CAstNode cn = Ast.makeNode(kind, c1, c2, c3);
-    setPos(wc, cn, n);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, ASTNode n, int kind, CAstNode c1, CAstNode c2, CAstNode c3, CAstNode c4) {
-    CAstNode cn = Ast.makeNode(kind, c1, c2, c3, c4);
-    setPos(wc, cn, n);
-    return cn;
-  }
-
-  protected CAstNode makeNode(WalkContext wc, CAst Ast, T pos, int kind, CAstNode c1, CAstNode c2, CAstNode c3) {
-    CAstNode cn = Ast.makeNode(kind, c1, c2, c3);
-    wc.pos().setPosition(cn, pos);
-    return cn;
-  }
-
-  protected void setPos(WalkContext wc, CAstNode cn, ASTNode jdtNode) {
-    if (jdtNode != null)
-      wc.pos().setPosition(cn, makePosition(jdtNode));
-  }
-
-  public T makePosition(ASTNode n) {
-    return makePosition(n.getStartPosition(), n.getStartPosition() + n.getLength());
-  }
-
-  public abstract T makePosition(int start, int end);
- 
-  // /////////////////////////////////////////////////////////////////
-  // // ENUM TRANSFORMATION //////////////////////////////////////////
-  // /////////////////////////////////////////////////////////////////
-
-  private static final ArrayList<CAstQualifier> enumQuals = new ArrayList<CAstQualifier>(3);
-  static {
-    enumQuals.add(CAstQualifier.PUBLIC);
-    enumQuals.add(CAstQualifier.STATIC);
-    enumQuals.add(CAstQualifier.FINAL);
-  }
-
-  /**
-   * Only called from createClassDeclaration.
-   * 
-   * @param decl
-   * @param context
-   * @return
-   */
-  private CAstEntity visit(EnumConstantDeclaration decl, WalkContext context) {
-    return new FieldEntity(decl.getName().getIdentifier(), decl.resolveVariable().getType(), enumQuals, makePosition(decl
-        .getStartPosition(), decl.getStartPosition() + decl.getLength()), null);
-  }
-
-  /**
-   * Called only from visitFieldInitNode(node,context)
-   */
-  private CAstNode createEnumConstantDeclarationInit(EnumConstantDeclaration node, WalkContext context) {
-    String hiddenVariableName = (String) node.getProperty("com.ibm.wala.cast.java.translator.jdt.fakeValuesDeclName");
-    if (hiddenVariableName == null) {
-      FieldReference fieldRef = fIdentityMapper.getFieldRef(node.resolveVariable());
-      // We use null to indicate an OBJECT_REF to a static field
-      CAstNode lhsNode = makeNode(context, fFactory, node, CAstNode.OBJECT_REF, makeNode(context, fFactory, null, CAstNode.VOID),
-          fFactory.makeConstant(fieldRef));
-
-      // CONSTRUCT ARGUMENTS & "new MyEnum(...)" statement
-      ArrayList<Object> arguments = new ArrayList<Object>();
-      arguments.add(fFactory.makeConstant(node.getName().getIdentifier())); // name of constant
-      arguments.add(fFactory.makeConstant(node.resolveVariable().getVariableId())); // id
-      arguments.addAll(node.arguments());
-      CAstNode rhsNode = createClassInstanceCreation(node, arguments, node.resolveConstructorBinding(), null, node
-          .getAnonymousClassDeclaration(), context);
-
-      CAstNode assNode = makeNode(context, fFactory, node, CAstNode.ASSIGN, lhsNode, rhsNode);
-
-      return assNode; // their naming, not mine
-    } else {
-
-      // String[] x = (new Direction[] {
-      // NORTH, EAST, SOUTH, WEST, $VALUES, $VALUES$
-      // });
-
-      return null;
-    }
-  }
-
-  private CAstEntity createEnumValueOfMethod(ITypeBinding enumType, WalkContext oldContext) {
-    IMethodBinding met = null, superMet = null;
-    // find our valueOf(String)
-    for (IMethodBinding m : enumType.getDeclaredMethods())
-      if (m.getName().equals("valueOf") && m.getParameterTypes().length == 1
-          && m.getParameterTypes()[0].isEqualTo(ast.resolveWellKnownType("java.lang.String")))
-        met = m;
-    // find Enum.valueOf(Class, String)
-    for (IMethodBinding m : enumType.getSuperclass().getTypeDeclaration().getDeclaredMethods())
-      if (m.getName().equals("valueOf") && m.getParameterTypes().length == 2)
-        superMet = m;
-    assert met != null && superMet != null : "Couldn't find enum values() function in JDT bindings!";
-
-    Map<CAstNode, CAstEntity> memberEntities = new LinkedHashMap<CAstNode, CAstEntity>();
-    final MethodContext context = new MethodContext(oldContext, memberEntities);
-
-    MethodDeclaration fakeMet = ast.newMethodDeclaration();
-    fakeMet.setName(ast.newSimpleName("valueOf"));
-    fakeMet.setSourceRange(-1, 0);
-    fakeMet.setBody(ast.newBlock());
-    SingleVariableDeclaration stringS = ast.newSingleVariableDeclaration();
-    stringS.setName(ast.newSimpleName("s"));
-    fakeMet.parameters().add(stringS);
-
-    // TODO: probably uses reflection so isn't very useful for analyses. Is there something more useful we could put in here?
-    // return (MyEnum)Enum.valueOf(MyEnum.class, s);
-    // cast(call(type_literal, var)))
-
-    CAstNode typeLit = makeNode(context, fFactory, fakeMet, CAstNode.TYPE_LITERAL_EXPR, fFactory.makeConstant(fIdentityMapper
-        .typeToTypeID(enumType)));
-    CAstNode stringSvar = makeNode(context, fFactory, fakeMet, CAstNode.VAR, fFactory.makeConstant("s"), fFactory.makeConstant(fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("java.lang.String"))));
-    ArrayList<Object> args = new ArrayList<Object>();
-    args.add(typeLit);
-    args.add(stringSvar);
-    CAstNode call = createMethodInvocation(fakeMet, superMet, makeNode(context, fFactory, fakeMet, CAstNode.VOID), args, context);
-    CAstNode cast = createCast(fakeMet, call, enumType, superMet.getReturnType(), context);
-    CAstNode bodyNode = makeNode(context, fFactory, fakeMet, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, fakeMet,
-        CAstNode.BLOCK_STMT, makeNode(context, fFactory, fakeMet, CAstNode.RETURN, cast)));
-
-    ArrayList<CAstType> paramTypes = new ArrayList<CAstType>(1);
-    paramTypes.add(fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("java.lang.String")));
-
-    return new ProcedureEntity(bodyNode, fakeMet, enumType, memberEntities, context, paramTypes, enumType, met.getModifiers(), handleAnnotations(met));
-  }
-
-  private CAstEntity createEnumValuesMethod(ITypeBinding enumType, ArrayList<IVariableBinding> constants, WalkContext oldContext) {
-    IMethodBinding met = null;
-    for (IMethodBinding m : enumType.getDeclaredMethods())
-      if (m.getName().equals("values") && m.getParameterTypes().length == 0)
-        met = m;
-    assert met != null : "Couldn't find enum values() function in JDT bindings!";
-
-    Map<CAstNode, CAstEntity> memberEntities = new LinkedHashMap<CAstNode, CAstEntity>();
-    final MethodContext context = new MethodContext(oldContext, memberEntities);
-
-    MethodDeclaration fakeMet = ast.newMethodDeclaration();
-    fakeMet.setName(ast.newSimpleName("values"));
-    fakeMet.setSourceRange(-1, 0);
-    fakeMet.setBody(ast.newBlock());
-
-    // make enum constant values array: new MyEnum() { MYENUMCST1, MYENUMCST2, ... }
-    CAstNode[] eltNodes = new CAstNode[constants.size() + 1];
-    int idx = 0;
-    TypeReference arrayTypeRef = fIdentityMapper.getTypeRef(enumType.createArrayType(1));
-    eltNodes[idx++] = makeNode(context, fFactory, fakeMet, CAstNode.NEW, fFactory.makeConstant(arrayTypeRef), fFactory
-        .makeConstant(constants.size()));
-    for (IVariableBinding cst : constants)
-      eltNodes[idx++] = createFieldAccess(makeNode(context, fFactory, fakeMet, CAstNode.VOID), cst.getName(), cst, fakeMet, context);
-
-    CAstNode bodyNode = makeNode(context, fFactory, fakeMet, CAstNode.LOCAL_SCOPE, makeNode(context, fFactory, fakeMet,
-        CAstNode.BLOCK_STMT, makeNode(context, fFactory, fakeMet, CAstNode.RETURN, makeNode(context, fFactory, fakeMet,
-            CAstNode.ARRAY_LITERAL, eltNodes))));
-
-    ArrayList<CAstType> paramTypes = new ArrayList<CAstType>(0);
-    return new ProcedureEntity(bodyNode, fakeMet, enumType, memberEntities, context, paramTypes, enumType.createArrayType(1), met
-        .getModifiers(), handleAnnotations(enumType));
-  }
-
-  private void doEnumHiddenEntities(ITypeBinding typeBinding, ArrayList<ASTNode> staticInits, List<CAstEntity> memberEntities,
-      WalkContext context) {
-    // PART I: create a $VALUES field
-    // collect constants
-    // ArrayList<String> constants = new ArrayList<String>();
-    // for ( ASTNode n: staticInits )
-    // if ( n instanceof EnumConstantDeclaration )
-    // constants.add(((EnumConstantDeclaration)n).getName().getIdentifier());
-    // figure out a suitable untaken name
-    // String hiddenFieldName = "hidden values field"; // illegal name
-    // // public static final MyEnum[] $VALUES;
-    // memberEntities.add(new FieldEntity(hiddenFieldName,
-    // typeBinding.createArrayType(1), enumQuals,
-    // makePosition(-1,-1)));
-    //
-    // EnumConstantDeclaration fakeValuesDecl = ast.newEnumConstantDeclaration();
-    // // pass along values that we will use in createEnumConstantDeclarationInit() in creating static initializer
-    // fakeValuesDecl.setProperty("com.ibm.wala.cast.java.translator.jdt.fakeValuesDeclName", hiddenFieldName);
-    // fakeValuesDecl.setProperty("com.ibm.wala.cast.java.translator.jdt.fakeValuesDeclConstants", constants);
-    // staticInits.add(fakeValuesDecl);
-
-    ArrayList<IVariableBinding> constants = new ArrayList<IVariableBinding>();
-    for (IVariableBinding var : typeBinding.getDeclaredFields())
-      if (var.isEnumConstant())
-        constants.add(var);
-
-    // constants are unsorted by default
-    Collections.sort(constants, new Comparator<IVariableBinding>() {
-      @Override
-      public int compare(IVariableBinding arg0, IVariableBinding arg1) {
-        return arg0.getVariableId() - arg1.getVariableId();
-      }
-    });
-
-    // PART II: create values()
-    memberEntities.add(createEnumValuesMethod(typeBinding, constants, context));
-
-    // PART III: create valueOf()
-    memberEntities.add(createEnumValueOfMethod(typeBinding, context));
-  }
-
-  private CAstEntity visit(EnumDeclaration n, WalkContext context) {
-
-    // JDT contains correct type info / class / subclass info for the enum
-    return createClassDeclaration(n, n.bodyDeclarations(), n.enumConstants(), n.resolveBinding(), n.getName().getIdentifier(), n
-        .resolveBinding().getModifiers(), false, false, context);
-  }
-
-  /**
-   * @param n for positioning.
-   */
-  private CAstEntity createEnumConstructorWithParameters(IMethodBinding ctor, ASTNode n, WalkContext oldContext,
-      ArrayList<ASTNode> inits, MethodDeclaration nonDefaultCtor) {
-    // PART I: find super ctor to call
-    ITypeBinding newType = ctor.getDeclaringClass();
-    ITypeBinding javalangenumType = newType.getSuperclass();
-    IMethodBinding superCtor = null;
-
-    if (newType.isEnum()) {
-      for (IMethodBinding met : javalangenumType.getDeclaredMethods())
-        if (met.isConstructor()) {
-          superCtor = met;
-          break;
-        }
-    }
-
-    assert superCtor != null : "enum";
-
-    // PART II: make ctor with simply "super(a,b,c...)"
-    // TODO: extra CAstNodes
-    final Map<CAstNode, CAstEntity> memberEntities = new LinkedHashMap<CAstNode, CAstEntity>();
-    final MethodContext context = new MethodContext(oldContext, memberEntities);
-    MethodDeclaration fakeCtor = ast.newMethodDeclaration();
-    fakeCtor.setConstructor(true);
-    fakeCtor.setSourceRange(n.getStartPosition(), n.getLength());
-    fakeCtor.setBody(ast.newBlock());
-
-    // PART IIa: make a fake JDT constructor method with the proper number of args
-    // Make fake args that will be passed
-    String[] fakeArguments = new String[3 + ctor.getParameterTypes().length];
-    if (nonDefaultCtor == null) {
-      for (int i = 3; i < fakeArguments.length; i++)
-        fakeArguments[i] = "__wala_jdtcast_argument" + i; // this is in the case of an anonymous class with parameters, eg NORTH in
-                                                          // the following example: public enum A { NORTH("south") { ...} A(String
-                                                          // s){} }
-    } else {
-      for (int i = 3; i < fakeArguments.length; i++)
-        fakeArguments[i] = ((SingleVariableDeclaration) nonDefaultCtor.parameters().get(i - 3)).getName().getIdentifier();
-    }
-
-    ArrayList<CAstType> paramTypes = new ArrayList<CAstType>(superCtor.getParameterTypes().length);
-    fakeArguments[0] = "this";
-    fakeArguments[1] = "__wala_jdtcast_argument1"; // TODO FIXME: change to invalid name in the case that nonDefaultCtor != null
-    fakeArguments[2] = "__wala_jdtcast_argument2"; // otherwise there will be conflicts if we name our variable
-                                                   // __wala_jdtcast_argument1!!!
-    for (int i = 1; i < fakeArguments.length; i++) {
-      // the name
-      SingleVariableDeclaration svd = ast.newSingleVariableDeclaration();
-      svd.setName(ast.newSimpleName(fakeArguments[i]));
-      fakeCtor.parameters().add(svd);
-
-      // the type
-      if (i == 1)
-        paramTypes.add(fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("java.lang.String")));
-      else if (i == 2)
-        paramTypes.add(fTypeDict.getCAstTypeFor(ast.resolveWellKnownType("int")));
-      else
-        paramTypes.add(fTypeDict.getCAstTypeFor(ctor.getParameterTypes()[i - 3]));
-    }
-
-    // PART IIb: create the statements in the constructor
-    // one super() call plus the inits
-    CAstNode[] bodyNodes;
-    if (nonDefaultCtor == null)
-      bodyNodes = new CAstNode[inits.size() + 1];
-    else
-      bodyNodes = new CAstNode[inits.size() + 2];
-
-    // make super(...) call
-    // this, call ref, args
-    CAstNode[] children;
-    if (ctor.isDefaultConstructor())
-      children = new CAstNode[4 + ctor.getParameterTypes().length]; // anonymous class' implicit constructors call constructors with
-                                                                    // more than standard two enum args
-    else
-      children = new CAstNode[4]; // explicit constructor
-    children[0] = makeNode(context, fFactory, n, CAstNode.SUPER);
-    CallSiteReference callSiteRef = CallSiteReference.make(0, fIdentityMapper.getMethodRef(superCtor),
-        IInvokeInstruction.Dispatch.SPECIAL);
-    children[1] = fFactory.makeConstant(callSiteRef);
-    children[2] = makeNode(context, fFactory, n, CAstNode.VAR, fFactory.makeConstant(fakeArguments[1]), fFactory.makeConstant(paramTypes.get(0)));
-    children[3] = makeNode(context, fFactory, n, CAstNode.VAR, fFactory.makeConstant(fakeArguments[2]), fFactory.makeConstant(paramTypes.get(1)));
-
-    if (ctor.isDefaultConstructor())
-      for (int i = 0; i < ctor.getParameterTypes().length; i++)
-        children[i + 4] = makeNode(context, fFactory, n, CAstNode.VAR, fFactory.makeConstant(fakeArguments[i + 3]), fFactory.makeConstant(paramTypes.get(i+2)));
-
-    bodyNodes[0] = makeNode(context, fFactory, n, CAstNode.CALL, children);
-    // QUESTION: no handleExceptions?
-
-    for (int i = 0; i < inits.size(); i++)
-      bodyNodes[i + 1] = visitFieldInitNode(inits.get(i), context);
-
-    if (nonDefaultCtor != null)
-      bodyNodes[bodyNodes.length - 1] = visitNode(nonDefaultCtor.getBody(), context);
-
-    // finally, make the procedure entity
-    CAstNode ast = makeNode(context, fFactory, n, CAstNode.BLOCK_STMT, bodyNodes);
-    return new ProcedureEntity(ast, fakeCtor, newType, memberEntities, context, paramTypes, null, handleAnnotations(ctor));
-
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTSourceLoaderImpl.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTSourceLoaderImpl.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTSourceLoaderImpl.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTSourceLoaderImpl.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,24 +37,21 @@
  */
 package com.ibm.wala.cast.java.translator.jdt;
 
-import java.io.IOException;
-
 import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl;
 import com.ibm.wala.cast.java.translator.SourceModuleTranslator;
 import com.ibm.wala.classLoader.IClassLoader;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.util.config.SetOfClasses;
 
 public class JDTSourceLoaderImpl extends JavaSourceLoaderImpl {
   private final boolean dump;
 
-  public JDTSourceLoaderImpl(ClassLoaderReference loaderRef, IClassLoader parent, SetOfClasses exclusions, IClassHierarchy cha) throws IOException {
-    this(loaderRef, parent, exclusions, cha, false);
+  public JDTSourceLoaderImpl(ClassLoaderReference loaderRef, IClassLoader parent, IClassHierarchy cha) {
+    this(loaderRef, parent, cha, false);
   }
   
-  public JDTSourceLoaderImpl(ClassLoaderReference loaderRef, IClassLoader parent, SetOfClasses exclusions, IClassHierarchy cha, boolean dump) throws IOException {
-    super(loaderRef, parent, exclusions, cha);
+  public JDTSourceLoaderImpl(ClassLoaderReference loaderRef, IClassLoader parent, IClassHierarchy cha, boolean dump) {
+    super(loaderRef, parent, cha);
     this.dump = dump;
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTSourceModuleTranslator.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTSourceModuleTranslator.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTSourceModuleTranslator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTSourceModuleTranslator.java	2019-01-29 17:08:39.000000000 +0000
@@ -39,7 +39,6 @@
 
 import java.io.File;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -66,6 +65,7 @@
 import com.ibm.wala.ide.util.JdtPosition;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.util.config.SetOfClasses;
 import com.ibm.wala.util.debug.Assertions;
 
 /**
@@ -87,7 +87,7 @@
     public void acceptAST(ICompilationUnit source, CompilationUnit ast) {
 
       try {
-        JDTJava2CAstTranslator jdt2cast = makeCAstTranslator(ast, proj.getValue().get(source).getIFile(), source.getUnderlyingResource().getLocation().toOSString());
+        JDTJava2CAstTranslator<JdtPosition> jdt2cast = makeCAstTranslator(ast, proj.getValue().get(source).getIFile(), source.getUnderlyingResource().getLocation().toOSString());
         final Java2IRTranslator java2ir = makeIRTranslator();
         java2ir.translate(proj.getValue().get(source), jdt2cast.translateToCAst());
       } catch (JavaModelException e) {
@@ -98,13 +98,13 @@
         IProblem[] problems = ast.getProblems();
         int length = problems.length;
         if (length > 0) {
-          StringBuffer buffer = new StringBuffer();
+          StringBuilder buffer = new StringBuilder();
           for (int i = 0; i < length; i++) {
             buffer.append(problems[i].getMessage());
             buffer.append('\n');
           }
           if (length != 0)
-            System.err.println("Unexpected problems in " + source.getElementName() + buffer.toString());
+            System.err.println("Unexpected problems in " + source.getElementName() + buffer);
         }
       }
     }
@@ -112,7 +112,8 @@
 
   protected boolean dump;
   protected JDTSourceLoaderImpl sourceLoader;
-
+  private final SetOfClasses exclusions;
+  
   public JDTSourceModuleTranslator(AnalysisScope scope, JDTSourceLoaderImpl sourceLoader) {
     this(scope, sourceLoader, false);
   }
@@ -121,19 +122,18 @@
     computeClassPath(scope);
     this.sourceLoader = sourceLoader;
     this.dump = dump;
+    this.exclusions = scope.getExclusions();
   }
 
-  private void computeClassPath(AnalysisScope scope) {
-    StringBuffer buf = new StringBuffer();
+  private static void computeClassPath(AnalysisScope scope) {
+    StringBuilder buf = new StringBuilder();
 
     ClassLoaderReference cl = scope.getApplicationLoader();
 
     while (cl != null) {
       List<Module> modules = scope.getModules(cl);
 
-      for (Iterator<Module> iter = modules.iterator(); iter.hasNext();) {
-        Module m = iter.next();
-
+      for (Module m : modules) {
         if (buf.length() > 0)
           buf.append(File.pathSeparator);
         if (m instanceof JarFileModule) {
@@ -161,7 +161,7 @@
     // TODO: group by project and send 'em in
 
     // sort files into projects
-    Map<IProject, Map<ICompilationUnit,EclipseSourceFileModule>> projectsFiles = new HashMap<IProject, Map<ICompilationUnit,EclipseSourceFileModule>>();
+    Map<IProject, Map<ICompilationUnit,EclipseSourceFileModule>> projectsFiles = new HashMap<>();
     for (ModuleEntry m : modules) {
       assert m instanceof EclipseSourceFileModule : "Expecing EclipseSourceFileModule, not " + m.getClass();
       EclipseSourceFileModule entry = (EclipseSourceFileModule) m;
@@ -172,23 +172,23 @@
       projectsFiles.get(proj).put(JavaCore.createCompilationUnitFrom(entry.getIFile()), entry);
     }
 
-    final ASTParser parser = ASTParser.newParser(AST.JLS8);
+    @SuppressWarnings("deprecation") final ASTParser parser = ASTParser.newParser(AST.JLS8);
  
     for (final Map.Entry<IProject,Map<ICompilationUnit,EclipseSourceFileModule>> proj : projectsFiles.entrySet()) {
       parser.setProject(JavaCore.create(proj.getKey()));
       parser.setResolveBindings(true);
  
       Set<ICompilationUnit> units = proj.getValue().keySet();
-      parser.createASTs(units.toArray(new ICompilationUnit[units.size()]), new String[0], new JdtAstToIR(proj), null);
+      parser.createASTs(units.toArray(new ICompilationUnit[0]), new String[0], new JdtAstToIR(proj), null);
 
     }
   }
 
   protected Java2IRTranslator makeIRTranslator() {
-    return new Java2IRTranslator(sourceLoader);
+    return new Java2IRTranslator(sourceLoader, exclusions);
   }
 
-  protected JDTJava2CAstTranslator makeCAstTranslator(CompilationUnit cu, final IFile sourceFile, String fullPath) {
+  protected JDTJava2CAstTranslator<JdtPosition> makeCAstTranslator(CompilationUnit cu, final IFile sourceFile, String fullPath) {
     return new JDTJava2CAstTranslator<JdtPosition>(sourceLoader, cu, fullPath, false, dump) {
       @Override
       public JdtPosition makePosition(int start, int end) {
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,197 +0,0 @@
-/*
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html.
- * 
- * This file is a derivative of code released by the University of
- * California under the terms listed below.  
- *
- * WALA JDT Frontend is Copyright (c) 2008 The Regents of the
- * University of California (Regents). Provided that this notice and
- * the following two paragraphs are included in any distribution of
- * Refinement Analysis Tools or its derivative work, Regents agrees
- * not to assert any of Regents' copyright rights in Refinement
- * Analysis Tools against recipient for recipient's reproduction,
- * preparation of derivative works, public display, public
- * performance, distribution or sublicensing of Refinement Analysis
- * Tools and derivative works, in source code and object code form.
- * This agreement not to assert does not confer, by implication,
- * estoppel, or otherwise any license or rights in any intellectual
- * property of Regents, including, but not limited to, any patents
- * of Regents or Regents' employees.
- * 
- * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
- * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
- * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
- * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *   
- * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
- * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
- * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
- * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
- * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-package com.ibm.wala.cast.java.translator.jdt;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-
-import com.ibm.wala.cast.java.types.JavaPrimitiveTypeMap;
-import com.ibm.wala.cast.java.types.JavaType;
-import com.ibm.wala.cast.tree.CAstQualifier;
-import com.ibm.wala.cast.tree.CAstType;
-import com.ibm.wala.cast.tree.impl.CAstTypeDictionaryImpl;
-import com.ibm.wala.util.debug.Assertions;
-
-public class JDTTypeDictionary extends CAstTypeDictionaryImpl {
-
-  // TODO: better way of getting type "ObjecT" that doesn't require us to keep AST? although this is similar to
-  // polyglot.
-  protected final AST fAst; // TAGALONG
-
-  protected final JDTIdentityMapper fIdentityMapper; // TAGALONG
-
-  /**
-   * 
-   * @param ast Needed to get root type "java.lang.Object"
-   * @param translator
-   */
-  public JDTTypeDictionary(AST ast, JDTIdentityMapper identityMapper) {
-    fAst = ast;
-    fIdentityMapper = identityMapper;
-  }
-
-  @Override
-  public CAstType getCAstTypeFor(Object astType) {
-
-    ITypeBinding jdtType = JDT2CAstUtils.getErasedType((ITypeBinding) astType, fAst);
-
-    CAstType type = super.getCAstTypeFor(astType); // check cache first
-    // Handle the case where we haven't seen an AST decl for some type before
-    // processing a reference. This can certainly happen with classes in byte-
-    // code libraries, for which we never see an AST decl.
-    // In this case, just create a new type and return that.
-    if (type == null) {
-
-      if (jdtType.isClass() || jdtType.isEnum() || jdtType.isInterface()) // in JDT interfaces are not classes
-        type = new JdtJavaType(jdtType);
-      else if (jdtType.isPrimitive()) {
-        type = JavaPrimitiveTypeMap.lookupType(jdtType.getName());
-      } else if (jdtType.isArray()) {
-        type = new JdtJavaArrayType(jdtType);
-      } else
-        Assertions.UNREACHABLE("getCAstTypeFor() passed type that is not primitive, array, or class?");
-      super.map(astType, type); // put in cache
-    }
-    return type;
-  }
-
-  private final class JdtJavaArrayType implements CAstType.Array {
-    private final ITypeBinding fEltJdtType;
-
-    private final CAstType fEltCAstType;
-
-    private JdtJavaArrayType(ITypeBinding arrayType) {
-      super();
-      fEltJdtType = arrayType.getComponentType();
-      fEltCAstType = getCAstTypeFor(fEltJdtType);
-    }
-
-    @Override
-    public int getNumDimensions() {
-      return 1; // always 1 for Java
-    }
-
-    @Override
-    public CAstType getElementType() {
-      return fEltCAstType;
-    }
-
-    @Override
-    public String getName() {
-      return "[" + fEltCAstType.getName();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Collection getSupertypes() {
-      if (fEltJdtType.isPrimitive())
-        return Collections.singleton(getCAstTypeFor(fAst.resolveWellKnownType("java.lang.Object")));
-      // TODO: there is no '.isReference()' as in Polyglot: is this right? enum? I think if it's another array it will
-      // just ignore it
-      // TEST DOUBLE ARRAYS! and maybe ask someone?
-      assert fEltJdtType.isArray() || fEltJdtType.isClass() : "Non-primitive, non-reference array element type!";
-      Collection<CAstType> supers = new ArrayList<CAstType>();
-      for (ITypeBinding type : fEltJdtType.getInterfaces()) {
-        supers.add(getCAstTypeFor(type));
-      }
-      if (fEltJdtType.getSuperclass() != null)
-        supers.add(getCAstTypeFor(fEltJdtType.getSuperclass()));
-      return supers;
-    }
-  }
-
-  public final class JdtJavaType implements JavaType {
-    private final ITypeBinding fType;
-
-    private Collection<CAstType> fSuperTypes = null;
-
-    @Override
-    public String toString() {
-      return super.toString() + ":" + getName();
-    }
-
-    public JdtJavaType(ITypeBinding type) {
-      super();
-      fType = type;
-    }
-
-    @Override
-    public String getName() {
-      return fIdentityMapper.getTypeRef(fType).getName().toString();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Collection getSupertypes() {
-      if (fSuperTypes == null) {
-        buildSuperTypes();
-      }
-      return fSuperTypes;
-    }
-
-    private void buildSuperTypes() {
-      // TODO this is a source entity, but it might actually be the root type
-      // (Object), so assume # intfs + 1
-      ITypeBinding superType = (fType.getSuperclass() == null) ? fAst.resolveWellKnownType("java.lang.Object") : fType
-          .getSuperclass();
-      int N = fType.getInterfaces().length + 1;
-
-      fSuperTypes = new ArrayList<CAstType>(N);
-      // Following assumes that noone can call getSupertypes() before we have
-      // created CAstType's for every type in the program being analyzed.
-      fSuperTypes.add(getCAstTypeFor(superType));
-      for (ITypeBinding t : fType.getInterfaces())
-        fSuperTypes.add(getCAstTypeFor(t));
-    }
-
-    @Override
-    public Collection<CAstQualifier> getQualifiers() {
-      return JDT2CAstUtils.mapModifiersToQualifiers(fType.getModifiers(), fType.isInterface(), fType.isAnnotation());
-    }
-
-    @Override
-    public boolean isInterface() {
-      return fType.isInterface();
-    }
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/AbstractJavaAnalysisAction.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/AbstractJavaAnalysisAction.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/AbstractJavaAnalysisAction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/AbstractJavaAnalysisAction.java	2019-01-29 17:08:39.000000000 +0000
@@ -40,6 +40,7 @@
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 
 /**
@@ -81,14 +82,12 @@
     if (selection == null) {
       throw new IllegalArgumentException("null selection");
     }
-    final Collection<EclipseProjectPath> projectPaths = new LinkedList<EclipseProjectPath>();
+    final Collection<EclipseProjectPath<?, ?>> projectPaths = new LinkedList<>();
     Job job = new Job("Compute project paths") {
 
-      @SuppressWarnings("unchecked")
       @Override
       protected IStatus run(IProgressMonitor monitor) {
-        for (Iterator it = selection.iterator(); it.hasNext();) {
-          Object object = it.next();
+        for (Object object : Iterator2Iterable.make((Iterator<?>) selection.iterator())) {
           if (object instanceof IJavaElement) {
             IJavaElement e = (IJavaElement) object;
             IJavaProject jp = e.getJavaProject();
@@ -134,12 +133,10 @@
   /**
    * compute the java projects represented by the current selection
    */
-  @SuppressWarnings("unchecked")
   protected Collection<IJavaProject> computeJavaProjects() {
     IStructuredSelection selection = (IStructuredSelection) currentSelection;
     Collection<IJavaProject> projects = HashSetFactory.make();
-    for (Iterator it = selection.iterator(); it.hasNext();) {
-      Object object = it.next();
+    for (Object object : Iterator2Iterable.make((Iterator<?>) selection.iterator())) {
       if (object instanceof IJavaElement) {
         IJavaElement e = (IJavaElement) object;
         IJavaProject jp = e.getJavaProject();
@@ -154,7 +151,7 @@
   /**
    * create an analysis scope as the union of a bunch of EclipseProjectPath
    */
-  private static AnalysisScope mergeProjectPaths(Collection<EclipseProjectPath> projectPaths) throws IOException {
+  private static AnalysisScope mergeProjectPaths(Collection<EclipseProjectPath<?, ?>> projectPaths) throws IOException {
     AnalysisScope scope = AnalysisScope.createJavaAnalysisScope();
 
     Collection<Module> seen = HashSetFactory.make();
@@ -175,9 +172,9 @@
    * @param scope the {@link AnalysisScope} under construction. This will be mutated.
    * @param seen set of {@link Module}s which have already been seen, and should not be added to the analysis scope
    */
-  private static void buildScope(ClassLoaderReference loader, Collection<EclipseProjectPath> projectPaths, AnalysisScope scope,
+  private static void buildScope(ClassLoaderReference loader, Collection<EclipseProjectPath<?, ?>> projectPaths, AnalysisScope scope,
       Collection<Module> seen) throws IOException {
-    for (EclipseProjectPath path : projectPaths) {
+    for (EclipseProjectPath<?, ?> path : projectPaths) {
       AnalysisScope pScope = path.toAnalysisScope((File) null);
       for (Module m : pScope.getModules(loader)) {
         if (!seen.contains(m)) {
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/ASTNodeFinder.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/ASTNodeFinder.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/ASTNodeFinder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/ASTNodeFinder.java	2019-01-29 17:08:39.000000000 +0000
@@ -28,7 +28,7 @@
 	public ASTNode getASTNode(JdtPosition pos) {
 		IFile sourceFile = pos.getEclipseFile();
 		if (!fileASTs.containsKey(sourceFile) || fileASTs.get(sourceFile).get() == null) {
-			fileASTs.put(sourceFile, new SoftReference<ASTNode>(getAST(sourceFile)));
+			fileASTs.put(sourceFile, new SoftReference<>(getAST(sourceFile)));
 		}
 		
 		return getOriginalNode(fileASTs.get(sourceFile).get(), pos);
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JavaEclipseProjectPath.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JavaEclipseProjectPath.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JavaEclipseProjectPath.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JavaEclipseProjectPath.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,7 +14,6 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
-import java.util.jar.JarFile;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
@@ -23,14 +22,10 @@
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.launching.JREContainer;
-import org.eclipse.jdt.launching.JavaRuntime;
 
 import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
 import com.ibm.wala.classLoader.BinaryDirectoryTreeModule;
-import com.ibm.wala.classLoader.JarFileModule;
 import com.ibm.wala.classLoader.Module;
-import com.ibm.wala.properties.WalaProperties;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.util.collections.MapUtil;
 import com.ibm.wala.util.debug.Assertions;
@@ -52,8 +47,7 @@
 		}
 	}
 	
-  protected JavaEclipseProjectPath(com.ibm.wala.ide.util.EclipseProjectPath.AnalysisScopeType scopeType)
-      throws IOException, CoreException {
+  protected JavaEclipseProjectPath(com.ibm.wala.ide.util.EclipseProjectPath.AnalysisScopeType scopeType) {
     super(scopeType);
   }
 
@@ -83,7 +77,8 @@
   @Override
   protected void resolveClasspathEntry(IJavaProject project, IClasspathEntry entry, ILoader loader, boolean includeSource, boolean cpeFromMainProject) {
 	  entry = JavaCore.getResolvedClasspathEntry(entry);
-	  switch (entry.getEntryKind()) {
+	  final int entryKind = entry.getEntryKind();
+    switch (entryKind) {
 	  case IClasspathEntry.CPE_SOURCE: {
 		  resolveSourcePathEntry(includeSource? JavaSourceLoader.SOURCE: Loader.APPLICATION, includeSource, cpeFromMainProject, entry.getPath(), entry.getOutputLocation(), entry.getExclusionPatterns()
 , "java");
@@ -94,7 +89,7 @@
 		  break;
 	  }
 	  case IClasspathEntry.CPE_PROJECT: {
-		  resolveProjectPathEntry(loader, includeSource, entry.getPath());
+		  resolveProjectPathEntry(includeSource, entry.getPath());
 		  break;
 	  }
 	  case IClasspathEntry.CPE_CONTAINER: {
@@ -107,7 +102,10 @@
 			  System.err.println(e);
 			  Assertions.UNREACHABLE();
 		  }
+		  break;
 	  }
+    default:
+      throw new UnsupportedOperationException(String.format("unexpected classpath entry kind %s", entryKind));
 	  }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JdtPosition.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JdtPosition.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JdtPosition.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JdtPosition.java	2019-01-29 17:08:39.000000000 +0000
@@ -100,7 +100,7 @@
 
     @Override
     public String toString() {
-      return "[offset " + firstOffset + ":" + lastOffset + "]";
+      return "[offset " + firstOffset + ':' + lastOffset + ']';
     }
     
     public IFile getEclipseFile() {
@@ -124,4 +124,4 @@
 		return firstOffset + 12432*lastOffset;
 	}
     
-  }
\ No newline at end of file
+  }
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JdtUtil.java wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JdtUtil.java
--- wala-1.3.9/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JdtUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt/source/com/ibm/wala/ide/util/JdtUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.ide.util;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -97,7 +98,7 @@
     ICompilationUnit cu = (ICompilationUnit) type.getParent();
     String packageName = getPackageName(cu);
     String className = type.getElementName();
-    String fullyQName = packageName + "." + className;
+    String fullyQName = packageName + '.' + className;
     return fullyQName;
   }
 
@@ -114,9 +115,8 @@
    * used as a handle to create JavaElement by 'JavaCore.create(String)'
    * 
    * For example, suppose we have the method 'fooPackage.barPackage.FooClass.fooMethod(int)' which is in the 'FooProject' and source
-   * folder 'src' the handle would be '=FooProject/src<fooPackage.barPackage{FooClass.java[FooClass~fooMethod~I'
+   * folder 'src' the handle would be '=FooProject/src&lt;fooPackage.barPackage{FooClass.java[FooClass~fooMethod~I'
    * 
-   * @param javaElt
    * @throws IllegalArgumentException if javaElt is null
    */
   public static String getJdtHandleString(IJavaElement javaElt) {
@@ -311,7 +311,7 @@
       // and failed. implementing a miserable hack instead.
       // Need to consult a guru to figure out how to do this.
       try {
-        List<IMethod> matches = new ArrayList<IMethod>();
+        List<IMethod> matches = new ArrayList<>();
         Collection<String> typeParameterNames = getTypeParameterNames(type);
         METHODS: for (IMethod x : type.getMethods()) {
           if (x.getElementName().equals(name)) {
@@ -370,7 +370,7 @@
         return result;
       }
     } catch (StringIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid selector: " + selector);
+      throw new IllegalArgumentException("invalid selector: " + selector, e);
     }
   }
 
@@ -389,7 +389,7 @@
         throw new IllegalArgumentException("invalid descriptor: " + d);
       }
 
-      ArrayList<String> sigs = new ArrayList<String>(10);
+      ArrayList<String> sigs = new ArrayList<>(10);
 
       int i = 1;
       while (true) {
@@ -444,7 +444,7 @@
           do {
             c = d.charAt(i++);
           } while (c != ',' && c != ')');
-          sigs.add("L" + d.substring(off, i - 1) + ";");
+          sigs.add('L' + d.substring(off, i - 1) + ';');
 
           if (c == ')') {
             return toArray(sigs);
@@ -455,7 +455,7 @@
         }
       }
     } catch (StringIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("error parsing selector " + selector);
+      throw new IllegalArgumentException("error parsing selector " + selector, e);
     }
   }
 
@@ -505,7 +505,7 @@
     if (kludge.size() == 1) {
       return (IMethod) kludge.iterator().next();
     } else {
-      System.err.println("RETURNED " + kludge.size() + " " + kludge);
+      System.err.println("RETURNED " + kludge.size() + ' ' + kludge);
       return null;
     }
   }
@@ -519,9 +519,7 @@
       Collection<IMethod> result = HashSetFactory.make();
       for (IType type : getClasses((ICompilationUnit) elt)) {
         try {
-          for (IMethod m : type.getMethods()) {
-            result.add(m);
-          }
+          result.addAll(Arrays.asList(type.getMethods()));
         } catch (JavaModelException e) {
           e.printStackTrace();
         }
@@ -578,7 +576,7 @@
   }
 
   public static ASTNode getAST(IFile javaSourceFile) {
-	  ASTParser parser = ASTParser.newParser(AST.JLS3);
+	  @SuppressWarnings("deprecation") ASTParser parser = ASTParser.newParser(AST.JLS3);
 	  parser.setSource(JavaCore.createCompilationUnitFrom(javaSourceFile));
 	  parser.setProject(JavaCore.create(javaSourceFile.getProject()));
 	  parser.setResolveBindings(true);
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/build.gradle wala-1.5.1/com.ibm.wala.ide.jdt.test/build.gradle
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,39 @@
+sourceSets.test {
+	java.srcDirs = ['source']
+	resources.srcDirs = ['testdata']
+}
+
+dependencies {
+	testCompile(
+		'eclipse-deps:org.eclipse.core.runtime:+',
+		'eclipse-deps:org.eclipse.jdt.core:+',
+		'eclipse-deps:org.eclipse.osgi:+',
+		'junit:junit:4.12',
+		'org.osgi:org.osgi.core:4.2.0',
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.cast.java'),
+		project(':com.ibm.wala.cast.java.ecj'),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.ide'),
+		project(':com.ibm.wala.ide.jdt'),
+		project(':com.ibm.wala.shrike'),
+		project(':com.ibm.wala.util'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.cast.java.test'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.ide.tests'),
+		)
+	testRuntime(
+		'eclipse-deps:org.eclipse.core.contenttype:+',
+		'eclipse-deps:org.eclipse.equinox.preferences:+',
+		)
+}
+
+test {
+	maxHeapSize = '1200M'
+
+	// https://github.com/liblit/WALA/issues/5
+	exclude '**/JDTJava15IRTests.class'
+	exclude '**/JDTJavaIRTests.class'
+
+	workingDir project(':com.ibm.wala.cast.java.test.data').projectDir
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/build.properties wala-1.5.1/com.ibm.wala.ide.jdt.test/build.properties
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,6 +1,9 @@
 source.. = source/,\
-           data/
+           testdata/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
-jre.compilation.profile = JavaSE-1.7
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
+jre.compilation.profile = JavaSE-1.8
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/.classpath wala-1.5.1/com.ibm.wala.ide.jdt.test/.classpath
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="source"/>
-	<classpathentry kind="src" path="data"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/launchers/#com.ibm.wala.ide.jdt.test.launch# wala-1.5.1/com.ibm.wala.ide.jdt.test/launchers/#com.ibm.wala.ide.jdt.test.launch#
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/launchers/#com.ibm.wala.ide.jdt.test.launch#	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/launchers/#com.ibm.wala.ide.jdt.test.launch#	2019-01-29 17:08:39.000000000 +0000
@@ -40,9 +40,9 @@
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
 <setAttribute key="selected_features">
-<setEntry value="com.ibm.wala-feature:default"/>
-<setEntry value="com.ibm.wala.ide-feature:default"/>
-<setEntry value="com.ibm.wala.tests-feature:default"/>
+<setEntry value="com.ibm.wala_feature:default"/>
+<setEntry value="com.ibm.wala.ide_feature:default"/>
+<setEntry value="com.ibm.wala.tests_feature:default"/>
 <setEntry value="com.ibm.wala.tests.ide:default"/>
 <setEntry value="org.eclipse.e4.rcp:default"/>
 <setEntry value="org.eclipse.ecf.core.feature:default"/>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/launchers/ECJJavaIRTest.launch wala-1.5.1/com.ibm.wala.ide.jdt.test/launchers/ECJJavaIRTest.launch
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/launchers/ECJJavaIRTest.launch	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/launchers/ECJJavaIRTest.launch	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/ECJJavaIRTest.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.java.test.ECJJavaIRTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.ide.jdt.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:com.ibm.wala.cast.java.test.data}"/>
+</launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/launchers/JDTJava15IRTests.launch wala-1.5.1/com.ibm.wala.ide.jdt.test/launchers/JDTJava15IRTests.launch
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/launchers/JDTJava15IRTests.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/launchers/JDTJava15IRTests.launch	2019-01-29 17:08:39.000000000 +0000
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<setAttribute key="additional_plugins">
-<setEntry value="com.ibm.wala.ide.jdt.test:1.3.4.qualifier:default:true"/>
-</setAttribute>
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bad_container_name" value="/com.ibm.wala.cast.java..jdt.test/launchers"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<stringAttribute key="deselected_workspace_plugins" value="NewAtomicSetsBuilder,com.ibm.appscan.jstaint,com.ibm.appscan.jstaint.analysis.ap,com.ibm.appscan.jstaint.exceptions,com.ibm.appscan.jstaint.harness,com.ibm.appscan.jstaint.hybridapps,com.ibm.appscan.jstaint.rules,com.ibm.appscan.jstaint.util,com.ibm.appscan.jstaint.util.logging,com.ibm.wala.andromeda.js.tests,com.ibm.wala.andromeda.rules,com.ibm.wala.andromeda.util,com.ibm.wala.cast.java.polyglot,com.ibm.wala.cast.java.polyglot.test,com.ibm.wala.cast.java.test.data,com.ibm.wala.cast.js,com.ibm.wala.cast.js.html.nu_validator,com.ibm.wala.cast.js.jsir,com.ibm.wala.cast.js.rhino,com.ibm.wala.cast.js.rhino.test,com.ibm.wala.cast.js.test,com.ibm.wala.cast.js.test.data,com.ibm.wala.core.testdata.java8,com.ibm.wala.dalvik,com.ibm.wala.dalvik.test,com.ibm.wala.dotnet,com.ibm.wala.dotnet.ikvm,com.ibm.wala.dotnet.test,com.ibm.wala.eventRacer,com.ibm.wala.ide.jsdt,com.ibm.wala.ide.jsdt.tests,com.ibm.wala.jstaint.rules,com.ibm.wala.jstaint.util,com.ibm.wala.memsat,com.ibm.wala.memsat.jdt.test,com.ibm.wala.memsat.test,com.ibm.wala.memsat.testdata,com.ibm.wala.memsat.tests.internal,com.ibm.wala.scandroid,com.ibm.wala.worklight,com.ibm.wala.worklight.rules"/>
-<stringAttribute key="featureDefaultLocation" value="workspace"/>
-<stringAttribute key="featurePluginResolution" value="workspace"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.java.test.JDTJava15IRTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.ide.jdt.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.ibm.wala.tracefile=/tmp/jdt15tests.txt -Xmx1024M -XX:MaxPermSize=256M -ea"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="false"/>
-<setAttribute key="selected_features">
-<setEntry value="com.ibm.wala-feature:default"/>
-<setEntry value="com.ibm.wala.ide-feature:default"/>
-<setEntry value="com.ibm.wala.tests-feature:default"/>
-<setEntry value="com.ibm.wala.tests.ide:default"/>
-</setAttribute>
-<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.logback.appender@default:false,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.platform@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xsd@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.ibm.wala.cast.java.test@default:default,com.ibm.wala.cast.java@default:default,com.ibm.wala.cast.test@default:default,com.ibm.wala.cast@default:default,com.ibm.wala.core.testdata@default:default,com.ibm.wala.core.tests@default:default,com.ibm.wala.core@default:default,com.ibm.wala.ide.jdt.test@default:default,com.ibm.wala.ide.jdt@default:default,com.ibm.wala.ide.tests@default:default,com.ibm.wala.ide@default:default,com.ibm.wala.shrike@default:default,com.ibm.wala.util@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
+    <setAttribute key="additional_plugins">
+        <setEntry value="com.ibm.wala.ide.jdt.test:1.3.4.qualifier:default:true"/>
+    </setAttribute>
+    <booleanAttribute key="append.args" value="true"/>
+    <booleanAttribute key="askclear" value="false"/>
+    <booleanAttribute key="automaticAdd" value="true"/>
+    <booleanAttribute key="automaticValidate" value="false"/>
+    <stringAttribute key="bad_container_name" value="/com.ibm.wala.cast.java..jdt.test/launchers"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="true"/>
+    <booleanAttribute key="clearws" value="true"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+    <booleanAttribute key="default" value="true"/>
+    <stringAttribute key="deselected_workspace_plugins" value="NewAtomicSetsBuilder,com.ibm.appscan.jstaint,com.ibm.appscan.jstaint.analysis.ap,com.ibm.appscan.jstaint.exceptions,com.ibm.appscan.jstaint.harness,com.ibm.appscan.jstaint.hybridapps,com.ibm.appscan.jstaint.rules,com.ibm.appscan.jstaint.util,com.ibm.appscan.jstaint.util.logging,com.ibm.wala.andromeda.js.tests,com.ibm.wala.andromeda.rules,com.ibm.wala.andromeda.util,com.ibm.wala.cast.java.polyglot,com.ibm.wala.cast.java.polyglot.test,com.ibm.wala.cast.java.test.data,com.ibm.wala.cast.js,com.ibm.wala.cast.js.html.nu_validator,com.ibm.wala.cast.js.jsir,com.ibm.wala.cast.js.rhino,com.ibm.wala.cast.js.rhino.test,com.ibm.wala.cast.js.test,com.ibm.wala.cast.js.test.data,com.ibm.wala.core.testdata.java8,com.ibm.wala.dalvik,com.ibm.wala.dalvik.test,com.ibm.wala.dotnet,com.ibm.wala.dotnet.ikvm,com.ibm.wala.dotnet.test,com.ibm.wala.eventRacer,com.ibm.wala.ide.jsdt,com.ibm.wala.ide.jsdt.tests,com.ibm.wala.jstaint.rules,com.ibm.wala.jstaint.util,com.ibm.wala.memsat,com.ibm.wala.memsat.jdt.test,com.ibm.wala.memsat.test,com.ibm.wala.memsat.testdata,com.ibm.wala.memsat.tests.internal,com.ibm.wala.scandroid,com.ibm.wala.worklight,com.ibm.wala.worklight.rules"/>
+    <stringAttribute key="featureDefaultLocation" value="workspace"/>
+    <stringAttribute key="featurePluginResolution" value="workspace"/>
+    <booleanAttribute key="includeOptional" value="true"/>
+    <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="1"/>
+    </listAttribute>
+    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+    <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+    <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.java.test.JDTJava15IRTests"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.ide.jdt.test"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.ibm.wala.tracefile=/tmp/jdt15tests.txt -Xmx1024M -XX:MaxPermSize=256M -ea"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.eclipse.platform.ide"/>
+    <booleanAttribute key="run_in_ui_thread" value="false"/>
+    <setAttribute key="selected_features">
+        <setEntry value="com.ibm.wala.ide_feature:default"/>
+        <setEntry value="com.ibm.wala.tests.ide:default"/>
+        <setEntry value="com.ibm.wala.tests_feature:default"/>
+        <setEntry value="com.ibm.wala_feature:default"/>
+    </setAttribute>
+    <stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.logback.appender@default:false,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.platform@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xsd@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+    <stringAttribute key="selected_workspace_plugins" value="com.ibm.wala.cast.java.test@default:default,com.ibm.wala.cast.java@default:default,com.ibm.wala.cast.test@default:default,com.ibm.wala.cast@default:default,com.ibm.wala.core.testdata@default:default,com.ibm.wala.core.tests@default:default,com.ibm.wala.core@default:default,com.ibm.wala.ide.jdt.test@default:default,com.ibm.wala.ide.jdt@default:default,com.ibm.wala.ide.tests@default:default,com.ibm.wala.ide@default:default,com.ibm.wala.shrike@default:default,com.ibm.wala.util@default:default"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="false"/>
+    <booleanAttribute key="useProduct" value="true"/>
 </launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/launchers/JDTJavaIRTests.launch wala-1.5.1/com.ibm.wala.ide.jdt.test/launchers/JDTJavaIRTests.launch
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/launchers/JDTJavaIRTests.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/launchers/JDTJavaIRTests.launch	2019-01-29 17:08:39.000000000 +0000
@@ -1,46 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bad_container_name" value="/com.ibm.wala.cast.java..jdt.test/launchers"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<stringAttribute key="deselected_workspace_plugins" value="com.ibm.commons,com.ibm.domo.js.ibmjs,com.ibm.domo.js.ibmjs.test,com.ibm.jscript,com.ibm.jscript.test.rhino,com.ibm.wala.cast.java.polyglot,com.ibm.wala.cast.java.polyglot.test,com.ibm.wala.cast.java.test.data,com.ibm.wala.cast.js,com.ibm.wala.cast.js.html.nu_validator,com.ibm.wala.cast.js.rhino,com.ibm.wala.cast.js.rhino.test*1.0.0,com.ibm.wala.cast.js.test,com.ibm.wala.core.testdata"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.java.test.JDTJavaIRTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.ide.jdt.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.ibm.wala.tracefile=/tmp/jdttests.txt -Xmx1024M -XX:MaxPermSize=256M -ea"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,org.apache.ant@default:default,org.apache.commons.logging@default:default,org.apache.jasper@default:false,org.apache.lucene.analysis@default:default,org.apache.lucene@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.update.core@default:default,org.hamcrest.core@default:default,org.junit4@default:default,org.mortbay.jetty.jasper@default:false,org.mortbay.jetty.server@default:default,org.mortbay.jetty.util@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.ibm.wala.cast*1.0.0.qualifier@default:default,com.ibm.wala.cast.java.test@default:default,com.ibm.wala.cast.java@default:default,com.ibm.wala.cast.js.test.data@default:default,com.ibm.wala.cast.test@default:default,com.ibm.wala.core.tests@default:default,com.ibm.wala.core@default:default,com.ibm.wala.ide*1.1.3.qualifier@default:default,com.ibm.wala.ide.jdt.test@default:default,com.ibm.wala.ide.jdt@default:default,com.ibm.wala.ide.jsdt@default:default,com.ibm.wala.ide.tests@default:default,com.ibm.wala.shrike@default:default,com.ibm.wala.util@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
+    <booleanAttribute key="append.args" value="true"/>
+    <booleanAttribute key="askclear" value="false"/>
+    <booleanAttribute key="automaticAdd" value="true"/>
+    <booleanAttribute key="automaticValidate" value="false"/>
+    <stringAttribute key="bad_container_name" value="/com.ibm.wala.cast.java..jdt.test/launchers"/>
+    <stringAttribute key="bootstrap" value=""/>
+    <stringAttribute key="checked" value="[NONE]"/>
+    <booleanAttribute key="clearConfig" value="true"/>
+    <booleanAttribute key="clearws" value="true"/>
+    <booleanAttribute key="clearwslog" value="false"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+    <booleanAttribute key="default" value="true"/>
+    <stringAttribute key="deselected_workspace_plugins" value="com.ibm.commons,com.ibm.domo.js.ibmjs,com.ibm.domo.js.ibmjs.test,com.ibm.jscript,com.ibm.jscript.test.rhino,com.ibm.wala.cast.java.polyglot,com.ibm.wala.cast.java.polyglot.test,com.ibm.wala.cast.java.test.data,com.ibm.wala.cast.js,com.ibm.wala.cast.js.html.nu_validator,com.ibm.wala.cast.js.rhino,com.ibm.wala.cast.js.rhino.test*1.0.0,com.ibm.wala.cast.js.test,com.ibm.wala.core.testdata"/>
+    <booleanAttribute key="includeOptional" value="true"/>
+    <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="1"/>
+    </listAttribute>
+    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+    <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+    <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+    <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.cast.java.test.JDTJavaIRTests"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl}"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.ide.jdt.test"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dcom.ibm.wala.tracefile=/tmp/jdttests.txt -Xmx1024M -XX:MaxPermSize=256M -ea"/>
+    <stringAttribute key="pde.version" value="3.3"/>
+    <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+    <booleanAttribute key="run_in_ui_thread" value="true"/>
+    <stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,org.apache.ant@default:default,org.apache.commons.logging@default:default,org.apache.jasper@default:false,org.apache.lucene.analysis@default:default,org.apache.lucene@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.update.core@default:default,org.hamcrest.core@default:default,org.junit4@default:default,org.mortbay.jetty.jasper@default:false,org.mortbay.jetty.server@default:default,org.mortbay.jetty.util@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default"/>
+    <stringAttribute key="selected_workspace_plugins" value="com.ibm.wala.cast*1.0.0.qualifier@default:default,com.ibm.wala.cast.java.test@default:default,com.ibm.wala.cast.java@default:default,com.ibm.wala.cast.js.test.data@default:default,com.ibm.wala.cast.test@default:default,com.ibm.wala.core.tests@default:default,com.ibm.wala.core@default:default,com.ibm.wala.ide*1.1.3.qualifier@default:default,com.ibm.wala.ide.jdt.test@default:default,com.ibm.wala.ide.jdt@default:default,com.ibm.wala.ide.jsdt@default:default,com.ibm.wala.ide.tests@default:default,com.ibm.wala.shrike@default:default,com.ibm.wala.util@default:default"/>
+    <booleanAttribute key="show_selected_only" value="false"/>
+    <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
+    <booleanAttribute key="tracing" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useDefaultConfig" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="false"/>
+    <booleanAttribute key="useProduct" value="true"/>
 </launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WALA CAst Java JDT Test Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.ide.jdt.test
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Bundle-Activator: com.ibm.wala.cast.java.jdt.test.Activator
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: com.ibm.wala.cast.java.test;bundle-version="1.0.0",
  com.ibm.wala.cast.test;bundle-version="1.0.0",
  com.ibm.wala.ide.tests;bundle-version="1.1.3",
@@ -22,9 +22,14 @@
  org.eclipse.pde.core,
  org.eclipse.platform,
  org.eclipse.jdt.launching,
+ org.eclipse.jdt.launching.macosx;resolution:=optional,
  org.eclipse.ui.ide,
  org.eclipse.ui.ide.application,
  org.eclipse.ant.launching,
- org.eclipse.jdt.launching.macosx;resolution:=optional
+ com.ibm.wala.cast.java.ecj,
+ com.ibm.wala.shrike
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: com.ibm.wala.cast.java.jdt.test,
+ com.ibm.wala.cast.java.test,
+ com.ibm.wala.demandpa.driver
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.ide.jdt.test/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.ide.jdt.test
+Bundle-Vendor = IBM
+Bundle-Name = WALA CAst Java JDT Test Plug-in
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/pom.xml wala-1.5.1/com.ibm.wala.ide.jdt.test/pom.xml
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.9</version>
+    <version>1.5.1</version>
   </parent>
 
   
@@ -47,7 +47,7 @@
 	<version>${tycho-version}</version>
         <configuration>
  	  <excludes>
-	    <exclude>**/*EJC*.java</exclude>
+	    <exclude>**/*ECJ*.java</exclude>
 	  </excludes>
 	</configuration>
       </plugin>
@@ -56,7 +56,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <executions>
           <execution>
-            <id>ejc-test</id>
+            <id>ecj-test</id>
             <phase>test</phase>
             <configuration>
               <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/.project wala-1.5.1/com.ibm.wala.ide.jdt.test/.project
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.ide.jdt.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,79 +1,128 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.APILeak=error
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=ignore
+org.eclipse.jdt.core.compiler.problem.deadCode=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=error
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=2
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0204file139target/site/dependency-convergence.htmlT0304file119target/work/pluginsT02
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude09113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T02111contentType133org.eclipse.jdt.junit.JUnitResultF04file119target/work/pluginsT0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/ECJJavaIRTest.java wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/ECJJavaIRTest.java
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/ECJJavaIRTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/ECJJavaIRTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package com.ibm.wala.cast.java.test;
+
+import java.util.Collection;
+import java.util.List;
+
+import com.ibm.wala.cast.java.client.ECJJavaSourceAnalysisEngine;
+import com.ibm.wala.cast.java.client.JavaSourceAnalysisEngine;
+import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
+import com.ibm.wala.client.AbstractAnalysisEngine;
+import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.cha.IClassHierarchy;
+
+public class ECJJavaIRTest extends JavaIRTests {
+  
+  public ECJJavaIRTest() {
+    super(null);
+  }
+
+  @Override
+  protected <I extends InstanceKey> AbstractAnalysisEngine<I, CallGraphBuilder<I>, ?> getAnalysisEngine(final String[] mainClassDescriptors, Collection<String> sources, List<String> libs) {
+    JavaSourceAnalysisEngine<I> engine = new ECJJavaSourceAnalysisEngine<I>() {
+      @Override
+      protected Iterable<Entrypoint> makeDefaultEntrypoints(AnalysisScope scope, IClassHierarchy cha) {
+        return Util.makeMainEntrypoints(JavaSourceAnalysisScope.SOURCE, cha, mainClassDescriptors);
+      }
+    };
+    engine.setExclusionsFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS);
+    populateScope(engine, sources, libs);
+    return engine;
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/ECJSyncDuplicatorTest.java wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/ECJSyncDuplicatorTest.java
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/ECJSyncDuplicatorTest.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/ECJSyncDuplicatorTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package com.ibm.wala.cast.java.test;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.jdt.core.dom.CompilationUnit;
+
+import com.ibm.wala.cast.java.client.ECJJavaSourceAnalysisEngine;
+import com.ibm.wala.cast.java.client.JavaSourceAnalysisEngine;
+import com.ibm.wala.cast.java.examples.ast.SynchronizedBlockDuplicator;
+import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
+import com.ibm.wala.cast.java.translator.SourceModuleTranslator;
+import com.ibm.wala.cast.java.translator.jdt.JDTJava2CAstTranslator;
+import com.ibm.wala.cast.java.translator.jdt.ecj.ECJClassLoaderFactory;
+import com.ibm.wala.cast.java.translator.jdt.ecj.ECJSourceLoaderImpl;
+import com.ibm.wala.cast.java.translator.jdt.ecj.ECJSourceModuleTranslator;
+import com.ibm.wala.cast.tree.CAstEntity;
+import com.ibm.wala.cast.tree.CAstSourcePositionMap.Position;
+import com.ibm.wala.cast.tree.impl.CAstImpl;
+import com.ibm.wala.cast.tree.impl.RangePosition;
+import com.ibm.wala.classLoader.CallSiteReference;
+import com.ibm.wala.classLoader.ClassLoaderFactory;
+import com.ibm.wala.classLoader.IClassLoader;
+import com.ibm.wala.client.AbstractAnalysisEngine;
+import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
+import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
+import com.ibm.wala.ipa.cha.IClassHierarchy;
+import com.ibm.wala.shrikeBT.IInvokeInstruction.Dispatch;
+import com.ibm.wala.types.ClassLoaderReference;
+import com.ibm.wala.types.MethodReference;
+import com.ibm.wala.types.TypeReference;
+import com.ibm.wala.util.config.SetOfClasses;
+
+public class ECJSyncDuplicatorTest extends SyncDuplicatorTests {
+  
+  private static CallSiteReference guard = 
+      CallSiteReference.make(0, 
+          MethodReference.findOrCreate(
+              TypeReference.findOrCreate(JavaSourceAnalysisScope.SOURCE, "LMonitor2"), 
+              "randomIsolate", "()Z"), 
+          Dispatch.STATIC);
+  
+  @Override
+  protected <I extends InstanceKey> AbstractAnalysisEngine<I, CallGraphBuilder<I>, ?> getAnalysisEngine(final String[] mainClassDescriptors, Collection<String> sources, List<String> libs) {
+    JavaSourceAnalysisEngine<I> engine = new ECJJavaSourceAnalysisEngine<I>() {
+      @Override
+      protected Iterable<Entrypoint> makeDefaultEntrypoints(AnalysisScope scope, IClassHierarchy cha) {
+        return Util.makeMainEntrypoints(JavaSourceAnalysisScope.SOURCE, cha, mainClassDescriptors);
+      }
+      
+      @Override
+      protected ClassLoaderFactory getClassLoaderFactory(SetOfClasses exclusions) {
+        return new ECJClassLoaderFactory(exclusions) {
+          @Override
+          protected ECJSourceLoaderImpl makeSourceLoader(ClassLoaderReference classLoaderReference, IClassHierarchy cha, IClassLoader parent) {
+            return new ECJSourceLoaderImpl(classLoaderReference, parent, cha) {
+              @Override
+              protected SourceModuleTranslator getTranslator() {
+                return new ECJSourceModuleTranslator(cha.getScope(), this) {
+                  @Override
+                  protected JDTJava2CAstTranslator<Position> makeCAstTranslator(CompilationUnit astRoot, String fullPath) {
+                    return new JDTJava2CAstTranslator<Position>(sourceLoader, astRoot, fullPath, true) { 
+                      @Override
+                      public CAstEntity translateToCAst() {
+                        CAstEntity ast = super.translateToCAst();
+                        SynchronizedBlockDuplicator unwind = new SynchronizedBlockDuplicator(new CAstImpl(), true, guard);
+                        return unwind.translate(ast);
+                      }
+
+                      @Override
+                      public Position makePosition(int start, int end) {
+                        try {
+                          return new RangePosition(new URL("file://" + fullPath), this.cu.getLineNumber(start), start, end);
+                        } catch (MalformedURLException e) {
+                          throw new RuntimeException("bad file: " + fullPath, e);
+                        }
+                      }                      
+                    };
+                  }
+                };
+              }
+            };
+          }
+        };
+      }
+    };
+    engine.setExclusionsFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS);
+    populateScope(engine, sources, libs);
+    return engine;
+  }
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/EJCJavaIRTest.java wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/EJCJavaIRTest.java
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/EJCJavaIRTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/EJCJavaIRTest.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package com.ibm.wala.cast.java.test;
-
-import java.util.Collection;
-import java.util.List;
-
-import com.ibm.wala.cast.java.client.EJCJavaSourceAnalysisEngine;
-import com.ibm.wala.cast.java.client.JavaSourceAnalysisEngine;
-import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
-import com.ibm.wala.client.AbstractAnalysisEngine;
-import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
-import com.ibm.wala.ipa.callgraph.AnalysisScope;
-import com.ibm.wala.ipa.callgraph.Entrypoint;
-import com.ibm.wala.ipa.callgraph.impl.Util;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
-
-public class EJCJavaIRTest extends JavaIRTests {
-  
-  public EJCJavaIRTest() {
-    super(null);
-  }
-
-  @Override
-  protected AbstractAnalysisEngine getAnalysisEngine(final String[] mainClassDescriptors, Collection<String> sources, List<String> libs) {
-    JavaSourceAnalysisEngine engine = new EJCJavaSourceAnalysisEngine() {
-      @Override
-      protected Iterable<Entrypoint> makeDefaultEntrypoints(AnalysisScope scope, IClassHierarchy cha) {
-        return Util.makeMainEntrypoints(JavaSourceAnalysisScope.SOURCE, cha, mainClassDescriptors);
-      }
-    };
-    engine.setExclusionsFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS);
-    populateScope(engine, sources, libs);
-    return engine;
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java	2019-01-29 17:08:39.000000000 +0000
@@ -8,7 +8,7 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.Collections;
 
 import org.junit.Test;
 
@@ -22,113 +22,113 @@
 
   @Test
   public void testAnonGeneNullarySimple() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testAnonymousGenerics() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testBasicsGenerics() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testCocovariant() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testCustomGenericsAndFields() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testEnumSwitch() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testExplicitBoxingTest() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testGenericArrays() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testGenericMemberClasses() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testGenericSuperSink() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testMethodGenerics() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testMoreOverriddenGenerics() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testNotSoSimpleEnums() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testOverridesOnePointFour() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testSimpleEnums() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testSimpleEnums2() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testVarargs() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testVarargsCovariant() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testVarargsOverriding() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testWildcards() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testAnnotations() throws IllegalArgumentException, CancelException, IOException {
-    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true);
+    runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true, null);
   }
 
   @Test
   public void testTypeInferencePrimAndStringOp() throws IllegalArgumentException, CancelException, IOException {
     String pkgName = "javaonepointfive";
     runTest(singlePkgTestSrc(pkgName), rtJar, simplePkgTestEntryPoint(pkgName),
-        Arrays.asList(new TypeInferenceAssertion(pkgName + File.separator + singleInputForTest())), false);
+        Collections.singletonList(new TypeInferenceAssertion(pkgName + File.separator + singleInputForTest())), false, null);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,12 +37,15 @@
  */
 package com.ibm.wala.cast.java.test;
 
+import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
 import com.ibm.wala.cast.java.jdt.test.Activator;
 import com.ibm.wala.client.AbstractAnalysisEngine;
 import com.ibm.wala.ide.tests.util.EclipseTestUtil.ZippedProjectData;
+import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 
 public class JDTJavaIRTests extends JavaIRTests {
   
@@ -50,8 +53,14 @@
  
   public static final String PROJECT_ZIP = "test_project.zip";
   
-  public static final ZippedProjectData PROJECT = new ZippedProjectData(Activator.getDefault(), PROJECT_NAME, PROJECT_ZIP);
-  
+  public static final ZippedProjectData PROJECT;
+  static {
+    try {
+      PROJECT = new ZippedProjectData(Activator.getDefault(), PROJECT_NAME, PROJECT_ZIP);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
   private final ZippedProjectData project;
 
   public JDTJavaIRTests() {
@@ -65,7 +74,7 @@
   }
 
   @Override
-  protected AbstractAnalysisEngine getAnalysisEngine(final String[] mainClassDescriptors, Collection<String> sources, List<String> libs) {
-    return JDTJavaTest.makeAnalysisEngine(mainClassDescriptors, sources, libs, project);
+  protected <I extends InstanceKey> AbstractAnalysisEngine<I, CallGraphBuilder<I>, ?> getAnalysisEngine(final String[] mainClassDescriptors, Collection<String> sources, List<String> libs) {
+    return JDTJavaTest.makeAnalysisEngine(mainClassDescriptors, project);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaTest.java wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaTest.java
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,9 +15,7 @@
 import java.util.Collection;
 import java.util.List;
 
-import junit.framework.Assert;
-
-import org.eclipse.core.runtime.CoreException;
+import org.junit.Assert;
 
 import com.ibm.wala.cast.java.client.JDTJavaSourceAnalysisEngine;
 import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope;
@@ -25,8 +23,10 @@
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.ide.tests.util.EclipseTestUtil.ZippedProjectData;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.util.io.TemporaryFile;
 
@@ -45,40 +45,32 @@
    }
 
   @Override
-  protected AbstractAnalysisEngine getAnalysisEngine(final String[] mainClassDescriptors, Collection<String> sources, List<String> libs) {
-    return makeAnalysisEngine(mainClassDescriptors, sources, libs, project);
+  protected <I extends InstanceKey> AbstractAnalysisEngine<I, CallGraphBuilder<I>, ?> getAnalysisEngine(final String[] mainClassDescriptors, Collection<String> sources, List<String> libs) {
+    return makeAnalysisEngine(mainClassDescriptors, project);
   }
   
-  static AbstractAnalysisEngine makeAnalysisEngine(final String[] mainClassDescriptors, Collection<String> sources, List<String> libs, ZippedProjectData project) {
-    AbstractAnalysisEngine engine;
-    try {
-      engine = new JDTJavaSourceAnalysisEngine(project.projectName) {
-        {
-          setDump(Boolean.parseBoolean(System.getProperty("wala.cast.dump", "false")));
-        }
-        
-        @Override
-        protected Iterable<Entrypoint> makeDefaultEntrypoints(AnalysisScope scope, IClassHierarchy cha) {
-          return Util.makeMainEntrypoints(JavaSourceAnalysisScope.SOURCE, cha, mainClassDescriptors);
-        }
-      };
-  
-      try {
-        File tf = TemporaryFile.urlToFile("exclusions.txt", CallGraphTestUtil.class.getClassLoader().getResource(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
-        engine.setExclusionsFile(tf.getAbsolutePath());
-        tf.deleteOnExit();
-      } catch (IOException e) {
-        Assert.assertFalse("Cannot find exclusions file: " + e.toString(), true);
+  static <I extends InstanceKey> AbstractAnalysisEngine<I, CallGraphBuilder<I>, ?> makeAnalysisEngine(final String[] mainClassDescriptors, ZippedProjectData project) {
+    AbstractAnalysisEngine<I, CallGraphBuilder<I>, ?> engine;
+    engine = new JDTJavaSourceAnalysisEngine<I>(project.projectName) {
+      {
+        setDump(Boolean.parseBoolean(System.getProperty("wala.cast.dump", "false")));
       }
-  
-      return engine;
-    } catch (IOException e1) {
-      Assert.fail(e1.getMessage());
-      return null;
-    } catch (CoreException e1) {
-      Assert.fail(e1.getMessage());
-      return null;
+      
+      @Override
+      protected Iterable<Entrypoint> makeDefaultEntrypoints(AnalysisScope scope, IClassHierarchy cha) {
+        return Util.makeMainEntrypoints(JavaSourceAnalysisScope.SOURCE, cha, mainClassDescriptors);
+      }
+    };
+ 
+    try {
+      File tf = TemporaryFile.urlToFile("exclusions.txt", CallGraphTestUtil.class.getClassLoader().getResource(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
+      engine.setExclusionsFile(tf.getAbsolutePath());
+      tf.deleteOnExit();
+    } catch (IOException e) {
+      Assert.assertFalse("Cannot find exclusions file: " + e.toString(), true);
     }
+ 
+    return engine;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/TypeInferenceAssertion.java wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/TypeInferenceAssertion.java
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/TypeInferenceAssertion.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/cast/java/test/TypeInferenceAssertion.java	2019-01-29 17:08:39.000000000 +0000
@@ -33,7 +33,7 @@
   @Override
   public void check(CallGraph cg) {
     IR ir = getIR(cg, typeName, "main", "[Ljava/lang/String;", "V");
-    AstJavaTypeInference inference = new AstJavaTypeInference(ir, cg.getClassHierarchy(), true);
+    AstJavaTypeInference inference = new AstJavaTypeInference(ir, true);
 
     for (SSAInstruction instr : Iterator2Iterable.make(ir.iterateAllInstructions())) {
       // Check defs
@@ -51,7 +51,7 @@
 
   }
 
-  private IR getIR(CallGraph cg, String fullyQualifiedTypeName, String methodName, String methodParameter, String methodReturnType) {
+  private static IR getIR(CallGraph cg, String fullyQualifiedTypeName, String methodName, String methodParameter, String methodReturnType) {
     IClassHierarchy classHierarchy = cg.getClassHierarchy();
     MethodReference methodRef = IRTests
         .descriptorToMethodRef(
@@ -62,4 +62,4 @@
     return node.getIR();
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/demandpa/driver/DemandCastChecker.java wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/demandpa/driver/DemandCastChecker.java
--- wala-1.3.9/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/demandpa/driver/DemandCastChecker.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jdt.test/source/com/ibm/wala/demandpa/driver/DemandCastChecker.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,10 +43,11 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
+import java.util.function.Predicate;
 
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.demandpa.alg.ContextSensitiveStateMachine;
@@ -61,7 +62,7 @@
 import com.ibm.wala.demandpa.flowgraph.IFlowLabel;
 import com.ibm.wala.demandpa.util.MemoryAccessMap;
 import com.ibm.wala.demandpa.util.SimpleMemoryAccessMap;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -70,6 +71,7 @@
 import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
 import com.ibm.wala.ipa.callgraph.CallGraphStats;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Util;
 import com.ibm.wala.ipa.callgraph.propagation.HeapModel;
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
@@ -77,6 +79,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.PointerKey;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.properties.WalaProperties;
 import com.ibm.wala.ssa.IR;
@@ -86,7 +89,6 @@
 import com.ibm.wala.types.TypeReference;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.NullProgressMonitor;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.ProgressMaster;
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.Pair;
@@ -103,12 +105,6 @@
   // maximum number of casts to check
   private static final int MAX_CASTS = Integer.MAX_VALUE;
 
-  /**
-   * @param args
-   * @throws CancelException
-   * @throws IllegalArgumentException
-   * @throws IOException
-   */
   public static void main(String[] args) throws IllegalArgumentException, CancelException, IOException {
     try {
       Properties p = new Properties();
@@ -135,15 +131,15 @@
       e.printStackTrace();
     }
     System.err.println("=*=*=*=*=*=*=*=*=*=*=*=*=*=*");
-    System.err.println("");
-    System.err.println("");
+    System.err.println();
+    System.err.println();
   }
 
   private static DemandRefinementPointsTo makeDemandPointerAnalysis(String scopeFile, String mainClass, String benchName)
       throws ClassHierarchyException, IllegalArgumentException, CancelException, IOException {
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(scopeFile, getExclusions(benchName));
     // build a type hierarchy
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
 
     // set up call graph construction options; mainly what should be considered
     // entrypoints?
@@ -151,7 +147,7 @@
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
 
     System.err.print("constructing call graph...");
-    final Pair<CallGraph, PointerAnalysis> cgAndPA = buildCallGraph(scope, cha, options);
+    final Pair<CallGraph, PointerAnalysis<InstanceKey>> cgAndPA = buildCallGraph(scope, cha, options);
     CallGraph cg = cgAndPA.fst;    
     System.err.println("done");
     System.err.println(CallGraphStats.getStats(cg));
@@ -172,24 +168,17 @@
 
   /**
    * builds a call graph, and sets the corresponding heap model for analysis
-   * 
-   * @param scope
-   * @param cha
-   * @param options
-   * @return
-   * @throws CancelException
-   * @throws IllegalArgumentException
    */
-  private static Pair<CallGraph, PointerAnalysis> buildCallGraph(AnalysisScope scope, ClassHierarchy cha, AnalysisOptions options)
+  private static Pair<CallGraph, PointerAnalysis<InstanceKey>> buildCallGraph(AnalysisScope scope, ClassHierarchy cha, AnalysisOptions options)
       throws IllegalArgumentException, CancelException {
     CallGraph retCG = null;
-    PointerAnalysis retPA = null;
-    final AnalysisCache cache = new AnalysisCache();
-    CallGraphBuilder builder;
+    PointerAnalysis<InstanceKey> retPA = null;
+    final IAnalysisCacheView cache = new AnalysisCacheImpl();
+    CallGraphBuilder<InstanceKey> builder;
     if (CHEAP_CG) {
-      builder = Util.makeZeroCFABuilder(options, cache, cha, scope);
+      builder = Util.makeZeroCFABuilder(Language.JAVA, options, cache, cha, scope);
       // we want vanilla 0-1 CFA, which has one abstract loc per allocation
-      heapModel = Util.makeVanillaZeroOneCFABuilder(options, cache, cha, scope);
+      heapModel = Util.makeVanillaZeroOneCFABuilder(Language.JAVA, options, cache, cha, scope);
     } else {
       builder = Util.makeZeroOneContainerCFABuilder(options, cache, cha, scope);
       heapModel = (HeapModel) builder;
@@ -207,7 +196,6 @@
     return Pair.make(retCG, retPA);
   }
 
-  @SuppressWarnings("unused")
   private static RefinementPolicyFactory chooseRefinePolicyFactory(ClassHierarchy cha) {
     if (true) {
       return new TunedRefinementPolicy.Factory(cha);
@@ -222,11 +210,10 @@
 
   private static List<Pair<CGNode, SSACheckCastInstruction>> findFailingCasts(CallGraph cg, DemandRefinementPointsTo dmp) {
     final IClassHierarchy cha = dmp.getClassHierarchy();
-    List<Pair<CGNode, SSACheckCastInstruction>> failing = new ArrayList<Pair<CGNode, SSACheckCastInstruction>>();
+    List<Pair<CGNode, SSACheckCastInstruction>> failing = new ArrayList<>();
 
     int numSafe = 0, numMightFail = 0;
-    outer: for (Iterator<? extends CGNode> nodeIter = cg.iterator(); nodeIter.hasNext();) {
-      CGNode node = nodeIter.next();
+    outer: for (CGNode node : cg) {
       TypeReference declaringClass = node.getMethod().getReference().getDeclaringClass();
       // skip library classes
       if (declaringClass.getClassLoader().equals(ClassLoaderReference.Primordial)) {
@@ -256,19 +243,14 @@
           
           System.err.println("CHECKING " + castInstr + " in " + node.getMethod());
           PointerKey castedPk = heapModel.getPointerKeyForLocal(node, castInstr.getUse(0));
-          Predicate<InstanceKey> castPred = new Predicate<InstanceKey>() {
-
-            @Override
-            public boolean test(InstanceKey ik) {
-              TypeReference ikTypeRef = ik.getConcreteType().getReference();
-              for (TypeReference t : declaredResultTypes) {
-                if (cha.isAssignableFrom(cha.lookupClass(t), cha.lookupClass(ikTypeRef))) {
-                  return true;
-                }
+          Predicate<InstanceKey> castPred = ik -> {
+            TypeReference ikTypeRef = ik.getConcreteType().getReference();
+            for (TypeReference t : declaredResultTypes) {
+              if (cha.isAssignableFrom(cha.lookupClass(t), cha.lookupClass(ikTypeRef))) {
+                return true;
               }
-              return false;
             }
-
+            return false;
           };
           long startTime = System.currentTimeMillis();
           Pair<PointsToResult, Collection<InstanceKey>> queryResult = dmp.getPointsTo(castedPk, castPred);
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/build.gradle wala-1.5.1/com.ibm.wala.ide.jsdt/build.gradle
--- wala-1.3.9/com.ibm.wala.ide.jsdt/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,19 @@
+sourceSets.main.java.srcDirs = ['source']
+
+dependencies {
+	compile(
+		'eclipse-deps:org.eclipse.core.resources:+',
+		'eclipse-deps:org.eclipse.core.runtime:+',
+		'eclipse-deps:org.eclipse.equinox.common:+',
+		'eclipse-deps:org.eclipse.osgi:+',
+		'eclipse-deps:org.eclipse.ui.workbench:+',
+		'wst-deps:org.eclipse.wst.jsdt.core:+',
+		'wst-deps:org.eclipse.wst.jsdt.ui:+',
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.cast.js'),
+		project(':com.ibm.wala.cast.js.rhino'),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.ide'),
+		project(':com.ibm.wala.util'),
+		)
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/build.properties wala-1.5.1/com.ibm.wala.ide.jsdt/build.properties
--- wala-1.3.9/com.ibm.wala.ide.jsdt/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,7 @@
 source.. = source/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/.classpath wala-1.5.1/com.ibm.wala.ide.jsdt/.classpath
--- wala-1.3.9/com.ibm.wala.ide.jsdt/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="source"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Jsdt
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.ide.jsdt
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Bundle-Activator: com.ibm.wala.ide.jsdt.Activator
-Bundle-Vendor: IBM
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
  com.ibm.wala.cast,
  com.ibm.wala.cast.js,
@@ -20,7 +20,7 @@
  org.eclipse.ui.ide;bundle-version="3.8.2",
  org.eclipse.pde;bundle-version="3.8.0",
  org.eclipse.pde.core;bundle-version="3.8.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.wst.jsdt.internal.corext.callhierarchy
 Export-Package: com.ibm.wala.cast.js.client,
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.ide.jsdt/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.ide.jsdt/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.ide.jsdt
+Bundle-Vendor = IBM
+Bundle-Name = Jsdt
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/pom.xml wala-1.5.1/com.ibm.wala.ide.jsdt/pom.xml
--- wala-1.3.9/com.ibm.wala.ide.jsdt/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.9</version>
+    <version>1.5.1</version>
   </parent>
   <artifactId>com.ibm.wala.ide.jsdt</artifactId>
   <packaging>eclipse-plugin</packaging>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/.project wala-1.5.1/com.ibm.wala.ide.jsdt/.project
--- wala-1.3.9/com.ibm.wala.ide.jsdt/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.ide.jsdt</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.ide.jsdt/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.ide.jsdt/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,79 +1,125 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.ide.jsdt/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.ide.jsdt/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=2
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.ide.jsdt/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.ide.jsdt/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FilteredFlowGraphBuilder.java wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FilteredFlowGraphBuilder.java
--- wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FilteredFlowGraphBuilder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/callgraph/fieldbased/flowgraph/FilteredFlowGraphBuilder.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2014 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-
-package com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph;
-
-import com.ibm.wala.classLoader.IMethod;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
-import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.util.functions.Function;
-
-public class FilteredFlowGraphBuilder extends FlowGraphBuilder {
-
-	private final Function<IMethod, Boolean> filter;
-	
-	public FilteredFlowGraphBuilder(IClassHierarchy cha, AnalysisCache cache, boolean fullPointerAnalysis, Function<IMethod, Boolean> filter) {
-		super(cha, cache, fullPointerAnalysis);
-		this.filter = filter;
-	}
-
-	@Override
-	public void visitFunction(FlowGraph flowgraph, IMethod method) {
-		if (filter.apply(method)) {
-			super.visitFunction(flowgraph, method);
-		}
-	}
-
-	
-}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/client/EclipseJavaScriptAnalysisEngine.java wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/client/EclipseJavaScriptAnalysisEngine.java
--- wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/client/EclipseJavaScriptAnalysisEngine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/client/EclipseJavaScriptAnalysisEngine.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,6 +13,7 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Set;
+import java.util.function.Function;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Plugin;
@@ -26,7 +27,6 @@
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.FilteredFlowGraphBuilder;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.FlowGraph;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.FlowGraphBuilder;
-import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.FuncVertex;
 import com.ibm.wala.cast.js.callgraph.fieldbased.flowgraph.vertices.ObjectVertex;
 import com.ibm.wala.cast.js.client.impl.ZeroCFABuilderFactory;
 import com.ibm.wala.cast.js.html.IncludedPosition;
@@ -43,11 +43,13 @@
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.ide.client.EclipseProjectSourceAnalysisEngine;
 import com.ibm.wala.ide.util.JavaScriptEclipseProjectPath;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
@@ -56,15 +58,14 @@
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.config.SetOfClasses;
-import com.ibm.wala.util.functions.Function;
 
-public class EclipseJavaScriptAnalysisEngine extends EclipseProjectSourceAnalysisEngine<IJavaScriptProject> {
+public class EclipseJavaScriptAnalysisEngine<I extends InstanceKey> extends EclipseProjectSourceAnalysisEngine<IJavaScriptProject, I> {
 
-  public enum BuilderType { PESSIMISTIC, OPTIMISTIC, REFLECTIVE };
+  public enum BuilderType { PESSIMISTIC, OPTIMISTIC, REFLECTIVE }
   
   private final BuilderType builderType;
   
-  public EclipseJavaScriptAnalysisEngine(IJavaScriptProject project, BuilderType builderType) throws IOException, CoreException {
+  public EclipseJavaScriptAnalysisEngine(IJavaScriptProject project, BuilderType builderType) {
     super(project, "js");
     this.builderType = builderType;
   }
@@ -107,14 +108,14 @@
   }
 
   @Override
-  public AnalysisCache makeDefaultCache() {
-    return new AnalysisCache(AstIRFactory.makeDefaultFactory());
+  public IAnalysisCacheView makeDefaultCache() {
+    return new AnalysisCacheImpl(AstIRFactory.makeDefaultFactory());
   }
 
   @Override
-  protected CallGraphBuilder getCallGraphBuilder(IClassHierarchy cha,
-		AnalysisOptions options, AnalysisCache cache) {
-	    return new ZeroCFABuilderFactory().make((JSAnalysisOptions)options, cache, cha, scope, false);
+  protected CallGraphBuilder<? super I> getCallGraphBuilder(IClassHierarchy cha,
+		AnalysisOptions options, IAnalysisCacheView cache) {
+	    return new ZeroCFABuilderFactory().make((JSAnalysisOptions)options, cache, cha);
   }
 
   public Pair<JSCallGraph, PointerAnalysis<ObjectVertex>> getFieldBasedCallGraph() throws CancelException {
@@ -128,7 +129,7 @@
     return getFieldBasedCallGraph(eps);
   }
   
-  private String getScriptName(AstMethod m) {
+  private static String getScriptName(AstMethod m) {
     
     // we want the original including file, since that will be the "script"
     Position p = m.getSourcePosition();
@@ -147,14 +148,11 @@
       scripts.add(scriptName);
     }
  
-    final Function<IMethod, Boolean> filter = new Function<IMethod, Boolean>() {
-      @Override
-      public Boolean apply(IMethod object) {
-        if (object instanceof AstMethod) {
-           return scripts.contains(getScriptName((AstMethod)object));
-        } else {
-          return true;
-        }
+    final Function<IMethod, Boolean> filter = object -> {
+      if (object instanceof AstMethod) {
+         return scripts.contains(getScriptName((AstMethod)object));
+      } else {
+        return true;
       }
     };
 
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/client/EclipseWebAnalysisEngine.java wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/client/EclipseWebAnalysisEngine.java
--- wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/client/EclipseWebAnalysisEngine.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/cast/js/client/EclipseWebAnalysisEngine.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,17 +22,18 @@
 import com.ibm.wala.ide.util.JavaScriptEclipseProjectPath;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.config.SetOfClasses;
 
-public class EclipseWebAnalysisEngine extends EclipseJavaScriptAnalysisEngine {
+public class EclipseWebAnalysisEngine extends EclipseJavaScriptAnalysisEngine<InstanceKey> {
 
   private final Set<Pair<String, Plugin>> models = HashSetFactory.make();
   
-  public EclipseWebAnalysisEngine(IJavaScriptProject project, Collection<Pair<String, Plugin>> models, BuilderType builderType) throws IOException, CoreException {
+  public EclipseWebAnalysisEngine(IJavaScriptProject project, Collection<Pair<String, Plugin>> models, BuilderType builderType) {
     super(project, builderType);
     // core DOM model
     this.models.add(Pair.make("preamble.js", (Plugin)Activator.getDefault()));
@@ -61,7 +62,7 @@
     eps.add(JSCallGraphUtil.makeScriptRoots(getClassHierarchy()).make("Lprologue.js"));
     
     for(Pair<String,Plugin> model : models) {
-      eps.add(JSCallGraphUtil.makeScriptRoots(getClassHierarchy()).make("L" + model.fst));
+      eps.add(JSCallGraphUtil.makeScriptRoots(getClassHierarchy()).make('L' + model.fst));
     }
 
     return getFieldBasedCallGraph(eps);
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/EclipseWebProjectPath.java wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/EclipseWebProjectPath.java
--- wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/EclipseWebProjectPath.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/EclipseWebProjectPath.java	2019-01-29 17:08:39.000000000 +0000
@@ -24,7 +24,7 @@
 
 public class EclipseWebProjectPath extends JavaScriptEclipseProjectPath {
   
-  public EclipseWebProjectPath(Set<Pair<String, Plugin>> models) throws IOException, CoreException {
+  public EclipseWebProjectPath(Set<Pair<String, Plugin>> models) {
     super(models);
   }
   
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JavaScriptEclipseProjectPath.java wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JavaScriptEclipseProjectPath.java
--- wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JavaScriptEclipseProjectPath.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JavaScriptEclipseProjectPath.java	2019-01-29 17:08:39.000000000 +0000
@@ -24,9 +24,9 @@
 import org.eclipse.wst.jsdt.core.JavaScriptCore;
 import org.eclipse.wst.jsdt.core.JavaScriptModelException;
 
+import com.ibm.wala.cast.js.ipa.callgraph.JSCallGraphUtil;
 import com.ibm.wala.cast.js.types.JavaScriptTypes;
 import com.ibm.wala.classLoader.Module;
-import com.ibm.wala.classLoader.SourceURLModule;
 import com.ibm.wala.ide.jsdt.Activator;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.util.collections.HashSetFactory;
@@ -51,8 +51,7 @@
 	
   private final Set<Pair<String, Plugin>> models = HashSetFactory.make();
 
-	protected JavaScriptEclipseProjectPath(Set<Pair<String, Plugin>> models) throws IOException,
-			CoreException {
+	protected JavaScriptEclipseProjectPath(Set<Pair<String, Plugin>> models) {
 		super(AnalysisScopeType.SOURCE_FOR_PROJ_AND_LINKED_PROJS);
 		this.models.addAll(models);
 		this.models.add(Pair.make("prologue.js", (Plugin)Activator.getDefault()));
@@ -66,19 +65,14 @@
 
 	
 	@Override
-  public EclipseProjectPath create(IProject project) throws CoreException, IOException {
-    EclipseProjectPath path = super.create(project);
+  public EclipseProjectPath<?, ?> create(IProject project) throws CoreException, IOException {
+    EclipseProjectPath<?, ?> path = super.create(project);
   
     Collection<Module> s = modules.get(JSLoader.JAVASCRIPT);
     for(Pair<String,Plugin> model : models) {
       URL modelFile = JsdtUtil.getPrologueFile(model.fst, model.snd);
       assert modelFile != null : "cannot find file for " + model;
-      s.add(new SourceURLModule(modelFile) {
-        @Override
-        public String getName() {
-          return super.getName().substring(1);
-        }
-      });
+      s.add(new JSCallGraphUtil.Bootstrap(model.fst, modelFile.openStream(), modelFile));
     }
 
     return path;
@@ -108,9 +102,13 @@
 			ILoader loader,
 			boolean includeSource, boolean cpeFromMainProject) {
 		IIncludePathEntry e = JavaScriptCore.getResolvedIncludepathEntry(entry);
-		switch (e.getEntryKind()) {
+		final int entryKind = e.getEntryKind();
+    switch (entryKind) {
 		case IIncludePathEntry.CPE_SOURCE:
 			resolveSourcePathEntry(JSLoader.JAVASCRIPT, true, cpeFromMainProject, e.getPath(), null, e.getExclusionPatterns(), "js");
+			break;
+		default:
+			// do nothing
 		}
 	}
 
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JavaScriptHeadlessUtil.java wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JavaScriptHeadlessUtil.java
--- wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JavaScriptHeadlessUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JavaScriptHeadlessUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,32 +10,26 @@
  *******************************************************************************/
 package com.ibm.wala.ide.util;
 
-import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.wst.jsdt.core.IJavaScriptProject;
 import org.eclipse.wst.jsdt.core.JavaScriptCore;
 
-import com.ibm.wala.util.functions.Function;
-
 public class JavaScriptHeadlessUtil extends HeadlessUtil {
 
 	  public static IJavaScriptProject getJavaScriptProjectFromWorkspace(final String projectName) {
-		    IJavaScriptProject jp = getProjectFromWorkspace(new Function<IProject, IJavaScriptProject>() {
-		      @Override
-          public IJavaScriptProject apply(IProject p) {
-		        try {
-		          if (p.hasNature(JavaScriptCore.NATURE_ID)) {
-		            IJavaScriptProject jp = JavaScriptCore.create(p);
-		             if (jp != null && jp.getElementName().equals(projectName)) {
-		              return jp;
-		            }
-		          }
-		        } catch (CoreException e) {
-		        }
-		        // failed to match
-		        return null;
-		      }
-		    });
+		    IJavaScriptProject jp = getProjectFromWorkspace(p -> {
+          try {
+            if (p.hasNature(JavaScriptCore.NATURE_ID)) {
+              IJavaScriptProject jp1 = JavaScriptCore.create(p);
+               if (jp1 != null && jp1.getElementName().equals(projectName)) {
+                return jp1;
+              }
+            }
+          } catch (CoreException e) {
+          }
+          // failed to match
+          return null;
+        });
 		    return jp;
 		  }
 
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JsdtUtil.java wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JsdtUtil.java
--- wala-1.3.9/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JsdtUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt/source/com/ibm/wala/ide/util/JsdtUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,10 +13,10 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -54,8 +54,8 @@
 import com.ibm.wala.ide.util.HeadlessUtil.Parser;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.Pair;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.impl.SlowSparseNumberedGraph;
 
@@ -72,7 +72,7 @@
   public static class CGInfo {
     public final Graph<IMember> cg = SlowSparseNumberedGraph.make();
     public final Set<FunctionInvocation> calls = HashSetFactory.make();
-  };
+  }
 
   public static Set<ModuleEntry> getJavaScriptCodeFromProject(String project) throws IOException, CoreException {
     IJavaScriptProject p = JavaScriptHeadlessUtil.getJavaScriptProjectFromWorkspace(project);
@@ -82,8 +82,8 @@
     List<Module> modules = s.getModules(JavaScriptTypes.jsLoader);
     Set<ModuleEntry> mes = HashSetFactory.make();
     for(Module m : modules) {
-      for(Iterator<? extends ModuleEntry> mm = m.getEntries(); mm.hasNext(); ) {
-        mes.add(mm.next());
+      for(ModuleEntry entry : Iterator2Iterable.make(m.getEntries())) {
+        mes.add(entry);
       }
     }
     return mes;
@@ -91,14 +91,14 @@
 
   public static CGInfo buildJSDTCallGraph(Set<ModuleEntry> mes) {
     final CGInfo info = new CGInfo();
-    HeadlessUtil.parseModules(mes, new EclipseCompiler<IJavaScriptUnit, JavaScriptUnit>() {
+    HeadlessUtil.parseModules(mes, new EclipseCompiler<IJavaScriptUnit>() {
       @Override
       public IJavaScriptUnit getCompilationUnit(IFile file) {
         return JavaScriptCore.createCompilationUnitFrom(file);
       }
       @Override
-      public Parser<IJavaScriptUnit, JavaScriptUnit> getParser() {
-        return new Parser<IJavaScriptUnit, JavaScriptUnit>() {
+      public Parser<IJavaScriptUnit> getParser() {
+        return new Parser<IJavaScriptUnit>() {
           IJavaScriptProject project;
 
           @Override
@@ -162,7 +162,7 @@
               ASTParser parser = ASTParser.newParser(AST.JLS3);
               parser.setProject(project);
               parser.setResolveBindings(true);
-              parser.createASTs(files.keySet().toArray(new IJavaScriptUnit[files.size()]), new String[0], new ASTRequestor() {
+              parser.createASTs(files.keySet().toArray(new IJavaScriptUnit[0]), new String[0], new ASTRequestor() {
                 @Override
                 public void acceptAST(IJavaScriptUnit source, JavaScriptUnit ast) {
                   ast.accept(visitor);
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/build.gradle wala-1.5.1/com.ibm.wala.ide.jsdt.tests/build.gradle
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,27 @@
+sourceSets.test {
+	java.srcDirs = ['src']
+	resources.srcDirs = ['testdata']
+}
+
+dependencies {
+	testCompile(
+		'eclipse-deps:org.eclipse.core.runtime:+',
+		'eclipse-deps:org.eclipse.equinox.common:+',
+		'eclipse-deps:org.eclipse.osgi:+',
+		'junit:junit:4.12',
+		'org.osgi:org.osgi.core:4.2.0',
+		'wst-deps:org.eclipse.wst.jsdt.core:+',
+		project(':com.ibm.wala.cast'),
+		project(':com.ibm.wala.cast.js'),
+		project(':com.ibm.wala.cast.js.rhino'),
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.ide.jsdt'),
+		project(':com.ibm.wala.util'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.ide.tests'),
+		)
+}
+
+test {
+	// https://github.com/liblit/WALA/issues/5
+	exclude '**/JSProjectScopeTest.class'
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/build.properties wala-1.5.1/com.ibm.wala.ide.jsdt.tests/build.properties
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,3 +1,7 @@
 source.. = src/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
+javacProjectSettings = true
+output.. = bin/
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/.classpath wala-1.5.1/com.ibm.wala.ide.jsdt.tests/.classpath
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/launchers/com.ibm.wala.ide.jsdt.tests.launch wala-1.5.1/com.ibm.wala.ide.jsdt.tests/launchers/com.ibm.wala.ide.jsdt.tests.launch
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/launchers/com.ibm.wala.ide.jsdt.tests.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/launchers/com.ibm.wala.ide.jsdt.tests.launch	2019-01-29 17:08:39.000000000 +0000
@@ -15,7 +15,7 @@
 <booleanAttribute key="clearwslog" value="false"/>
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
 <booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="NewAtomicSetsBuilder,com.ibm.appscan.jstaint,com.ibm.appscan.jstaint.analysis.ap,com.ibm.appscan.jstaint.exceptions,com.ibm.appscan.jstaint.harness,com.ibm.appscan.jstaint.hybridapps,com.ibm.appscan.jstaint.rules,com.ibm.appscan.jstaint.util,com.ibm.appscan.jstaint.util.logging,com.ibm.wala.andromeda.js.tests,com.ibm.wala.andromeda.rules,com.ibm.wala.andromeda.util,com.ibm.wala.cast.java,com.ibm.wala.cast.java.polyglot,com.ibm.wala.cast.java.polyglot.test,com.ibm.wala.cast.java.test,com.ibm.wala.cast.java.test.data,com.ibm.wala.cast.js.html.nu_validator,com.ibm.wala.cast.js.jsir,com.ibm.wala.cast.js.rhino.test,com.ibm.wala.cast.js.test,com.ibm.wala.cast.js.test.data,com.ibm.wala.cast.test,com.ibm.wala.core.testdata.java8,com.ibm.wala.dalvik,com.ibm.wala.dalvik.test,com.ibm.wala.dotnet,com.ibm.wala.dotnet.ikvm,com.ibm.wala.dotnet.test,com.ibm.wala.eventRacer,com.ibm.wala.ide.jdt,com.ibm.wala.ide.jdt.test,com.ibm.wala.jstaint.rules,com.ibm.wala.jstaint.util,com.ibm.wala.memsat,com.ibm.wala.memsat.jdt.test,com.ibm.wala.memsat.test,com.ibm.wala.memsat.testdata,com.ibm.wala.memsat.tests.internal,com.ibm.wala.scandroid,com.ibm.wala.worklight,com.ibm.wala.worklight.rules"/>
+<stringAttribute key="deselected_workspace_plugins" value="com.ibm.wala.cast.java,com.ibm.wala.cast.java.test,com.ibm.wala.cast.java.test.data,com.ibm.wala.cast.js.html.nu_validator,com.ibm.wala.cast.js.rhino.test,com.ibm.wala.cast.js.test,com.ibm.wala.cast.js.test.data,com.ibm.wala.cast.test,com.ibm.wala.dalvik,com.ibm.wala.dalvik.test,com.ibm.wala.ide.jdt,com.ibm.wala.ide.jdt.test,com.ibm.wala.scandroid"/>
 <stringAttribute key="featureDefaultLocation" value="workspace"/>
 <stringAttribute key="featurePluginResolution" value="workspace"/>
 <booleanAttribute key="includeOptional" value="true"/>
@@ -41,10 +41,10 @@
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
 <setAttribute key="selected_features">
-<setEntry value="com.ibm.wala-feature:default"/>
-<setEntry value="com.ibm.wala.ide-feature:default"/>
-<setEntry value="com.ibm.wala.tests-feature:default"/>
+<setEntry value="com.ibm.wala.ide_feature:default"/>
 <setEntry value="com.ibm.wala.tests.ide:default"/>
+<setEntry value="com.ibm.wala.tests_feature:default"/>
+<setEntry value="com.ibm.wala_feature:default"/>
 <setEntry value="org.eclipse.e4.rcp:default"/>
 <setEntry value="org.eclipse.ecf.core.feature:default"/>
 <setEntry value="org.eclipse.ecf.core.ssl.feature:default"/>
@@ -65,8 +65,8 @@
 <setEntry value="org.eclipse.rcp:default"/>
 <setEntry value="org.eclipse.wst.jsdt.feature:default"/>
 </setAttribute>
-<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.logging@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.logback.appender@default:false,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde@default:default,org.eclipse.platform@default:default,org.eclipse.search@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xsd@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.ibm.wala.cast.js.rhino@default:default,com.ibm.wala.cast.js@default:default,com.ibm.wala.cast@default:default,com.ibm.wala.core.testdata@default:default,com.ibm.wala.core.tests@default:default,com.ibm.wala.core@default:default,com.ibm.wala.ide.jsdt.tests@default:default,com.ibm.wala.ide.jsdt@default:default,com.ibm.wala.ide.tests@default:default,com.ibm.wala.ide@default:default,com.ibm.wala.shrike@default:default,com.ibm.wala.util@default:default"/>
+<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava*15.0.0.v201403281430@default:default,com.google.guava*21.0.0.v20170206-1425@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.lucene.core*3.5.0.v20120725-1805@default:default,org.apache.lucene.core*6.1.0.v20170814-1820@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.logback.appender@default:false,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde@default:default,org.eclipse.platform@default:default,org.eclipse.search@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xsd@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="com.ibm.wala.cast.java.ecj@default:default,com.ibm.wala.cast.js.nodejs.test@default:default,com.ibm.wala.cast.js.nodejs@default:default,com.ibm.wala.cast.js.rhino@default:default,com.ibm.wala.cast.js@default:default,com.ibm.wala.cast@default:default,com.ibm.wala.core.testdata@default:default,com.ibm.wala.core.tests@default:default,com.ibm.wala.core@default:default,com.ibm.wala.ide.jsdt.tests@default:default,com.ibm.wala.ide.jsdt@default:default,com.ibm.wala.ide.tests@default:default,com.ibm.wala.ide@default:default,com.ibm.wala.shrike@default:default,com.ibm.wala.util@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/launchers/JSProjectScopeTest.launch wala-1.5.1/com.ibm.wala.ide.jsdt.tests/launchers/JSProjectScopeTest.launch
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/launchers/JSProjectScopeTest.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/launchers/JSProjectScopeTest.launch	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,7 @@
 <booleanAttribute key="clearwslog" value="false"/>
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
 <booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="NewAtomicSetsBuilder,com.ibm.appscan.jstaint,com.ibm.appscan.jstaint.analysis.ap,com.ibm.appscan.jstaint.exceptions,com.ibm.appscan.jstaint.harness,com.ibm.appscan.jstaint.hybridapps,com.ibm.appscan.jstaint.rules,com.ibm.appscan.jstaint.util,com.ibm.appscan.jstaint.util.logging,com.ibm.wala.andromeda.js.tests,com.ibm.wala.andromeda.rules,com.ibm.wala.andromeda.util,com.ibm.wala.cast.java,com.ibm.wala.cast.java.polyglot,com.ibm.wala.cast.java.polyglot.test,com.ibm.wala.cast.java.test,com.ibm.wala.cast.java.test.data,com.ibm.wala.cast.js.html.nu_validator,com.ibm.wala.cast.js.jsir,com.ibm.wala.cast.js.rhino.test,com.ibm.wala.cast.js.test,com.ibm.wala.cast.js.test.data,com.ibm.wala.cast.test,com.ibm.wala.core.testdata.java8,com.ibm.wala.dalvik,com.ibm.wala.dalvik.test,com.ibm.wala.dotnet,com.ibm.wala.dotnet.ikvm,com.ibm.wala.dotnet.test,com.ibm.wala.eventRacer,com.ibm.wala.ide.jdt,com.ibm.wala.ide.jdt.test,com.ibm.wala.jstaint.rules,com.ibm.wala.jstaint.util,com.ibm.wala.memsat,com.ibm.wala.memsat.jdt.test,com.ibm.wala.memsat.test,com.ibm.wala.memsat.testdata,com.ibm.wala.memsat.tests.internal,com.ibm.wala.scandroid,com.ibm.wala.worklight,com.ibm.wala.worklight.rules"/>
+<stringAttribute key="deselected_workspace_plugins" value="com.ibm.wala.cast.java,com.ibm.wala.cast.java.test,com.ibm.wala.cast.java.test.data,com.ibm.wala.cast.js.html.nu_validator,com.ibm.wala.cast.js.rhino.test,com.ibm.wala.cast.js.test,com.ibm.wala.cast.js.test.data,com.ibm.wala.cast.test,com.ibm.wala.dalvik,com.ibm.wala.dalvik.test,com.ibm.wala.ide.jdt,com.ibm.wala.ide.jdt.test,com.ibm.wala.scandroid"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -27,7 +27,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/1.7.0 25"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/Java 8"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.ide.jsdt.tests.JSProjectScopeTest"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.ide.jsdt.tests"/>
@@ -36,8 +36,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.logging@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.logback.appender@default:false,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde@default:default,org.eclipse.platform@default:default,org.eclipse.search@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xsd@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.ibm.wala.cast.js.rhino@default:default,com.ibm.wala.cast.js@default:default,com.ibm.wala.cast@default:default,com.ibm.wala.core.testdata@default:default,com.ibm.wala.core.tests@default:default,com.ibm.wala.core@default:default,com.ibm.wala.ide.jsdt@default:default,com.ibm.wala.ide.tests@default:default,com.ibm.wala.ide@default:default,com.ibm.wala.shrike@default:default,com.ibm.wala.util@default:default"/>
+<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava*15.0.0.v201403281430@default:default,com.google.guava*21.0.0.v20170206-1425@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.lucene.core*3.5.0.v20120725-1805@default:default,org.apache.lucene.core*6.1.0.v20170814-1820@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.logback.appender@default:false,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde@default:default,org.eclipse.platform@default:default,org.eclipse.search@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xsd@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="com.ibm.wala.cast.java.ecj@default:default,com.ibm.wala.cast.js.nodejs.test@default:default,com.ibm.wala.cast.js.nodejs@default:default,com.ibm.wala.cast.js.rhino@default:default,com.ibm.wala.cast.js@default:default,com.ibm.wala.cast@default:default,com.ibm.wala.core.testdata@default:default,com.ibm.wala.core.tests@default:default,com.ibm.wala.core@default:default,com.ibm.wala.ide.jsdt.tests@default:default,com.ibm.wala.ide.jsdt@default:default,com.ibm.wala.ide.tests@default:default,com.ibm.wala.ide@default:default,com.ibm.wala.shrike@default:default,com.ibm.wala.util@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: JSDT Tests
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.ide.jsdt.tests;singleton:=true
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Require-Bundle: com.ibm.wala.core;bundle-version="1.1.3",
  com.ibm.wala.cast;bundle-version="1.0.0",
  com.ibm.wala.cast.js;bundle-version="1.0.0",
@@ -23,5 +23,5 @@
  org.eclipse.ui.ide.application;bundle-version="1.0.501"
 Bundle-Activator: com.ibm.wala.ide.jsdt.tests.Activator
 Export-Package: com.ibm.wala.ide.jsdt.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.ide.jsdt.tests/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+#Properties file for com.ibm.wala.ide.jsdt.tests
+Bundle-Name = JSDT Tests
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/pom.xml wala-1.5.1/com.ibm.wala.ide.jsdt.tests/pom.xml
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.9</version>
+    <version>1.5.1</version>
   </parent>
 
   <artifactId>com.ibm.wala.ide.jsdt.tests</artifactId>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/.project wala-1.5.1/com.ibm.wala.ide.jsdt.tests/.project
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.ide.jsdt.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,79 +1,127 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=error
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=error
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=0
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude11004file139target/site/dependency-convergence.htmlT0304file119target/work/pluginsT0204file176target/work/data/com.ibm.wala.cast.js.test.data/examples-src/pages/list.htmlT0304file177target/work/data/com.ibm.wala.cast.js.test.data/examples-src/pages/page1.htmlT0304file177target/work/data/com.ibm.wala.cast.js.test.data/examples-src/pages/page2.htmlT0304file177target/work/data/com.ibm.wala.cast.js.test.data/examples-src/pages/page1.htmlT0304file177target/work/data/com.ibm.wala.cast.js.test.data/examples-src/pages/page2.htmlT0304file177target/work/data/com.ibm.wala.cast.js.test.data/examples-src/pages/page4.htmlT0304file179target/work/data/com.ibm.wala.cast.js.test.data/examples-src/pages/windowx.htmlT0304file193target/work/data/com.ibm.wala.cast.js.test.data/examples-src/tests/portal-example-simple.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude09113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T02111contentType133org.eclipse.jdt.junit.JUnitResultF04file119target/work/pluginsT0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/src/com/ibm/wala/ide/jsdt/tests/AbstractJSProjectScopeTest.java wala-1.5.1/com.ibm.wala.ide.jsdt.tests/src/com/ibm/wala/ide/jsdt/tests/AbstractJSProjectScopeTest.java
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/src/com/ibm/wala/ide/jsdt/tests/AbstractJSProjectScopeTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/src/com/ibm/wala/ide/jsdt/tests/AbstractJSProjectScopeTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -35,8 +35,8 @@
 import com.ibm.wala.ide.util.JsdtUtil;
 import com.ibm.wala.ide.util.JsdtUtil.CGInfo;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
-import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.Pair;
 
 public abstract class AbstractJSProjectScopeTest {
@@ -81,9 +81,9 @@
   }
 
   @Test
-  public void testEngine() throws IOException, CoreException, IllegalArgumentException, CancelException {
+  public void testEngine() throws IOException, IllegalArgumentException {
     IJavaScriptProject p = JavaScriptHeadlessUtil.getJavaScriptProjectFromWorkspace(project.projectName);
-    EclipseJavaScriptAnalysisEngine e = makeAnalysisEngine(p);
+    EclipseJavaScriptAnalysisEngine<InstanceKey> e = makeAnalysisEngine(p);
     JSCallGraphUtil.setTranslatorFactory(new CAstRhinoTranslatorFactory());
     e.buildAnalysisScope();
     IClassHierarchy cha = e.getClassHierarchy();
@@ -91,8 +91,8 @@
     Assert.assertTrue(cha != null);
   }
 
-  protected EclipseJavaScriptAnalysisEngine makeAnalysisEngine(IJavaScriptProject p) throws IOException, CoreException {
-    return new EclipseJavaScriptAnalysisEngine(p, BuilderType.REFLECTIVE);
+  protected EclipseJavaScriptAnalysisEngine<InstanceKey> makeAnalysisEngine(IJavaScriptProject p) {
+    return new EclipseJavaScriptAnalysisEngine<>(p, BuilderType.REFLECTIVE);
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/src/com/ibm/wala/ide/jsdt/tests/Activator.java wala-1.5.1/com.ibm.wala.ide.jsdt.tests/src/com/ibm/wala/ide/jsdt/tests/Activator.java
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/src/com/ibm/wala/ide/jsdt/tests/Activator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/src/com/ibm/wala/ide/jsdt/tests/Activator.java	2019-01-29 17:08:39.000000000 +0000
@@ -31,6 +31,7 @@
    * 
    * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
    */
+  @Override
   public void start(BundleContext context) throws Exception {
     super.start(context);
     plugin = this;
@@ -41,6 +42,7 @@
    * 
    * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
    */
+  @Override
   public void stop(BundleContext context) throws Exception {
     plugin = null;
     super.stop(context);
diff -Nru wala-1.3.9/com.ibm.wala.ide.jsdt.tests/src/com/ibm/wala/ide/jsdt/tests/JSProjectScopeTest.java wala-1.5.1/com.ibm.wala.ide.jsdt.tests/src/com/ibm/wala/ide/jsdt/tests/JSProjectScopeTest.java
--- wala-1.3.9/com.ibm.wala.ide.jsdt.tests/src/com/ibm/wala/ide/jsdt/tests/JSProjectScopeTest.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.jsdt.tests/src/com/ibm/wala/ide/jsdt/tests/JSProjectScopeTest.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package com.ibm.wala.ide.jsdt.tests;
 
+import java.io.IOException;
+
 import com.ibm.wala.ide.tests.util.EclipseTestUtil.ZippedProjectData;
 
 public class JSProjectScopeTest extends AbstractJSProjectScopeTest {
@@ -18,7 +20,14 @@
 
   public static final String PROJECT_ZIP = "test_js_project.zip";
   
-  public static final ZippedProjectData PROJECT = new ZippedProjectData(Activator.getDefault(), PROJECT_NAME, PROJECT_ZIP);
+  public static final ZippedProjectData PROJECT;
+  static {
+    try {
+      PROJECT = new ZippedProjectData(Activator.getDefault(), PROJECT_NAME, PROJECT_ZIP);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
   
   public JSProjectScopeTest() {
     super(PROJECT);
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/build.gradle wala-1.5.1/com.ibm.wala.ide.tests/build.gradle
--- wala-1.3.9/com.ibm.wala.ide.tests/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,26 @@
+plugins {
+	id 'com.github.hauner.jarTest'
+	id 'eclipse'
+}
+
+eclipse.project.natures 'org.eclipse.pde.PluginNature'
+
+sourceSets.test.java.srcDirs = ['src']
+
+dependencies {
+	testCompile(
+		'eclipse-deps:org.eclipse.core.resources:+',
+		'eclipse-deps:org.eclipse.core.runtime:+',
+		'eclipse-deps:org.eclipse.equinox.common:+',
+		'eclipse-deps:org.eclipse.jface:+',
+		'eclipse-deps:org.eclipse.osgi:+',
+		'eclipse-deps:org.eclipse.ui.ide:+',
+		'eclipse-deps:org.eclipse.ui.workbench:+',
+		'org.osgi:org.osgi.core:4.2.0',
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.ide'),
+		project(':com.ibm.wala.util'),
+		project(configuration: 'testArchives', path: ':com.ibm.wala.core.tests'),
+		)
+	testRuntime project(':com.ibm.wala.ide.jdt')
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/build.properties wala-1.5.1/com.ibm.wala.ide.tests/build.properties
--- wala-1.3.9/com.ibm.wala.ide.tests/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,6 +1,7 @@
 source.. = src/,
-output.. = bin/
+output.. = bin/test
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                plugin.properties
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/.classpath wala-1.5.1/com.ibm.wala.ide.tests/.classpath
--- wala-1.3.9/com.ibm.wala.ide.tests/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/launchers/IFDSExplorerExample.launch wala-1.5.1/com.ibm.wala.ide.tests/launchers/IFDSExplorerExample.launch
--- wala-1.3.9/com.ibm.wala.ide.tests/launchers/IFDSExplorerExample.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/launchers/IFDSExplorerExample.launch	2019-01-29 17:08:39.000000000 +0000
@@ -6,6 +6,7 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5&quot; javaProject=&quot;com.ibm.wala.ide.tests&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;com.ibm.wala.ide.tests&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
@@ -13,6 +14,7 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/bin&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/com.ibm.wala.core.testdata/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.IFDSExplorerExample"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-dotExe /opt/local/bin/dot -viewerExe /Users/manu/scripts/open_pdf.scpt"/>
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/launchers/SWTCallGraph.launch wala-1.5.1/com.ibm.wala.ide.tests/launchers/SWTCallGraph.launch
--- wala-1.3.9/com.ibm.wala.ide.tests/launchers/SWTCallGraph.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/launchers/SWTCallGraph.launch	2019-01-29 17:08:39.000000000 +0000
@@ -7,8 +7,9 @@
 <listEntry value="1"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.SWTCallGraph"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar ${resource_loc:/com.ibm.wala.core.testdata/JLex.jar}"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar &quot;${resource_loc:/com.ibm.wala.core.testdata/JLex.jar}&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.ide.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx800M"/>
 </launchConfiguration>
diff -Nru "/tmp/tmpdO65hx/hoNCbJkA_9/wala-1.3.9/com.ibm.wala.ide.tests/launchers/SWTCallGraph - OCaml - ipascal.launch" "/tmp/tmpdO65hx/vj4dUdzt1P/wala-1.5.1/com.ibm.wala.ide.tests/launchers/SWTCallGraph - OCaml - ipascal.launch"
--- "/tmp/tmpdO65hx/hoNCbJkA_9/wala-1.3.9/com.ibm.wala.ide.tests/launchers/SWTCallGraph - OCaml - ipascal.launch"	2016-05-10 12:59:26.000000000 +0000
+++ "/tmp/tmpdO65hx/vj4dUdzt1P/wala-1.5.1/com.ibm.wala.ide.tests/launchers/SWTCallGraph - OCaml - ipascal.launch"	2019-01-29 17:08:39.000000000 +0000
@@ -6,6 +6,7 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.SWTCallGraph"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar /Users/dolby/Analysis/examples/ocaml-examples-3.12/pascal/ipascal.jar"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.ide.tests"/>
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/launchers/SWTPointsTo.launch wala-1.5.1/com.ibm.wala.ide.tests/launchers/SWTPointsTo.launch
--- wala-1.3.9/com.ibm.wala.ide.tests/launchers/SWTPointsTo.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/launchers/SWTPointsTo.launch	2019-01-29 17:08:39.000000000 +0000
@@ -6,8 +6,9 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.SWTPointsTo"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar ${resource_loc:/com.ibm.wala.core.testdata/JLex.jar}"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-appJar &quot;${resource_loc:/com.ibm.wala.core.testdata/JLex.jar}&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.ide.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx800M"/>
 </launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/launchers/SWTTypeHierarchy.launch wala-1.5.1/com.ibm.wala.ide.tests/launchers/SWTTypeHierarchy.launch
--- wala-1.3.9/com.ibm.wala.ide.tests/launchers/SWTTypeHierarchy.launch	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/launchers/SWTTypeHierarchy.launch	2019-01-29 17:08:39.000000000 +0000
@@ -6,8 +6,9 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.ibm.wala.examples.drivers.SWTTypeHierarchy"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-classpath ${resource_loc:/com.ibm.wala.core.testdata/JLex.jar}"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-classpath &quot;${resource_loc:/com.ibm.wala.core.testdata/JLex.jar}&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.ibm.wala.ide.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx800M"/>
 </launchConfiguration>
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -2,11 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.ibm.wala.ide.tests;singleton:=true
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Bundle-Vendor: %providerName
 Require-Bundle: com.ibm.wala.shrike,
  com.ibm.wala.core,
  com.ibm.wala.ide,
+ com.ibm.wala.ide.jdt;bundle-version="1.5.1",
  com.ibm.wala.core.tests,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
@@ -18,7 +19,10 @@
  org.eclipse.e4.core.di;bundle-version="1.2.0";resolution:=optional,
  org.junit;bundle-version="4.0.0"
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Export-Package: com.ibm.wala.ide.tests.util
+Export-Package: com.ibm.wala.examples.drivers,
+ com.ibm.wala.ide.test,
+ com.ibm.wala.ide.tests.util
 Bundle-Activator: com.ibm.wala.ide.test.Activator
+Automatic-Module-Name: com.ibm.wala.ide.tests
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/plugin.xml wala-1.5.1/com.ibm.wala.ide.tests/plugin.xml
--- wala-1.3.9/com.ibm.wala.ide.tests/plugin.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/plugin.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.2"?>
+<!DOCTYPE plugin>
 <plugin>
    <extension id="HeadlessWALA"
          point="org.eclipse.core.runtime.applications">
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/pom.xml wala-1.5.1/com.ibm.wala.ide.tests/pom.xml
--- wala-1.3.9/com.ibm.wala.ide.tests/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.9</version>
+    <version>1.5.1</version>
   </parent>
   <artifactId>com.ibm.wala.ide.tests</artifactId>
   <packaging>eclipse-plugin</packaging>
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/.project wala-1.5.1/com.ibm.wala.ide.tests/.project
--- wala-1.3.9/com.ibm.wala.ide.tests/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.ide.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.ide.tests/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.ide.tests/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,78 +1,128 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=error
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=error
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.ide.tests/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.ide.tests/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.ide.tests/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.ide.tests/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/IFDSExplorerExample.java wala-1.5.1/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/IFDSExplorerExample.java
--- wala-1.3.9/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/IFDSExplorerExample.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/IFDSExplorerExample.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,12 +13,13 @@
 import java.io.IOException;
 import java.util.Properties;
 
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.core.tests.util.TestConstants;
 import com.ibm.wala.dataflow.IFDS.TabulationResult;
 import com.ibm.wala.examples.analysis.dataflow.ContextSensitiveReachingDefs;
 import com.ibm.wala.ide.ui.IFDSExplorer;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -26,9 +27,11 @@
 import com.ibm.wala.ipa.callgraph.CallGraphBuilder;
 import com.ibm.wala.ipa.callgraph.CallGraphBuilderCancelException;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.cfg.BasicBlockInContext;
-import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ssa.analysis.IExplodedBasicBlock;
 import com.ibm.wala.util.WalaException;
@@ -42,29 +45,23 @@
 public class IFDSExplorerExample {
 
   /**
-   * Usage: IFDSExplorerExample -dotExe <path_to_dot_exe> -viewerExe <path_to_viewer_exe>
-   * 
-   * @param args
-   * @throws IOException
-   * @throws CallGraphBuilderCancelException
-   * @throws IllegalArgumentException
-   * @throws WalaException
+   * Usage: {@code IFDSExplorerExample -dotExe <path_to_dot_exe> -viewerExe <path_to_viewer_exe>}
    */
   public static void main(String[] args) throws IOException, IllegalArgumentException, CallGraphBuilderCancelException,
       WalaException {
     Properties p = CommandLine.parse(args);
     AnalysisScope scope = CallGraphTestUtil.makeJ2SEAnalysisScope(TestConstants.WALA_TESTDATA, "Java60RegressionExclusions.txt");
-    IClassHierarchy cha = ClassHierarchy.make(scope);
+    IClassHierarchy cha = ClassHierarchyFactory.make(scope);
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha,
         "Ldataflow/StaticDataflow");
     AnalysisOptions options = CallGraphTestUtil.makeAnalysisOptions(scope, entrypoints);
-    AnalysisCache cache = new AnalysisCache();
-    CallGraphBuilder builder = Util.makeZeroOneCFABuilder(options, cache, cha, scope);
+    IAnalysisCacheView cache = new AnalysisCacheImpl();
+    CallGraphBuilder<InstanceKey> builder = Util.makeZeroOneCFABuilder(Language.JAVA, options, cache, cha, scope);
     System.out.println("building CG");
     CallGraph cg = builder.makeCallGraph(options, null);
     System.out.println("done with CG");
     System.out.println("computing reaching defs");
-    ContextSensitiveReachingDefs reachingDefs = new ContextSensitiveReachingDefs(cg, cache);
+    ContextSensitiveReachingDefs reachingDefs = new ContextSensitiveReachingDefs(cg);
     TabulationResult<BasicBlockInContext<IExplodedBasicBlock>, CGNode, Pair<CGNode, Integer>> result = reachingDefs.analyze();
     System.out.println("done with reaching defs");
     IFDSExplorer.setDotExe(p.getProperty("dotExe"));
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTCallGraph.java wala-1.5.1/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTCallGraph.java
--- wala-1.3.9/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,11 +16,12 @@
 
 import org.eclipse.jface.window.ApplicationWindow;
 
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.examples.properties.WalaExamplesProperties;
 import com.ibm.wala.ide.ui.SWTTreeViewer;
 import com.ibm.wala.ide.ui.ViewIRAction;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions.ReflectionOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
@@ -28,7 +29,9 @@
 import com.ibm.wala.ipa.callgraph.CallGraphStats;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 import com.ibm.wala.ipa.callgraph.impl.Util;
+import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.properties.WalaProperties;
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.config.AnalysisScopeReader;
@@ -57,11 +60,8 @@
    * 
    * If it's a directory, then we'll try to find all jar files under that
    * directory.
-   * 
-   * @param args
-   * @throws WalaException
    */
-  public static void main(String[] args) throws WalaException {
+  public static void main(String[] args) {
     Properties p = CommandLine.parse(args);
     PDFCallGraph.validateCommandLine(p);
     run(p);
@@ -79,10 +79,8 @@
    *            <li> "RTA"
    *            </ul>
    *            </ul>
-   * 
-   * @throws WalaException
    */
-  public static ApplicationWindow run(Properties p) throws WalaException {
+  public static ApplicationWindow run(Properties p) {
 
     try {
       String appJar = p.getProperty("appJar");
@@ -95,14 +93,15 @@
       AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, exclusionFile != null ? new File(exclusionFile)
           : (new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
-      ClassHierarchy cha = ClassHierarchy.make(scope);
+      ClassHierarchy cha = ClassHierarchyFactory.make(scope);
 
       Iterable<Entrypoint> entrypoints = null;
-      JarFile jar = new JarFile(appJar);
-      if (jar.getManifest() != null) {
-        String mainClass = jar.getManifest().getMainAttributes().getValue("Main-Class");
-        if (mainClass != null) {
-          entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha, "L" + mainClass.replace('.', '/'));
+      try (final JarFile jar = new JarFile(appJar)) {
+        if (jar.getManifest() != null) {
+          String mainClass = jar.getManifest().getMainAttributes().getValue("Main-Class");
+          if (mainClass != null) {
+            entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha, 'L' + mainClass.replace('.', '/'));
+          }
         }
       }
       if (entrypoints == null) {
@@ -115,7 +114,7 @@
       // //
       // build the call graph
       // //
-      com.ibm.wala.ipa.callgraph.CallGraphBuilder builder = Util.makeZeroCFABuilder(options, new AnalysisCache(), cha, scope, null,
+      com.ibm.wala.ipa.callgraph.CallGraphBuilder<InstanceKey> builder = Util.makeZeroCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(), cha, scope, null,
           null);
       CallGraph cg = builder.makeCallGraph(options,null);
 
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTPointsTo.java wala-1.5.1/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTPointsTo.java
--- wala-1.3.9/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTPointsTo.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTPointsTo.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,9 +16,10 @@
 import org.eclipse.jface.window.ApplicationWindow;
 
 import com.ibm.wala.analysis.pointers.BasicHeapGraph;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.core.tests.callGraph.CallGraphTestUtil;
 import com.ibm.wala.ide.ui.SWTTreeViewer;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CallGraph;
@@ -27,6 +28,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
 import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.config.AnalysisScopeReader;
@@ -47,11 +49,8 @@
   /**
    * Usage: SWTPointsTo -appJar [jar file name] The "jar file name" should be
    * something like "c:/temp/testdata/java_cup.jar"
-   * 
-   * @param args
-   * @throws WalaException
    */
-  public static void main(String[] args) throws WalaException {
+  public static void main(String[] args) {
     Properties p = CommandLine.parse(args);
     PDFCallGraph.validateCommandLine(p);
     run(p.getProperty("appJar"));
@@ -83,7 +82,7 @@
     AnalysisScope scope = AnalysisScopeReader.makeJavaBinaryAnalysisScope(appJar, (new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
     
-    ClassHierarchy cha = ClassHierarchy.make(scope);
+    ClassHierarchy cha = ClassHierarchyFactory.make(scope);
 
     Iterable<Entrypoint> entrypoints = com.ibm.wala.ipa.callgraph.impl.Util.makeMainEntrypoints(scope, cha);
     AnalysisOptions options = new AnalysisOptions(scope, entrypoints);
@@ -91,12 +90,12 @@
     // //
     // build the call graph
     // //
-    com.ibm.wala.ipa.callgraph.CallGraphBuilder builder = Util.makeVanillaZeroOneCFABuilder(options, new AnalysisCache(),cha, scope, null, null);
+    com.ibm.wala.ipa.callgraph.CallGraphBuilder<InstanceKey> builder = Util.makeVanillaZeroOneCFABuilder(Language.JAVA, options, new AnalysisCacheImpl(),cha, scope, null, null);
     CallGraph cg = builder.makeCallGraph(options,null);
     PointerAnalysis<InstanceKey> pointerAnalysis = builder.getPointerAnalysis();
     
     System.err.println(pointerAnalysis);
     
-    return new BasicHeapGraph(pointerAnalysis, cg);
+    return new BasicHeapGraph<>(pointerAnalysis, cg);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTTypeHierarchy.java wala-1.5.1/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTTypeHierarchy.java
--- wala-1.3.9/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTTypeHierarchy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/src/com/ibm/wala/examples/drivers/SWTTypeHierarchy.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.examples.drivers;
 
 import java.util.Collection;
+import java.util.function.Predicate;
 
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.window.ApplicationWindow;
@@ -20,11 +21,10 @@
 import com.ibm.wala.ide.ui.SWTTreeViewer;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.types.ClassLoaderReference;
-import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.CollectionFilter;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.config.AnalysisScopeReader;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.GraphSlicer;
@@ -58,7 +58,7 @@
           .getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS));
 
       // invoke WALA to build a class hierarchy
-      ClassHierarchy cha = ClassHierarchy.make(scope);
+      ClassHierarchy cha = ClassHierarchyFactory.make(scope);
 
       Graph<IClass> g = typeHierarchy2Graph(cha);
       g = pruneForAppLoader(g);
@@ -84,7 +84,7 @@
   /**
    * Return a view of an {@link IClassHierarchy} as a {@link Graph}, with edges from classes to immediate subtypes
    */
-  public static Graph<IClass> typeHierarchy2Graph(IClassHierarchy cha) throws WalaException {
+  public static Graph<IClass> typeHierarchy2Graph(IClassHierarchy cha) {
     Graph<IClass> result = SlowSparseNumberedGraph.make();
     for (IClass c : cha) {
       result.addNode(c);
@@ -105,21 +105,17 @@
   /**
    * Restrict g to nodes from the Application loader
    */
-  static Graph<IClass> pruneForAppLoader(Graph<IClass> g) throws WalaException {
-    Predicate<IClass> f = new Predicate<IClass>() {
-      @Override public boolean test(IClass c) {
-        return (c.getClassLoader().getReference().equals(ClassLoaderReference.Application));
-      }
-    };
+  static Graph<IClass> pruneForAppLoader(Graph<IClass> g) {
+    Predicate<IClass> f = c -> (c.getClassLoader().getReference().equals(ClassLoaderReference.Application));
     return pruneGraph(g, f);
   }
 
   /**
    * Remove from a graph g any nodes that are not accepted by a {@link Predicate}
    */
-  public static <T> Graph<T> pruneGraph(Graph<T> g, Predicate<T> f) throws WalaException {
+  public static <T> Graph<T> pruneGraph(Graph<T> g, Predicate<T> f) {
     Collection<T> slice = GraphSlicer.slice(g, f);
-    return GraphSlicer.prune(g, new CollectionFilter<T>(slice));
+    return GraphSlicer.prune(g, new CollectionFilter<>(slice));
   }
 
   /**
@@ -137,4 +133,4 @@
       throw new UnsupportedOperationException("invalid command-line, args[0] should be -classpath, but is " + args[0]);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.ide.tests/src/com/ibm/wala/ide/tests/util/EclipseTestUtil.java wala-1.5.1/com.ibm.wala.ide.tests/src/com/ibm/wala/ide/tests/util/EclipseTestUtil.java
--- wala-1.3.9/com.ibm.wala.ide.tests/src/com/ibm/wala/ide/tests/util/EclipseTestUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.ide.tests/src/com/ibm/wala/ide/tests/util/EclipseTestUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -41,14 +41,14 @@
     public final String projectName;
     public final String zipFileName;
  
-    public ZippedProjectData(Plugin sourcePlugin, String projectName, String zipFileName) {
+    public ZippedProjectData(Plugin sourcePlugin, String projectName, String zipFileName) throws IOException {
       this.sourcePlugin = sourcePlugin;
       this.projectName = projectName;
       this.zipFileName = zipFileName;
       open();
     }
     
-    private void open() {
+    private void open() throws IOException {
       importZippedProject(sourcePlugin, projectName, zipFileName, new NullProgressMonitor());
     }
     
@@ -57,10 +57,11 @@
     }
   }
   
-  public static void importZippedProject(Plugin plugin, String projectName, String zipFileName, IProgressMonitor monitor) {
-    ZipFile zipFile = getZipFile(plugin, zipFileName);
-    createOpenProject(projectName);
-    importZipfile(projectName, zipFile, monitor);
+  public static void importZippedProject(Plugin plugin, String projectName, String zipFileName, IProgressMonitor monitor) throws IOException {
+    try (final ZipFile zipFile = getZipFile(plugin, zipFileName)) {
+      createOpenProject(projectName);
+      importZipfile(projectName, zipFile, monitor);
+    }
   }
 
   public static void createOpenProject(String projectName) {
@@ -104,12 +105,7 @@
   protected static <T> void importProject(IImportStructureProvider provider, IProgressMonitor monitor, String projectName, T root) {
     IPath containerPath = getWorkspacePath().append(projectName).addTrailingSeparator();
 
-    ImportOperation importOp = new ImportOperation(containerPath, root, provider, new IOverwriteQuery() {
-      @Override
-      public String queryOverwrite(String pathString) {
-        return IOverwriteQuery.ALL;
-      }
-    });
+    ImportOperation importOp = new ImportOperation(containerPath, root, provider, pathString -> IOverwriteQuery.ALL);
 
     importOp.setCreateContainerStructure(false);
     importOp.setOverwriteResources(true);
diff -Nru wala-1.3.9/com.ibm.wala-repository/category.xml wala-1.5.1/com.ibm.wala-repository/category.xml
--- wala-1.3.9/com.ibm.wala-repository/category.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala-repository/category.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-    <feature id="com.ibm.wala-feature">
+    <feature id="com.ibm.wala_feature">
         <category name="main"/>
     </feature>
-    <feature id="com.ibm.wala-feature.source">
+    <feature id="com.ibm.wala_feature.source">
         <category name="main"/>
     </feature>
-    <feature id="com.ibm.wala.ide-feature">
+    <feature id="com.ibm.wala.ide_feature">
         <category name="main"/>
     </feature>
-    <feature id="com.ibm.wala.ide-feature.source">
+    <feature id="com.ibm.wala.ide_feature.source">
         <category name="main"/>
     </feature>
    <category-def name="main" label="Wala"/>
diff -Nru wala-1.3.9/com.ibm.wala-repository/pom.xml wala-1.5.1/com.ibm.wala-repository/pom.xml
--- wala-1.3.9/com.ibm.wala-repository/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala-repository/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ibm.wala</groupId>
         <artifactId>WALA</artifactId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
     <artifactId>com.ibm.wala-repository</artifactId>
     <packaging>eclipse-repository</packaging>
diff -Nru wala-1.3.9/com.ibm.wala-repository/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala-repository/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala-repository/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala-repository/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,9 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/build.gradle wala-1.5.1/com.ibm.wala.scandroid/build.gradle
--- wala-1.3.9/com.ibm.wala.scandroid/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,12 @@
+sourceSets.main.java.srcDirs = ['source']
+
+dependencies {
+	compile(
+		'com.google.guava:guava:18.0',
+		'commons-cli:commons-cli:1.4',
+		project(':com.ibm.wala.core'),
+		project(':com.ibm.wala.dalvik'),
+		project(':com.ibm.wala.shrike'),
+		project(':com.ibm.wala.util'),
+		)
+}
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/build.properties wala-1.5.1/com.ibm.wala.scandroid/build.properties
--- wala-1.3.9/com.ibm.wala.scandroid/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,7 @@
 source.. = source/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/l10n/bundle.properties,\
+               OSGI-INF/
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/.classpath wala-1.5.1/com.ibm.wala.scandroid/.classpath
--- wala-1.3.9/com.ibm.wala.scandroid/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="source"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.scandroid/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.scandroid/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,14 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SCanDroid
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.scandroid
-Bundle-Version: 1.3.9
-Bundle-Activator: com.ibm.wala.scandroid.Activator
-Bundle-Vendor: IBM
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- com.ibm.wala.dalvik;bundle-version="1.3.4",
+Bundle-Version: 1.5.1
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: com.ibm.wala.dalvik;bundle-version="1.3.4",
  com.ibm.wala.core;bundle-version="1.3.4",
  com.ibm.wala.shrike;bundle-version="1.3.4"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/mvncentral.xml wala-1.5.1/com.ibm.wala.scandroid/mvncentral.xml
--- wala-1.3.9/com.ibm.wala.scandroid/mvncentral.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/mvncentral.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.ibm.wala</groupId>
+  <artifactId>com.ibm.wala.scandroid</artifactId>
+  <version>1.5.1</version>
+  <packaging>jar</packaging>
+  <name>WALA Scandroid</name>
+  <description>WALA Scandroid taint analysis</description>
+  <url>http://wala.sourceforge.net</url>
+  <licenses>
+    <license>
+      <name>Eclipse Public License, Version 1.0</name>
+      <url>https://www.eclipse.org/legal/epl-v10.html</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>Manu Sridharan</name>
+      <email>m.sridharan@samsung.com</email>
+      <organization>Samsung Research America</organization>
+      <organizationUrl>http://www.sisa.samsung.com/</organizationUrl>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git@github.com:wala/WALA.git</connection>
+    <developerConnection>scm:git:git@github.com:example/example-application.git</developerConnection>
+    <url>git@github.com:example/example-application.git</url>
+  </scm>
+
+  <properties>
+    <src.dir>source</src.dir>
+  </properties>
+
+  <distributionManagement>
+    <snapshotRepository>
+      <id>ossrh</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <dependencies>
+   <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.util</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.core</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.shrike</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.ibm.wala</groupId>
+      <artifactId>com.ibm.wala.dalvik</artifactId>
+      <version>1.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>22.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.4</version>
+    </dependency>
+  </dependencies>
+
+  <repositories>
+    <repository>
+      <id>sonatype-snapshots</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+    </repository>
+    <repository>
+        <id>maven-jars-mvn-repo</id>
+        <url>https://raw.github.com/msridhar/maven-jars/mvn-repo/</url>
+    </repository>
+  </repositories>
+
+  <profiles>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
+
+  <build>
+    <sourceDirectory>${src.dir}</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.2</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.3</version>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>ossrh</serverId>
+          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>true</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.2.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <additionalparam>${javadoc.options}</additionalparam>
+        </configuration>
+        <version>2.9.1</version>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+    <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-gpg-plugin</artifactId>
+      <version>1.5</version>
+      <executions>
+        <execution>
+          <id>sign-artifacts</id>
+          <phase>verify</phase>
+          <goals>
+            <goal>sign</goal>
+          </goals>
+        </execution>
+      </executions>
+    </plugin>
+
+    </plugins>
+  </build>
+</project>
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.scandroid/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.scandroid/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.scandroid
+Bundle-Vendor = IBM
+Bundle-Name = SCanDroid
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/pom.xml wala-1.5.1/com.ibm.wala.scandroid/pom.xml
--- wala-1.3.9/com.ibm.wala.scandroid/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
   <artifactId>com.ibm.wala.scandroid</artifactId>
   <packaging>eclipse-plugin</packaging>
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/.project wala-1.5.1/com.ibm.wala.scandroid/.project
--- wala-1.3.9/com.ibm.wala.scandroid/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.scandroid</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.scandroid/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.scandroid/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,7 +1,115 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.scandroid/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.scandroid/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=1
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=1
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=2
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=1
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.scandroid/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.scandroid/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/com/ibm/wala/scandroid/Activator.java wala-1.5.1/com.ibm.wala.scandroid/source/com/ibm/wala/scandroid/Activator.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/com/ibm/wala/scandroid/Activator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/com/ibm/wala/scandroid/Activator.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *****************************************************************************/
-package com.ibm.wala.scandroid;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "com.ibm.wala.scandroid"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/domain/CodeElement.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/domain/CodeElement.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/domain/CodeElement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/domain/CodeElement.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,21 +47,16 @@
 
 package org.scandroid.domain;
 
-import java.util.HashSet;
+import java.util.Collections;
 import java.util.Set;
 
-import com.ibm.wala.ipa.callgraph.CGNode;
-import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
-import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
-
 public abstract class CodeElement {
     /* For a given value number, and enclosing call graph node, yield
      * the set of all CodeElements that that it may refer to (i.e., the
      * associated local variable and any instances it may refer to). */
-    public static Set<CodeElement> valueElements(PointerAnalysis<InstanceKey> pa, CGNode node, int valueNumber) {
+    public static Set<CodeElement> valueElements(int valueNumber) {
     	//System.out.println("ValueNumber: " + valueNumber + ", Node: " + node.getMethod().getSignature());
-        Set<CodeElement> elements = new HashSet<CodeElement>();
-        elements.add(new LocalElement(valueNumber));
+        Set<CodeElement> elements = Collections.singleton(new LocalElement(valueNumber));
 //        PointerKey pk = new LocalPointerKey(node, valueNumber);
 //        OrdinalSet<InstanceKey> m = pa.getPointsToSet(pk);
 //        if(m != null) {
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/domain/DomainElement.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/domain/DomainElement.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/domain/DomainElement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/domain/DomainElement.java	2019-01-29 17:08:39.000000000 +0000
@@ -87,6 +87,7 @@
 	
 	
 	
+	@Override
 	public String toString() {
 		return codeElement.toString() + ", " + taintSource;
 	}
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/domain/FieldElement.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/domain/FieldElement.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/domain/FieldElement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/domain/FieldElement.java	2019-01-29 17:08:39.000000000 +0000
@@ -94,6 +94,6 @@
     @Override
     public String toString()
     {
-        return "FieldElement("+fieldRef.getSignature()+","+object+")";
+        return "FieldElement("+fieldRef.getSignature()+ ',' +object+ ')';
     }
 }
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/domain/IFDSTaintDomain.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/domain/IFDSTaintDomain.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/domain/IFDSTaintDomain.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/domain/IFDSTaintDomain.java	2019-01-29 17:08:39.000000000 +0000
@@ -61,12 +61,12 @@
 
 public class IFDSTaintDomain <E extends ISSABasicBlock>
   implements TabulationDomain<DomainElement, BasicBlockInContext<E>> {
-    private Map<DomainElement, Integer> table = new HashMap<DomainElement, Integer>();
-    private ArrayList<DomainElement> objects = new ArrayList<DomainElement>();
+    private Map<DomainElement, Integer> table = new HashMap<>();
+    private ArrayList<DomainElement> objects = new ArrayList<>();
 
-    private Map<CodeElement, Set<DomainElement>> elementIndex = new HashMap<CodeElement, Set<DomainElement>>();
+    private Map<CodeElement, Set<DomainElement>> elementIndex = new HashMap<>();
 
-    Set<DomainElement> emptySet = new HashSet<DomainElement>();
+    Set<DomainElement> emptySet = new HashSet<>();
     public Set<DomainElement> getPossibleElements(CodeElement codeElement)
     {
         Set<DomainElement> elts = elementIndex.get(codeElement);
@@ -80,12 +80,13 @@
         Set<DomainElement> elements = elementIndex.get(e.codeElement);
         if(elements == null)
         {
-            elements = new HashSet<DomainElement>();
+            elements = new HashSet<>();
             elementIndex.put(e.codeElement, elements);
         }
         elements.add(e);
     }
 
+    @Override
     public int add(DomainElement o) {
         Integer i = table.get(o);
         if(i == null)
@@ -101,6 +102,7 @@
     }
 
 
+    @Override
     public synchronized int getMappedIndex(final Object o) {
     	if (!(o instanceof DomainElement)) {
     		throw new IllegalArgumentException(o.getClass().getCanonicalName());
@@ -112,30 +114,36 @@
         return (i == null ? add(de) : i);
     }
 
+    @Override
     public boolean hasPriorityOver(
             PathEdge<BasicBlockInContext<E>> p1,
             PathEdge<BasicBlockInContext<E>> p2) {
         return false;
     }
 
+    @Override
     public DomainElement getMappedObject(int n) {
         if(n > 0 && n <= objects.size())
             return objects.get(n - 1);
         return null;
     }
 
+    @Override
     public int getMaximumIndex() {
         return objects.size();
     }
 
+    @Override
     public int getSize() {
         return objects.size()+1;
     }
 
+    @Override
     public boolean hasMappedIndex(DomainElement o) {
         return table.keySet().contains(o);
     }
 
+    @Override
     public Iterator<DomainElement> iterator() {
         return table.keySet().iterator();
     }
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/domain/InstanceKeyElement.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/domain/InstanceKeyElement.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/domain/InstanceKeyElement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/domain/InstanceKeyElement.java	2019-01-29 17:08:39.000000000 +0000
@@ -70,9 +70,10 @@
         return ik.hashCode();
     }
 
+    @Override
     public String toString()
     {
-        return "InstanceKeyElement("+ik+")";
+        return "InstanceKeyElement("+ik+ ')';
     }
     
     public InstanceKey getInstanceKey() {
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/domain/LocalElement.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/domain/LocalElement.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/domain/LocalElement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/domain/LocalElement.java	2019-01-29 17:08:39.000000000 +0000
@@ -84,7 +84,7 @@
 	@Override
     public String toString()
     {
-        return "LocalElement("+id+")";
+        return "LocalElement("+id+ ')';
     }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/FlowAnalysis.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/FlowAnalysis.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/FlowAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/FlowAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -80,7 +80,6 @@
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.CancelRuntimeException;
-import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
 
 
 public class FlowAnalysis {
@@ -90,10 +89,9 @@
     analyze(final CGAnalysisContext<E> analysisContext,
           Map<BasicBlockInContext<E>,
           Map<FlowType<E>,Set<CodeElement>>> initialTaints,
-          IFDSTaintDomain<E> d,
-          IProgressMonitor progressMonitor
+          IFDSTaintDomain<E> d
           ) throws CancelRuntimeException {
-        return analyze(analysisContext.graph, analysisContext.cg, analysisContext.pa, initialTaints, d, progressMonitor);
+        return analyze(analysisContext.graph, analysisContext.cg, analysisContext.pa, initialTaints, d);
     }
     
     public static <E extends ISSABasicBlock>
@@ -102,10 +100,9 @@
           Map<BasicBlockInContext<E>,
           Map<FlowType<E>,Set<CodeElement>>> initialTaints,
           IFDSTaintDomain<E> d,
-          IProgressMonitor progressMonitor,
           IFlowFunctionMap<BasicBlockInContext<E>> flowFunctionMap
           ) throws CancelRuntimeException {
-        return analyze(analysisContext.graph, analysisContext.cg, analysisContext.pa, initialTaints, d, progressMonitor, flowFunctionMap);
+        return analyze(analysisContext.graph, analysisContext.cg, initialTaints, d, flowFunctionMap);
     }
     
     public static <E extends ISSABasicBlock>
@@ -115,11 +112,9 @@
 	          CallGraph cg,
 	          PointerAnalysis<InstanceKey> pa,
 	          Map<BasicBlockInContext<E>, Map<FlowType<E>,Set<CodeElement>>> initialTaints,
-	          IFDSTaintDomain<E> d,
-	          IProgressMonitor progressMonitor
+	          IFDSTaintDomain<E> d
 	        ) {
-				return analyze(graph, cg, pa, initialTaints, d,
-						progressMonitor, new TaintTransferFunctions<E>(d, graph, pa));
+				return analyze(graph, cg, initialTaints, d, new TaintTransferFunctions<>(d, pa));
 
 //    			return analyze(graph, cg, pa, initialTaints, d,
 //    					progressMonitor, new IDTransferFunctions<E>(d, graph, pa));
@@ -134,31 +129,30 @@
       analyze(final ISupergraph<BasicBlockInContext<E>, 
     		  CGNode> graph,
               CallGraph cg,
-              PointerAnalysis<InstanceKey> pa,
               Map<BasicBlockInContext<E>, Map<FlowType<E>,Set<CodeElement>>> initialTaints,
               IFDSTaintDomain<E> d,
-              IProgressMonitor progressMonitor, 
               final IFlowFunctionMap<BasicBlockInContext<E>> flowFunctionMap
             ) {
 
         final IFDSTaintDomain<E> domain = d;
 
         final List<PathEdge<BasicBlockInContext<E>>>
-           initialEdges = new ArrayList<PathEdge<BasicBlockInContext<E>>>();
+           initialEdges = new ArrayList<>();
 
         //Add PathEdges to the taints
         //Places that initial taints occur, and where they initially flow into
-        for(BasicBlockInContext<E> taintBB:initialTaints.keySet())
+        for(Map.Entry<BasicBlockInContext<E>, Map<FlowType<E>, Set<CodeElement>>> bbEntry : initialTaints.entrySet())
         {
-        	Map<FlowType<E>, Set<CodeElement>> bbTaints = initialTaints.get(taintBB);
-        	for(FlowType<E> taintType:bbTaints.keySet())
+        	Map<FlowType<E>, Set<CodeElement>> bbTaints = bbEntry.getValue();
+        	for(Map.Entry<FlowType<E>, Set<CodeElement>> flowEntry : bbTaints.entrySet())
             {
-                for(CodeElement taintElement:bbTaints.get(taintType))
+                for(CodeElement taintElement: flowEntry.getValue())
                 {
+                    final BasicBlockInContext<E> taintBB = bbEntry.getKey();
                 	BasicBlockInContext<E>[] entryBlocks = graph.getEntriesForProcedure(taintBB.getNode());
-                	for (int i = 0; i < entryBlocks.length; i++) {
+                	for (BasicBlockInContext<E> entryBlock : entryBlocks) {
                 		//Add PathEdge <s_p,0> -> <n,d1>
-                		initialEdges.add(PathEdge.createPathEdge(entryBlocks[i], 0, taintBB, domain.getMappedIndex(new DomainElement(taintElement,taintType))));
+                		initialEdges.add(PathEdge.createPathEdge(entryBlock, 0, taintBB, domain.getMappedIndex(new DomainElement(taintElement, flowEntry.getKey()))));
                 	}
                     //initialEdges.add(PathEdge.createPathEdge(e.getKey(), 0, e.getKey(), domain.getMappedIndex(new DomainElement(o,e2.getKey()))));
                 }
@@ -167,30 +161,35 @@
         //Add PathEdges to the entry points of the supergraph <s_main,0> -> <s_main,0>
         for (CGNode entry : cg.getEntrypointNodes()) {
         	BasicBlockInContext<E>[] bbic = graph.getEntriesForProcedure(entry);
-        	for (int i = 0; i < bbic.length; i++)
-        		initialEdges.add(PathEdge.createPathEdge(bbic[i], 0, bbic[i], 0));
+        	for (BasicBlockInContext<E> element : bbic)
+				initialEdges.add(PathEdge.createPathEdge(element, 0, element, 0));
         }
         
         final TabulationProblem<BasicBlockInContext<E>, CGNode, DomainElement>
           problem =
             new TabulationProblem<BasicBlockInContext<E>, CGNode, DomainElement>() {
 
+            @Override
             public TabulationDomain<DomainElement, BasicBlockInContext<E>> getDomain() {
                 return domain;
             }
 
+            @Override
             public IFlowFunctionMap<BasicBlockInContext<E>> getFunctionMap() {
                 return flowFunctionMap;
             }
 
+            @Override
             public IMergeFunction getMergeFunction() {
                 return null;
             }
 
+            @Override
             public ISupergraph<BasicBlockInContext<E>, CGNode> getSupergraph() {
                 return graph;
             }
 
+            @Override
             public Collection<PathEdge<BasicBlockInContext<E>>> initialSeeds() {
                 return initialEdges;
 //              CGNode entryProc = cfg.getCallGraph().getEntrypointNodes()
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/CallNoneToReturnFunction.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/CallNoneToReturnFunction.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/CallNoneToReturnFunction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/CallNoneToReturnFunction.java	2019-01-29 17:08:39.000000000 +0000
@@ -91,4 +91,4 @@
 		}
 		return set;
 	}
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/GlobalReturnToNodeFunction.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/GlobalReturnToNodeFunction.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/GlobalReturnToNodeFunction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/GlobalReturnToNodeFunction.java	2019-01-29 17:08:39.000000000 +0000
@@ -74,8 +74,6 @@
  * to those keys
  * 
  * @author acfoltzer
- * 
- * @param <E>
  */
 public class GlobalReturnToNodeFunction<E extends ISSABasicBlock> implements
 		IUnaryFlowFunction {
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/IDTransferFunctions.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/IDTransferFunctions.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/IDTransferFunctions.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/IDTransferFunctions.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,17 +47,11 @@
 package org.scandroid.flow.functions;
 
 
-import org.scandroid.domain.IFDSTaintDomain;
-
 import com.ibm.wala.dataflow.IFDS.IFlowFunction;
 import com.ibm.wala.dataflow.IFDS.IFlowFunctionMap;
 import com.ibm.wala.dataflow.IFDS.IReversibleFlowFunction;
-import com.ibm.wala.dataflow.IFDS.ISupergraph;
 import com.ibm.wala.dataflow.IFDS.IUnaryFlowFunction;
 import com.ibm.wala.dataflow.IFDS.IdentityFlowFunction;
-import com.ibm.wala.ipa.callgraph.CGNode;
-import com.ibm.wala.ipa.callgraph.propagation.InstanceKey;
-import com.ibm.wala.ipa.callgraph.propagation.PointerAnalysis;
 import com.ibm.wala.ipa.cfg.BasicBlockInContext;
 import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.util.intset.IntSet;
@@ -66,18 +60,11 @@
 
 public class IDTransferFunctions <E extends ISSABasicBlock> implements
         IFlowFunctionMap<BasicBlockInContext<E>> {
-	@SuppressWarnings("unused")
-	
 	public static final IntSet EMPTY_SET = new SparseIntSet();
 	public static final IntSet ZERO_SET = SparseIntSet.singleton(0);
 
     private static final IReversibleFlowFunction IDENTITY_FN = new IdentityFlowFunction();
     
-    public IDTransferFunctions(IFDSTaintDomain<E> domain,
-            ISupergraph<BasicBlockInContext<E>, CGNode> graph, 
-            PointerAnalysis<InstanceKey> pa) {
-    }
-
 	@Override
 	public IUnaryFlowFunction getNormalFlowFunction(BasicBlockInContext<E> src,
 			BasicBlockInContext<E> dest) {
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/IFDSTaintFlowFunctionProvider.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/IFDSTaintFlowFunctionProvider.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/IFDSTaintFlowFunctionProvider.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/IFDSTaintFlowFunctionProvider.java	2019-01-29 17:08:39.000000000 +0000
@@ -144,7 +144,7 @@
 
 	private class DefUse implements IUnaryFlowFunction {
 	
-		private final List<UseDefSetPair> useToDefList = new ArrayList<UseDefSetPair>();
+		private final List<UseDefSetPair> useToDefList = new ArrayList<>();
 
 		private final BasicBlockInContext<E> bb;
 
@@ -186,10 +186,10 @@
 			else
 			{
 				for (int i = 0; i < instruction.getNumberOfUses(); i++) {
-					p.uses.addAll(CodeElement.valueElements(pa, bb.getNode(), instruction.getUse(i)));
+					p.uses.addAll(CodeElement.valueElements(instruction.getUse(i)));
 				}
 				for (int j = 0; j < instruction.getNumberOfDefs(); j++) {
-					p.defs.addAll(CodeElement.valueElements(pa, bb.getNode(), instruction.getDef(j)));
+					p.defs.addAll(CodeElement.valueElements(instruction.getDef(j)));
 				}
 			}
 			
@@ -206,7 +206,7 @@
 				{
 					//p.uses.add(new LocalElement(instruction.getUse(i)));
 					p.uses.addAll(
-						CodeElement.valueElements(pa, bb.getNode(), instruction.getUse(i)));
+						CodeElement.valueElements(instruction.getUse(i)));
 					
 				}
 				p.defs.add(new ReturnElement());
@@ -222,12 +222,12 @@
 				//System.out.println("adding receiver flow in "+this+" for "+invInst);
 				//System.out.println("\tadding local element "+invInst.getReceiver());
 				//getReceiver() == getUse(0) == param[0] == this
-				p.uses.addAll(CodeElement.valueElements(pa, bb.getNode(), invInst.getReceiver()));
+				p.uses.addAll(CodeElement.valueElements(invInst.getReceiver()));
 				for(int i = 0; i < invInst.getNumberOfDefs(); i++)
 				{
 					//System.out.println("\tadding def local element "+invInst.getDef(i));
 					//return valuenumber of invoke instruction
-					p.defs.addAll(CodeElement.valueElements(pa, bb.getNode(), invInst.getDef(i)));
+					p.defs.addAll(CodeElement.valueElements(invInst.getDef(i)));
 				}
 			}
 			thisToResult = true;
@@ -268,12 +268,12 @@
 					// These loops cause all parameters flow into the 
 					// 'this' param (due to instruction.getUse(0))
 					for (int i = 1; i < instruction.getNumberOfUses(); i++) {
-						p.uses.addAll(CodeElement.valueElements(pa, bb.getNode(), instruction.getUse(i)));
+						p.uses.addAll(CodeElement.valueElements(instruction.getUse(i)));
 					}
 				
 
 					if (instruction.getNumberOfUses() > 0) {
-						p.defs.addAll(CodeElement.valueElements(pa, bb.getNode(), instruction.getUse(0)));
+						p.defs.addAll(CodeElement.valueElements(instruction.getUse(0)));
 					}
 				}
 			}
@@ -281,8 +281,8 @@
 
 		private void handleOutflowArrayStoreInstruction(
 				SSAInstruction instruction, UseDefSetPair p) {
-			p.uses.addAll(CodeElement.valueElements(pa, bb.getNode(), instruction.getUse(2)));
-			p.defs.addAll(CodeElement.valueElements(pa, bb.getNode(), instruction.getUse(0)));
+			p.uses.addAll(CodeElement.valueElements(instruction.getUse(2)));
+			p.defs.addAll(CodeElement.valueElements(instruction.getUse(0)));
 		}
 
 		private void handleOutflowPutInstruction(SSAInstruction instruction,
@@ -291,7 +291,7 @@
 			PointerKey pk;
 			Set<CodeElement> elements = HashSetFactory.make();
 			if (pi.isStatic()) {
-			    p.uses.addAll(CodeElement.valueElements(pa, bb.getNode(), instruction.getUse(0)));
+			    p.uses.addAll(CodeElement.valueElements(instruction.getUse(0)));
 			    FieldReference declaredField = pi.getDeclaredField();
 			    IField staticField = getStaticIField(ch, declaredField);
 			    if (staticField == null) {
@@ -301,7 +301,7 @@
 			    }
 			} else {
 			    p.uses.addAll(
-			    		CodeElement.valueElements(pa, bb.getNode(), instruction.getUse(1)));
+			    		CodeElement.valueElements(instruction.getUse(1)));
 
 			    // this value number seems to be the object referenced in this instruction (?)
 				int valueNumber = instruction.getUse(0);
@@ -311,7 +311,7 @@
 				
 				// add the object that holds the field that was modified
 				// to the list of things tainted by this flow:
-				p.defs.addAll(CodeElement.valueElements(pa, bb.getNode(), valueNumber));
+				p.defs.addAll(CodeElement.valueElements(valueNumber));
 			}	
 			// now add the field keys to the defs list so that they
 			// are also tainted:
@@ -329,8 +329,8 @@
 
 		private void handleInflowArrayLoadInstruction(
 				SSAInstruction instruction, UseDefSetPair p) {
-			p.uses.addAll(CodeElement.valueElements(pa, bb.getNode(), instruction.getUse(0)));
-			p.defs.addAll(CodeElement.valueElements(pa, bb.getNode(),instruction.getDef()));
+			p.uses.addAll(CodeElement.valueElements(instruction.getUse(0)));
+			p.defs.addAll(CodeElement.valueElements(instruction.getDef()));
 		}
 
 		private void handleInflowGetInstruction(SSAInstruction instruction,
@@ -370,7 +370,6 @@
 
 		/**
 		 * Determines if the provide method is in the exclusions by checking the supergraph.
-		 * @param method
 		 * @return True if the method can not be found in the supergraph.
 		 */
         private boolean methodExcluded(MethodReference method) {
@@ -411,6 +410,7 @@
 			}
 		}	
 
+		@Override
 		@SuppressWarnings("unchecked")
 		public IntSet getTargets(int d1) {
 			//System.out.println(this.toString()+".getTargets("+d1+") "+bb);
@@ -425,6 +425,7 @@
 		}
 	}
 
+	@Override
 	public IUnaryFlowFunction getCallFlowFunction(
 			BasicBlockInContext<E> src,
 			BasicBlockInContext<E> dest,
@@ -434,7 +435,7 @@
 		final SSAInvokeInstruction instruction = (SSAInvokeInstruction) src.getLastInstruction();
 		
 //		String signature = dest.getMethod().getSignature();
-//		if ( dest.getMethod().isSynthetic() ) { 
+//		if ( dest.getMethod().isWalaSynthetic() ) {
 //			System.out.println("Synthetic: "+signature);
 //		} else {
 //			System.err.println(signature);
@@ -446,36 +447,33 @@
 //			System.out.println("Call to system: "+signature);
 //		}
 		
-//		if (! dest.getMethod().isSynthetic() 
+//		if (! dest.getMethod().isWalaSynthetic()
 //		    && LoaderUtils.fromLoader(dest.getNode(), ClassLoaderReference.Primordial)) {
 //		    
 //            MyLogger.log(DEBUG,"Primordial and No Summary! (getCallFlowFunction) - " + dest.getMethod().getReference());
 //		}
 
 		final Map<CodeElement,CodeElement> parameterMap = HashMapFactory.make();
-		for (int i = 0; i < instruction.getNumberOfParameters(); i++) {
-			Set<CodeElement> elements = CodeElement.valueElements(pa, src.getNode(), instruction.getUse(i));
+		for (int i = 0; i < instruction.getNumberOfPositionalParameters(); i++) {
+			Set<CodeElement> elements = CodeElement.valueElements(instruction.getUse(i));
 			for(CodeElement e: elements) {
 				parameterMap.put(e, new LocalElement(i+1));
 			}
 		}
 
-		return new IUnaryFlowFunction() {
-
-			public IntSet getTargets(int d1) {
-				BitVectorIntSet set = new BitVectorIntSet();
-				if(d1 == 0 || !(domain.getMappedObject(d1).codeElement instanceof LocalElement)) {
-					set.add(d1);
-				}
-				DomainElement de = domain.getMappedObject(d1);
-				if(de!=null && parameterMap.containsKey(de.codeElement))
-					set.add(domain.getMappedIndex(new DomainElement(parameterMap.get(de.codeElement),de.taintSource)));
-				return set;
+		return d1 -> {
+			BitVectorIntSet set = new BitVectorIntSet();
+			if(d1 == 0 || !(domain.getMappedObject(d1).codeElement instanceof LocalElement)) {
+				set.add(d1);
 			}
-
+			DomainElement de = domain.getMappedObject(d1);
+			if(de!=null && parameterMap.containsKey(de.codeElement))
+				set.add(domain.getMappedIndex(new DomainElement(parameterMap.get(de.codeElement),de.taintSource)));
+			return set;
 		};
 	}
 
+	@Override
 	public IUnaryFlowFunction getCallNoneToReturnFlowFunction(
 			BasicBlockInContext<E> src,
 			BasicBlockInContext<E> dest) {
@@ -494,6 +492,7 @@
 		return new DefUse(dest);
 	}
 
+	@Override
 	public IUnaryFlowFunction getCallToReturnFlowFunction(
 			BasicBlockInContext<E> src,
 			BasicBlockInContext<E> dest) {
@@ -504,6 +503,7 @@
 		return new DefUse(dest);
 	}
 
+	@Override
 	public IUnaryFlowFunction getNormalFlowFunction(
 			BasicBlockInContext<E> src,
 			BasicBlockInContext<E> dest) {
@@ -517,7 +517,7 @@
 	public class ReturnDefUse extends DefUse
 	{
 		CodeElement callSet;
-		Set<CodeElement> receivers = new HashSet<CodeElement>();
+		Set<CodeElement> receivers = new HashSet<>();
 
 		public ReturnDefUse(BasicBlockInContext<E> dest,
 				BasicBlockInContext<E> call) {
@@ -535,7 +535,7 @@
 
 						if ( !invInst.isStatic() ) {
 							//used to be invInst.getReceiver(), but I believe that was incorrect.
-							receivers.addAll(CodeElement.valueElements(pa, call.getNode(), invInst.getReceiver()));
+							receivers.addAll(CodeElement.valueElements(invInst.getReceiver()));
 							//receivers.addAll(CodeElement.valueElements(pa, call.getNode(), invInst.getReturnValue(0)));
 						}
 					}
@@ -592,6 +592,7 @@
 		}
 	}
 
+	@Override
 	public IFlowFunction getReturnFlowFunction(BasicBlockInContext<E> call,
 			BasicBlockInContext<E> src,
 			BasicBlockInContext<E> dest) {
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/PairBasedFlowFunction.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/PairBasedFlowFunction.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/PairBasedFlowFunction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/PairBasedFlowFunction.java	2019-01-29 17:08:39.000000000 +0000
@@ -124,4 +124,4 @@
     	// logger.debug("getTargets("+d+"): "+set);
         return set;
     }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/ReturnFlowFunction.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/ReturnFlowFunction.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/ReturnFlowFunction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/ReturnFlowFunction.java	2019-01-29 17:08:39.000000000 +0000
@@ -70,7 +70,6 @@
 	private final CodeElement ce;
 
 	/**
-	 * @param domain
 	 * @param def
 	 *            of the invoke instruction we're returning to
 	 */
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/TaintTransferFunctions.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/TaintTransferFunctions.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/TaintTransferFunctions.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/TaintTransferFunctions.java	2019-01-29 17:08:39.000000000 +0000
@@ -71,7 +71,6 @@
 import com.ibm.wala.dataflow.IFDS.IFlowFunction;
 import com.ibm.wala.dataflow.IFDS.IFlowFunctionMap;
 import com.ibm.wala.dataflow.IFDS.IReversibleFlowFunction;
-import com.ibm.wala.dataflow.IFDS.ISupergraph;
 import com.ibm.wala.dataflow.IFDS.IUnaryFlowFunction;
 import com.ibm.wala.dataflow.IFDS.IdentityFlowFunction;
 import com.ibm.wala.ipa.callgraph.CGNode;
@@ -95,7 +94,6 @@
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.intset.IntSet;
-import com.ibm.wala.util.intset.IntSetAction;
 import com.ibm.wala.util.intset.MutableSparseIntSet;
 import com.ibm.wala.util.intset.OrdinalSet;
 import com.ibm.wala.util.intset.SparseIntSet;
@@ -106,6 +104,8 @@
 	// Java, you need type aliases.
 	private static class BlockPair<E extends ISSABasicBlock> extends
 			Pair<BasicBlockInContext<E>, BasicBlockInContext<E>> {
+		private static final long serialVersionUID = 6838579950051954781L;
+
 		protected BlockPair(BasicBlockInContext<E> fst,
 				BasicBlockInContext<E> snd) {
 			super(fst, snd);
@@ -126,34 +126,31 @@
 	private static final IReversibleFlowFunction IDENTITY_FN = new IdentityFlowFunction();
 
 	public TaintTransferFunctions(IFDSTaintDomain<E> domain,
-			ISupergraph<BasicBlockInContext<E>, CGNode> graph,
 			PointerAnalysis<InstanceKey> pa) {
-		this(domain, graph, pa, false);
+		this(domain, pa, false);
 	}
 
 	public TaintTransferFunctions(IFDSTaintDomain<E> domain,
-			ISupergraph<BasicBlockInContext<E>, CGNode> graph,
-			PointerAnalysis<InstanceKey> pa, boolean taintStaticFields) {
+			PointerAnalysis<InstanceKey> pa,
+			boolean taintStaticFields) {
 		this.domain = domain;
 		this.pa = pa;
-		this.globalId = new GlobalIdentityFunction<E>(domain);
-		this.callToReturn = new CallToReturnFunction<E>(domain);
+		this.globalId = new GlobalIdentityFunction<>(domain);
+		this.callToReturn = new CallToReturnFunction<>(domain);
 		this.callFlowFunctions = CacheBuilder.newBuilder().maximumSize(10000)
 				.expireAfterWrite(10, TimeUnit.MINUTES)
 				.build(new CacheLoader<BlockPair<E>, IUnaryFlowFunction>() {
 					@Override
-					public IUnaryFlowFunction load(BlockPair<E> key)
-							throws Exception {
-						return makeCallFlowFunction(key.fst, key.snd, null);
+					public IUnaryFlowFunction load(BlockPair<E> key) {
+						return makeCallFlowFunction(key.fst);
 					}
 				});
 		this.normalFlowFunctions = CacheBuilder.newBuilder().maximumSize(10000)
 				.expireAfterWrite(10, TimeUnit.MINUTES)
 				.build(new CacheLoader<BlockPair<E>, IUnaryFlowFunction>() {
 					@Override
-					public IUnaryFlowFunction load(BlockPair<E> key)
-							throws Exception {
-						return makeNormalFlowFunction(key.fst, key.snd);
+					public IUnaryFlowFunction load(BlockPair<E> key) {
+						return makeNormalFlowFunction(key.snd);
 					}
 				});
 		this.taintStaticFields = taintStaticFields;
@@ -163,15 +160,14 @@
 	public IUnaryFlowFunction getCallFlowFunction(BasicBlockInContext<E> src,
 			BasicBlockInContext<E> dest, BasicBlockInContext<E> ret) {
 		try {
-			return callFlowFunctions.get(new BlockPair<E>(src, dest));
+			return callFlowFunctions.get(new BlockPair<>(src, dest));
 		} catch (ExecutionException e) {
 			
 			throw new RuntimeException(e);
 		}
 	}
 
-	private IUnaryFlowFunction makeCallFlowFunction(BasicBlockInContext<E> src,
-			BasicBlockInContext<E> dest, BasicBlockInContext<E> ret) {
+	private IUnaryFlowFunction makeCallFlowFunction(BasicBlockInContext<E> src) {
 		
 		SSAInstruction srcInst = src.getLastInstruction();
 		if (null == srcInst) {
@@ -183,8 +179,8 @@
 			// build list of actual parameter code elements, and return a
 			// function
 			final int numParams = ((SSAInvokeInstruction) srcInst)
-					.getNumberOfParameters();
-			List<CodeElement> actualParams = new ArrayList<CodeElement>(numParams);
+					.getNumberOfPositionalParameters();
+			List<CodeElement> actualParams = new ArrayList<>(numParams);
 			for (int i = 0; i < numParams; i++) {
 				actualParams.add(i, new LocalElement(srcInst.getUse(i)));
 			}
@@ -193,7 +189,7 @@
 			// GlobalIdentityFunction<E>(domain),
 			// new CallFlowFunction<E>(domain, actualParams)));
 			return union(globalId,
-					new CallFlowFunction<E>(domain, actualParams));
+					new CallFlowFunction<>(domain, actualParams));
 		} else {
 			throw new RuntimeException("src block not an invoke instruction");
 		}
@@ -228,7 +224,7 @@
 	public IUnaryFlowFunction getNormalFlowFunction(BasicBlockInContext<E> src,
 			BasicBlockInContext<E> dest) {
 		try {
-			return normalFlowFunctions.get(new BlockPair<E>(src, dest));
+			return normalFlowFunctions.get(new BlockPair<>(src, dest));
 		} catch (ExecutionException e) {
 			
 			throw new RuntimeException(e);
@@ -236,8 +232,8 @@
 	}
 
 	private IUnaryFlowFunction makeNormalFlowFunction(
-			BasicBlockInContext<E> src, BasicBlockInContext<E> dest) {
-		List<UseDefPair> pairs = new ArrayList<UseDefPair>();
+			BasicBlockInContext<E> dest) {
+		List<UseDefPair> pairs = new ArrayList<>();
 
 		// we first try to process the destination instruction
 		SSAInstruction inst = dest.getLastInstruction();
@@ -268,35 +264,33 @@
 
 		// globals may be redefined here, so we can't union with the globals ID
 		// flow function, as we often do elsewhere.
-		final PairBasedFlowFunction<E> flowFunction = new PairBasedFlowFunction<E>(
+		final PairBasedFlowFunction<E> flowFunction = new PairBasedFlowFunction<>(
 				domain, pairs);
 
 		// special case for static field gets so we can introduce new taints for
 		// them
 		if (taintStaticFields && inst instanceof SSAGetInstruction
 				&& ((SSAGetInstruction) inst).isStatic()) {
-			return makeStaticFieldTaints(dest, inst, node, flowFunction);
+			return makeStaticFieldTaints(dest, inst, flowFunction);
 		}
 
 		return flowFunction;
 	}
 
 	public IUnaryFlowFunction makeStaticFieldTaints(
-			BasicBlockInContext<E> dest, SSAInstruction inst, CGNode node,
-			final PairBasedFlowFunction<E> flowFunction) {
+			BasicBlockInContext<E> dest, SSAInstruction inst, final PairBasedFlowFunction<E> flowFunction) {
 		final Set<DomainElement> elts = HashSetFactory.make();
-		for (CodeElement ce : getStaticFieldAccessCodeElts(node,
-				(SSAGetInstruction) inst)) {
+		for (CodeElement ce : getStaticFieldAccessCodeElts((SSAGetInstruction) inst)) {
 			StaticFieldElement sfe = (StaticFieldElement) ce;
 			IField field = pa.getClassHierarchy().resolveField(sfe.getRef());
 			if (field.isFinal()) {
 				continue;
 			}
-			final StaticFieldFlow<E> taintSource = new StaticFieldFlow<E>(dest,
+			final StaticFieldFlow<E> taintSource = new StaticFieldFlow<>(dest,
 					field, true);
 			elts.add(new DomainElement(ce, taintSource));
 		}
-		IUnaryFlowFunction newTaints = new ConstantFlowFunction<E>(domain, elts);
+		IUnaryFlowFunction newTaints = new ConstantFlowFunction<>(domain, elts);
 		return compose(flowFunction, newTaints);
 	}
 
@@ -351,7 +345,7 @@
 		// we have a return value, so we need to map any return elements onto
 		// the local element corresponding to the invoke's def
 		final IUnaryFlowFunction flowToDest = union(globalId,
-				new ReturnFlowFunction<E>(domain, invoke.getDef()));
+				new ReturnFlowFunction<>(domain, invoke.getDef()));
 
 		// return new TracingFlowFunction<E>(domain, compose(flowFromDest,
 		// flowToDest));
@@ -383,7 +377,7 @@
 		for (int i = 0; i < defNo; i++) {
 			int valNo = inst.getDef(i);
 
-			elts.addAll(CodeElement.valueElements(pa, node, valNo));
+			elts.addAll(CodeElement.valueElements(valNo));
 		}
 
 		return elts;
@@ -411,7 +405,7 @@
 				continue;
 			}
 			try {
-				elts.addAll(CodeElement.valueElements(pa, node, valNo));
+				elts.addAll(CodeElement.valueElements(valNo));
 			} catch (IllegalArgumentException e) {
 				
 				
@@ -445,7 +439,7 @@
 	private Set<CodeElement> getFieldAccessCodeElts(CGNode node,
 			SSAFieldAccessInstruction inst) {
 		if (inst.isStatic()) {
-			return getStaticFieldAccessCodeElts(node, inst);
+			return getStaticFieldAccessCodeElts(inst);
 		}
 
 		Set<CodeElement> elts = HashSetFactory.make();
@@ -468,8 +462,7 @@
 		return elts;
 	}
 
-	private Set<CodeElement> getStaticFieldAccessCodeElts(CGNode node,
-			SSAFieldAccessInstruction inst) {
+	private static Set<CodeElement> getStaticFieldAccessCodeElts(SSAFieldAccessInstruction inst) {
 		Set<CodeElement> elts = HashSetFactory.make();
 		final FieldReference fieldRef = inst.getDeclaredField();
 		elts.add(new StaticFieldElement(fieldRef));
@@ -498,39 +491,22 @@
 		return elts;
 	}
 
-	private IUnaryFlowFunction union(final IUnaryFlowFunction g,
+	private static IUnaryFlowFunction union(final IUnaryFlowFunction g,
 			final IUnaryFlowFunction h) {
-		return new IUnaryFlowFunction() {
-			@Override
-			public IntSet getTargets(int d1) {
-				return g.getTargets(d1).union(h.getTargets(d1));
-			}
-		};
+		return d1 -> g.getTargets(d1).union(h.getTargets(d1));
 	}
 
 	/**
 	 * Flow function composition
 	 * 
-	 * @param f
-	 * @param g
 	 * @return { (x, z) | (x, y) \in g, (y, z) \in f }
 	 */
-	private IUnaryFlowFunction compose(final IUnaryFlowFunction f,
+	private static IUnaryFlowFunction compose(final IUnaryFlowFunction f,
 			final IUnaryFlowFunction g) {
-		return new IUnaryFlowFunction() {
-
-			@Override
-			public IntSet getTargets(int d1) {
-				final MutableSparseIntSet set = MutableSparseIntSet.makeEmpty();
-				g.getTargets(d1).foreach(new IntSetAction() {
-
-					@Override
-					public void act(int x) {
-						set.addAll(f.getTargets(x));
-					}
-				});
-				return set;
-			}
+		return d1 -> {
+			final MutableSparseIntSet set = MutableSparseIntSet.makeEmpty();
+			g.getTargets(d1).foreach(x -> set.addAll(f.getTargets(x)));
+			return set;
 		};
 	}
 
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/TracingFlowFunction.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/TracingFlowFunction.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/TracingFlowFunction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/TracingFlowFunction.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,34 +48,19 @@
  */
 package org.scandroid.flow.functions;
 
-import org.scandroid.domain.IFDSTaintDomain;
-
 import com.ibm.wala.dataflow.IFDS.IUnaryFlowFunction;
-import com.ibm.wala.ssa.ISSABasicBlock;
 import com.ibm.wala.util.intset.IntSet;
-import com.ibm.wala.util.intset.IntSetAction;
 
-public class TracingFlowFunction<E extends ISSABasicBlock> implements IUnaryFlowFunction {	
-	private final IFDSTaintDomain<E> domain;
+public class TracingFlowFunction implements IUnaryFlowFunction {	
 	private final IUnaryFlowFunction function;
 	
-	public TracingFlowFunction(IFDSTaintDomain<E> domain, IUnaryFlowFunction function) {
-		this.domain = domain;
+	public TracingFlowFunction(IUnaryFlowFunction function) {
 		this.function = function;
 	}
 	
 	@Override
 	public IntSet getTargets(int d1) {
-		IntSet result = function.getTargets(d1); 
-		
-		result.foreach(new IntSetAction() {
-			
-			@Override
-			public void act(int x) {
-				
-			}
-		});
-		return result;
+		return function.getTargets(d1);
 	}
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/UseDefPair.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/UseDefPair.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/UseDefPair.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/functions/UseDefPair.java	2019-01-29 17:08:39.000000000 +0000
@@ -64,7 +64,7 @@
     }
 	@Override
 	public String toString() {
-		return "UseDefPair [use=" + use + ", def=" + def + "]";
+		return "UseDefPair [use=" + use + ", def=" + def + ']';
 	}
     
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/InflowAnalysis.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/InflowAnalysis.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/InflowAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/InflowAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -56,6 +56,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -86,7 +87,7 @@
 import com.ibm.wala.util.collections.HashMapFactory;
 
 @SuppressWarnings("rawtypes")
-public class InflowAnalysis <E extends ISSABasicBlock> {
+public class InflowAnalysis {
 
     @SuppressWarnings("unchecked")
 	public static <E extends ISSABasicBlock>
@@ -97,13 +98,13 @@
             Set<CodeElement> newElements) {
         Map<FlowType<E>,Set<CodeElement>> blockMap = taintMap.get(block);
         if(blockMap == null) {
-            blockMap = new HashMap<FlowType<E>,Set<CodeElement>>();
+            blockMap = new HashMap<>();
             taintMap.put(block, blockMap);
         }
         
         Set<CodeElement> elements = blockMap.get(taintType);
         if(elements == null) {
-            elements = new HashSet<CodeElement>();
+            elements = new HashSet<>();
             blockMap.put(taintType, elements);
         }
         elements.addAll(newElements);
@@ -116,8 +117,7 @@
             FlowType taintType,
             CodeElement element) {
         
-        Set<CodeElement> elements = new HashSet<CodeElement>();
-        elements.add(element);
+        final Set<CodeElement> elements = Collections.singleton(element);
         addDomainElements(taintMap, block, taintType, elements);
     }
 
@@ -154,7 +154,6 @@
                             StaticFieldSourceSpec ss, 
                             CallGraph cg, 
                             ISupergraph<BasicBlockInContext<E>, CGNode> graph,
-                            ClassHierarchy cha,
                             PointerAnalysis<InstanceKey> pa) {
     	// get the first block:
     	BasicBlockInContext<E> bb = null;
@@ -174,8 +173,8 @@
                               ArrayList<SourceSpec> ssAL, ISupergraph<BasicBlockInContext<E>, CGNode> graph, 
                               PointerAnalysis<InstanceKey> pa, 
                               ClassHierarchy cha, CallGraph cg) {
-    	Collection<IMethod> targets = new HashSet<IMethod>();
-    	ArrayList<Collection<IMethod>> targetList = new ArrayList<Collection<IMethod>>();
+    	Collection<IMethod> targets = new HashSet<>();
+    	ArrayList<Collection<IMethod>> targetList = new ArrayList<>();
     	
     	for (int i = 0; i < ssAL.size(); i++) {
     		Collection<IMethod> tempList = ssAL.get(i).getNamePattern().getPossibleTargets(cha);
@@ -216,9 +215,9 @@
 
     public static <E extends ISSABasicBlock>
       Map<BasicBlockInContext<E>,Map<FlowType<E>,Set<CodeElement>>> analyze(
-            CGAnalysisContext<E> analysisContext, Map<InstanceKey, String> prefixes,
+            CGAnalysisContext<E> analysisContext,
             ISpecs s) {
-        return analyze(analysisContext, analysisContext.cg, analysisContext.getClassHierarchy(), analysisContext.graph, analysisContext.pa, prefixes, s);
+        return analyze(analysisContext, analysisContext.cg, analysisContext.getClassHierarchy(), analysisContext.graph, analysisContext.pa, s);
     }
 
     public static <E extends ISSABasicBlock>
@@ -228,21 +227,20 @@
           ClassHierarchy cha, 
           ISupergraph<BasicBlockInContext<E>, CGNode> graph,
           PointerAnalysis<InstanceKey> pa, 
-          Map<InstanceKey, String> prefixes,
           ISpecs s) {
 
         Map<BasicBlockInContext<E>, Map<FlowType<E>,Set<CodeElement>>> taintMap = HashMapFactory.make();
 
         SourceSpec[] ss = s.getSourceSpecs();
         
-        ArrayList<SourceSpec> ssAL = new ArrayList<SourceSpec>();
-        for (int i = 0; i < ss.length; i++) {
-        	if (ss[i] instanceof EntryArgSourceSpec)
-        		processInputSource(ctx, taintMap, ss[i], cg, graph, cha, pa);
-        	else if (ss[i] instanceof CallRetSourceSpec || ss[i] instanceof CallArgSourceSpec)
-        		ssAL.add(ss[i]);
-        	else if (ss[i] instanceof StaticFieldSourceSpec) {
-        		processStaticFieldSource(ctx, taintMap, (StaticFieldSourceSpec)ss[i], cg, graph, cha, pa);
+        ArrayList<SourceSpec> ssAL = new ArrayList<>();
+        for (SourceSpec element : ss) {
+        	if (element instanceof EntryArgSourceSpec)
+        		processInputSource(ctx, taintMap, element, cg, graph, cha, pa);
+        	else if (element instanceof CallRetSourceSpec || element instanceof CallArgSourceSpec)
+        		ssAL.add(element);
+        	else if (element instanceof StaticFieldSourceSpec) {
+        		processStaticFieldSource(ctx, taintMap, (StaticFieldSourceSpec)element, cg, graph, pa);
         	} else 
         		throw new UnsupportedOperationException("Unrecognized SourceSpec");
         } 
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/LocalSinkPoint.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/LocalSinkPoint.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/LocalSinkPoint.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/LocalSinkPoint.java	2019-01-29 17:08:39.000000000 +0000
@@ -153,7 +153,7 @@
 	@Override
 	public String toString() {
 		return "SinkPoint [block=" + block + ", ssaVal=" + ssaVal
-				+ ", sinkFlow=" + sinkFlow + "]";
+				+ ", sinkFlow=" + sinkFlow + ']';
 	}
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/OutflowAnalysis.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/OutflowAnalysis.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/OutflowAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/OutflowAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -76,7 +76,6 @@
 
 import com.ibm.wala.classLoader.IMethod;
 import com.ibm.wala.dataflow.IFDS.ICFGSupergraph;
-import com.ibm.wala.dataflow.IFDS.ISupergraph;
 import com.ibm.wala.dataflow.IFDS.TabulationResult;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
@@ -122,13 +121,13 @@
 		this.specs = specs;
 	}
 
-	private void addEdge(
+	private static void addEdge(
 			Map<FlowType<IExplodedBasicBlock>, Set<FlowType<IExplodedBasicBlock>>> graph,
 			FlowType<IExplodedBasicBlock> source,
 			FlowType<IExplodedBasicBlock> dest) {
 		Set<FlowType<IExplodedBasicBlock>> dests = graph.get(source);
 		if (dests == null) {
-			dests = new HashSet<FlowType<IExplodedBasicBlock>>();
+			dests = new HashSet<>();
 			graph.put(source, dests);
 		}
 		dests.add(dest);
@@ -141,7 +140,7 @@
 			IFDSTaintDomain<IExplodedBasicBlock> domain,
 			Map<FlowType<IExplodedBasicBlock>, Set<FlowType<IExplodedBasicBlock>>> flowGraph,
 			List<SinkSpec> sinkSpecs) {
-		List<Collection<IMethod>> targetList = new ArrayList<Collection<IMethod>>();
+		List<Collection<IMethod>> targetList = new ArrayList<>();
 
 		for (int i = 0; i < sinkSpecs.size(); i++) {
 			Collection<IMethod> tempList = sinkSpecs.get(i).getNamePattern()
@@ -186,13 +185,13 @@
 						CGNode node = block.getNode();
 
 						IntSet resultSet = flowResult.getResult(block);
-						for (int j = 0; j < argNums.length; j++) {
+						for (int argNum : argNums) {
 
 							// The set of flow types we're looking for:
 							Set<FlowType<IExplodedBasicBlock>> taintTypeSet = HashSetFactory.make();
 
 							LocalElement le = new LocalElement(
-									invInst.getUse(argNums[j]));
+									invInst.getUse(argNum));
 							Set<DomainElement> elements = domain
 									.getPossibleElements(le);
 							if (elements != null) {
@@ -205,7 +204,7 @@
 							}
 
 							LocalPointerKey lpkey = new LocalPointerKey(node,
-									invInst.getUse(argNums[j]));
+									invInst.getUse(argNum));
 							for (InstanceKey ik : pa.getPointsToSet(lpkey)) {
 								for (DomainElement de : domain
 										.getPossibleElements(new InstanceKeyElement(
@@ -276,12 +275,12 @@
 			//
 			// }
 			// }
-			for (int i = 0; i < newArgNums.length; i++) {
+			for (int newArgNum : newArgNums) {
 
 				// see if anything flowed into the args as sinks:
 				for (DomainElement de : domain
 						.getPossibleElements(new LocalElement(node.getIR()
-								.getParameter(newArgNums[i])))) {
+								.getParameter(newArgNum)))) {
 
 					for (BasicBlockInContext<IExplodedBasicBlock> block : graph
 							.getExitsForProcedure(node)) {
@@ -289,29 +288,29 @@
 						int mappedIndex = domain.getMappedIndex(de);
 						if (flowResult.getResult(block).contains(mappedIndex)) {
 							addEdge(flowGraph, de.taintSource,
-									new ParameterFlow<IExplodedBasicBlock>(
-											entryBlock, newArgNums[i], false));
+									new ParameterFlow<>(
+											entryBlock, newArgNum, false));
 						}
 					}
 
 					int mappedIndex = domain.getMappedIndex(de);
 					if (flowResult.getResult(entryBlock).contains(mappedIndex)) {
 						addEdge(flowGraph, de.taintSource,
-								new ParameterFlow<IExplodedBasicBlock>(
-										entryBlock, newArgNums[i], false));
+								new ParameterFlow<>(
+										entryBlock, newArgNum, false));
 					}
 
 				}
 				for (InstanceKey ik : pa.getPointsToSet(new LocalPointerKey(
-						node, node.getIR().getParameter(newArgNums[i])))) {
+						node, node.getIR().getParameter(newArgNum)))) {
 					for (DomainElement de : domain
 							.getPossibleElements(new InstanceKeyElement(ik))) {
 						if (flowResult.getResult(entryBlock).contains(
 								domain.getMappedIndex(de))) {
 							
 							addEdge(flowGraph, de.taintSource,
-									new ParameterFlow<IExplodedBasicBlock>(
-											entryBlock, newArgNums[i], false));
+									new ParameterFlow<>(
+											entryBlock, newArgNum, false));
 						}
 					}
 				}
@@ -352,7 +351,7 @@
 							domain.getMappedIndex(de))) {
 						
 						addEdge(flowGraph, de.taintSource,
-								new ReturnFlow<IExplodedBasicBlock>(block,
+								new ReturnFlow<>(block,
 										false));
 					}
 					// Iterator<BasicBlockInContext<E>> it =
@@ -395,7 +394,7 @@
 										domain.getMappedIndex(ikElement))) {
 									addEdge(flowGraph,
 											ikElement.taintSource,
-											new ReturnFlow<IExplodedBasicBlock>(
+											new ReturnFlow<>(
 													realBlock, false));
 								}
 							}
@@ -409,17 +408,13 @@
 	public Map<FlowType<IExplodedBasicBlock>, Set<FlowType<IExplodedBasicBlock>>> analyze(
 			TabulationResult<BasicBlockInContext<IExplodedBasicBlock>, CGNode, DomainElement> flowResult,
 			IFDSTaintDomain<IExplodedBasicBlock> domain) {
-		return analyze(ctx.cg, ctx.getClassHierarchy(), ctx.graph, ctx.pa,
-				flowResult, domain, specs);
+		return analyze(flowResult, domain, specs);
 	}
 
 	public Map<FlowType<IExplodedBasicBlock>, Set<FlowType<IExplodedBasicBlock>>> analyze(
-			CallGraph cg,
-			ClassHierarchy cha,
-			ISupergraph<BasicBlockInContext<IExplodedBasicBlock>, CGNode> graph,
-			PointerAnalysis<InstanceKey> pa,
 			TabulationResult<BasicBlockInContext<IExplodedBasicBlock>, CGNode, DomainElement> flowResult,
-			IFDSTaintDomain<IExplodedBasicBlock> domain, ISpecs s) {
+			IFDSTaintDomain<IExplodedBasicBlock> domain,
+			ISpecs s) {
 
 		
 		
@@ -430,15 +425,15 @@
 		SinkSpec[] ss = s.getSinkSpecs();
 		
 
-		for (int i = 0; i < ss.length; i++) {
-			if (ss[i] instanceof EntryArgSinkSpec)
-				processSinkSpec(flowResult, domain, taintFlow, ss[i]);
-			else if (ss[i] instanceof CallArgSinkSpec)
-				processSinkSpec(flowResult, domain, taintFlow, ss[i]);
-			else if (ss[i] instanceof EntryRetSinkSpec)
-				processSinkSpec(flowResult, domain, taintFlow, ss[i]);
-			else if (ss[i] instanceof StaticFieldSinkSpec)
-				processSinkSpec(flowResult, domain, taintFlow, ss[i]);
+		for (SinkSpec element : ss) {
+			if (element instanceof EntryArgSinkSpec)
+				processSinkSpec(flowResult, domain, taintFlow, element);
+			else if (element instanceof CallArgSinkSpec)
+				processSinkSpec(flowResult, domain, taintFlow, element);
+			else if (element instanceof EntryRetSinkSpec)
+				processSinkSpec(flowResult, domain, taintFlow, element);
+			else if (element instanceof StaticFieldSinkSpec)
+				processSinkSpec(flowResult, domain, taintFlow, element);
 			else
 				throw new UnsupportedOperationException(
 						"SinkSpec not yet Implemented");
@@ -526,7 +521,7 @@
 						.getICFG().getExit(node);
 				for (int argNum : sinkSpec.getArgNums()) {
 					final int ssaVal = node.getIR().getParameter(argNum);
-					final ParameterFlow<IExplodedBasicBlock> sinkFlow = new ParameterFlow<IExplodedBasicBlock>(
+					final ParameterFlow<IExplodedBasicBlock> sinkFlow = new ParameterFlow<>(
 							entryBlock, argNum, false);
 					final LocalSinkPoint sinkPoint = new LocalSinkPoint(
 							exitBlock, ssaVal, sinkFlow);
@@ -588,13 +583,13 @@
 							final IExplodedBasicBlock block = graph.getICFG()
 									.getCFG(caller)
 									.getBlockForInstruction(invokeIndex);
-							BasicBlockInContext<IExplodedBasicBlock> callBlock = new BasicBlockInContext<IExplodedBasicBlock>(
+							BasicBlockInContext<IExplodedBasicBlock> callBlock = new BasicBlockInContext<>(
 									caller, block);
 
 							for (int argNum : sinkSpec.getArgNums()) {
 								// and add a sink point for each arg num
 								final int ssaVal = invokeInst.getUse(argNum);
-								final ParameterFlow<IExplodedBasicBlock> sinkFlow = new ParameterFlow<IExplodedBasicBlock>(
+								final ParameterFlow<IExplodedBasicBlock> sinkFlow = new ParameterFlow<>(
 										callBlock, argNum, false);
 								final LocalSinkPoint sinkPoint = new LocalSinkPoint(
 										callBlock, ssaVal, sinkFlow);
@@ -639,7 +634,7 @@
 						SSAReturnInstruction returnInst = (SSAReturnInstruction) inst;
 						if (!returnInst.returnsVoid()) {
 							final int ssaVal = returnInst.getResult();
-							final ReturnFlow<IExplodedBasicBlock> sinkFlow = new ReturnFlow<IExplodedBasicBlock>(
+							final ReturnFlow<IExplodedBasicBlock> sinkFlow = new ReturnFlow<>(
 									exitBlock, false);
 							final LocalSinkPoint sinkPoint = new LocalSinkPoint(
 									exitBlock, ssaVal, sinkFlow);
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/StaticFieldSinkPoint.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/StaticFieldSinkPoint.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/StaticFieldSinkPoint.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/StaticFieldSinkPoint.java	2019-01-29 17:08:39.000000000 +0000
@@ -81,7 +81,7 @@
 			BasicBlockInContext<IExplodedBasicBlock> block) {
 		this.field = spec.getField();
 		this.block = block;
-		this.flow = new StaticFieldFlow<IExplodedBasicBlock>(block, field, false);
+		this.flow = new StaticFieldFlow<>(block, field, false);
 	}
 
 	/*
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/types/FieldFlow.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/types/FieldFlow.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/types/FieldFlow.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/types/FieldFlow.java	2019-01-29 17:08:39.000000000 +0000
@@ -61,8 +61,6 @@
  * but potentially convenient. In the latter case, it's necessary.
  *
  * @author atomb
- *
- * @param <E>
  */
 public class FieldFlow<E extends ISSABasicBlock> extends FlowType<E> {
 
@@ -76,12 +74,12 @@
 
     @Override
     public String toString() {
-        return "FieldFlow( field=" + field + " "+ super.toString() + ")";
+        return "FieldFlow( field=" + field + ' ' + super.toString() + ')';
     }
 
     @Override
     public String descString() {
-        return field.getDeclaringClass().toString() + "." + field.getName().toString();
+        return field.getDeclaringClass().toString() + '.' + field.getName().toString();
     }
     
     public IField getField() {
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/types/FlowType.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/types/FlowType.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/types/FlowType.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/types/FlowType.java	2019-01-29 17:08:39.000000000 +0000
@@ -121,23 +121,19 @@
      * custom comparison for BasicBlockInContext.  The WALA .equals() 
      * implementation eventually delegates to pointer equality, which is too 
      * specific for our needs. 
-     * 
-     * @param a
-     * @param b
-     * @return
      */
     @SuppressWarnings("unused")
 	private boolean compareBlocks(BasicBlockInContext<E> a,
             BasicBlockInContext<E> b) {
+        if (null == a || null == b) {
+            return false;
+        }
+
         // delegate to the defined implementation, but only if it's true.
         if (a.equals(b)) {
             return true;
         }
 
-        if (null == a || null == b) {
-            return false;
-        }
-
         if (a.getNumber() != b.getNumber()) {
             return false;
         }
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/types/IKFlow.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/types/IKFlow.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/types/IKFlow.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/types/IKFlow.java	2019-01-29 17:08:39.000000000 +0000
@@ -87,7 +87,7 @@
     
     @Override
     public String toString() {
-        return "IKFlow(ik=" + ik + " " + super.toString() + ")";
+        return "IKFlow(ik=" + ik + ' ' + super.toString() + ')';
     }
 
     public InstanceKey getIK() {
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/types/ParameterFlow.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/types/ParameterFlow.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/types/ParameterFlow.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/types/ParameterFlow.java	2019-01-29 17:08:39.000000000 +0000
@@ -58,8 +58,6 @@
  * the invoke instruction.
  *
  * @author atomb
- *
- * @param <E>
  */
 public class ParameterFlow <E extends ISSABasicBlock> extends FlowType<E> {
 
@@ -100,15 +98,15 @@
 
     @Override
     public String toString() {
-        return "ParameterFlow( argNum="+argNum+" "+super.toString()+")";
+        return "ParameterFlow( argNum="+argNum+ ' ' +super.toString()+ ')';
     }
 
     @Override
     public String descString() {
-        String s = "arg(" + argNum + ")";
+        String s = "arg(" + argNum + ')';
         if(!getBlock().isEntryBlock()) {
             SSAInvokeInstruction inv = (SSAInvokeInstruction) ((IExplodedBasicBlock) getBlock().getDelegate()).getInstruction();
-            s = s + ":" + inv.getDeclaredTarget().getSignature();
+            s = s + ':' + inv.getDeclaredTarget().getSignature();
         }
         return s;
     }
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/types/ReturnFlow.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/types/ReturnFlow.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/types/ReturnFlow.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/types/ReturnFlow.java	2019-01-29 17:08:39.000000000 +0000
@@ -66,7 +66,7 @@
 
     @Override
     public String toString() {
-        return "ReturnFlow( " + super.toString() + ")";
+        return "ReturnFlow( " + super.toString() + ')';
     }
 
     @Override
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/types/StaticFieldFlow.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/types/StaticFieldFlow.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/flow/types/StaticFieldFlow.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/flow/types/StaticFieldFlow.java	2019-01-29 17:08:39.000000000 +0000
@@ -66,12 +66,12 @@
 	
     @Override
     public String toString() {
-        return "StaticFieldFlow( field=" + field + " "+ super.toString() + ")";
+        return "StaticFieldFlow( field=" + field + ' ' + super.toString() + ')';
     }
 
     @Override
     public String descString() {
-        return field.getDeclaringClass().toString() + "." + field.getName().toString();
+        return field.getDeclaringClass().toString() + '.' + field.getName().toString();
     }
     
     public IField getField() {
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/model/AppModelMethod.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/model/AppModelMethod.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/model/AppModelMethod.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/model/AppModelMethod.java	2019-01-29 17:08:39.000000000 +0000
@@ -72,9 +72,9 @@
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
 import com.ibm.wala.shrikeBT.IInvokeInstruction.IDispatch;
 import com.ibm.wala.ssa.ConstantValue;
+import com.ibm.wala.ssa.SSAAbstractInvokeInstruction;
 import com.ibm.wala.ssa.SSAArrayStoreInstruction;
 import com.ibm.wala.ssa.SSAInstructionFactory;
-import com.ibm.wala.ssa.SSAInvokeInstruction;
 import com.ibm.wala.ssa.SSANewInstruction;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.Descriptor;
@@ -89,7 +89,7 @@
 	
 	int nextLocal;
     /**
-     * A mapping from String (variable name) -> Integer (local number)
+     * A mapping from String (variable name) -&gt; Integer (local number)
      */
     private Map<String, Integer> symbolTable = null;
     
@@ -105,13 +105,13 @@
 
     
 	//Maps a Type to variable name
-	private Map<TypeReference, Integer> typeToID = new HashMap<TypeReference, Integer> ();    
+	private Map<TypeReference, Integer> typeToID = new HashMap<> ();    
 	//innerclass dependencies
-	private Map<TypeReference, LinkedList<TypeReference>> icDependencies = new HashMap<TypeReference, LinkedList<TypeReference>> ();
+	private Map<TypeReference, LinkedList<TypeReference>> icDependencies = new HashMap<> ();
     //all callbacks to consider
-	private List<MethodParams> callBacks = new ArrayList<MethodParams>();
+	private List<MethodParams> callBacks = new ArrayList<>();
 	
-	private Map<TypeReference, TypeReference> aClassToTR = new HashMap<TypeReference, TypeReference> ();
+	private Map<TypeReference, TypeReference> aClassToTR = new HashMap<> ();
 	
 	private class MethodParams{
 		public IMethod im;
@@ -203,7 +203,7 @@
 		nextLocal = nParams + 1;
 		symbolTable = HashMapFactory.make(5);
 		for (int i = 0; i < nParams; i++) {
-			symbolTable.put("arg" + i, new Integer(i + 1));
+			symbolTable.put("arg" + i, Integer.valueOf(i + 1));
 		}
     }	
     
@@ -231,12 +231,12 @@
     }
     
   	private void addDependencies(TypeReference tr) {
-		String packageName = "L"+tr.getName().getPackage().toString()+"/";
+		String packageName = 'L' +tr.getName().getPackage().toString()+ '/';
 		String outerClassName;		
 		String innerClassName = tr.getName().getClassName().toString();
-		LinkedList<TypeReference> trLL = new LinkedList<TypeReference> ();
+		LinkedList<TypeReference> trLL = new LinkedList<> ();
 		trLL.push(tr);
-		int index = innerClassName.lastIndexOf("$");
+		int index = innerClassName.lastIndexOf('$');
 		while (index != -1) {
     		outerClassName = innerClassName.substring(0, index);
     		TypeReference innerTR = TypeReference.findOrCreate(ClassLoaderReference.Application, packageName+outerClassName);
@@ -247,14 +247,14 @@
     		}
     		
     		innerClassName = outerClassName;
-    		index = outerClassName.lastIndexOf("$");
+    		index = outerClassName.lastIndexOf('$');
 		}
 		icDependencies.put(tr, trLL);
 	}
 
         
     private void processTypeMap() {
-    	Set<Integer> createdIDs = new HashSet<Integer> ();    	
+    	Set<Integer> createdIDs = new HashSet<> ();    	
     	for (Entry<TypeReference, Integer> eSet:typeToID.entrySet()) {    		
     		Integer i = eSet.getValue();
     		if (createdIDs.contains(i))
@@ -424,12 +424,12 @@
         return a;
     }
         
-    public SSAInvokeInstruction addInvocation(int[] params, CallSiteReference site) {
+    public SSAAbstractInvokeInstruction addInvocation(int[] params, CallSiteReference site) {
     	if (site == null) {
     		throw new IllegalArgumentException("site is null");
     	}
     	CallSiteReference newSite = CallSiteReference.make(methodSummary.getNumberOfStatements(), site.getDeclaredTarget(), site.getInvocationCode());
-    	SSAInvokeInstruction s = null;
+    	SSAAbstractInvokeInstruction s = null;
     	if (newSite.getDeclaredTarget().getReturnType().equals(TypeReference.Void)) {
     		s = insts.InvokeInstruction(methodSummary.getNumberOfStatements(), params, nextLocal++, newSite, null);
     	} else {
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/BlockSearch.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/BlockSearch.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/BlockSearch.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/BlockSearch.java	2019-01-29 17:08:39.000000000 +0000
@@ -57,7 +57,7 @@
 
 public class BlockSearch {
 
-    private ArrayList<ISSABasicBlock> blockQueue = new ArrayList<ISSABasicBlock>();
+    private ArrayList<ISSABasicBlock> blockQueue = new ArrayList<>();
     private int location = 0;
 
     private final SSACFG cfg;
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/modeledAllocations/ConstantString.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/modeledAllocations/ConstantString.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/modeledAllocations/ConstantString.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/modeledAllocations/ConstantString.java	2019-01-29 17:08:39.000000000 +0000
@@ -70,8 +70,9 @@
         return retVal;
     }
 
+    @Override
     public String toString() {
-        return ("ConstantString(instanceID = " + instanceID + "; value = " + constantValue + ")");
+        return ("ConstantString(instanceID = " + instanceID + "; value = " + constantValue + ')');
     }
 
     @Override
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/modeledAllocations/UriAppendString.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/modeledAllocations/UriAppendString.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/modeledAllocations/UriAppendString.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/modeledAllocations/UriAppendString.java	2019-01-29 17:08:39.000000000 +0000
@@ -70,7 +70,7 @@
         retVal.copyState(input);
         String prefix = input.getPrefix(uriInstanceID);
         if (input.fullPrefixKnown.contains(uriInstanceID)) {
-            retVal.update(instanceID, prefix + "/" + input.getPrefix(stringInstanceID));
+            retVal.update(instanceID, prefix + '/' + input.getPrefix(stringInstanceID));
             if (input.fullPrefixKnown.contains(stringInstanceID))
                 retVal.include(instanceID);
         }
@@ -78,8 +78,9 @@
         return retVal;
     }
 
+    @Override
     public String toString() {
-        return ("UriAppendString(instanceID = " + instanceID + "; uriInstanceID = " + uriInstanceID + "; stringInstanceID = " + stringInstanceID + ")");
+        return ("UriAppendString(instanceID = " + instanceID + "; uriInstanceID = " + uriInstanceID + "; stringInstanceID = " + stringInstanceID + ')');
     }
 
     @Override
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/modeledAllocations/UriParseString.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/modeledAllocations/UriParseString.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/modeledAllocations/UriParseString.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/modeledAllocations/UriParseString.java	2019-01-29 17:08:39.000000000 +0000
@@ -73,8 +73,9 @@
         return retVal;
     }
 
+    @Override
     public String toString() {
-        return ("UriParseString(instanceID = " + instanceID + "; stringInstanceID = " + stringInstanceID + ")");
+        return ("UriParseString(instanceID = " + instanceID + "; stringInstanceID = " + stringInstanceID + ')');
     }
 
     @Override
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferFunctionProvider.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferFunctionProvider.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferFunctionProvider.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferFunctionProvider.java	2019-01-29 17:08:39.000000000 +0000
@@ -56,11 +56,13 @@
     public PrefixTransferFunctionProvider()
     {}
 
+    @Override
     public UnaryOperator<PrefixVariable> getEdgeTransferFunction(
             InstanceKeySite src, InstanceKeySite dst) {
         return null;
     }
 
+    @Override
     public AbstractMeetOperator<PrefixVariable> getMeetOperator() {
         return new AbstractMeetOperator<PrefixVariable>()
         {
@@ -95,14 +97,17 @@
         };
     }
 
+    @Override
     public UnaryOperator<PrefixVariable> getNodeTransferFunction(InstanceKeySite node) {
         return new PrefixTransferFunction(node);
     }
 
+    @Override
     public boolean hasEdgeTransferFunctions() {
         return false;
     }
 
+    @Override
     public boolean hasNodeTransferFunctions() {
         return true;
     }
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferGraph.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferGraph.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixTransferGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -76,17 +76,16 @@
 
 public class PrefixTransferGraph implements Graph<InstanceKeySite> {
 
-    private final Map<InstanceKey, InstanceKeySite> nodeMap = new HashMap<InstanceKey, InstanceKeySite>();
-    private final List<InstanceKeySite> nodes = new ArrayList<InstanceKeySite>();
-    private final Map<InstanceKeySite,Set<InstanceKeySite>> successors = new HashMap<InstanceKeySite, Set<InstanceKeySite>>();
-    private final Map<InstanceKeySite,Set<InstanceKeySite>> predecessors = new HashMap<InstanceKeySite, Set<InstanceKeySite>>();
-    public final Map<InstanceKey, StringBuilderUseAnalysis> sbuaMap = new HashMap<InstanceKey, StringBuilderUseAnalysis>();
+    private final Map<InstanceKey, InstanceKeySite> nodeMap = new HashMap<>();
+    private final List<InstanceKeySite> nodes = new ArrayList<>();
+    private final Map<InstanceKeySite,Set<InstanceKeySite>> successors = new HashMap<>();
+    private final Map<InstanceKeySite,Set<InstanceKeySite>> predecessors = new HashMap<>();
+    public final Map<InstanceKey, StringBuilderUseAnalysis> sbuaMap = new HashMap<>();
 
     public PrefixTransferGraph(PointerAnalysis<InstanceKey> pa)
     {
-        Map<InstanceKeySite, Set<InstanceKey>> unresolvedDependencies = new HashMap<InstanceKeySite, Set<InstanceKey>>();
-        ArrayList<InstanceKey> instanceKeys = new ArrayList<InstanceKey>();
-        instanceKeys.addAll(pa.getInstanceKeys());
+        Map<InstanceKeySite, Set<InstanceKey>> unresolvedDependencies = new HashMap<>();
+        ArrayList<InstanceKey> instanceKeys = new ArrayList<>(pa.getInstanceKeys());
         for(InstanceKey k:instanceKeys)
         {
             if(k.getConcreteType().getName().toString().equals("Ljava/lang/StringBuilder"))
@@ -144,7 +143,7 @@
                             }
                             addNode(node);
                             nodeMap.put(k, node);
-                            HashSet<InstanceKey> iks = new HashSet<InstanceKey>();
+                            HashSet<InstanceKey> iks = new HashSet<>();
                             for (Integer i: ((StringBuilderToStringInstanceKeySite) node).concatenatedInstanceKeys) {
                                 iks.add(pa.getInstanceKeyMapping().getMappedObject(i));
                             }
@@ -200,85 +199,101 @@
         }
     }
 
+    @Override
     public void removeNodeAndEdges(InstanceKeySite n)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void addNode(InstanceKeySite n) {
         predecessors.put(n,new HashSet<InstanceKeySite>());
         successors.put(n,new HashSet<InstanceKeySite>());
         nodes.add(n);
     }
 
+    @Override
     public boolean containsNode(InstanceKeySite n) {
         return nodes.contains(n);
     }
 
+    @Override
     public int getNumberOfNodes() {
         return nodes.size();
     }
 
+    @Override
     public Iterator<InstanceKeySite> iterator() {
         return nodes.iterator();
     }
 
+    @Override
     public void removeNode(InstanceKeySite n) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void addEdge(InstanceKeySite src, InstanceKeySite dst) {
         Set<InstanceKeySite> predSet = predecessors.get(dst);
         if(predSet == null)
         {
-            predSet = new HashSet<InstanceKeySite>();
+            predSet = new HashSet<>();
             predecessors.put(dst,predSet);
         }
         predSet.add(src);
         Set<InstanceKeySite> succSet = successors.get(src);
         if(succSet == null)
         {
-            succSet = new HashSet<InstanceKeySite>();
+            succSet = new HashSet<>();
             successors.put(src,succSet);
         }
         succSet.add(dst);
     }
 
+    @Override
     public int getPredNodeCount(InstanceKeySite n) {
         return predecessors.get(n).size();
     }
 
+    @Override
     public Iterator<InstanceKeySite> getPredNodes(InstanceKeySite n) {
         return predecessors.get(n).iterator();
     }
 
+    @Override
     public int getSuccNodeCount(InstanceKeySite N) {
         return successors.get(N).size();
     }
 
+    @Override
     public Iterator<InstanceKeySite> getSuccNodes(InstanceKeySite n) {
         return successors.get(n).iterator();
     }
 
+    @Override
     public boolean hasEdge(InstanceKeySite src, InstanceKeySite dst) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removeAllIncidentEdges(InstanceKeySite node)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removeEdge(InstanceKeySite src, InstanceKeySite dst)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removeIncomingEdges(InstanceKeySite node)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removeOutgoingEdges(InstanceKeySite node)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixVariable.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixVariable.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixVariable.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/PrefixVariable.java	2019-01-29 17:08:39.000000000 +0000
@@ -57,12 +57,13 @@
 public class PrefixVariable extends AbstractVariable<PrefixVariable>{
 
     // map instance keys to their prefixes
-    public HashMap<Integer, String> knownPrefixes = new HashMap<Integer,String>();
-    public HashSet<Integer> fullPrefixKnown = new HashSet<Integer>();
+    public HashMap<Integer, String> knownPrefixes = new HashMap<>();
+    public HashSet<Integer> fullPrefixKnown = new HashSet<>();
 
     // TODO: keep track of completely known strings (not just known by prefix)
     //  HashMap<Integer, String> knownStrings = new HashMap<Integer,String>();
 
+    @Override
     public void copyState(PrefixVariable v) {
         knownPrefixes.clear();
         knownPrefixes.putAll(v.knownPrefixes);
@@ -102,9 +103,7 @@
 
     public boolean include(Integer i)
     {
-        if (fullPrefixKnown.contains(i)) return false;
-        fullPrefixKnown.add(i);
-        return true;
+        return fullPrefixKnown.add(i);
     }
 
     // set an instance key to have a known prefix
@@ -127,6 +126,7 @@
         }
     }
 
+    @Override
     public String toString() {
         return knownPrefixes.toString();
     }
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/StringBuilderUseAnalysis.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/StringBuilderUseAnalysis.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/StringBuilderUseAnalysis.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/StringBuilderUseAnalysis.java	2019-01-29 17:08:39.000000000 +0000
@@ -74,28 +74,26 @@
 
 	public final Map<ISSABasicBlock, ISSABasicBlock> blockOrdering;
 	
-	private final InstanceKey sbik;
 	private final CGNode node;
 	private final PointerAnalysis<InstanceKey> pa;
-	private final Set<LocalPointerKey> localPointerKeys = new HashSet<LocalPointerKey>();
+	private final Set<LocalPointerKey> localPointerKeys = new HashSet<>();
 	private final List<SSAInstruction> instructions;
 	
-	public StringBuilderUseAnalysis(final InstanceKey ik, final PointerAnalysis<InstanceKey> pa) throws Exception {
+	public StringBuilderUseAnalysis(final InstanceKey ik, final PointerAnalysis<InstanceKey> pa) {
 		assert(ik.getConcreteType().getName().toString().equals("Ljava/lang/StringBuilder"));
 	
-		this.sbik = ik;
 		this.pa = pa;
 		this.node = findCGNode(ik, pa);
 		this.instructions = findInstructions();
 		
-		final HashSet<ISSABasicBlock> blockSet = new HashSet<ISSABasicBlock>();
+		final HashSet<ISSABasicBlock> blockSet = new HashSet<>();
 		for (final SSAInstruction inst : instructions) {
 			blockSet.add(node.getIR().getBasicBlockForInstruction(inst));
 		}
 		
 		// find the ordering for all of the instructions
 		final BlockSearch blockSearch = new BlockSearch(node.getIR());
-		final Map<ISSABasicBlock,ISSABasicBlock> blockOrdering = new HashMap<ISSABasicBlock, ISSABasicBlock>();
+		final Map<ISSABasicBlock,ISSABasicBlock> blockOrdering = new HashMap<>();
 		
 		for (final ISSABasicBlock b : blockSet) {
 			final ISSABasicBlock target = blockSearch.searchFromBlock(b, blockSet);
@@ -108,7 +106,7 @@
 		this.blockOrdering = blockOrdering;
 	}
 
-	private CGNode findCGNode(final InstanceKey ik, final PointerAnalysis<InstanceKey> pa) throws Exception {
+	private CGNode findCGNode(final InstanceKey ik, final PointerAnalysis<InstanceKey> pa) {
 		CGNode nominatedNode = null;
 		
 		for (final PointerKey pk : pa.getPointerKeys()) {
@@ -144,7 +142,7 @@
 	}
 
 	private List<SSAInstruction> findInstructions() {
-		List<SSAInstruction> instructions = new ArrayList<SSAInstruction>();
+		List<SSAInstruction> instructions = new ArrayList<>();
 		if (node != null) {
 			for (SSAInstruction inst: node.getIR().getInstructions()) {
 				if (inst instanceof SSAInvokeInstruction) {
@@ -175,7 +173,7 @@
 		@Override
 		public PrefixVariable propagate(final PrefixVariable input) {
 			// TODO: go through each of the concatenatedInstanceKeys and look up their prefixes in input to figure out the prefix of the string generated by toString()
-			final StringBuffer buf = new StringBuffer();
+			final StringBuilder buf = new StringBuilder();
 			boolean prefixNew = false;
 			boolean prefixFull = true;
 			
@@ -206,8 +204,9 @@
 			return retVal;
 		}
 
+		@Override
 		public String toString() {
-			return ("StringBuilderToString(instanceID = " + instanceID + "; concatenatedInstanceKeys = " + concatenatedInstanceKeys + ")");
+			return ("StringBuilderToString(instanceID = " + instanceID + "; concatenatedInstanceKeys = " + concatenatedInstanceKeys + ')');
 		}
 
 		@Override
@@ -221,8 +220,8 @@
 		final ISSABasicBlock bbs[] = node.getIR().getBasicBlocksForCall(csr);
 		
 		final OrdinalSetMapping<InstanceKey> mapping = pa.getInstanceKeyMapping();
-		final HashSet<ISSABasicBlock> blocksSeen = new HashSet<ISSABasicBlock>();
-		final ArrayList<Integer> concatenatedInstanceKeys = new ArrayList<Integer>();
+		final HashSet<ISSABasicBlock> blocksSeen = new HashSet<>();
+		final ArrayList<Integer> concatenatedInstanceKeys = new ArrayList<>();
 
 		ISSABasicBlock bPrev = bbs[0];
 		ISSABasicBlock bNext = blockOrdering.get(bPrev);
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/UriPrefixTransferGraph.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/UriPrefixTransferGraph.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/UriPrefixTransferGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/prefixtransfer/UriPrefixTransferGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,6 +50,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -86,28 +87,28 @@
 
 public class UriPrefixTransferGraph implements Graph<InstanceKeySite> {
 	
-    public final Map<InstanceKey, InstanceKeySite> nodeMap = new HashMap<InstanceKey, InstanceKeySite>();
+    public final Map<InstanceKey, InstanceKeySite> nodeMap = new HashMap<>();
     public final Map<InstanceKey, StringBuilderUseAnalysis> sbuaMap =
-    	new HashMap<InstanceKey, StringBuilderUseAnalysis>();
+    	new HashMap<>();
 
-    private final List<InstanceKeySite> nodes = new ArrayList<InstanceKeySite>();
+    private final List<InstanceKeySite> nodes = new ArrayList<>();
     private final Map<InstanceKeySite,Set<InstanceKeySite>> successors =
-    	new HashMap<InstanceKeySite, Set<InstanceKeySite>>();
+    	new HashMap<>();
     private final Map<InstanceKeySite,Set<InstanceKeySite>> predecessors =
-    	new HashMap<InstanceKeySite, Set<InstanceKeySite>>();
+    	new HashMap<>();
 
     public UriPrefixTransferGraph(final PointerAnalysis<InstanceKey> pa) {
         final Map<InstanceKeySite, Set<InstanceKey>> unresolvedDependencies =
-        	new HashMap<InstanceKeySite, Set<InstanceKey>>();
+        	new HashMap<>();
         final OrdinalSetMapping<InstanceKey> mapping = pa.getInstanceKeyMapping();
         final Collection<InstanceKey> instanceKeys = pa.getInstanceKeys();
         
         for (final InstanceKey k : instanceKeys) {
-        	handleStringBuilder(k, pa, mapping, unresolvedDependencies);
+        	handleStringBuilder(k, pa);
         }
         
         for (final InstanceKey k : instanceKeys) {
-        	handleString(k, pa, mapping, unresolvedDependencies);
+        	handleString(k, mapping, unresolvedDependencies);
         }
 
         for (final PointerKey pk : pa.getPointerKeys()) {
@@ -135,8 +136,7 @@
         }
     }
     
-    private void handleString(final InstanceKey ik, final PointerAnalysis<InstanceKey> pa,
-    		final OrdinalSetMapping<InstanceKey> mapping,
+    private void handleString(final InstanceKey ik, final OrdinalSetMapping<InstanceKey> mapping,
     		final Map<InstanceKeySite, Set<InstanceKey>> unresolvedDependencies) {
         if (isOfType(ik, "Ljava/lang/String")) {
             if (ik instanceof ConstantKey) {
@@ -146,14 +146,12 @@
                 nodeMap.put(ik, node);
             } else if (ik instanceof NormalAllocationInNode) {
             	final NormalAllocationInNode nain = (NormalAllocationInNode) ik;
-            	handleStringBuilderToString(nain, pa, mapping, unresolvedDependencies);
+            	handleStringBuilderToString(nain, mapping, unresolvedDependencies);
             }
         }
     }
     
-    private void handleStringBuilder(final InstanceKey ik, final PointerAnalysis<InstanceKey> pa,
-    		final OrdinalSetMapping<InstanceKey> mapping,
-    		final Map<InstanceKeySite, Set<InstanceKey>> unresolvedDependencies) {
+    private void handleStringBuilder(final InstanceKey ik, final PointerAnalysis<InstanceKey> pa) {
     	
         if (isOfType(ik, "Ljava/lang/StringBuilder")) {
             if (ik instanceof AllocationSiteInNode) {
@@ -173,8 +171,7 @@
         }
     }
     
-    private void handleStringBuilderToString(final NormalAllocationInNode nain, final PointerAnalysis<InstanceKey> pa,
-    		final OrdinalSetMapping<InstanceKey> mapping,
+    private void handleStringBuilderToString(final NormalAllocationInNode nain, final OrdinalSetMapping<InstanceKey> mapping,
     		final Map<InstanceKeySite, Set<InstanceKey>> unresolvedDependencies) {
         if (hasSignature(nain, "java.lang.StringBuilder.toString()Ljava/lang/String;")) {
             final Context context = nain.getNode().getContext();
@@ -193,7 +190,7 @@
                         
                         final StringBuilderToStringInstanceKeySite s2si =
                         		(StringBuilderToStringInstanceKeySite) node;
-                        final HashSet<InstanceKey> iks = new HashSet<InstanceKey>();
+                        final HashSet<InstanceKey> iks = new HashSet<>();
                         
                         for (final Integer i: s2si.concatenatedInstanceKeys) {
                             iks.add(mapping.getMappedObject(i));
@@ -236,15 +233,14 @@
 					final OrdinalSet<InstanceKey> returnSet =
 							pa.getPointsToSet(new LocalPointerKey(caller, invoke.getReturnValue(0)));
 					
-					for (final Iterator<InstanceKey> rIK = returnSet.iterator(); rIK.hasNext(); ) {
-						final InstanceKey returnIK = rIK.next();
+					for (InstanceKey returnIK : returnSet) {
 						final UriAppendString node = new UriAppendString(mapping.getMappedIndex(returnIK),
 							mapping.getMappedIndex(uriKey), mapping.getMappedIndex(stringKey));
 												
 						if (!nodeMap.containsKey(returnIK)) {
 							addNode(node);
 							nodeMap.put(returnIK, node);
-							final HashSet<InstanceKey> iks = new HashSet<InstanceKey>();
+							final HashSet<InstanceKey> iks = new HashSet<>();
 							iks.add(uriKey);
 							iks.add(stringKey);
 							unresolvedDependencies.put(node, iks);
@@ -284,7 +280,7 @@
                     
                     addNode(node);
                     nodeMap.put(ik, node);
-                    final HashSet<InstanceKey> iks = new HashSet<InstanceKey>();
+                    final HashSet<InstanceKey> iks = new HashSet<>();
                     iks.add(uriKey);
                     iks.add(stringKey);
                     unresolvedDependencies.put(node, iks);
@@ -317,90 +313,105 @@
                 
                 addNode(node);
                 nodeMap.put(ik, node);
-                final HashSet<InstanceKey> iks = new HashSet<InstanceKey>();
-                iks.add(stringKey);
+                final Set<InstanceKey> iks = Collections.singleton(stringKey);
                 unresolvedDependencies.put(node, iks);
             }
     	}
     }
 
+    @Override
     public void removeNodeAndEdges(InstanceKeySite n) throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void addNode(final InstanceKeySite n) {
         predecessors.put(n, new HashSet<InstanceKeySite>());
         successors.put(n, new HashSet<InstanceKeySite>());
         nodes.add(n);
     }
 
+    @Override
     public boolean containsNode(final InstanceKeySite n) {
         return nodes.contains(n);
     }
 
+    @Override
     public int getNumberOfNodes() {
         return nodes.size();
     }
 
+    @Override
     public Iterator<InstanceKeySite> iterator() {
         return nodes.iterator();
     }
 
+    @Override
     public void removeNode(final InstanceKeySite n) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void addEdge(final InstanceKeySite src, final InstanceKeySite dst) {
         Set<InstanceKeySite> predSet = predecessors.get(dst);
         if (predSet == null) {
-            predSet = new HashSet<InstanceKeySite>();
+            predSet = new HashSet<>();
             predecessors.put(dst, predSet);
         }
         predSet.add(src);
 
         Set<InstanceKeySite> succSet = successors.get(src);
         if (succSet == null) {
-            succSet = new HashSet<InstanceKeySite>();
+            succSet = new HashSet<>();
             successors.put(src, succSet);
         }
         succSet.add(dst);
     }
 
+    @Override
     public int getPredNodeCount(final InstanceKeySite n) {
         return predecessors.get(n).size();
     }
 
+    @Override
     public Iterator<InstanceKeySite> getPredNodes(InstanceKeySite n) {
         return predecessors.get(n).iterator();
     }
 
+    @Override
     public int getSuccNodeCount(InstanceKeySite N) {
         return successors.get(N).size();
     }
 
+    @Override
     public Iterator<InstanceKeySite> getSuccNodes(InstanceKeySite n) {
         return successors.get(n).iterator();
     }
 
+    @Override
     public boolean hasEdge(InstanceKeySite src, InstanceKeySite dst) {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removeAllIncidentEdges(InstanceKeySite node)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removeEdge(InstanceKeySite src, InstanceKeySite dst)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removeIncomingEdges(InstanceKeySite node)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
     }
 
+    @Override
     public void removeOutgoingEdges(InstanceKeySite node)
             throws UnsupportedOperationException {
         throw new UnsupportedOperationException();
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/AndroidSpecs.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/AndroidSpecs.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/AndroidSpecs.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/AndroidSpecs.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,6 +48,7 @@
 package org.scandroid.spec;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -196,6 +197,7 @@
 		glStatusChanged,
 		nlNmeaRecvd,
 	};
+	@Override
 	public MethodNamePattern[] getEntrypointSpecs() { return defaultCallbacks; }
 
 
@@ -254,6 +256,7 @@
 		
 	};
 	
+	@Override
 	public SourceSpec[] getSourceSpecs() { return sourceSpecs; }
 
 	/**
@@ -293,6 +296,7 @@
 		new CallArgSinkSpec(new MethodNamePattern(sms, "sendDataMessage"), null),
 	};
 
+	@Override
 	public SinkSpec[] getSinkSpecs() { return sinkSpecs; }
 
 	private static MethodNamePattern[] callBacks = new MethodNamePattern[]{};
@@ -302,7 +306,7 @@
 //		return callBacks;
 //	}
 	public void addPossibleListeners(ClassHierarchy cha) {
-		Set<String> ignoreMethods = new HashSet<String>();
+		Set<String> ignoreMethods = new HashSet<>();
 		ignoreMethods.add("<init>");
 		ignoreMethods.add("<clinit>");
 		ignoreMethods.add("registerNatives");
@@ -316,14 +320,10 @@
 		ignoreMethods.add("finalize");
 		ignoreMethods.add("wait");		
 
-		List<MethodNamePattern> moreEntryPointSpecs = new ArrayList<MethodNamePattern> ();
-		
 		//add default entrypoints from AndroidSpecs.entrypointSpecs
 		//Currently adds methods even if they exist in the ignnoreMethods
 		//set.
-		for (MethodNamePattern mnp: defaultCallbacks) {
-			moreEntryPointSpecs.add(mnp);
-		}
+		List<MethodNamePattern> moreEntryPointSpecs = new ArrayList<>(Arrays.asList(defaultCallbacks));
 
 		for (IClass ic:cha) {
 			if (!LoaderUtils.fromLoader(ic, ClassLoaderReference.Application)) {
@@ -356,7 +356,7 @@
 
 //		entrypointSpecs =
 		callBacks = 
-				moreEntryPointSpecs.toArray(new MethodNamePattern[moreEntryPointSpecs.size()]);
+				moreEntryPointSpecs.toArray(new MethodNamePattern[0]);
 
 	}
 	
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/CallArgSinkSpec.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/CallArgSinkSpec.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/CallArgSinkSpec.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/CallArgSinkSpec.java	2019-01-29 17:08:39.000000000 +0000
@@ -69,7 +69,7 @@
 	public <E extends ISSABasicBlock> Collection<FlowType<E>> getFlowType(
 			BasicBlockInContext<E> block) {
 
-		HashSet<FlowType<E>> flowSet = new HashSet<FlowType<E>>();
+		HashSet<FlowType<E>> flowSet = new HashSet<>();
 		if (argNums == null) {
 			SSAInvokeInstruction i = (SSAInvokeInstruction) block
 					.getLastInstruction();
@@ -78,7 +78,7 @@
 				argNums[p] = p;
 		}
 		for (int arg : argNums) {
-			flowSet.add(new ParameterFlow<E>(block, arg, false));
+			flowSet.add(new ParameterFlow<>(block, arg, false));
 		}
 		return flowSet;
 	}
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/CallArgSourceSpec.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/CallArgSourceSpec.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/CallArgSourceSpec.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/CallArgSourceSpec.java	2019-01-29 17:08:39.000000000 +0000
@@ -97,15 +97,14 @@
 			ISupergraph<BasicBlockInContext<E>, CGNode> graph,
 			PointerAnalysis<InstanceKey> pa, CallGraph cg) {
 
-		for (int j = 0; j < newArgNums.length; j++) {
+		for (int newArgNum : newArgNums) {
 			for (FlowType<E> ft : getFlowType(block)) {
 				// a collection of a LocalElement for this argument's SSA value,
 				// along with a set of InstanceKeyElements for each instance
 				// that this SSA value might point to
-				final int ssaVal = invInst.getUse(newArgNums[j]);
+				final int ssaVal = invInst.getUse(newArgNum);
 				final CGNode node = block.getNode();
-				Set<CodeElement> valueElements = CodeElement.valueElements(pa,
-						node, ssaVal);
+				Set<CodeElement> valueElements = CodeElement.valueElements(ssaVal);
 				PointerKey pk = pa.getHeapModel().getPointerKeyForLocal(node, ssaVal);
 				for (InstanceKey ik : pa.getPointsToSet(pk)) {
 					valueElements.add(new InstanceKeyElement(ik));
@@ -121,7 +120,7 @@
 			BasicBlockInContext<E> block) {
 		HashSet<FlowType<E>> flowSet = HashSetFactory.make();
 		for (int i : argNums) {
-			flowSet.add(new ParameterFlow<E>(block, i, true));
+			flowSet.add(new ParameterFlow<>(block, i, true));
 		}
 		return flowSet;
 	}
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/CallRetSourceSpec.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/CallRetSourceSpec.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/CallRetSourceSpec.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/CallRetSourceSpec.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,7 +48,7 @@
 package org.scandroid.spec;
 
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
@@ -89,21 +89,16 @@
 			BasicBlockInContext<E> block, SSAInvokeInstruction invInst, int[] newArgNums,
 			ISupergraph<BasicBlockInContext<E>, CGNode> graph, PointerAnalysis<InstanceKey> pa, CallGraph cg) {
 
-		for (FlowType<E> ft:getFlowType(block, invInst,block.getNode(), im, pa)) {
+		for (FlowType<E> ft:getFlowType(block)) {
 			InflowAnalysis.addDomainElements(taintMap, block, ft, 
-			        CodeElement.valueElements(pa, block.getNode(), invInst.getDef(0)));
+			        CodeElement.valueElements(invInst.getDef(0)));
 		}
 	}
 
-	private<E extends ISSABasicBlock> Collection<FlowType<E>> getFlowType(
-	        BasicBlockInContext<E> block,
-	        SSAInvokeInstruction invInst,
-			CGNode node, IMethod im, PointerAnalysis<InstanceKey> pa) {
-
-		HashSet<FlowType<E>> flowSet = new HashSet<FlowType<E>>();
-		flowSet.clear();
-		flowSet.add(new ReturnFlow<E>(block, true));
-		return flowSet;
+	private static <E extends ISSABasicBlock> Collection<FlowType<E>> getFlowType(
+																				  BasicBlockInContext<E> block) {
+
+		return Collections.singleton(new ReturnFlow<>(block, true));
 	}
 
 	@Override
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/EntryArgSinkSpec.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/EntryArgSinkSpec.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/EntryArgSinkSpec.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/EntryArgSinkSpec.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,7 +49,7 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.stream.Collectors;
 
 import org.scandroid.flow.types.FlowType;
 import org.scandroid.flow.types.ParameterFlow;
@@ -71,15 +71,13 @@
 		argNums = args;
 	}
 
+	@Override
 	public <E extends ISSABasicBlock> Collection<FlowType<E>> getFlowType(
 			BasicBlockInContext<E> block) {
 
-		HashSet<FlowType<E>> flowSet = new HashSet<FlowType<E>>();
-		flowSet.clear();
-		for (int i : argNums) {
-			flowSet.add(new ParameterFlow<E>(block, i, false));
-		}
-		return flowSet;
+		return Arrays.stream(argNums)
+				.mapToObj(i -> new ParameterFlow<>(block, i, false))
+				.collect(Collectors.toSet());
 	}
 
 	@Override
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/EntryArgSourceSpec.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/EntryArgSourceSpec.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/EntryArgSourceSpec.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/EntryArgSourceSpec.java	2019-01-29 17:08:39.000000000 +0000
@@ -96,9 +96,9 @@
 
 		for(CGNode node: cg.getNodes(im.getReference())) {
 		    for(int i: newArgNums) {
-		        FlowType<E> flow = new ParameterFlow<E>(block, i, true);
+		        FlowType<E> flow = new ParameterFlow<>(block, i, true);
 		        final int ssaVal = node.getIR().getParameter(i);
-				final Set<CodeElement> valueElements = CodeElement.valueElements(pa, node, ssaVal);
+				final Set<CodeElement> valueElements = CodeElement.valueElements(ssaVal);
 				
 				PointerKey pk = pa.getHeapModel().getPointerKeyForLocal(node, ssaVal);
 				final OrdinalSet<InstanceKey> pointsToSet = pa.getPointsToSet(pk);
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/EntryRetSinkSpec.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/EntryRetSinkSpec.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/EntryRetSinkSpec.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/EntryRetSinkSpec.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,8 +50,7 @@
 package org.scandroid.spec;
 
 import java.util.Collection;
-import java.util.HashSet;
-
+import java.util.Collections;
 import org.scandroid.flow.types.FlowType;
 import org.scandroid.flow.types.ReturnFlow;
 
@@ -67,10 +66,7 @@
 	@Override
 	public <E extends ISSABasicBlock> Collection<FlowType<E>> getFlowType(
 			BasicBlockInContext<E> block) {
-		HashSet<FlowType<E>> flowSet = new HashSet<FlowType<E>>();
-		flowSet.clear();
-		flowSet.add(new ReturnFlow<E>(block, false));
-		return flowSet;
+		return Collections.singleton(new ReturnFlow<>(block, false));
 	}
 
 	@Override
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/FieldNamePattern.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/FieldNamePattern.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/FieldNamePattern.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/FieldNamePattern.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,9 +49,10 @@
 
 import java.util.Collection;
 import java.util.LinkedList;
-import com.ibm.wala.classLoader.IField;
+
 import com.ibm.wala.classLoader.IClass;
 import com.ibm.wala.classLoader.IClassLoader;
+import com.ibm.wala.classLoader.IField;
 import com.ibm.wala.types.TypeName;
 import com.ibm.wala.util.strings.Atom;
 
@@ -66,7 +67,7 @@
     }
 
     Collection<IField> lookupFields(IClassLoader cl) {
-        Collection<IField> matching = new LinkedList<IField>();
+        Collection<IField> matching = new LinkedList<>();
         IClass c = cl.lookupClass(TypeName.findOrCreate(className));
         if(c == null) return matching;
         Atom atom = Atom.findOrCreateUnicodeAtom(memberName);
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/MethodNamePattern.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/MethodNamePattern.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/MethodNamePattern.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/MethodNamePattern.java	2019-01-29 17:08:39.000000000 +0000
@@ -82,10 +82,10 @@
 	}
 
 	private Collection<IMethod> lookupMethods(IClass c) {
-		Collection<IMethod> matching = new LinkedList<IMethod>();
+		Collection<IMethod> matching = new LinkedList<>();
 		Atom atom = Atom.findOrCreateUnicodeAtom(memberName);
 		Descriptor desc = descriptor == null ? null : Descriptor.findOrCreateUTF8(descriptor);
-		Collection<IMethod> allMethods = c.getAllMethods();
+		Collection<? extends IMethod> allMethods = c.getAllMethods();
 		for(IMethod m: allMethods) {
 			if(m.getName().equals(atom) && (desc == null || m.getDescriptor().equals(desc))) {
 				matching.add(m);
@@ -97,11 +97,9 @@
 	/**
 	 * Returns a Collection of IMethods which are found in the following 
 	 * ClassLoaders: Application, Primordial, Extension
-	 * @param cha
-	 * @return
 	 */
 	public Collection<IMethod> getPossibleTargets(IClassHierarchy cha) {
-		Collection<IMethod> matching = new LinkedList<IMethod>();
+		Collection<IMethod> matching = new LinkedList<>();
 		IClass c;
 		c = cha.lookupClass(TypeReference.findOrCreate(ClassLoaderReference.Application, className));
 		if (c != null)
@@ -127,8 +125,8 @@
 		String returnString = "MethodNamePattern (Class: "+className+
 				" - Method: "+memberName; 
 		if (descriptor == null)
-			return returnString+")";
-		return returnString+" - Descriptor: "+descriptor+")";
+			return returnString+ ')';
+		return returnString+" - Descriptor: "+descriptor+ ')';
 
 	}
 	
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/SinkSpec.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/SinkSpec.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/SinkSpec.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/SinkSpec.java	2019-01-29 17:08:39.000000000 +0000
@@ -80,7 +80,7 @@
 	@Override
 	public String toString() {
 		return "SinkSpec [namePattern=" + namePattern + ", argNums="
-				+ Arrays.toString(argNums) + "]";
+				+ Arrays.toString(argNums) + ']';
 	}
 
 	abstract public <E extends ISSABasicBlock> Collection<FlowType<E>> getFlowType(
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/SpecUtils.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/SpecUtils.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/SpecUtils.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/SpecUtils.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,16 +49,12 @@
 
 package org.scandroid.spec;
 
-import java.lang.reflect.Array;
+import java.util.Arrays;
 
 public class SpecUtils {
 
 	/**
 	 * Combine two specs objects.
-	 * 
-	 * @param s1
-	 * @param s2
-	 * @return
 	 */
 	public static ISpecs combine(final ISpecs s1, final ISpecs s2) {
 		return new ISpecs() {
@@ -80,7 +76,6 @@
 				return concat(s1.getEntrypointSpecs(), s2.getEntrypointSpecs());
 			}
 	
-			@SuppressWarnings("unchecked")
 			private <T> T[] concat(final T[] a, final T[] b) {
 				if (null == a) {
 					return b;
@@ -88,9 +83,8 @@
 				if (null == b) {
 					return a;
 				}
-				
-				T[] newArray = (T[]) Array.newInstance(a.getClass().getComponentType(), a.length + b.length);
-				System.arraycopy(a, 0, newArray, 0, a.length);
+
+				T[] newArray = Arrays.copyOf(a, a.length + b.length);
 				System.arraycopy(b, 0, newArray, a.length, b.length);
 				return newArray;
 			}
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/StaticFieldSinkSpec.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/StaticFieldSinkSpec.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/StaticFieldSinkSpec.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/StaticFieldSinkSpec.java	2019-01-29 17:08:39.000000000 +0000
@@ -84,7 +84,7 @@
 	@Override
 	public <E extends ISSABasicBlock> Collection<FlowType<E>> getFlowType(
 			BasicBlockInContext<E> block) {
-		Collection<FlowType<E>> flow = HashSetFactory.make(Collections.singleton((FlowType<E>) new StaticFieldFlow<E>(block, field, false)));
+		Collection<FlowType<E>> flow = HashSetFactory.make(Collections.singleton((FlowType<E>) new StaticFieldFlow<>(block, field, false)));
 		return flow;
 	}
 
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/StaticFieldSourceSpec.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/StaticFieldSourceSpec.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/StaticFieldSourceSpec.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/StaticFieldSourceSpec.java	2019-01-29 17:08:39.000000000 +0000
@@ -108,7 +108,7 @@
 
 		Set<CodeElement> valueElements = HashSetFactory.make();
 		valueElements.add(new StaticFieldElement(field.getReference()));
-		FlowType<E> flow = new StaticFieldFlow<E>(block, field, true);
+		FlowType<E> flow = new StaticFieldFlow<>(block, field, true);
 		
 		TypeReference typeRef = field.getFieldTypeReference();
 		
@@ -152,6 +152,6 @@
 
 	@Override
 	public String toString() {
-		return "StaticFieldSourceSpec [field=" + field + "]";
+		return "StaticFieldSourceSpec [field=" + field + ']';
 	}
 }
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/StaticSpecs.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/StaticSpecs.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/spec/StaticSpecs.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/spec/StaticSpecs.java	2019-01-29 17:08:39.000000000 +0000
@@ -99,11 +99,8 @@
 		return new SourceSpec[] {};
 	}
 
-	/**
-	 * @return
-	 */
 	private List<IField> collectFields() {
-		List<IField> fields = new ArrayList<IField>();
+		List<IField> fields = new ArrayList<>();
 		Iterator<IClass> itr = cha.iterator();
 		while (itr.hasNext()) {
 			IClass cls = itr.next();
@@ -121,7 +118,7 @@
 	 */
 	@Override
 	public SinkSpec[] getSinkSpecs() {		
-		List<SinkSpec> specs = new ArrayList<SinkSpec>();
+		List<SinkSpec> specs = new ArrayList<>();
 		Collection<IMethod> methods = cha.getPossibleTargets(StringStuff.makeMethodReference(methodSignature));
 		for (IField field : fields) {
 			if (!field.isFinal()) {
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/DefaultSCanDroidOptions.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/DefaultSCanDroidOptions.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/DefaultSCanDroidOptions.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/DefaultSCanDroidOptions.java	2019-01-29 17:08:39.000000000 +0000
@@ -184,7 +184,7 @@
 				+ options.getReflectionOptions() + ", getSummariesURI()="
 				+ options.getSummariesURI() + ", classHierarchyWarnings()="
 				+ options.classHierarchyWarnings() + ", cgBuilderWarnings()="
-				+ options.cgBuilderWarnings() + "]";
+				+ options.cgBuilderWarnings() + ']';
 	}
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/SSAtoXMLVisitor.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/SSAtoXMLVisitor.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/SSAtoXMLVisitor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/SSAtoXMLVisitor.java	2019-01-29 17:08:39.000000000 +0000
@@ -104,7 +104,7 @@
     /**
      * XML elements that represent the ssa instructions
      */
-    private final List<Element> summary = new ArrayList<Element>();
+    private final List<Element> summary = new ArrayList<>();
 
     public SSAtoXMLVisitor(Document doc, int argCount) {
         this.doc = doc;
@@ -119,9 +119,9 @@
     }
 
     /**
-     * Load from an array ref, at specified index, and store in def.
+     * <p>Load from an array ref, at specified index, and store in def.</p>
      * 
-     *   <aaload ref="x" index="0" def="y" />
+     *   {@code <aaload ref="x" index="0" def="y" />}
      */
     @Override
     public void visitArrayLoad(SSAArrayLoadInstruction instruction) {
@@ -134,7 +134,7 @@
             String defStr = getLocalName(instruction.getDef());
             elt.setAttribute(XMLSummaryWriter.A_VALUE, defStr);
             
-            elt.setAttribute(XMLSummaryWriter.A_INDEX, ""+instruction.getIndex());
+            elt.setAttribute(XMLSummaryWriter.A_INDEX, String.valueOf(instruction.getIndex()));
             summary.add(elt);
         } catch (Exception e) {
             throw new SSASerializationException(e);
@@ -142,7 +142,7 @@
     }
 
     /**
-     *    <aastore ref="x" value="y" index="0" />
+     *    {@code <aastore ref="x" value="y" index="0" />}
      */
     @Override
     public void visitArrayStore(SSAArrayStoreInstruction instruction) {
@@ -155,7 +155,7 @@
             String valueStr = getLocalName(instruction.getValue());
             elt.setAttribute(XMLSummaryWriter.A_VALUE, valueStr);
             
-            elt.setAttribute(XMLSummaryWriter.A_INDEX, ""+instruction.getIndex());
+            elt.setAttribute(XMLSummaryWriter.A_INDEX, String.valueOf(instruction.getIndex()));
             summary.add(elt);
         } catch (Exception e) {
             throw new SSASerializationException(e);
@@ -208,15 +208,15 @@
     }
 
     /**
-     * eg:
+     * <p>eg:</p>
      * 
-     * <getfield class="Ljava/lang/Thread" field="runnable"
-     * fieldType="Ljava/lang/Runnable" def="x" ref="arg0" />
+     * {@code <getfield class="Ljava/lang/Thread" field="runnable"
+     * fieldType="Ljava/lang/Runnable" def="x" ref="arg0" />}
      * 
-     * I think the get statics look like this:
-     * 1007g 9.1g  12m S 237.9  0.9   4:27.32 java
-     * <getstatic class="Ljava/lang/Thread" field="runnable"
-     * fieldType="Ljava/lang/Runnable" def="x" />
+     * <p>I think the get statics look like this:</p>
+     * <p>1007g 9.1g  12m S 237.9  0.9   4:27.32 java</p>
+     * {@code <getstatic class="Ljava/lang/Thread" field="runnable"
+     * fieldType="Ljava/lang/Runnable" def="x" />}
      */
     @Override
     public void visitGet(SSAGetInstruction instruction) {
@@ -256,11 +256,11 @@
     }
 
     /**
-     * <putstatic class="Ljava/lang/System" field="security"
-     * fieldType="Ljava/lang/SecurityManager" value="secure" />
+     * <p>{@code <putstatic class="Ljava/lang/System" field="security"
+     * fieldType="Ljava/lang/SecurityManager" value="secure" />}</p>
      * 
-     * <putfield class="Ljava/lang/Thread" field="runnable"
-     * fieldType="Ljava/lang/Runnable" ref="arg0" value="arg0" />
+     * <p>{@code <putfield class="Ljava/lang/Thread" field="runnable"
+     * fieldType="Ljava/lang/Runnable" ref="arg0" value="arg0" />}</p>
      * 
      */
     @Override
@@ -302,10 +302,10 @@
     }
 
     /**
-     * 	  <call type="virtual" name="put"
+     * 	  {@code <call type="virtual" name="put"
 	 *          class="Ljava/util/Hashtable"
 	 *          descriptor="(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"
-	 *          arg0="x" arg1="key" arg2="value" def="local_def" />
+	 *          arg0="x" arg1="key" arg2="value" def="local_def" />}
      */
     @Override
     public void visitInvoke(SSAInvokeInstruction instruction) {
@@ -333,7 +333,7 @@
                 elt.setAttribute(XMLSummaryWriter.A_DEF, localName);
             }
 
-            int paramCount = instruction.getNumberOfParameters();
+            int paramCount = instruction.getNumberOfPositionalParameters();
             for (int i=0; i < paramCount; i++) {
             	String argName = getLocalName(instruction.getUse(i));
             	elt.setAttribute(XMLSummaryWriter.A_ARG+i, argName);
@@ -384,11 +384,11 @@
     }
 
     /**
-     * Serialiaze a throw to XML.
+     * <p>Serialiaze a throw to XML.</p>
      * 
-     * Something like this?
+     * <p>Something like this?</p>
      * 
-     * <throw value="val_localDef" /> 
+     * {@code <throw value="val_localDef" />}
      */
     @Override
     public void visitThrow(SSAThrowInstruction instruction) {
@@ -443,8 +443,6 @@
 
     /**
      * Add a new defNum, creating a name for that defnum.
-     * 
-     * @param defNum
      */
     private String newLocalDef(int defNum) {
         String newName = "localdef_" + defCounter;
@@ -461,12 +459,7 @@
      * local name associated with it) then this will throw an illegal state
      * exception.
      *
-     * TODO needs to return 'arg0' -> 'argN' for those value numbers...
-     *
-     * @param defNum
-     *
-     * @return
-     * @throws IllegalStateException
+     * TODO needs to return 'arg0' -&gt; 'argN' for those value numbers...
      */
     private String getLocalName(int defNum) throws IllegalStateException {
     	if (0 == defNum) {
@@ -486,7 +479,7 @@
     }
 
     @SuppressWarnings("unused")
-	private String typeRefToStr(TypeReference fieldType)
+	private static String typeRefToStr(TypeReference fieldType)
             throws UTFDataFormatException {
         Atom className = fieldType.getName().getClassName();
         Atom pkgName = fieldType.getName().getPackage();
@@ -499,7 +492,7 @@
         	
         }
         
-        return pkgName.toUnicodeString() + "/" + className.toUnicodeString();
+        return pkgName.toUnicodeString() + '/' + className.toUnicodeString();
     }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/XMLSummaryWriter.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/XMLSummaryWriter.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/XMLSummaryWriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/XMLSummaryWriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -173,12 +173,6 @@
      * Throws various exceptions if a problem occurred serializing this method.
      * 
      * No guarantees as to the state of the Document if an exception is thrown.
-     * 
-     * @param summary
-     * @return
-     * @throws DOMException
-     * @throws UTFDataFormatException
-     * @throws SSASerializationException
      */
 	public void add(MethodSummary summary) throws UTFDataFormatException {
 		// create a method element, and populate it's attributes:
@@ -266,11 +260,8 @@
     /**
      * Generate a method descriptor, such as
      * (I[Ljava/lang/String;)[Ljava/lang/String;
-     * 
-     * @param summary
-     * @return
      */
-    private String getMethodDescriptor(MethodSummary summary) {
+    private static String getMethodDescriptor(MethodSummary summary) {
         StringBuilder typeSigs = new StringBuilder("(");
         
         int i=0;
@@ -283,23 +274,23 @@
 
             // unwrap array types
             while (tr.isArrayType()) {
-            	typeSigs.append("[");
+            	typeSigs.append('[');
             	tr = tr.getArrayElementType();
             }
             
             if (tr.isPrimitiveType()) {
             	typeSigs.append(tr.getName().toUnicodeString());
             } else {
-            	typeSigs.append(tr.getName().toUnicodeString()+ ";");
+            	typeSigs.append(tr.getName().toUnicodeString()).append(';');
             }
         }
-        typeSigs.append(")");
+        typeSigs.append(')');
         
         TypeReference returnType = summary.getReturnType();
         if (returnType.isPrimitiveType()) {
         	typeSigs.append(returnType.getName().toUnicodeString());
         } else {
-        	typeSigs.append(returnType.getName().toUnicodeString() + ";");
+        	typeSigs.append(returnType.getName().toUnicodeString()).append(';');
         }
         String descriptor = typeSigs.toString();
         return descriptor;
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/AndroidAnalysisContext.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/AndroidAnalysisContext.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/AndroidAnalysisContext.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/AndroidAnalysisContext.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,13 +50,10 @@
 package org.scandroid.util;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.Deque;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -64,13 +61,13 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Queues;
 import com.ibm.wala.classLoader.IClass;
+import com.ibm.wala.classLoader.Language;
 import com.ibm.wala.dalvik.util.AndroidAnalysisScope;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.ClassTargetSelector;
 import com.ibm.wala.ipa.callgraph.ContextSelector;
-import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.MethodTargetSelector;
 import com.ibm.wala.ipa.callgraph.impl.Util;
 import com.ibm.wala.ipa.callgraph.propagation.SSAContextInterpreter;
@@ -79,6 +76,7 @@
 import com.ibm.wala.ipa.callgraph.propagation.cfa.ZeroXInstanceKeys;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
 import com.ibm.wala.ipa.cha.ClassHierarchyException;
+import com.ibm.wala.ipa.cha.ClassHierarchyFactory;
 import com.ibm.wala.ipa.cha.IClassHierarchy;
 import com.ibm.wala.ipa.summaries.BypassClassTargetSelector;
 import com.ibm.wala.ipa.summaries.BypassMethodTargetSelector;
@@ -86,12 +84,10 @@
 import com.ibm.wala.ipa.summaries.XMLMethodSummaryReader;
 import com.ibm.wala.types.MethodReference;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.io.FileProvider;
 import com.ibm.wala.util.strings.Atom;
-import com.ibm.wala.util.warnings.Warning;
 import com.ibm.wala.util.warnings.Warnings;
 
 public class AndroidAnalysisContext {
@@ -108,52 +104,33 @@
 
 	public AndroidAnalysisContext(ISCanDroidOptions options)
 			throws IllegalArgumentException, ClassHierarchyException,
-			IOException, CancelException, URISyntaxException {
+			IOException {
 		this(options, "Java60RegressionExclusions.txt");
 	}
 
-	/**
-	 * @param exclusions
-	 * @param classpath
-	 * @param packagename
-	 * @throws IOException
-	 * @throws IllegalArgumentException
-	 * @throws CancelException
-	 * @throws ClassHierarchyException
-	 * @throws URISyntaxException
-	 */
 	public AndroidAnalysisContext(ISCanDroidOptions options, String exclusions)
-			throws IOException, IllegalArgumentException, CancelException,
-			       ClassHierarchyException, URISyntaxException {
+			throws IOException, IllegalArgumentException, ClassHierarchyException {
 		
 		this.options = options;
 		scope = AndroidAnalysisScope.setUpAndroidAnalysisScope(options.getClasspath(), exclusions, getClass().getClassLoader(), options.getAndroidLibrary());
 		
-		cha = ClassHierarchy.make(scope);
+		cha = ClassHierarchyFactory.make(scope);
 
+		/*
 		if (options.classHierarchyWarnings()) {
 			// log ClassHierarchy warnings
-			for (Iterator<Warning> wi = Warnings.iterator(); wi.hasNext();) {
-				Warning w = wi.next();
+			for (Warning w : Iterator2Iterable.make(Warnings.iterator())) {
 				
 			}
 		}
+		*/
 		Warnings.clear();
 	}
 	
 	
 
-	// ContextSelector, entry points, reflection options, IR Factory, call graph
-	// type, include library
-	public void buildGraphs(List<Entrypoint> localEntries,
-			InputStream summariesStream) throws CancelException {
-
-		
-
-	}
-
 	public static SSAPropagationCallGraphBuilder makeVanillaZeroOneCFABuilder(
-			AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha,
+			AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha,
 			AnalysisScope scope, ContextSelector customSelector,
 			SSAContextInterpreter customInterpreter,
 			InputStream summariesStream, MethodSummary extraSummary) {
@@ -168,7 +145,7 @@
 		// AndroidAppLoader.class.getClassLoader(), methodSpec, cha);
 		addBypassLogic(options, scope, summariesStream, cha, extraSummary);
 
-		return ZeroXCFABuilder.make(cha, options, cache, customSelector,
+		return ZeroXCFABuilder.make(Language.JAVA, cha, options, cache, customSelector,
 				customInterpreter, ZeroXInstanceKeys.ALLOCATIONS
 						| ZeroXInstanceKeys.CONSTANT_SPECIFIC);
 	}
@@ -191,12 +168,12 @@
 	 * TODO: move
 	 */
 	public static SSAPropagationCallGraphBuilder makeZeroCFABuilder(
-			AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha,
+			AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha,
 			AnalysisScope scope, ContextSelector customSelector,
 			SSAContextInterpreter customInterpreter,
-			InputStream summariesStream, MethodSummary extraSummary) {
+			List<InputStream> arrayList, MethodSummary extraSummary) {
 				return makeZeroCFABuilder(options, cache, cha, scope,
-						customSelector, customInterpreter, Lists.newArrayList(summariesStream),
+						customSelector, customInterpreter, Lists.newArrayList(arrayList),
 						extraSummary);
 			}
 
@@ -218,7 +195,7 @@
      * TODO: move
 	 */
 	public static SSAPropagationCallGraphBuilder makeZeroCFABuilder(
-			AnalysisOptions options, AnalysisCache cache, IClassHierarchy cha,
+			AnalysisOptions options, IAnalysisCacheView cache, IClassHierarchy cha,
 			AnalysisScope scope, ContextSelector customSelector,
 			SSAContextInterpreter customInterpreter,
 			Collection<InputStream> summariesStreams, MethodSummary extraSummary) {
@@ -231,7 +208,7 @@
 			addBypassLogic(options, scope, stream, cha, extraSummary);
 		}
 
-		return ZeroXCFABuilder.make(cha, options, cache, customSelector,
+		return ZeroXCFABuilder.make(Language.JAVA, cha, options, cache, customSelector,
 				customInterpreter, ZeroXInstanceKeys.NONE);
 	}
 
@@ -255,7 +232,6 @@
 			throw new IllegalArgumentException("cha cannot be null");
 		}
 
-		InputStream s = null;
 		try {
 			Set<TypeReference> summaryClasses = HashSetFactory.make();
 			Map<MethodReference, MethodSummary> summaries = HashMapFactory.make();
@@ -268,75 +244,55 @@
 			}
 			// for (MethodReference mr : summaries.keySet()) {
 			// 
-			// }
+			// }    
 
-			s = new FileProvider().getInputStreamFromClassLoader(pathToSpec
+			try (final InputStream s = new FileProvider().getInputStreamFromClassLoader(pathToSpec
 					+ File.separator + methodSpec,
-					AndroidAnalysisContext.class.getClassLoader());
+					AndroidAnalysisContext.class.getClassLoader())) {
 
-			XMLMethodSummaryReader nativeSummaries = loadMethodSummaries(scope,
-					s);
-
-			summaries.putAll(nativeSummaries.getSummaries());
-			summaryClasses.addAll(nativeSummaries.getAllocatableClasses());
-			if (extraSummary != null) {
-				summaries.put((MethodReference) extraSummary.getMethod(),
-						extraSummary);
-			}
+				XMLMethodSummaryReader nativeSummaries = loadMethodSummaries(scope,
+						s);
 
-			MethodTargetSelector ms = new BypassMethodTargetSelector(
-					options.getMethodTargetSelector(), summaries,
-					nativeSummaries.getIgnoredPackages(), cha);
-			options.setSelector(ms);
-
-			ClassTargetSelector cs = new BypassClassTargetSelector(
-					options.getClassTargetSelector(), summaryClasses, cha,
-					cha.getLoader(scope.getLoader(Atom
-							.findOrCreateUnicodeAtom("Synthetic"))));
-			options.setSelector(cs);
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		} finally {
-			if (null != s) {
-				try {
-					s.close();
-				} catch (IOException e) {
-					e.printStackTrace();
+				summaries.putAll(nativeSummaries.getSummaries());
+				summaryClasses.addAll(nativeSummaries.getAllocatableClasses());
+				if (extraSummary != null) {
+					summaries.put((MethodReference) extraSummary.getMethod(),
+							extraSummary);
 				}
+
+				MethodTargetSelector ms = new BypassMethodTargetSelector(
+						options.getMethodTargetSelector(), summaries,
+						nativeSummaries.getIgnoredPackages(), cha);
+				options.setSelector(ms);
+
+				ClassTargetSelector cs = new BypassClassTargetSelector(
+						options.getClassTargetSelector(), summaryClasses, cha,
+						cha.getLoader(scope.getLoader(Atom
+								.findOrCreateUnicodeAtom("Synthetic"))));
+				options.setSelector(cs);
+				
 			}
+		} catch (IOException e) {
+			e.printStackTrace();
 		}
 
 	}
 
 	private static XMLMethodSummaryReader loadMethodSummaries(
-			AnalysisScope scope, InputStream xmlIStream)
-			throws FileNotFoundException {
-		InputStream s = xmlIStream;
-		XMLMethodSummaryReader summary = null;
-
-		try {
-			if (null == s) {
-				s = AndroidAnalysisContext.class.getClassLoader()
-						.getResourceAsStream(
-								pathToSpec + File.separator + methodSpec);
-			}
-			summary = new XMLMethodSummaryReader(s, scope);
-		} finally {
-			try {
-				if (null != s) {
-					s.close();
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
+			AnalysisScope scope, InputStream xmlIStream) {
+		try (InputStream s = xmlIStream != null ? xmlIStream :
+			AndroidAnalysisContext.class.getClassLoader()
+				.getResourceAsStream(
+					pathToSpec + File.separator + methodSpec)) {
+			return new XMLMethodSummaryReader(s, scope);
+		} catch (IOException e) {
+			e.printStackTrace();
 		}
-		return summary;
+		return null;
 	}
 	
 	/**
 	 * Returns all concrete classes implementing the given interface or any subinterfaces
-	 * @param iRoot
-	 * @return
 	 */
 	public Collection<IClass> concreteClassesForInterface(IClass iRoot) {
 		Set<IClass> clazzes = HashSetFactory.make();
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/CGAnalysisContext.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/CGAnalysisContext.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/CGAnalysisContext.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/CGAnalysisContext.java	2019-01-29 17:08:39.000000000 +0000
@@ -70,12 +70,13 @@
 import com.ibm.wala.dalvik.classLoader.DexIRFactory;
 import com.ibm.wala.dataflow.IFDS.ICFGSupergraph;
 import com.ibm.wala.dataflow.IFDS.ISupergraph;
-import com.ibm.wala.ipa.callgraph.AnalysisCache;
+import com.ibm.wala.ipa.callgraph.AnalysisCacheImpl;
 import com.ibm.wala.ipa.callgraph.AnalysisOptions;
 import com.ibm.wala.ipa.callgraph.AnalysisScope;
 import com.ibm.wala.ipa.callgraph.CGNode;
 import com.ibm.wala.ipa.callgraph.CallGraph;
 import com.ibm.wala.ipa.callgraph.Entrypoint;
+import com.ibm.wala.ipa.callgraph.IAnalysisCacheView;
 import com.ibm.wala.ipa.callgraph.impl.DefaultContextSelector;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 import com.ibm.wala.ipa.callgraph.impl.PartialCallGraph;
@@ -86,19 +87,13 @@
 import com.ibm.wala.ipa.callgraph.propagation.SSAPropagationCallGraphBuilder;
 import com.ibm.wala.ipa.cfg.BasicBlockInContext;
 import com.ibm.wala.ipa.cha.ClassHierarchy;
-import com.ibm.wala.ssa.IRFactory;
 import com.ibm.wala.ssa.ISSABasicBlock;
-import com.ibm.wala.ssa.SSACFG;
-import com.ibm.wala.ssa.SSACFG.BasicBlock;
-import com.ibm.wala.ssa.SSAInstruction;
 import com.ibm.wala.types.ClassLoaderReference;
 import com.ibm.wala.types.TypeReference;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.GraphSlicer;
 import com.ibm.wala.util.intset.OrdinalSet;
-import com.ibm.wala.util.warnings.Warning;
 import com.ibm.wala.util.warnings.Warnings;
 
 /**
@@ -139,29 +134,34 @@
 
 		entrypoints = specifier.specify(analysisContext);
 		AnalysisOptions analysisOptions = new AnalysisOptions(scope, entrypoints);
+		/*
 		for (Entrypoint e : entrypoints) {
 			
 		}
+		*/
 		analysisOptions.setReflectionOptions(options.getReflectionOptions());
 
-		AnalysisCache cache = new AnalysisCache((IRFactory<IMethod>) new DexIRFactory());
+		IAnalysisCacheView cache = new AnalysisCacheImpl(new DexIRFactory());
 
 		SSAPropagationCallGraphBuilder cgb;
 
 		if (null != options.getSummariesURI()) {
-			extraSummaries.add(new FileInputStream(new File(options.getSummariesURI())));
+			try (final FileInputStream in = new FileInputStream(new File(options.getSummariesURI()))) {
+				extraSummaries.add(in);
+			}
 		}
 
 		cgb = AndroidAnalysisContext.makeZeroCFABuilder(analysisOptions, cache,	cha, scope,
 				new DefaultContextSelector(analysisOptions, cha), null, extraSummaries, null);
 
+		/*
 		if (analysisContext.getOptions().cgBuilderWarnings()) {
 			// CallGraphBuilder construction warnings
-			for (Iterator<Warning> wi = Warnings.iterator(); wi.hasNext();) {
-				Warning w = wi.next();
+			for (Warning w : Iterator2Iterable.make(Warnings.iterator())) {
 				
 			}
 		}
+		*/
 		Warnings.clear();
 
 		
@@ -186,104 +186,92 @@
 			System.exit(status);
 		}
 
+		/*
 		// makeCallGraph warnings
-		for (Iterator<Warning> wi = Warnings.iterator(); wi.hasNext();) {
-			Warning w = wi.next();
+		for (Warning w : Iterator2Iterable.make(Warnings.iterator())) {
 			
 		}
+		*/
 		Warnings.clear();
 
 		pa = cgb.getPointerAnalysis();
-		partialGraph = GraphSlicer.prune(cg, new Predicate<CGNode>() {
-			@Override
-			// CallGraph composed of APK nodes
-			public boolean test(CGNode node) {
-				return LoaderUtils.fromLoader(node, ClassLoaderReference.Application) || node.getMethod().isSynthetic();
-			}
-		});
+		partialGraph = GraphSlicer.prune(cg, node -> LoaderUtils.fromLoader(node, ClassLoaderReference.Application) || node.getMethod().isWalaSynthetic());
 		if (options.includeLibrary()) {
-			graph = (ISupergraph) ICFGSupergraph.make(cg, cache);
+			graph = (ISupergraph) ICFGSupergraph.make(cg);
 		} else {
 
 			Collection<CGNode> nodes = HashSetFactory.make();
-			for (Iterator<CGNode> nIter = partialGraph.iterator(); nIter.hasNext();) {
-				nodes.add(nIter.next());
+			for (CGNode cgNode : partialGraph) {
+				nodes.add(cgNode);
 			}
 			CallGraph pcg = PartialCallGraph.make(cg, cg.getEntrypointNodes(), nodes);
-			graph = (ISupergraph) ICFGSupergraph.make(pcg, cache);
+			graph = (ISupergraph) ICFGSupergraph.make(pcg);
 		}
 
-		oneLevelGraph = GraphSlicer.prune(cg, new Predicate<CGNode>() {
-			@Override
-			public boolean test(CGNode node) {
-				// Node in APK
-				if (LoaderUtils.fromLoader(node, ClassLoaderReference.Application)) {
-					return true;
-				} else {
-					Iterator<CGNode> n = cg.getPredNodes(node);
-					while (n.hasNext()) {
-						// Primordial node has a successor in APK
-						if (LoaderUtils.fromLoader(n.next(), ClassLoaderReference.Application))
-							return true;
-					}
-					n = cg.getSuccNodes(node);
-					while (n.hasNext()) {
-						// Primordial node has a predecessor in APK
-						if (LoaderUtils.fromLoader(n.next(), ClassLoaderReference.Application))
-							return true;
-					}
-					// Primordial node with no direct successors or predecessors
-					// to APK code
-					return false;
+		oneLevelGraph = GraphSlicer.prune(cg, node -> {
+			// Node in APK
+			if (LoaderUtils.fromLoader(node, ClassLoaderReference.Application)) {
+				return true;
+			} else {
+				Iterator<CGNode> n = cg.getPredNodes(node);
+				while (n.hasNext()) {
+					// Primordial node has a successor in APK
+					if (LoaderUtils.fromLoader(n.next(), ClassLoaderReference.Application))
+						return true;
+				}
+				n = cg.getSuccNodes(node);
+				while (n.hasNext()) {
+					// Primordial node has a predecessor in APK
+					if (LoaderUtils.fromLoader(n.next(), ClassLoaderReference.Application))
+						return true;
 				}
+				// Primordial node with no direct successors or predecessors
+				// to APK code
+				return false;
 			}
 		});
 
-		systemToApkGraph = GraphSlicer.prune(cg, new Predicate<CGNode>() {
-			@Override
-			public boolean test(CGNode node) {
-
-				if (LoaderUtils.fromLoader(node, ClassLoaderReference.Primordial)) {
-					Iterator<CGNode> succs = cg.getSuccNodes(node);
-					while (succs.hasNext()) {
-						CGNode n = succs.next();
+		systemToApkGraph = GraphSlicer.prune(cg, node -> {
 
-						if (LoaderUtils.fromLoader(n, ClassLoaderReference.Application)) {
-							return true;
-						}
-					}
-					// Primordial method, with no link to APK code:
-					return false;
-				} else if (LoaderUtils.fromLoader(node, ClassLoaderReference.Application)) {
-					// see if this is an APK method that was
-					// invoked by a Primordial method:
-					Iterator<CGNode> preds = cg.getPredNodes(node);
-					while (preds.hasNext()) {
-						CGNode n = preds.next();
+			if (LoaderUtils.fromLoader(node, ClassLoaderReference.Primordial)) {
+				Iterator<CGNode> succs = cg.getSuccNodes(node);
+				while (succs.hasNext()) {
+					CGNode n1 = succs.next();
 
-						if (LoaderUtils.fromLoader(n, ClassLoaderReference.Primordial)) {
-							return true;
-						}
+					if (LoaderUtils.fromLoader(n1, ClassLoaderReference.Application)) {
+						return true;
 					}
-					// APK code, no link to Primordial:
-					return false;
 				}
+				// Primordial method, with no link to APK code:
+				return false;
+			} else if (LoaderUtils.fromLoader(node, ClassLoaderReference.Application)) {
+				// see if this is an APK method that was
+				// invoked by a Primordial method:
+				Iterator<CGNode> preds = cg.getPredNodes(node);
+				while (preds.hasNext()) {
+					CGNode n2 = preds.next();
 
-				// who knows, not interesting:
+					if (LoaderUtils.fromLoader(n2, ClassLoaderReference.Primordial)) {
+						return true;
+					}
+				}
+				// APK code, no link to Primordial:
 				return false;
 			}
+
+			// who knows, not interesting:
+			return false;
 		});
 
+		/*
 		if (options.stdoutCG()) {
-			for (Iterator<CGNode> nodeI = cg.iterator(); nodeI.hasNext();) {
-				CGNode node = nodeI.next();
+			for (CGNode node : Iterator2Iterable.make(cg.iterator())) {
 
 				
 			}
 		}
-		for (Iterator<CGNode> nodeI = cg.iterator(); nodeI.hasNext();) {
-			CGNode node = nodeI.next();
-			if (node.getMethod().isSynthetic()) {
+		for (CGNode node : Iterator2Iterable.make(cg.iterator())) {
+			if (node.getMethod().isWalaSynthetic()) {
 				SSACFG ssaCFG = node.getIR().getControlFlowGraph();
 				int totalBlocks = ssaCFG.getNumberOfNodes();
 				for (int i = 0; i < totalBlocks; i++) {
@@ -296,10 +284,10 @@
 				}
 			}
 		}
+		*/
 	}
 
 	/**
-	 * @param rootIK
 	 * @return a set of all code elements that might refer to this object or one
 	 *         of its fields (recursively)
 	 */
@@ -329,24 +317,21 @@
 						for (IClass implementor : analysisContext.concreteClassesForInterface(contentsClass)) {
 							final InstanceKey contentsIK = new ConcreteTypeKey(implementor);
 							final InstanceKeyElement elt = new InstanceKeyElement(contentsIK);
-							if (!elts.contains(elt)) {
-								elts.add(elt);
+							if (elts.add(elt)) {
 								iks.push(contentsIK);
 							}
 						}
 					} else {
 						InstanceKey contentsIK = new ConcreteTypeKey(contentsClass);
 						final InstanceKeyElement elt = new InstanceKeyElement(contentsIK);
-						if (!elts.contains(elt)) {
-							elts.add(elt);
+						if (elts.add(elt)) {
 							iks.push(contentsIK);
 						}
 					}
 				} else {
 					for (InstanceKey contentsIK : pointsToSet) {
 						final InstanceKeyElement elt = new InstanceKeyElement(contentsIK);
-						if (!elts.contains(elt)) {
-							elts.add(elt);
+						if (elts.add(elt)) {
 							iks.push(contentsIK);
 						}
 					}
@@ -367,15 +352,13 @@
 						
 						InstanceKey fieldIK = new ConcreteTypeKey(pa.getClassHierarchy().lookupClass(fieldTypeRef));
 						final InstanceKeyElement elt = new InstanceKeyElement(fieldIK);
-						if (!elts.contains(elt)) {
-							elts.add(elt);
+						if (elts.add(elt)) {
 							iks.push(fieldIK);
 						}
 					} else {
 						for (InstanceKey fieldIK : pointsToSet) {
 							final InstanceKeyElement elt = new InstanceKeyElement(fieldIK);
-							if (!elts.contains(elt)) {
-								elts.add(elt);
+							if (elts.add(elt)) {
 								iks.push(fieldIK);
 							}
 						}
@@ -387,15 +370,13 @@
 						
 						InstanceKey fieldIK = new ConcreteTypeKey(fieldClass);
 						final InstanceKeyElement elt = new InstanceKeyElement(fieldIK);
-						if (!elts.contains(elt)) {
-							elts.add(elt);
+						if (elts.add(elt)) {
 							iks.push(fieldIK);
 						}
 					} else {
 						for (InstanceKey fieldIK : pointsToSet) {
 							final InstanceKeyElement elt = new InstanceKeyElement(fieldIK);
-							if (!elts.contains(elt)) {
-								elts.add(elt);
+							if (elts.add(elt)) {
 								iks.push(fieldIK);
 							}
 						}
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/CLISCanDroidOptions.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/CLISCanDroidOptions.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/CLISCanDroidOptions.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/CLISCanDroidOptions.java	2019-01-29 17:08:39.000000000 +0000
@@ -53,15 +53,14 @@
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.OptionBuilder;
+import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
 
 import com.ibm.wala.ipa.callgraph.AnalysisOptions.ReflectionOptions;
 
-@SuppressWarnings("static-access")
 public class CLISCanDroidOptions implements ISCanDroidOptions {
 	private static final String VERBOSE = "verbose";
 	private static final String REFLECTION = "reflection";
@@ -81,7 +80,7 @@
 	private static final String PARTIAL_CALL_GRAPH = "partial-call-graph";
 	private static final String CALL_GRAPH = "call-graph";
 
-	private CommandLineParser parser = new PosixParser();
+	private CommandLineParser parser = new DefaultParser();
 	private CommandLine line;
 	private URI classpath;
 	private String filename;
@@ -93,11 +92,11 @@
 	private final Options options = new Options();
 	{
 		options.addOption("h", "help", false, "print this message");
-		options.addOption(OptionBuilder
-				.withLongOpt(VERBOSE)
-				.withDescription(
+		options.addOption(Option.builder()
+				.longOpt(VERBOSE)
+				.desc(
 						"logging level (default INFO) [OFF, ERROR, WARN, INFO, DEBUG, TRACE, ALL]")
-				.hasArg().withArgName("level").create());
+				.hasArg().argName("level").build());
 		options.addOption("c", CALL_GRAPH, false, "create full call graph pdf");
 		options.addOption("p", PARTIAL_CALL_GRAPH, false,
 				"create partial call graph pdf (Application only)");
@@ -121,22 +120,22 @@
 				"run string prefix analysis");
 		options.addOption("f", SUMMARIES_FILE, true,
 				"Use the specified summaries xml file");
-		options.addOption(OptionBuilder
-				.withLongOpt(TEST_CGB)
-				.withDescription(
+		options.addOption(Option.builder()
+				.longOpt(TEST_CGB)
+				.desc(
 						"Only load the call graph, exit status indicates success")
-				.create());
+				.build());
 		options.addOption("y", CHECK_POLICY, false,
 				"Check conformance with built-in policy");
 
-		options.addOption(OptionBuilder.withLongOpt(ANDROID_LIB)
-				.withDescription("include ALIB in scope of analysis").hasArg()
-				.withArgName("ALIB").create());
-		options.addOption(OptionBuilder
-				.withLongOpt(REFLECTION)
-				.withDescription(
+		options.addOption(Option.builder().longOpt(ANDROID_LIB)
+				.desc("include ALIB in scope of analysis").hasArg()
+				.argName("ALIB").build());
+		options.addOption(Option.builder()
+				.longOpt(REFLECTION)
+				.desc(
 						"FULL, NO_FLOW_TO_CASTS, NO_METHOD_INVOKE, NO_FLOW_TO_CASTS_NO_METHOD_INVOKE, ONE_FLOW_TO_CASTS_NO_METHOD_INVOKE, NO_STRING_CONSTANTS, NONE (Default)")
-				.hasArg().withArgName("option").create());
+				.hasArg().argName("option").build());
 	}
 
 	public CLISCanDroidOptions(String[] args, boolean reqArgs) {
@@ -176,7 +175,7 @@
 		}
 	}
 
-	private URI processURIArg(String arg) {
+	private static URI processURIArg(String arg) {
 		if (arg == null) {
 			return null;
 		} else {
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/DexDotUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,10 +17,9 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Iterator;
-
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.Iterator2Collection;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.viz.DotUtil;
@@ -110,12 +109,12 @@
             }
             if (output.available() > 0) {
               byte[] data = new byte[output.available()];
-              int nRead = output.read(data);
+              output.read(data);
               
             }
             if (error.available() > 0) {
               byte[] data = new byte[error.available()];
-              int nRead = error.read(data);
+              error.read(data);
               
             }
             try {
@@ -154,7 +153,7 @@
         if (g == null) {
           throw new IllegalArgumentException("g is null");
         }
-        StringBuffer dotStringBuffer = dotOutput(g, labels, title);
+        StringBuilder dotStringBuffer = dotOutput(g, labels, title);
 
         // retrieve the filename parameter to this component, a String
         if (dotfile == null) {
@@ -162,32 +161,31 @@
         }
         try {
           File f = new File(dotfile);
-          FileWriter fw = new FileWriter(f);
-          fw.write(dotStringBuffer.toString());
-          fw.close();
+          try (final FileWriter fw = new FileWriter(f)) {
+        	fw.write(dotStringBuffer.toString());
+          }
           return f;
 
         } catch (Exception e) {
-          throw new WalaException("Error writing dot file " + dotfile);
+          throw new WalaException("Error writing dot file " + dotfile, e);
         }
       }
 
       /**
        * @return StringBuffer holding dot output representing G
-       * @throws WalaException
        */
-      private static <T> StringBuffer dotOutput(Graph<T> g, NodeDecorator<T> labels, String title) throws WalaException {
-        StringBuffer result = new StringBuffer("digraph \"DirectedGraph\" {\n");
+      public static <T> StringBuilder dotOutput(Graph<T> g, NodeDecorator<T> labels, String title) throws WalaException {
+        StringBuilder result = new StringBuilder("digraph \"DirectedGraph\" {\n");
 
         if (title != null) {
-          result.append("graph [label = \""+title+"\", labelloc=t, concentrate = true];");
+          result.append("graph [label = \"").append(title).append("\", labelloc=t, concentrate = true];");
         } else {
           result.append("graph [concentrate = true];");
         }
 
         String rankdir = getRankDir();
         if (rankdir != null) {
-          result.append("rankdir=" + rankdir + ";");
+          result.append("rankdir=").append(rankdir).append(';');
         }
         String fontsizeStr = "fontsize=" + fontSize;
         String fontcolorStr = (fontColor != null) ? ",fontcolor="+fontColor : "";
@@ -209,11 +207,9 @@
 
         outputNodes(labels, result, dotNodes);
 
-        for (Iterator<? extends T> it = g.iterator(); it.hasNext();) {
-          T n = it.next();
-          for (Iterator<? extends T> it2 = g.getSuccNodes(n); it2.hasNext();) {
-            T s = it2.next();
-            result.append(" ");
+        for (T n : g) {
+          for (T s : Iterator2Iterable.make(g.getSuccNodes(n))) {
+            result.append(' ');
             result.append(getPort(n, labels));
             result.append(" -> ");
             result.append(getPort(s, labels));
@@ -225,28 +221,28 @@
         return result;
       }
 
-      private static <T> void outputNodes(NodeDecorator<T> labels, StringBuffer result, Collection<T> dotNodes) throws WalaException {
-        for (Iterator<T> it = dotNodes.iterator(); it.hasNext();) {
-          outputNode(labels, result, it.next());
+      private static <T> void outputNodes(NodeDecorator<T> labels, StringBuilder result, Collection<T> dotNodes) throws WalaException {
+        for (T t : dotNodes) {
+          outputNode(labels, result, t);
         }
       }
 
-      private static <T> void outputNode(NodeDecorator<T> labels, StringBuffer result, T n) throws WalaException {
+      private static <T> void outputNode(NodeDecorator<T> labels, StringBuilder result, T n) throws WalaException {
         result.append("   ");
-        result.append("\"");
+        result.append('\"');
         result.append(getLabel(n, labels));
-        result.append("\"");
+        result.append('\"');
         result.append(decorateNode(n, labels));
       }
 
       /**
        * Compute the nodes to visualize
        */
-      private static <T> Collection<T> computeDotNodes(Graph<T> g) throws WalaException {
+      private static <T> Collection<T> computeDotNodes(Graph<T> g) {
         return Iterator2Collection.toSet(g.iterator());
       }
 
-      private static String getRankDir() throws WalaException {
+      private static String getRankDir() {
         return null;
       }
 
@@ -254,10 +250,8 @@
        * @param n node to decorate
        * @param d decorating master
        */
-      private static <T> String decorateNode(T n, NodeDecorator<T> d) throws WalaException {
-        StringBuffer result = new StringBuffer();
-        result.append(" [ ]\n");
-        return result.toString();
+      private static <T> String decorateNode(T n, NodeDecorator<T> d) {
+          return " [ ]\n";
       }
 
       private static <T> String getLabel(T o, NodeDecorator<T> d) throws WalaException {
@@ -276,7 +270,7 @@
       }
 
       private static <T> String getPort(T o, NodeDecorator<T> d) throws WalaException {
-        return "\"" + getLabel(o, d) + "\"";
+        return '"' + getLabel(o, d) + '"';
 
       }
 
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/EmptyProgressMonitor.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/EmptyProgressMonitor.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/EmptyProgressMonitor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/EmptyProgressMonitor.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,10 +49,10 @@
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
 
 public final class EmptyProgressMonitor implements IProgressMonitor {
-    public void beginTask(String task, int totalWork) { }
-    public boolean isCanceled() { return false; }
-    public void done() { }
-    public void worked(int units) { }
+    @Override public void beginTask(String task, int totalWork) { }
+    @Override public boolean isCanceled() { return false; }
+    @Override public void done() { }
+    @Override public void worked(int units) { }
     
 	@Override
 	public void subTask(String subTask) {
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/EntryPoints.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/EntryPoints.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/EntryPoints.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/EntryPoints.java	2019-01-29 17:08:39.000000000 +0000
@@ -89,8 +89,8 @@
 
     private LinkedList<Entrypoint> entries;
 
-    public void listenerEntryPoints(ClassHierarchy cha, AndroidAnalysisContext loader) {
-        ArrayList<MethodReference> entryPointMRs = new ArrayList<MethodReference>();
+    public void listenerEntryPoints(ClassHierarchy cha) {
+        ArrayList<MethodReference> entryPointMRs = new ArrayList<>();
 
         // onLocation
         entryPointMRs.add(StringStuff.makeMethodReference("android.location.LocationListener.onLocationChanged(Landroid/location/Location;)V"));
@@ -109,7 +109,7 @@
     }
 
     public static List<Entrypoint> defaultEntryPoints(ClassHierarchy cha) {
-    	List<Entrypoint> entries = new ArrayList<Entrypoint>();
+    	List<Entrypoint> entries = new ArrayList<>();
     	for (MethodNamePattern mnp:new AndroidSpecs().getEntrypointSpecs()) {
     		for (IMethod im: mnp.getPossibleTargets(cha)) {
     			
@@ -124,7 +124,7 @@
     	return entries;
     }
     
-    public void activityModelEntry(ClassHierarchy cha, AndroidAnalysisContext loader) {
+    public void activityModelEntry(ClassHierarchy cha) {
         String[] methodReferences = {
             "android.app.Activity.ActivityModel()V",
             // find all onActivityResult functions and add them as entry points
@@ -137,9 +137,9 @@
 //            "android.app.Service.onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)B"
          };
 
-        for (int i = 0; i < methodReferences.length; i++) {
+        for (String methodReference : methodReferences) {
             MethodReference mr =
-                    StringStuff.makeMethodReference(methodReferences[i]);
+                    StringStuff.makeMethodReference(methodReference);
             
             for (IMethod im : cha.getPossibleTargets(mr)) {
                 
@@ -154,37 +154,7 @@
         }
     }
     
-    @SuppressWarnings("unused")
-	private void systemEntry(ClassHierarchy cha, AndroidAnalysisContext loader) {
-        String[] systemEntyPoints = { 
-//              "android.app.ActivityThread.main([Ljava/lang/String;)V"
-//              , "com.android.server.ServerThread.run()V"
-           	//"android.location.LocationManager$ListenerTransport._handleMessage(Landroid/os/Message;)V"
-//           		"android.location.LocationManager$ListenerTransport$1.handleMessage(Landroid/os/Message;)V"
-//           		"android.os.Handler.handleMessage(Landroid/os/Message;)V",
-//           		"android.os.Handler$Callback.handleMessage(Landroid/os/Message;)Z",
-//           		"com.android.internal.os.HandlerCaller$Callback.executeMessage(Landroid/os/Message;)V"
-//           		"android.os.Handler.dispatchMessage(Landroid/os/Message;)V",
-//           		"android.view.View.dispatchTouchEvent(Landroid/view/MotionEvent;)Z",
-//           		"android.view.View.onTouchEvent(Landroid/view/MotionEvent;)Z",
-//           		"android.view.View.setOnClickListener(Landroid/view/View$OnClickListener;)V",
-           		"com.android.server.ServerThread.run()V"
-           		//"android.app.ActivityThread.main([Ljava/lang/String;)V"
-           };
-
-           for (int i = 0; i < systemEntyPoints.length; i++) {
-               MethodReference methodRef =
-                       StringStuff.makeMethodReference(systemEntyPoints[i]);
-
-               for (IMethod im : cha.getPossibleTargets(methodRef)) {
-                   
-                   entries.add(new DefaultEntrypoint(im, cha));
-               }
-           }
-    }
-    
-    
-    public void addTestEntry(ClassHierarchy cha, AndroidAnalysisContext loader) {
+	public void addTestEntry(ClassHierarchy cha) {
     	String[] methodReferences = {
 //    			"Test.Apps.Outer$PrivateInnerClass.printNum()V",
     			//"Test.Apps.Outer$PublicInnerClass.printNum()V"
@@ -195,9 +165,9 @@
     			"android.view.View.setOnClickListener(Landroid/view/View$OnClickListener;)V",
     	};
 
-    	for (int i = 0; i < methodReferences.length; i++) {
+    	for (String methodReference : methodReferences) {
     		MethodReference mr =
-    				StringStuff.makeMethodReference(methodReferences[i]);
+    				StringStuff.makeMethodReference(methodReference);
 
     		for (IMethod im : cha.getPossibleTargets(mr)) {
     			
@@ -288,7 +258,7 @@
 	private static String getTagValue(String sTag, Element eElement) {
         NodeList nlList = eElement.getElementsByTagName(sTag).item(0).getChildNodes();
 
-        Node nValue = (Node) nlList.item(0);
+        Node nValue = nlList.item(0);
 
         return nValue.getNodeValue();
     }
@@ -314,7 +284,7 @@
                     if (IntentClass.startsWith("."))
                         IntentList.get(IntentList.size()-1)[1] = basePackage + IntentClass;
                     else {
-                        IntentList.get(IntentList.size()-1)[1] = basePackage + "." + IntentClass;
+                        IntentList.get(IntentList.size()-1)[1] = basePackage + '.' + IntentClass;
                         IntentList.add(new String[2]);
                         IntentList.get(IntentList.size()-1)[0] = actionList.item(i).getAttributes().getNamedItem("android:name").getTextContent();
                         IntentList.get(IntentList.size()-1)[1] = IntentClass;
@@ -335,9 +305,8 @@
         for (String[] intent: ActivityIntentList) {
             //method = IntentToMethod(intent[0]);
             method = "onCreate(Landroid/os/Bundle;)V";
-            
-            if (method != null)
-                im = cha.resolveMethod(StringStuff.makeMethodReference(intent[1]+"."+method));
+
+            im = cha.resolveMethod(StringStuff.makeMethodReference(intent[1]+ '.' +method));
             if (im!=null)
                 entries.add(new DefaultEntrypoint(im,cha));
 
@@ -346,9 +315,8 @@
             //Seems that every broadcast receiver can be an entrypoints?
 //          method = IntentToMethod(intent[0]);
             method = "onReceive(Landroid/content/Context;Landroid/content/Intent;)V";
-            
-            if (method != null)
-                im = cha.resolveMethod(StringStuff.makeMethodReference(intent[1]+"."+method));
+
+            im = cha.resolveMethod(StringStuff.makeMethodReference(intent[1]+ '.' +method));
             if (im!=null)
                 entries.add(new DefaultEntrypoint(im,cha));
         }
@@ -357,7 +325,7 @@
     }
 
     @SuppressWarnings("unused")
-	private String IntentToMethod(String intent) {
+	private static String IntentToMethod(String intent) {
         if (intent.contentEquals("android.intent.action.MAIN") ||
                 intent.contentEquals("android.media.action.IMAGE_CAPTURE") ||
                 intent.contentEquals("android.media.action.VIDEO_CAPTURE") ||
diff -Nru wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/IEntryPointSpecifier.java wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/IEntryPointSpecifier.java
--- wala-1.3.9/com.ibm.wala.scandroid/source/org/scandroid/util/IEntryPointSpecifier.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.scandroid/source/org/scandroid/util/IEntryPointSpecifier.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,13 +50,11 @@
 
 import java.util.List;
 
-
 import com.ibm.wala.ipa.callgraph.Entrypoint;
 
 public interface IEntryPointSpecifier {
 
 	/**
-	 * @param analysisContext
 	 * @return a list of entrypoints for the given analysis context
 	 */
 	public List<Entrypoint> specify(AndroidAnalysisContext analysisContext);
diff -Nru wala-1.3.9/com.ibm.wala.shrike/build.gradle wala-1.5.1/com.ibm.wala.shrike/build.gradle
--- wala-1.3.9/com.ibm.wala.shrike/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,11 @@
+plugins {
+	id 'eclipse'
+}
+
+eclipse.project.natures 'org.eclipse.pde.PluginNature'
+
+sourceSets.main.java.srcDirs = ['src']
+
+dependencies {
+	compile project(':com.ibm.wala.util')
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/build.properties wala-1.5.1/com.ibm.wala.shrike/build.properties
--- wala-1.3.9/com.ibm.wala.shrike/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -3,4 +3,5 @@
                plugin.properties
 jars.compile.order = .
 source.. = src/
-output.. = bin/
+output.. = bin/main
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.shrike/build.xml wala-1.5.1/com.ibm.wala.shrike/build.xml
--- wala-1.3.9/com.ibm.wala.shrike/build.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/build.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.ibm.wala.shrike" default="build.jars" basedir=".">
-
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="com.ibm.wala.shrike"/>
-	<property name="bundleVersion" value="1.0.0"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="true"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="javacSource" value="1.5"/>
-	<property name="javacTarget" value="1.5"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/com.ibm.wala.shrike_1.0.0">
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: com.ibm.wala.shrike for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/com.ibm.wala.shrike_1.0.0.jar" basedir="${temp.folder}/com.ibm.wala.shrike_1.0.0" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot" depends="init" unless="@dot" description="Create jar: com.ibm.wala.shrike @dot.">
-		<delete dir="${temp.folder}/@dot.bin"/>
-		<mkdir dir="${temp.folder}/@dot.bin"/>
-		<path id="@dot.classpath">
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<exclude name="**/bak/"/>
-			<compilerarg line="-log '${temp.folder}/@dot.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-		</javac>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/@dot.bin" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${build.result.folder}"/>
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="${temp.folder}/@dot.bin">
-			</fileset>
-		</copy>
-		<delete dir="${temp.folder}/@dot.bin"/>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: com.ibm.wala.shrike.">
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/com.ibm.wala.shrike_1.0.0"/>
-		<copy todir="${destination.temp.folder}/com.ibm.wala.shrike_1.0.0" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/com.ibm.wala.shrike_1.0.0" failonerror="true" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/com.ibm.wala.shrike_1.0.0"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/com.ibm.wala.shrike_1.0.0" failonerror="false" overwrite="false"/>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/com.ibm.wala.shrike_1.0.0"/>
-		<copy todir="${destination.temp.folder}/com.ibm.wala.shrike_1.0.0" failonerror="false" overwrite="false">
-			<fileset dir="${temp.folder}">
-				<include name="@dot.bin${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: com.ibm.wala.shrike of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/com.ibm.wala.shrike_1.0.0.jar"/>
-		<delete file="${plugin.destination}/com.ibm.wala.shrike_1.0.0.zip"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="C:/Data/Projects/Safe/workspaces/safe-build/com.ibm.wala.shrike" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: com.ibm.wala.shrike.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/com.ibm.wala.shrike_1.0.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.shrike/.classpath wala-1.5.1/com.ibm.wala.shrike/.classpath
--- wala-1.3.9/com.ibm.wala.shrike/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.shrike/.cvsignore wala-1.5.1/com.ibm.wala.shrike/.cvsignore
--- wala-1.3.9/com.ibm.wala.shrike/.cvsignore	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/.cvsignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-build
-shrike.jar
-domo-trace.txt*
-com.ibm.shrike_*.jar
diff -Nru wala-1.3.9/com.ibm.wala.shrike/exportPlugin.xml wala-1.5.1/com.ibm.wala.shrike/exportPlugin.xml
--- wala-1.3.9/com.ibm.wala.shrike/exportPlugin.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/exportPlugin.xml	2019-01-29 17:08:39.000000000 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project>
 <project name="com.ibm.wala.shrike" default="build.update.jar" basedir=".">
 	<import file="../org.eclipse.imp.runtime.feature/buildCommon.xml"/>
 	<import file="../org.eclipse.imp.update/buildPluginCommon.xml"/>
diff -Nru wala-1.3.9/com.ibm.wala.shrike/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.shrike/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.shrike/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -2,19 +2,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.ibm.wala.shrike
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Export-Package: com.ibm.wala.shrike.bench,
  com.ibm.wala.shrike.cg,
  com.ibm.wala.shrike.copywriter,
+ com.ibm.wala.shrike.instrumentation,
  com.ibm.wala.shrikeBT,
  com.ibm.wala.shrikeBT.analysis,
  com.ibm.wala.shrikeBT.info,
  com.ibm.wala.shrikeBT.shrikeCT,
  com.ibm.wala.shrikeBT.shrikeCT.tools,
  com.ibm.wala.shrikeBT.tools,
- com.ibm.wala.shrikeCT
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+ com.ibm.wala.shrikeCT,
+ com.ibm.wala.sourcepos
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.ibm.wala.util
+Automatic-Module-Name: com.ibm.wala.shrike
diff -Nru wala-1.3.9/com.ibm.wala.shrike/mvncentral.xml wala-1.5.1/com.ibm.wala.shrike/mvncentral.xml
--- wala-1.3.9/com.ibm.wala.shrike/mvncentral.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/mvncentral.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.wala</groupId>
   <artifactId>com.ibm.wala.shrike</artifactId>
-  <version>1.3.9</version>  
+  <version>1.5.1</version>
   <packaging>jar</packaging>
   <name>WALA Shrike</name>
   <description>WALA Shrike library for bytecode reading and instrumentation</description>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>com.ibm.wala</groupId>
       <artifactId>com.ibm.wala.util</artifactId>
-      <version>1.3.9</version>
+      <version>1.5.1</version>
     </dependency>
   </dependencies>
 
@@ -55,7 +55,19 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
     </repository>
   </repositories>  
-  
+
+  <profiles>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
+
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
     <plugins>
@@ -64,8 +76,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.2</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
 
@@ -97,6 +109,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <additionalparam>${javadoc.options}</additionalparam>
+        </configuration>        
         <version>2.9.1</version>
         <executions>
           <execution>
diff -Nru wala-1.3.9/com.ibm.wala.shrike/pom.xml wala-1.5.1/com.ibm.wala.shrike/pom.xml
--- wala-1.3.9/com.ibm.wala.shrike/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>WALA</artifactId>
         <groupId>com.ibm.wala</groupId>
-        <version>1.3.9</version>
+        <version>1.5.1</version>
     </parent>
   <artifactId>com.ibm.wala.shrike</artifactId>
   <packaging>eclipse-plugin</packaging>
diff -Nru wala-1.3.9/com.ibm.wala.shrike/.project wala-1.5.1/com.ibm.wala.shrike/.project
--- wala-1.3.9/com.ibm.wala.shrike/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.shrike</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.shrike/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.shrike/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.shrike/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -9,80 +9,131 @@
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=error
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.shrike/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.shrike/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.shrike/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=2
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.shrike/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.shrike/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.shrike/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/AddBytecodeDebug.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/AddBytecodeDebug.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/AddBytecodeDebug.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/AddBytecodeDebug.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,24 +42,24 @@
 
   public static void main(String[] args) throws Exception {
     for (int i = 0; i < 1; i++) {
-      instrumenter = new OfflineInstrumenter(true);
+      instrumenter = new OfflineInstrumenter();
 
-      Writer w = new BufferedWriter(new FileWriter("report", false));
-
-      args = instrumenter.parseStandardArgs(args);
-      instrumenter.setPassUnmodifiedClasses(true);
-      instrumenter.beginTraversal();
-      ClassInstrumenter ci;
-      while ((ci = instrumenter.nextClass()) != null) {
-        doClass(ci, w);
+      try (final Writer w = new BufferedWriter(new FileWriter("report", false))) {
+        args = instrumenter.parseStandardArgs(args);
+        instrumenter.setPassUnmodifiedClasses(true);
+        instrumenter.beginTraversal();
+        ClassInstrumenter ci;
+        while ((ci = instrumenter.nextClass()) != null) {
+          doClass(ci, w);
+        }
+        instrumenter.close();
       }
-      instrumenter.close();
     }
   }
 
   private static void doClass(final ClassInstrumenter ci, Writer w) throws Exception {
     final String className = ci.getReader().getName();
-    w.write("Class: " + className + "\n");
+    w.write("Class: " + className + '\n');
     w.flush();
 
     ci.enableFakeLineNumbers(10000);
@@ -73,9 +73,9 @@
         me.beginPass();
         ExceptionHandler[][] handlers = me.getHandlers();
         boolean[] putDumperAt = new boolean[handlers.length];
-        for (int i = 0; i < handlers.length; i++) {
-          for (int j = 0; j < handlers[i].length; j++) {
-            int offset = handlers[i][j].getHandler();
+        for (ExceptionHandler[] handler : handlers) {
+          for (ExceptionHandler element : handler) {
+            int offset = element.getHandler();
             if (!putDumperAt[offset]) {
               putDumperAt[offset] = true;
               me.insertBefore(offset, new MethodEditor.Patch() {
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Bench.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Bench.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Bench.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Bench.java	2019-01-29 17:08:39.000000000 +0000
@@ -32,7 +32,7 @@
 import com.ibm.wala.shrikeBT.shrikeCT.CTDecoder;
 import com.ibm.wala.shrikeBT.shrikeCT.ClassInstrumenter;
 import com.ibm.wala.shrikeBT.shrikeCT.OfflineInstrumenter;
-import com.ibm.wala.shrikeCT.ClassReader;
+import com.ibm.wala.shrikeCT.ClassConstants;
 import com.ibm.wala.shrikeCT.ClassWriter;
 
 /**
@@ -62,23 +62,24 @@
   public static void main(String[] args) throws Exception {
     for (int i = 0; i < 1; i++) {
 
-      Writer w = new BufferedWriter(new FileWriter("report", false));
+      try (final Writer w = new BufferedWriter(new FileWriter("report", false))) {
 
-      args = instrumenter.parseStandardArgs(args);
-      if (args.length > 0) {
-        if (args[0].equals("-doexit")) {
-          doExit = true;
-        } else if (args[0].equals("-doexception")) {
-          doExit = true;
-          doException = true;
+        args = instrumenter.parseStandardArgs(args);
+        if (args.length > 0) {
+          if (args[0].equals("-doexit")) {
+            doExit = true;
+          } else if (args[0].equals("-doexception")) {
+            doExit = true;
+            doException = true;
+          }
+        }
+        instrumenter = new OfflineInstrumenter();
+        instrumenter.setPassUnmodifiedClasses(true);
+        instrumenter.beginTraversal();
+        ClassInstrumenter ci;
+        while ((ci = instrumenter.nextClass()) != null) {
+          doClass(ci, w);
         }
-      }
-      instrumenter = new OfflineInstrumenter(!doException);
-      instrumenter.setPassUnmodifiedClasses(true);
-      instrumenter.beginTraversal();
-      ClassInstrumenter ci;
-      while ((ci = instrumenter.nextClass()) != null) {
-        doClass(ci, w);
       }
       instrumenter.close();
     }
@@ -93,7 +94,7 @@
 
   private static void doClass(final ClassInstrumenter ci, Writer w) throws Exception {
     final String className = ci.getReader().getName();
-    w.write("Class: " + className + "\n");
+    w.write("Class: " + className + '\n');
     w.flush();
 
     for (int m = 0; m < ci.getReader().getMethodCount(); m++) {
@@ -101,7 +102,7 @@
 
       // d could be null, e.g., if the method is abstract or native
       if (d != null) {
-        w.write("Instrumenting " + ci.getReader().getMethodName(m) + " " + ci.getReader().getMethodType(m) + ":\n");
+        w.write("Instrumenting " + ci.getReader().getMethodName(m) + ' ' + ci.getReader().getMethodType(m) + ":\n");
         w.flush();
 
         if (disasm) {
@@ -119,7 +120,7 @@
         me.beginPass();
 
         if (doEntry) {
-          final String msg0 = "Entering call to " + Util.makeClass("L" + ci.getReader().getName() + ";") + "."
+          final String msg0 = "Entering call to " + Util.makeClass('L' + ci.getReader().getName() + ';') + '.'
               + ci.getReader().getMethodName(m);
           final int noTraceLabel = me.allocateLabel();
           me.insertAtStart(new MethodEditor.Patch() {
@@ -136,7 +137,7 @@
           });
         }
         if (doExit) {
-          final String msg0 = "Exiting call to " + Util.makeClass("L" + ci.getReader().getName() + ";") + "."
+          final String msg0 = "Exiting call to " + Util.makeClass('L' + ci.getReader().getName() + ';') + '.'
               + ci.getReader().getMethodName(m);
           IInstruction[] instr = me.getInstructions();
           for (int i = 0; i < instr.length; i++) {
@@ -159,7 +160,7 @@
           }
         }
         if (doException) {
-          final String msg0 = "Exception exiting call to " + Util.makeClass("L" + ci.getReader().getName() + ";") + "."
+          final String msg0 = "Exception exiting call to " + Util.makeClass('L' + ci.getReader().getName() + ';') + '.'
               + ci.getReader().getMethodName(m);
           final int noTraceLabel = me.allocateLabel();
           me.addMethodExceptionHandler(null, new MethodEditor.Patch() {
@@ -189,7 +190,7 @@
 
     if (ci.isChanged()) {
       ClassWriter cw = ci.emitClass();
-      cw.addField(ClassReader.ACC_PUBLIC | ClassReader.ACC_STATIC, fieldName, Constants.TYPE_boolean, new ClassWriter.Element[0]);
+      cw.addField(ClassConstants.ACC_PUBLIC | ClassConstants.ACC_STATIC, fieldName, Constants.TYPE_boolean, new ClassWriter.Element[0]);
       instrumenter.outputModifiedClass(ci, cw);
     }
   }
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/InterfaceAnalyzer.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/InterfaceAnalyzer.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/InterfaceAnalyzer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/InterfaceAnalyzer.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,7 +14,7 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.util.HashMap;
-import java.util.Iterator;
+import java.util.Map;
 
 import com.ibm.wala.shrikeBT.Constants;
 import com.ibm.wala.shrikeBT.Util;
@@ -38,37 +38,33 @@
     int lastMUID;
   }
 
-  final static HashMap<String, TypeStats> typeStats = new HashMap<String, TypeStats>();
+  final static HashMap<String, TypeStats> typeStats = new HashMap<>();
 
   public static void main(String[] args) throws Exception {
-    OfflineInstrumenter instrumenter = new OfflineInstrumenter(true);
+    OfflineInstrumenter instrumenter = new OfflineInstrumenter();
 
-    Writer w = new BufferedWriter(new OutputStreamWriter(System.out));
+    try (final Writer w = new BufferedWriter(new OutputStreamWriter(System.out))) {
 
-    args = instrumenter.parseStandardArgs(args);
+      args = instrumenter.parseStandardArgs(args);
 
-    instrumenter.beginTraversal();
-    ClassInstrumenter ci;
-    while ((ci = instrumenter.nextClass()) != null) {
-      doClass(ci.getReader());
-    }
-    instrumenter.close();
+      instrumenter.beginTraversal();
+      ClassInstrumenter ci;
+      while ((ci = instrumenter.nextClass()) != null) {
+        doClass(ci.getReader());
+      }
+      instrumenter.close();
 
-    w.write("Type\t# Total\t# Method\t# Public Method\t# Public Method as Foreign\n");
-    for (Iterator<String> i = typeStats.keySet().iterator(); i.hasNext();) {
-      String k = i.next();
-      TypeStats t = typeStats.get(k);
-      w.write(k + "\t" + t.totalOccurrences + "\t" + t.methodOccurrences + "\t" + t.publicMethodOccurrences + "\t"
-          + t.foreignPublicMethodOccurrences + "\n");
+      w.write("Type\t# Total\t# Method\t# Public Method\t# Public Method as Foreign\n");
+      for (Map.Entry<String, TypeStats> entry : typeStats.entrySet()) {
+        TypeStats t = entry.getValue();
+        w.write(entry.getKey() + '\t' + t.totalOccurrences + '\t' + t.methodOccurrences + '\t' + t.publicMethodOccurrences + '\t'
+            + t.foreignPublicMethodOccurrences + '\n');
+      }
     }
-    w.close();
   }
 
   static int methodUID = 0;
 
-  /**
-   * @param reader
-   */
   private static void doClass(ClassReader reader) throws Exception {
     if ((reader.getAccessFlags() & Constants.ACC_INTERFACE) != 0 && (reader.getAccessFlags() & Constants.ACC_PUBLIC) != 0) {
       String cType = Util.makeType(reader.getName());
@@ -77,8 +73,8 @@
         String[] params = Util.getParamsTypes(null, sig);
         int flags = reader.getMethodAccessFlags(m);
         int mUID = methodUID++;
-        for (int p = 0; p < params.length; p++) {
-          doType(flags, params[p], cType, mUID);
+        for (String param : params) {
+          doType(flags, param, cType, mUID);
         }
         doType(flags, Util.getReturnType(sig), cType, mUID);
       }
@@ -120,4 +116,4 @@
     }
     return c.substring(0, lastDot);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Mangler.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Mangler.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Mangler.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Mangler.java	2019-01-29 17:08:39.000000000 +0000
@@ -57,27 +57,27 @@
 
   public static void main(String[] args) throws Exception {
     for (int i = 0; i < 1; i++) {
-      instrumenter = new OfflineInstrumenter(true);
+      instrumenter = new OfflineInstrumenter();
 
-      Writer w = new BufferedWriter(new FileWriter("report", false));
+      try (final Writer w = new BufferedWriter(new FileWriter("report", false))) {
 
-      args = instrumenter.parseStandardArgs(args);
-      int seed;
-      try {
-        seed = Integer.parseInt(args[0]);
-      } catch (NumberFormatException ex) {
-        System.err.println("Invalid number: " + args[0]);
-        w.close();
-        return;
-      }
+        args = instrumenter.parseStandardArgs(args);
+        int seed;
+        try {
+          seed = Integer.parseInt(args[0]);
+        } catch (NumberFormatException ex) {
+          System.err.println("Invalid number: " + args[0]);
+          return;
+        }
 
-      Random r = new Random(seed);
-      instrumenter.setPassUnmodifiedClasses(true);
-      instrumenter.beginTraversal();
-      instrumenter.setOutputJar(new File("output.jar"));
-      ClassInstrumenter ci;
-      while ((ci = instrumenter.nextClass()) != null) {
-        doClass(ci, w, r);
+        Random r = new Random(seed);
+        instrumenter.setPassUnmodifiedClasses(true);
+        instrumenter.beginTraversal();
+        instrumenter.setOutputJar(new File("output.jar"));
+        ClassInstrumenter ci;
+        while ((ci = instrumenter.nextClass()) != null) {
+          doClass(ci, w, r);
+        }
       }
       instrumenter.close();
     }
@@ -85,7 +85,7 @@
 
   private static void doClass(final ClassInstrumenter ci, Writer w, final Random r) throws Exception {
     final String className = ci.getReader().getName();
-    w.write("Class: " + className + "\n");
+    w.write("Class: " + className + '\n');
     w.flush();
 
     for (int m = 0; m < ci.getReader().getMethodCount(); m++) {
@@ -93,7 +93,7 @@
 
       // d could be null, e.g., if the method is abstract or native
       if (d != null) {
-        w.write("Instrumenting " + ci.getReader().getMethodName(m) + " " + ci.getReader().getMethodType(m) + ":\n");
+        w.write("Instrumenting " + ci.getReader().getMethodName(m) + ' ' + ci.getReader().getMethodType(m) + ":\n");
         w.flush();
 
         if (disasm) {
@@ -211,4 +211,4 @@
       instrumenter.outputModifiedClass(ci, cw);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Slots.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Slots.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Slots.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Slots.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,4 +17,4 @@
   public static Object o;
 
   public static int i;
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Statistics.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Statistics.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Statistics.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/bench/Statistics.java	2019-01-29 17:08:39.000000000 +0000
@@ -39,26 +39,26 @@
 
   public static void main(String[] args) throws Exception {
     for (int i = 0; i < 1; i++) {
-      instrumenter = new OfflineInstrumenter(true);
+      instrumenter = new OfflineInstrumenter();
 
-      Writer w = new BufferedWriter(new FileWriter("report", false));
+      try (Writer w = new BufferedWriter(new FileWriter("report", false))) {
 
-      args = instrumenter.parseStandardArgs(args);
+        args = instrumenter.parseStandardArgs(args);
 
-      instrumenter.beginTraversal();
-      ClassInstrumenter ci;
-      while ((ci = instrumenter.nextClass()) != null) {
-        doClass(ci, w);
+        instrumenter.beginTraversal();
+        ClassInstrumenter ci;
+        while ((ci = instrumenter.nextClass()) != null) {
+          doClass(ci, w);
+        }
+        instrumenter.close();
       }
-      instrumenter.close();
-      w.close();
     }
   }
 
   private static void doClass(final ClassInstrumenter ci, Writer w) throws Exception {
     ClassReader cr = ci.getReader();
     final String className = cr.getName();
-    w.write("Class: " + className + "\n");
+    w.write("Class: " + className + '\n');
 
     boolean allPrivateConstructors = true;
     boolean methodCallsConstructor = false;
@@ -79,9 +79,9 @@
 
         int constructorCalls = 0;
         IInstruction[] instrs = d.getInstructions();
-        for (int i = 0; i < instrs.length; i++) {
-          if (instrs[i] instanceof InvokeInstruction) {
-            InvokeInstruction invoke = (InvokeInstruction) instrs[i];
+        for (IInstruction instr : instrs) {
+          if (instr instanceof InvokeInstruction) {
+            InvokeInstruction invoke = (InvokeInstruction) instr;
             if (invoke.getMethodName().equals("<init>") && invoke.getClassType().equals(Util.makeType(className))) {
               constructorCalls++;
             }
@@ -101,4 +101,4 @@
       w.write("Restricted Creation\n");
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/OfflineDynamicCallGraph.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/OfflineDynamicCallGraph.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/OfflineDynamicCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/OfflineDynamicCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,6 +22,9 @@
 import com.ibm.wala.shrikeBT.Constants;
 import com.ibm.wala.shrikeBT.Disassembler;
 import com.ibm.wala.shrikeBT.IInvokeInstruction;
+import com.ibm.wala.shrikeBT.IInvokeInstruction.Dispatch;
+import com.ibm.wala.shrikeBT.InvokeDynamicInstruction;
+import com.ibm.wala.shrikeBT.InvokeInstruction;
 import com.ibm.wala.shrikeBT.LoadInstruction;
 import com.ibm.wala.shrikeBT.MethodData;
 import com.ibm.wala.shrikeBT.MethodEditor;
@@ -40,6 +43,7 @@
 import com.ibm.wala.shrikeCT.ConstantPoolParser;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
 import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.config.FileOfClasses;
 import com.ibm.wala.util.config.SetOfClasses;
 
@@ -58,260 +62,360 @@
  * @since 10/18
  */
 public class OfflineDynamicCallGraph {
-	private final static boolean disasm = true;
-	private final static boolean verify = true;
+  private static class AddTracingToInvokes extends MethodEditor.Visitor {
+    @Override
+    public void visitInvoke(IInvokeInstruction inv) {
+      final String calleeClass = inv.getClassType();
+      final String calleeMethod = inv.getMethodName() + inv.getMethodSignature();
+      addInstructionExceptionHandler(/*"java.lang.Throwable"*/null, new MethodEditor.Patch() {
+        @Override
+        public void emitTo(MethodEditor.Output w) {
+          w.emit(Util.makeInvoke(runtime, "pop", new Class[] {}));
+          w.emit(ThrowInstruction.make(true));
+        }
+      });
+      insertBefore(new MethodEditor.Patch() {
+        @Override
+        public void emitTo(MethodEditor.Output w) {
+          w.emit(ConstantInstruction.makeString(calleeClass));
+          w.emit(ConstantInstruction.makeString(calleeMethod));
+          // target unknown
+          w.emit(Util.makeGet(runtime, "NULL_TAG"));
+          // w.emit(ConstantInstruction.make(Constants.TYPE_null, null));
+          w.emit(Util.makeInvoke(runtime, "addToCallStack", new Class[] {String.class, String.class, Object.class}));
+        }
+      });
+      insertAfter(new MethodEditor.Patch() {
+        @Override
+        public void emitTo(MethodEditor.Output w) {
+          w.emit(Util.makeInvoke(runtime, "pop", new Class[] {}));
+        }
+      });
+    }
+  }
+
+  private final static boolean disasm = true;
+  private final static boolean verify = true;
 
-	private static boolean patchExits = true;
-	private static boolean patchCalls = false;
-	
-	private static Class<?> runtime = Runtime.class;
-	
-	private static SetOfClasses filter;
-	
-	private static ClassHierarchyStore cha = new ClassHierarchyStore();
-	
-	public static void main(String[] args) throws IOException, ClassNotFoundException, InvalidClassFileException, FailureException {
-	  OfflineInstrumenter instrumenter;
-	  ClassInstrumenter ci;
-	  Writer w = new BufferedWriter(new FileWriter("report", false));
-
-	   for(int i = 0; i < args.length - 1; i++) {
-	      if ("--runtime".equals(args[i])) {
-	        runtime = Class.forName(args[i+1]);
-	      } else if ("--exclusions".equals(args[i])) {
-	        filter = new FileOfClasses(new FileInputStream(args[i+1]));
-	      } else if ("--dont-patch-exits".equals(args[i])) {
-	        patchExits = false;
-	      } else if ("--patch-calls".equals(args[i])) {
+  private static boolean patchExits = true;
+  private static boolean patchCalls = true;
+  private static boolean extractCalls = true;
+  private static boolean extractDynamicCalls = false;
+  private static boolean extractConstructors = true;
+  
+  private static Class<?> runtime = Runtime.class;
+
+  private static SetOfClasses filter;
+
+  private static ClassHierarchyStore cha = new ClassHierarchyStore();
+
+  public static void main(String[] args) throws IOException, ClassNotFoundException, InvalidClassFileException, FailureException {
+    OfflineInstrumenter instrumenter;
+    ClassInstrumenter ci;
+    try (final Writer w = new BufferedWriter(new FileWriter("report", false))) {
+
+      for(int i = 0; i < args.length; i++) {
+        if ("--runtime".equals(args[i])) {
+          runtime = Class.forName(args[i+1]);
+        } else if ("--exclusions".equals(args[i])) {
+          filter = new FileOfClasses(new FileInputStream(args[i+1]));
+        } else if ("--dont-patch-exits".equals(args[i])) {
+          patchExits = false;
+        } else if ("--patch-calls".equals(args[i])) {
           patchCalls = true;
+        } else if ("--extract-dynamic-calls".equals(args[i])) {
+          extractDynamicCalls = true;
+        } else if ("--extract-constructors".equals(args[i])) {
+          extractConstructors = true;
         } else if ("--rt-jar".equals(args[i])) {
-	        System.err.println("using " + args[i+1] + " as stdlib");
-	        OfflineInstrumenter libReader = new OfflineInstrumenter(true);
-	        libReader.addInputJar(new File(args[i+1]));
-	        while ((ci = libReader.nextClass()) != null) {
-	          CTUtils.addClassToHierarchy(cha, ci.getReader());
-	        }
-	      }
-	    }
-
-	  instrumenter = new OfflineInstrumenter(true);
-	  args = instrumenter.parseStandardArgs(args);
-				  
-	  instrumenter.setPassUnmodifiedClasses(true);
-
-	  instrumenter.beginTraversal();
-	  while ((ci = instrumenter.nextClass()) != null) {
-	    CTUtils.addClassToHierarchy(cha, ci.getReader());
-	  }
-
-	  instrumenter.setClassHierarchyProvider(cha);
-	  
-	  instrumenter.beginTraversal();
-	  while ((ci = instrumenter.nextClass()) != null) {
-	    ClassWriter cw = doClass(ci, w);
-	    if (cw != null) {
-	      instrumenter.outputModifiedClass(ci, cw);
-	    }
-	  }
-	  
-	  instrumenter.close();
-	}
+          System.err.println("using " + args[i+1] + " as stdlib");
+          OfflineInstrumenter libReader = new OfflineInstrumenter();
+          libReader.addInputJar(new File(args[i+1]));
+          while ((ci = libReader.nextClass()) != null) {
+            CTUtils.addClassToHierarchy(cha, ci.getReader());
+          }
+        }
+      }
+
+      instrumenter = new OfflineInstrumenter();
+      args = instrumenter.parseStandardArgs(args);
+
+      instrumenter.setPassUnmodifiedClasses(true);
 
-	static ClassWriter doClass(final ClassInstrumenter ci, Writer w) throws InvalidClassFileException, IOException, FailureException {
-		final String className = ci.getReader().getName();
+      instrumenter.beginTraversal();
+      while ((ci = instrumenter.nextClass()) != null) {
+        CTUtils.addClassToHierarchy(cha, ci.getReader());
+      }
+
+      instrumenter.setClassHierarchyProvider(cha);
+
+      instrumenter.beginTraversal();
+      while ((ci = instrumenter.nextClass()) != null) {
+        ClassWriter cw = doClass(ci, w);
+        if (cw != null) {
+          instrumenter.outputModifiedClass(ci, cw);
+        }
+      }
+    }
+
+    instrumenter.close();
+  }
+
+  static ClassWriter doClass(final ClassInstrumenter ci, Writer w) throws InvalidClassFileException, IOException, FailureException {
+    final String className = ci.getReader().getName();
     if (filter != null && filter.contains(className)) {
       return null;
     }
-    
+
     if (disasm) {
-      w.write("Class: " + className + "\n");
+      w.write("Class: " + className + '\n');
       w.flush();
     }
+
+    final ClassReader r = ci.getReader();
+
+    final Map<Object,MethodData> methods = HashMapFactory.make();
     
-		final ClassReader r = ci.getReader();
-		
-		for (int m = 0; m < ci.getReader().getMethodCount(); m++) {
-			final MethodData d = ci.visitMethod(m);
-
-			// d could be null, e.g., if the method is abstract or native
-			if (d != null) {
-		    if (filter != null && filter.contains(className + "." + ci.getReader().getMethodName(m))) {
-		      return null;
-		    }
-
-				if (disasm) {
-	        w.write("Instrumenting " + ci.getReader().getMethodName(m) + " " + ci.getReader().getMethodType(m) + ":\n");
-					w.write("Initial ShrikeBT code:\n");
-					(new Disassembler(d)).disassembleTo(w);
-					w.flush();
-				}
-
-				if (verify) {
-					Verifier v = new Verifier(d);
-					// v.setClassHierarchy(cha);
-					v.verify();
-				}
-
-				final MethodEditor me = new MethodEditor(d);
-				me.beginPass();
-			
-				final String theClass = r.getName();
-				final String theMethod = r.getMethodName(m).concat(r.getMethodType(m));
-				final boolean isConstructor = theMethod.contains("<init>");
-				final boolean nonStatic = !java.lang.reflect.Modifier.isStatic(r.getMethodAccessFlags(m));
+    for (int m = 0; m < ci.getReader().getMethodCount(); m++) {
+      final MethodData d = ci.visitMethod(m);
+
+      // d could be null, e.g., if the method is abstract or native
+      if (d != null) {
+        if (filter != null && filter.contains(className + '.' + ci.getReader().getMethodName(m))) {
+          return null;
+        }
+
+        if (disasm) {
+          w.write("Instrumenting " + ci.getReader().getMethodName(m) + ' ' + ci.getReader().getMethodType(m) + ":\n");
+          w.write("Initial ShrikeBT code:\n");
+          (new Disassembler(d)).disassembleTo(w);
+          w.flush();
+        }
+
+        if (verify) {
+          Verifier v = new Verifier(d);
+          // v.setClassHierarchy(cha);
+          v.verify();
+        }
 
-				me.insertAtStart(new MethodEditor.Patch() {
-				  @Override
+        final MethodEditor me = new MethodEditor(d);
+        me.beginPass();
+
+        final String theClass = r.getName();
+        final String theMethod = r.getMethodName(m).concat(r.getMethodType(m));
+        final boolean isConstructor = theMethod.contains("<init>");
+        final boolean nonStatic = !java.lang.reflect.Modifier.isStatic(r.getMethodAccessFlags(m));
+
+        if (patchExits) {
+          me.addMethodExceptionHandler(null, new MethodEditor.Patch() { 
+            @Override
+            public void emitTo(Output w) {
+              w.emit(ConstantInstruction.makeString(theClass));
+              w.emit(ConstantInstruction.makeString(theMethod));
+              //if (nonStatic)
+              //  w.emit(LoadInstruction.make(Constants.TYPE_Object, 0)); //load this
+              //else
+              w.emit(Util.makeGet(runtime, "NULL_TAG"));
+              // w.emit(ConstantInstruction.make(Constants.TYPE_null, null));
+              w.emit(ConstantInstruction.make(1)); // true
+              w.emit(Util.makeInvoke(runtime, "termination", new Class[] {String.class, String.class, Object.class, boolean.class}));
+              w.emit(ThrowInstruction.make(false));
+            }
+          });
+
+          me.visitInstructions(new MethodEditor.Visitor() {
+            @Override
+            public void visitReturn(ReturnInstruction instruction) {
+              insertBefore(new MethodEditor.Patch() {
+                @Override
+                public void emitTo(MethodEditor.Output w) {
+                  w.emit(ConstantInstruction.makeString(theClass));
+                  w.emit(ConstantInstruction.makeString(theMethod));
+                  if (nonStatic)
+                    w.emit(LoadInstruction.make(Constants.TYPE_Object, 0)); //load this
+                  else
+                    w.emit(Util.makeGet(runtime, "NULL_TAG"));
+                  // w.emit(ConstantInstruction.make(Constants.TYPE, null));
+                  w.emit(ConstantInstruction.make(0)); // false
+                  w.emit(Util.makeInvoke(runtime, "termination", new Class[] {String.class, String.class, Object.class, boolean.class}));
+                }
+              });
+            }
+          });
+        }
+
+        if (patchCalls) {
+          if (extractCalls) {
+            me.visitInstructions(new AddTracingToInvokes() {
+              @Override
+              public void visitInvoke(final IInvokeInstruction inv) {
+                if ((!extractConstructors && inv.getMethodName().equals("<init>")) || 
+                    (r.getAccessFlags()&Constants.ACC_INTERFACE) != 0 ||
+                    (!extractDynamicCalls && inv instanceof InvokeDynamicInstruction)) 
+                {
+                  super.visitInvoke(inv);
+                } else {
+                  this.replaceWith(new MethodEditor.Patch() {                    
+                    @Override
+                    public void emitTo(final Output w) {
+                      final String methodSignature = 
+                          inv.getInvocationCode().hasImplicitThis() && !(inv instanceof InvokeDynamicInstruction)?
+                                  '(' + inv.getClassType() + inv.getMethodSignature().substring(1):
+                              inv.getMethodSignature(); 
+                      Object key;
+                      if (inv instanceof InvokeDynamicInstruction) {
+                        key = inv;
+                      } else {
+                        key = Pair.make(inv.getClassType(), Pair.make(inv.getMethodName(), methodSignature));
+                      }
+                      
+                      if (! methods.containsKey(key)) {
+                        MethodData trampoline = ci.createEmptyMethodData("$shrike$trampoline$" + methods.size(), methodSignature, Constants.ACC_STATIC|Constants.ACC_PRIVATE);
+                        methods.put(key,  trampoline);
+                        MethodEditor me = new MethodEditor(trampoline);
+                        me.beginPass();
+                        me.insertAtStart(new MethodEditor.Patch() {
+                          private String hackType(String type) {
+                            if ("B".equals(type) || "C".equals(type) || "S".equals(type) || "Z".equals(type)) {
+                              return "I";
+                            } else {
+                              return type;
+                            }
+                          }
+                          
+                          @Override
+                          public void emitTo(MethodEditor.Output w) {
+                            String[] types = Util.getParamsTypes(null, methodSignature);
+                            for(int i = 0, local = 0; i < types.length; i++) {
+                              String type = hackType(types[i]);
+                              w.emit(LoadInstruction.make(type, local));
+                              if ("J".equals(type) || "D".equals(type)) {
+                                local += 2;
+                              } else {
+                                local++;
+                              }
+                            }
+                            Dispatch mode = (Dispatch)inv.getInvocationCode();
+                            if (inv instanceof InvokeDynamicInstruction) {
+                              InvokeDynamicInstruction inst = new InvokeDynamicInstruction(((InvokeDynamicInstruction) inv).getOpcode(), ((InvokeDynamicInstruction) inv).getBootstrap(), inv.getMethodName(), inv.getMethodSignature());
+                              w.emit(inst);
+                            } else {
+                              InvokeInstruction inst = InvokeInstruction.make(inv.getMethodSignature(), inv.getClassType(), inv.getMethodName(), mode);
+                              w.emit(inst);
+                            }
+                            //w.emit(ReturnInstruction.make(hackType(inv.getMethodSignature().substring(inv.getMethodSignature().indexOf(")")+1))));
+                            }   
+                        });
+                        
+                        me.applyPatches();
+                        me.endPass();
+
+                           
+                        me.beginPass();
+                        me.visitInstructions(new AddTracingToInvokes());
+                        me.applyPatches();
+                        me.endPass();
+
+                        if (verify) {
+                          Verifier v = new Verifier(trampoline);
+                          // v.setClassHierarchy(cha);
+                          try {
+                            v.verify();
+                          } catch (FailureException e) {
+                            throw new RuntimeException(e);
+                          }
+                        }
+                      }
+                      
+                      MethodData mt = methods.get(key);
+                      w.emit(InvokeInstruction.make(mt.getSignature(), mt.getClassType(), mt.getName(), Dispatch.STATIC));
+                    }
+                  });
+                }
+              }
+            });				    
+          } else {
+            me.visitInstructions(new AddTracingToInvokes());
+          }
+        }
+
+        me.insertAtStart(new MethodEditor.Patch() {
+          @Override
           public void emitTo(MethodEditor.Output w) {
             w.emit(ConstantInstruction.makeString(theClass));
-				    w.emit(ConstantInstruction.makeString(theMethod));
-				    if (nonStatic && !isConstructor)
-				      w.emit(LoadInstruction.make(Constants.TYPE_Object, 0)); //load this
-				    else
+            w.emit(ConstantInstruction.makeString(theMethod));
+            if (nonStatic && !isConstructor)
+              w.emit(LoadInstruction.make(Constants.TYPE_Object, 0)); //load this
+            else
               w.emit(Util.makeGet(runtime, "NULL_TAG"));
-				      // w.emit(ConstantInstruction.make(Constants.TYPE_null, null));
-				    w.emit(Util.makeInvoke(runtime, "execution", new Class[] {String.class, String.class, Object.class}));
-				  }
-				});
-
-				if (patchExits) {
-				  me.addMethodExceptionHandler(null, new MethodEditor.Patch() { 
-				    @Override
-				    public void emitTo(Output w) {
-				      w.emit(ConstantInstruction.makeString(theClass));
-				      w.emit(ConstantInstruction.makeString(theMethod));
-				      //if (nonStatic)
-				      //  w.emit(LoadInstruction.make(Constants.TYPE_Object, 0)); //load this
-				      //else
-				      w.emit(Util.makeGet(runtime, "NULL_TAG"));
-				      // w.emit(ConstantInstruction.make(Constants.TYPE_null, null));
-				      w.emit(ConstantInstruction.make(1)); // true
-				      w.emit(Util.makeInvoke(runtime, "termination", new Class[] {String.class, String.class, Object.class, boolean.class}));
-				      w.emit(ThrowInstruction.make(false));
-				    }
-				  });
-
-				  me.visitInstructions(new MethodEditor.Visitor() {
-				    @Override
-				    public void visitReturn(ReturnInstruction instruction) {
-				      insertBefore(new MethodEditor.Patch() {
-				        @Override
-				        public void emitTo(MethodEditor.Output w) {
-				          w.emit(ConstantInstruction.makeString(theClass));
-				          w.emit(ConstantInstruction.makeString(theMethod));
-				          if (nonStatic)
-				            w.emit(LoadInstruction.make(Constants.TYPE_Object, 0)); //load this
-				          else
-				            w.emit(Util.makeGet(runtime, "NULL_TAG"));
-				          // w.emit(ConstantInstruction.make(Constants.TYPE, null));
-				          w.emit(ConstantInstruction.make(0)); // false
-				          w.emit(Util.makeInvoke(runtime, "termination", new Class[] {String.class, String.class, Object.class, boolean.class}));
-				        }
-				      });
-				    }
-				  });
-				}
-
-				if (patchCalls) {
-				  me.visitInstructions(new MethodEditor.Visitor() {
-
-				    @Override
-				    public void visitInvoke(IInvokeInstruction inv) {
-				      final String calleeClass = inv.getClassType();
-				      final String calleeMethod = inv.getMethodName() + inv.getMethodSignature();
-				      addInstructionExceptionHandler(/*"java.lang.Throwable"*/null, new MethodEditor.Patch() {
-				        @Override
-				        public void emitTo(MethodEditor.Output w) {
-				          w.emit(ConstantInstruction.makeString(calleeClass));
-				          w.emit(ConstantInstruction.makeString(calleeMethod));
-				          w.emit(Util.makeInvoke(runtime, "pop", new Class[] {String.class, String.class}));
-				          w.emit(ThrowInstruction.make(true));
-				        }
-				      });
-				      insertBefore(new MethodEditor.Patch() {
-				        @Override
-				        public void emitTo(MethodEditor.Output w) {
-				          w.emit(ConstantInstruction.makeString(calleeClass));
-				          w.emit(ConstantInstruction.makeString(calleeMethod));
-				          // target unknown
-				          w.emit(Util.makeGet(runtime, "NULL_TAG"));
-				          // w.emit(ConstantInstruction.make(Constants.TYPE_null, null));
-				          w.emit(Util.makeInvoke(runtime, "addToCallStack", new Class[] {String.class, String.class, Object.class}));
-				        }
-				      });
-				      insertAfter(new MethodEditor.Patch() {
-				        @Override
-				        public void emitTo(MethodEditor.Output w) {
-				          w.emit(ConstantInstruction.makeString(calleeClass));
-				          w.emit(ConstantInstruction.makeString(calleeMethod));
-				          w.emit(Util.makeInvoke(runtime, "pop", new Class[] {String.class, String.class}));
-				        }
-				      });
-				    }
-				  });
-				}
-				
-				// this updates the data d
-				me.applyPatches();
-
-				if (disasm) {
-					w.write("Final ShrikeBT code:\n");
-					(new Disassembler(d)).disassembleTo(w);
-					w.flush();
-				}
+            // w.emit(ConstantInstruction.make(Constants.TYPE_null, null));
+            w.emit(Util.makeInvoke(runtime, "execution", new Class[] {String.class, String.class, Object.class}));
+          }
+        });
+        
+        // this updates the data d
+        me.applyPatches();
+
+        me.endPass();
+
+        if (disasm) {
+          w.write("Final ShrikeBT code:\n");
+          (new Disassembler(d)).disassembleTo(w);
+          w.flush();
+        }
 
-				if (verify) {
-					Verifier v = new Verifier(d);
+        if (verify && !extractConstructors) {
+          Verifier v = new Verifier(d);
           // v.setClassHierarchy(cha);
-					v.verify();
-				}
-			}
-		}
-
-		if (ci.isChanged()) {
-		  ClassWriter cw = new ClassWriter() {
-		    private final Map<Object, Integer> entries = HashMapFactory.make();
-		    
-		    {
-		      ConstantPoolParser p = r.getCP();
-		      for(int i = 1; i < p.getItemCount(); i++) {
-		        switch (p.getItemType(i)) {
-		        case CONSTANT_Integer:
-		          entries.put(new Integer(p.getCPInt(i)), i);
-		          break;
-		        case CONSTANT_Long:
-              entries.put(new Long(p.getCPLong(i)), i);
+          v.verify();
+        }
+      }
+    }
+
+    if (ci.isChanged()) {
+      ClassWriter cw = new ClassWriter() {
+        private final Map<Object, Integer> entries = HashMapFactory.make();
+
+        {
+          ConstantPoolParser p = r.getCP();
+          for(int i = 1; i < p.getItemCount(); i++) {
+            final byte itemType = p.getItemType(i);
+            switch (itemType) {
+            case CONSTANT_Integer:
+              entries.put(Integer.valueOf(p.getCPInt(i)), i);
+              break;
+            case CONSTANT_Long:
+              entries.put(Long.valueOf(p.getCPLong(i)), i);
+              break;
+            case CONSTANT_Float:
+              entries.put(Float.valueOf(p.getCPFloat(i)), i);
               break;
-		        case CONSTANT_Float:
-              entries.put(new Float(p.getCPFloat(i)), i);
+            case CONSTANT_Double:
+              entries.put(Double.valueOf(p.getCPDouble(i)), i);
               break;
-		        case CONSTANT_Double:
-              entries.put(new Double(p.getCPDouble(i)), i);
+            case CONSTANT_Utf8:
+              entries.put(p.getCPUtf8(i), i);
               break;
-		        case CONSTANT_Utf8:
-		          entries.put(p.getCPUtf8(i), i);
-		          break;
-		        case CONSTANT_String:
+            case CONSTANT_String:
               entries.put(new CWStringItem(p.getCPString(i), CONSTANT_String), i);
               break;
-		        case CONSTANT_Class:
+            case CONSTANT_Class:
               entries.put(new CWStringItem(p.getCPClass(i), CONSTANT_Class), i);
               break;
-		        case CONSTANT_MethodHandle:
-		        case CONSTANT_MethodType:
-		        case CONSTANT_InvokeDynamic:
-		        }
-		      }
-		    }
-		    
-		    private int findExistingEntry(Object o) {
-		      if (entries.containsKey(o)) {
-		        return entries.get(o);
-		      } else {
-		        return -1;
-		      }
-		    }
-		    
+            default:
+              // do nothing
+            }
+          }
+        }
+
+        private int findExistingEntry(Object o) {
+          if (entries.containsKey(o)) {
+            return entries.get(o);
+          } else {
+            return -1;
+          }
+        }
+
         @Override
         protected int addCPEntry(Object o, int size) {
           int entry = findExistingEntry(o);
@@ -321,13 +425,21 @@
             return super.addCPEntry(o, size);
           }
         }
-		  };
-			ci.emitClass(cw);
-			return cw;
-		
-		} else {
-		  return null;
-		}
-	}
+      };
+
+      ci.emitClass(cw);
+
+      if (patchCalls && extractCalls) {
+        for(MethodData trampoline : methods.values()) {
+          CTUtils.compileAndAddMethodToClassWriter(trampoline, cw, null);
+        }
+      }
+
+      return cw;
+
+    } else {
+      return null;
+    }
+  }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/OnlineDynamicCallGraph.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/OnlineDynamicCallGraph.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/OnlineDynamicCallGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/OnlineDynamicCallGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,7 +23,7 @@
   private Writer out = new PrintWriter(System.err);
   
   public OnlineDynamicCallGraph() throws IllegalArgumentException, IOException, InvalidClassFileException {
-    OfflineInstrumenter libReader = new OfflineInstrumenter(true);
+    OfflineInstrumenter libReader = new OfflineInstrumenter();
     for (String cps : new String[]{ System.getProperty("java.class.path"), System.getProperty("sun.boot.class.path") }) {
       for (String cp : cps.split(File.pathSeparator)) {
         File x = new File(cp);
@@ -50,7 +50,7 @@
       if (className.contains("com/ibm/wala") || className.contains("java/lang") || (className.contains("java/") && !className.matches("java/util/[A-Z]")) || className.contains("sun/")) {
         return classfileBuffer;
       } else {
-        ClassInstrumenter ci = new ClassInstrumenter(className, classfileBuffer, cha, false);
+        ClassInstrumenter ci = new ClassInstrumenter(className, classfileBuffer, cha);
         return OfflineDynamicCallGraph.doClass(ci, out).makeBytes();
       }
     } catch (InvalidClassFileException | IOException | FailureException e) {
@@ -60,7 +60,7 @@
     }
   }
   
-  public static void premain(String agentArgs, Instrumentation inst) throws IllegalArgumentException, IOException, InvalidClassFileException {
+  public static void premain(Instrumentation inst) throws IllegalArgumentException, IOException, InvalidClassFileException {
     inst.addTransformer(new OnlineDynamicCallGraph());
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/Runtime.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/Runtime.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/Runtime.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/cg/Runtime.java	2019-01-29 17:08:39.000000000 +0000
@@ -35,7 +35,7 @@
          "<clinit>".equals(stack[1].getMethodName())? "clinit": 
            "finalize".equals(stack[1].getMethodName())? "root":
              "callbacks";
-     String line = root + "\t" + bashToDescriptor(klass) + "\t" + String.valueOf(method) + "\n";
+     String line = root + '\t' + bashToDescriptor(klass) + '\t' + String.valueOf(method) + '\n';
      synchronized (runtime) {
        if (runtime.output != null) {
          runtime.output.printf(line);
@@ -53,13 +53,13 @@
   private PrintWriter output;
   private SetOfClasses filter;
   private Policy handleCallback;
-  private String currentSite;
+  private ThreadLocal<String> currentSite = new ThreadLocal<>();
   
   private ThreadLocal<Stack<String>> callStacks = new ThreadLocal<Stack<String>>() {
 
     @Override
     protected Stack<String> initialValue() {
-      Stack<String> callStack = new Stack<String>();
+      Stack<String> callStack = new Stack<>();
       callStack.push("root");
       return callStack;
     }
@@ -67,8 +67,8 @@
   };
   
   private Runtime(String fileName, String filterFileName, String policyClassName) {
-    try {
-      filter = new FileOfClasses(new FileInputStream(filterFileName));
+    try (final FileInputStream in = new FileInputStream(filterFileName)) {
+      filter = new FileOfClasses(in);
     } catch (Exception e) {
       filter = null;
     }
@@ -120,7 +120,7 @@
   }
   
   public static void execution(String klass, String method, Object receiver) {
-    runtime.currentSite = null;
+    runtime.currentSite.set(null);
     if (runtime.filter == null || ! runtime.filter.contains(bashToDescriptor(klass))) {
       if (runtime.output != null) {
         String caller = runtime.callStacks.get().peek();
@@ -134,15 +134,17 @@
             if (stack.length > 2) {
               // frames: Runtime.execution(0), callee(1), caller(2)
               StackTraceElement callerFrame = stack[2];
-              if (! caller.contains(callerFrame.getMethodName()) ||
-                  ! caller.contains(bashToDescriptor(callerFrame.getClassName()))) {
-                runtime.handleCallback.callback(stack, klass, method, receiver);
-                break checkValid;
+              if (!callerFrame.getMethodName().startsWith("$")) {
+                if (! caller.contains(callerFrame.getMethodName())||
+                    ! caller.contains(bashToDescriptor(callerFrame.getClassName()))) {
+                  runtime.handleCallback.callback(stack, klass, method, receiver);
+                  break checkValid;
+                }
               }
             }
           }
         
-          String line = (method.contains("<clinit>")? "clinit": String.valueOf(caller)) + "\t" + bashToDescriptor(klass) + "\t" + String.valueOf(method) + "\n";
+          String line = (method.contains("<clinit>")? "clinit": String.valueOf(caller)) + '\t' + bashToDescriptor(klass) + '\t' + String.valueOf(method) + '\n';
           synchronized (runtime) {
             if (runtime.output != null) {
               runtime.output.printf(line);
@@ -153,31 +155,35 @@
       }
     }
 
-    runtime.callStacks.get().push(bashToDescriptor(klass) + "\t" + method);
+    runtime.callStacks.get().push(bashToDescriptor(klass) + '\t' + method);
   }
   
+  @SuppressWarnings("unused")
   public static void termination(String klass, String method, Object receiver, boolean exception) {
     runtime.callStacks.get().pop();
   }
   
-  public static void pop(String klass, String method) {
-    if (runtime.currentSite != null) {
+  public static void pop() {
+    if (runtime.currentSite.get() != null) {
       synchronized (runtime) {
         if (runtime.output != null) {
-          runtime.output.printf("return from " + runtime.currentSite + "\n");
+          runtime.output.printf("return from " + runtime.currentSite.get() + '\n');
           runtime.output.flush();
         }
       }
 
-      runtime.currentSite = null;
+      runtime.currentSite.set(null);
     }
   }
   
   public static void addToCallStack(String klass, String method, Object receiver) {
-    runtime.currentSite = klass + "\t" + method + "\t" + receiver;
+    String callerClass = runtime.callStacks.get().isEmpty() ? "BLOB" : runtime.callStacks.get().peek().split("\t")[0];
+    String callerMethod = runtime.callStacks.get().isEmpty() ? "BLOB" : runtime.callStacks.get().peek().split("\t")[1];
+    runtime.currentSite.set(callerClass + '\t' + callerMethod + '\t' + klass + '\t' + method + '\t' + receiver);
+//	  runtime.currentSite = klass + "\t" + method + "\t" + receiver;
     synchronized (runtime) {
       if (runtime.output != null) {
-        runtime.output.printf("call to " + runtime.currentSite + "\n");
+        runtime.output.printf("call to " + runtime.currentSite.get() + '\n');
         runtime.output.flush();
       }
     }    
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/copywriter/CopyWriter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/copywriter/CopyWriter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/copywriter/CopyWriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/copywriter/CopyWriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,7 +13,6 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.zip.ZipEntry;
 
 import com.ibm.wala.shrikeBT.Compiler;
@@ -23,6 +22,7 @@
 import com.ibm.wala.shrikeBT.shrikeCT.CTDecoder;
 import com.ibm.wala.shrikeBT.shrikeCT.ClassInstrumenter;
 import com.ibm.wala.shrikeBT.shrikeCT.OfflineInstrumenter;
+import com.ibm.wala.shrikeCT.ClassConstants;
 import com.ibm.wala.shrikeCT.ClassReader;
 import com.ibm.wala.shrikeCT.ClassReader.AttrIterator;
 import com.ibm.wala.shrikeCT.ClassWriter;
@@ -91,15 +91,10 @@
       System.exit(1);
     }
 
-    final ArrayList<ZipEntry> entries = new ArrayList<ZipEntry>();
+    final ArrayList<ZipEntry> entries = new ArrayList<>();
 
-    instrumenter = new OfflineInstrumenter(true);
-    instrumenter.setManifestBuilder(new OfflineInstrumenter.ManifestBuilder() {
-      @Override
-      public void addEntry(ZipEntry ze) {
-        entries.add(ze);
-      }
-    });
+    instrumenter = new OfflineInstrumenter();
+    instrumenter.setManifestBuilder(entries::add);
     instrumenter.parseStandardArgs(args);
     instrumenter.setJARComment(copyright);
     instrumenter.beginTraversal();
@@ -116,12 +111,11 @@
     instrumenter.writeUnmodifiedClasses();
 
     Writer w = new OutputStreamWriter(instrumenter.addOutputJarEntry(new ZipEntry("IBM-Copyright")));
-    w.write(copyright + "\n");
-    for (Iterator<ZipEntry> iter = entries.iterator(); iter.hasNext();) {
-      ZipEntry ze = iter.next();
-      w.write("  " + ze.getName() + "\n");
+    w.write(copyright + '\n');
+    for (ZipEntry ze : entries) {
+      w.write("  " + ze.getName() + '\n');
     }
-    w.write(copyright + "\n");
+    w.write(copyright + '\n');
     w.flush();
     instrumenter.endOutputJarEntry();
 
@@ -236,33 +230,34 @@
     return elems;
   }
 
-  private int copyEntry(ConstantPoolParser cp, ClassWriter w, int i) throws InvalidClassFileException {
+  private static int copyEntry(ConstantPoolParser cp, ClassWriter w, int i) throws InvalidClassFileException {
     byte t = cp.getItemType(i);
     switch (t) {
-    case ClassReader.CONSTANT_String:
+    case ClassConstants.CONSTANT_String:
       return w.addCPString(cp.getCPString(i));
-    case ClassReader.CONSTANT_Class:
+    case ClassConstants.CONSTANT_Class:
       return w.addCPClass(cp.getCPClass(i));
-    case ClassReader.CONSTANT_FieldRef:
+    case ClassConstants.CONSTANT_FieldRef:
       return w.addCPFieldRef(cp.getCPRefClass(i), cp.getCPRefName(i), cp.getCPRefType(i));
-    case ClassReader.CONSTANT_InterfaceMethodRef:
+    case ClassConstants.CONSTANT_InterfaceMethodRef:
       return w.addCPInterfaceMethodRef(cp.getCPRefClass(i), cp.getCPRefName(i), cp.getCPRefType(i));
-    case ClassReader.CONSTANT_MethodRef:
+    case ClassConstants.CONSTANT_MethodRef:
       return w.addCPMethodRef(cp.getCPRefClass(i), cp.getCPRefName(i), cp.getCPRefType(i));
-    case ClassReader.CONSTANT_NameAndType:
+    case ClassConstants.CONSTANT_NameAndType:
       return w.addCPNAT(cp.getCPNATName(i), cp.getCPNATType(i));
-    case ClassReader.CONSTANT_Integer:
+    case ClassConstants.CONSTANT_Integer:
       return w.addCPInt(cp.getCPInt(i));
-    case ClassReader.CONSTANT_Float:
+    case ClassConstants.CONSTANT_Float:
       return w.addCPFloat(cp.getCPFloat(i));
-    case ClassReader.CONSTANT_Long:
+    case ClassConstants.CONSTANT_Long:
       return w.addCPLong(cp.getCPLong(i));
-    case ClassReader.CONSTANT_Double:
+    case ClassConstants.CONSTANT_Double:
       return w.addCPDouble(cp.getCPDouble(i));
-    case ClassReader.CONSTANT_Utf8:
+    case ClassConstants.CONSTANT_Utf8:
       return w.addCPUtf8(cp.getCPUtf8(i));
+    default:
+      return -1;
     }
-    return -1;
   }
 
   private void doClass(final ClassInstrumenter ci) throws Exception {
@@ -291,9 +286,10 @@
     int CPCount = cp.getItemCount();
 
     if (1 < CPCount) {
-      switch (cp.getItemType(1)) {
-      case ClassReader.CONSTANT_Long:
-      case ClassReader.CONSTANT_Double:
+      final byte itemType = cp.getItemType(1);
+      switch (itemType) {
+      case ClassConstants.CONSTANT_Long:
+      case ClassConstants.CONSTANT_Double:
         // item 1 is a double-word item, so the next real item is at 3
         // to make sure item 3 is allocated at index 3, we'll need to
         // insert a dummy entry at index 2
@@ -301,6 +297,8 @@
         if (r != 2)
           throw new Error("Invalid constant pool index for dummy: " + r);
         break;
+      default:
+        throw new UnsupportedOperationException(String.format("unexpected constant-pool item type %s", itemType));
       }
     }
     for (int i = 2; i < CPCount; i++) {
@@ -343,4 +341,4 @@
 
     instrumenter.outputModifiedClass(ci, w);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/instrumentation/CodeScraper.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/instrumentation/CodeScraper.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrike/instrumentation/CodeScraper.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrike/instrumentation/CodeScraper.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,11 +1,12 @@
 package com.ibm.wala.shrike.instrumentation;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.IllegalClassFormatException;
 import java.lang.instrument.Instrumentation;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.security.ProtectionDomain;
 
 import com.ibm.wala.shrikeCT.ClassReader;
@@ -15,11 +16,16 @@
 
 public class CodeScraper implements ClassFileTransformer {
 
-  private static final String prefix = System.getProperty("java.io.tmpdir") + File.separator + "loggedClasses" + File.separator + System.currentTimeMillis();
+  private static final Path prefix;
   
   static {
+    try {
+      prefix = Files.createTempDirectory("loggedClasses");
+      prefix.toFile().deleteOnExit();
+    } catch (final IOException problem) {
+      throw new RuntimeException(problem);
+    }
     System.err.println("scraping to " + prefix);
-    (new File(prefix)).mkdirs();
   }
   
   @Override
@@ -38,11 +44,10 @@
         }
       }
       if (className == null || sourceFile == null || !sourceFile.endsWith("java") || true) try {
-        String log = prefix + File.separator + reader.getName() + ".class";
-        (new File(log)).getParentFile().mkdirs();
-        FileOutputStream f = new FileOutputStream(log);
-        f.write(classfileBuffer);
-        f.close();
+        Path log = prefix.resolve(reader.getName() + ".class");
+        try (final OutputStream f = Files.newOutputStream(log)) {
+          f.write(classfileBuffer);
+        }
       } catch (IOException e) {
         assert false : e;
       }
@@ -54,7 +59,7 @@
     }
   }
 
-  public static void premain(String agentArgs, Instrumentation inst) {
+  public static void premain(Instrumentation inst) {
     inst.addTransformer(new CodeScraper());
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/Analyzer.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/Analyzer.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/Analyzer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/Analyzer.java	2019-01-29 17:08:39.000000000 +0000
@@ -137,8 +137,7 @@
       }
       oldEdges[left] = to;
     } else {
-      int[] newEdges = new int[oldEdges.length * 2];
-      System.arraycopy(oldEdges, 0, newEdges, 0, oldEdges.length);
+      int[] newEdges = Arrays.copyOf(oldEdges, oldEdges.length * 2);
       newEdges[oldEdges.length] = to;
       for (int i = oldEdges.length + 1; i < newEdges.length; i++) {
         newEdges[i] = -1;
@@ -157,12 +156,12 @@
     for (int i = 0; i < instructions.length; i++) {
       IInstruction instr = instructions[i];
       int[] targets = instr.getBranchTargets();
-      for (int j = 0; j < targets.length; j++) {
-        addBackEdge(targets[j], i);
+      for (int target : targets) {
+        addBackEdge(target, i);
       }
       ExceptionHandler[] hs = handlers[i];
-      for (int j = 0; j < hs.length; j++) {
-        addBackEdge(hs[j].getHandler(), i);
+      for (ExceptionHandler element : hs) {
+        addBackEdge(element.getHandler(), i);
       }
     }
 
@@ -198,7 +197,7 @@
     return ClassHierarchy.isSubtypeOf(hierarchy, patchType(t1), patchType(t2)) != ClassHierarchy.NO;
   }
 
-  private boolean isPrimitive(String type) {
+  private static boolean isPrimitive(String type) {
     return type != null && (!type.startsWith("L") && !type.startsWith("["));
   }
   
@@ -236,18 +235,17 @@
     BitSet r = new BitSet(instructions.length);
 
     r.set(0);
-    for (int i = 0; i < instructions.length; i++) {
-      int[] targets = instructions[i].getBranchTargets();
+    for (IInstruction instruction : instructions) {
+      int[] targets = instruction.getBranchTargets();
 
-      for (int j = 0; j < targets.length; j++) {
-        r.set(targets[j]);
+      for (int target : targets) {
+        r.set(target);
       }
     }
-    for (int i = 0; i < handlers.length; i++) {
-      ExceptionHandler[] hs = handlers[i];
+    for (ExceptionHandler[] hs : handlers) {
       if (hs != null) {
-        for (int j = 0; j < hs.length; j++) {
-          r.set(hs[j].getHandler());
+        for (ExceptionHandler element : hs) {
+          r.set(element.getHandler());
         }
       }
     }
@@ -276,14 +274,14 @@
 
       IInstruction instr = instructions[from];
       int[] targets = instr.getBranchTargets();
-      for (int i = 0; i < targets.length; i++) {
-        getReachableRecursive(targets[i], reachable, followHandlers, mask);
+      for (int target : targets) {
+        getReachableRecursive(target, reachable, followHandlers, mask);
       }
 
       if (followHandlers) {
         ExceptionHandler[] hs = handlers[from];
-        for (int i = 0; i < hs.length; i++) {
-          getReachableRecursive(hs[i].getHandler(), reachable, followHandlers, mask);
+        for (ExceptionHandler element : hs) {
+          getReachableRecursive(element.getHandler(), reachable, followHandlers, mask);
         }
       }
 
@@ -325,8 +323,8 @@
       reaching.set(to);
 
       int[] targets = backEdges[to];
-      for (int i = 0; i < targets.length; i++) {
-        getReachingRecursive(targets[i], reaching, mask);
+      for (int target : targets) {
+        getReachingRecursive(target, reaching, mask);
       }
 
       if (to > 0 && instructions[to - 1].isFallThrough()) {
@@ -340,8 +338,8 @@
 
   private void getReachingBase(int to, BitSet reaching, BitSet mask) {
     int[] targets = backEdges[to];
-    for (int i = 0; i < targets.length; i++) {
-      getReachingRecursive(targets[i], reaching, mask);
+    for (int target : targets) {
+      getReachingRecursive(target, reaching, mask);
     }
 
     if (to > 0 && instructions[to - 1].isFallThrough()) {
@@ -391,12 +389,12 @@
       }
 
       int[] targets = instr.getBranchTargets();
-      for (int j = 0; j < targets.length; j++) {
-        computeStackSizesAt(stackSizes, targets[j], size);
+      for (int target : targets) {
+        computeStackSizesAt(stackSizes, target, size);
       }
       ExceptionHandler[] hs = handlers[i];
-      for (int j = 0; j < hs.length; j++) {
-        computeStackSizesAt(stackSizes, hs[j].getHandler(), 1);
+      for (ExceptionHandler element : hs) {
+        computeStackSizesAt(stackSizes, element.getHandler(), 1);
       }
 
       if (!instr.isFallThrough()) {
@@ -516,7 +514,7 @@
     }
   }
 
-  private String[] cutArray(String[] a, int len) {
+  private static String[] cutArray(String[] a, int len) {
     if (len == 0) {
       return noStrings;
     } else {
@@ -529,11 +527,11 @@
   private boolean mergeTypes(int i, String[] curStack, int curStackSize, String[] curLocals, int curLocalsSize,
       List<PathElement> path) throws FailureException {
     boolean a = mergeStackTypes(i, curStack, curStackSize, path);
-    boolean b = mergeLocalTypes(i, curLocals, curLocalsSize, path);
+    boolean b = mergeLocalTypes(i, curLocals, curLocalsSize);
     return a||b;
   }
   
-  private boolean longType(String type) {
+  private static boolean longType(String type) {
     return Constants.TYPE_long.equals(type) || Constants.TYPE_double.equals(type);
   }
   
@@ -552,7 +550,7 @@
         String t = findCommonSupertype(st[j], curStack[j]);
         if (t != st[j]) {
           if (t == null) {
-            throw new FailureException(i, "Stack type mismatch at " + j + " (" + st[j] + " vs " + curStack[j] + ")", path);
+            throw new FailureException(i, "Stack type mismatch at " + j + " (" + st[j] + " vs " + curStack[j] + ')', path);
           }
           st[j] = t;
           changed = true;
@@ -563,7 +561,7 @@
     return changed;
   }
 
-  private boolean mergeLocalTypes(int i, String[] curLocals, int curLocalsSize, List<PathElement> path) throws FailureException {
+  private boolean mergeLocalTypes(int i, String[] curLocals, int curLocalsSize) {
     boolean changed = false;
 
     if (locals[i] == null) {
@@ -683,9 +681,10 @@
           curStack[0] = curStack[1];
           curStack[1] = s;
         } else {
+          @SuppressWarnings("NonConstantStringShouldBeStringBuffer")
           String pushed = instr.getPushedType(curStack);
           if (instr instanceof NewInstruction && ! pushed.startsWith("[")) {
-            pushed = "#" + instToBC[i] + "#" + pushed;
+            pushed = "#" + instToBC[i] + '#' + pushed;
           }
           if (pushed != null) {
             System.arraycopy(curStack, popped, curStack, 1, curStackSize - popped);
@@ -720,9 +719,9 @@
         }
 
         ExceptionHandler[] handler = handlers[i];
-        for(int h = 0; h < handler.length; h++) {
-          int target = handler[h].getHandler();
-          String cls = handler[h].getCatchClass();
+        for (ExceptionHandler element : handler) {
+          int target = element.getHandler();
+          String cls = element.getCatchClass();
           if (cls == null) {
             cls = "Ljava/lang/Throwable;";
           }
@@ -733,12 +732,9 @@
         }
         
         int[] targets = instr.getBranchTargets();
-        for (int j = 0; j < targets.length; j++) {
-          if (targets[j] == 29 && classType.contains("MetaClassImpl;") && signature.contains("(Ljava/lang/String;Lorg/codehaus/groovy/reflection/CachedClass;)")) {
-              System.err.println("got here");
-          }
-          if (mergeTypes(targets[j], curStack, curStackSize, curLocals, curLocalsSize[0], path)) {
-            computeTypes(targets[j], visitor, makeTypesAt, path);
+        for (int target : targets) {
+          if (mergeTypes(target, curStack, curStackSize, curLocals, curLocalsSize[0], path)) {
+            computeTypes(target, visitor, makeTypesAt, path);
           }
         }
 
@@ -784,8 +780,7 @@
 
   private void computeMaxLocals() {
     maxLocals = locals[0].length;
-    for (int i = 0; i < instructions.length; i++) {
-      IInstruction instr = instructions[i];
+    for (IInstruction instr : instructions) {
       if (instr instanceof LoadInstruction) {
         maxLocals = Math.max(maxLocals, ((LoadInstruction) instr).getVarIndex() + 1);
       } else if (instr instanceof StoreInstruction) {
@@ -816,8 +811,8 @@
     }
     int[] stackSizes = getStackSizes();
     maxStack = 0;
-    for (int i = 0; i < stackSizes.length; i++) {
-      maxStack = Math.max(maxStack, stackSizes[i]);
+    for (int stackSize : stackSizes) {
+      maxStack = Math.max(maxStack, stackSize);
     }
     computeMaxLocals();
   }
@@ -869,4 +864,4 @@
     return new Analyzer(info);
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/ClassHierarchy.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/ClassHierarchy.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/ClassHierarchy.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/ClassHierarchy.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,10 +47,9 @@
     }
 
     int r = NO;
-    for (int i = 0; i < ifaces.length; i++) {
-      String iface = ifaces[i];
-      if (!visited.contains(iface)) {
-        visited.add(iface);
+    for (String iface2 : ifaces) {
+      String iface = iface2;
+      if (visited.add(iface)) {
         if (iface.equals(t2)) {
           return YES;
         } else {
@@ -87,7 +86,7 @@
     }
 
     if (hierarchy.isInterface(t2) != NO) {
-      HashSet<String> visited = new HashSet<String>();
+      HashSet<String> visited = new HashSet<>();
 
       for (c = t1; c != null; c = hierarchy.getSuperClass(c)) {
         int v = checkSuperinterfacesContain(hierarchy, c, t2, visited);
@@ -114,10 +113,9 @@
     }
 
     int r = NO;
-    for (int i = 0; i < subtypes.length; i++) {
-      String subt = subtypes[i];
-      if (!visited.contains(subt)) {
-        visited.add(subt);
+    for (String subtype : subtypes) {
+      String subt = subtype;
+      if (visited.add(subt)) {
         if (subt.equals(t2)) {
           return YES;
         } else {
@@ -194,8 +192,7 @@
       boolean r = true;
       for (int i = 0; i < ifaces.length; i++) {
         String iface = ifaces[i];
-        if (!supers.contains(iface)) {
-          supers.add(iface);
+        if (supers.add(iface)) {
           if (!insertSuperInterfaces(hierarchy, ifaces[i], supers)) {
             r = false;
           }
@@ -244,7 +241,7 @@
   }
 
   private static boolean collectDominatingSuperInterfacesFromClass(ClassHierarchyProvider hierarchy, String t,
-      HashSet<String> matches, HashSet<String> supers) {
+      HashSet<String> supers) {
     String[] ifaces = hierarchy.getSuperInterfaces(t);
     if (ifaces == null) {
       return false;
@@ -252,8 +249,7 @@
       boolean r = true;
       for (int i = 0; i < ifaces.length; i++) {
         String iface = ifaces[i];
-        if (!supers.contains(iface)) {
-          supers.add(iface);
+        if (supers.add(iface)) {
           if (!insertSuperInterfaces(hierarchy, ifaces[i], supers)) {
             r = false;
           }
@@ -263,12 +259,11 @@
     }
   }
 
-  private static boolean collectDominatingSuperInterfaces(ClassHierarchyProvider hierarchy, String t, HashSet<String> matches,
-      HashSet<String> supers) {
+  private static boolean collectDominatingSuperInterfaces(ClassHierarchyProvider hierarchy, String t, HashSet<String> supers) {
     boolean r = true;
 
     for (String c = t; c != null && !supers.contains(c); c = hierarchy.getSuperClass(c)) {
-      if (!collectDominatingSuperInterfacesFromClass(hierarchy, c, matches, supers)) {
+      if (!collectDominatingSuperInterfacesFromClass(hierarchy, c, supers)) {
         r = false;
       }
     }
@@ -283,13 +278,13 @@
       return t1;
     }
 
-    HashSet<String> t1Supers = new HashSet<String>();
+    HashSet<String> t1Supers = new HashSet<>();
     t1Supers.add(Constants.TYPE_Object);
     boolean t1ExactClasses = insertSuperClasses(hierarchy, t1, t1Supers);
     int t1ClassCount = t1Supers.size();
     boolean t1ExactInterfaces = insertSuperClassInterfaces(hierarchy, t1, t1Supers);
 
-    HashSet<String> t2Supers = new HashSet<String>();
+    HashSet<String> t2Supers = new HashSet<>();
     boolean t2ExactClasses = collectDominatingSuperClasses(hierarchy, t2, t1Supers, t2Supers);
 
     if (t2Supers.size() == 0) {
@@ -303,7 +298,7 @@
       // interfaces
       t2ExactInterfaces = true;
     } else {
-      t2ExactInterfaces = collectDominatingSuperInterfaces(hierarchy, t2, t1Supers, t2Supers);
+      t2ExactInterfaces = collectDominatingSuperInterfaces(hierarchy, t2, t2Supers);
       if (!t1ExactInterfaces && t2Supers.size() != 1) {
         // we found an interface; it might also apply to t1; must bail
         return Constants.TYPE_unknown;
@@ -319,8 +314,7 @@
       String element = iter.next();
       boolean subsumed = false;
 
-      for (Iterator<String> iterator = t2Supers.iterator(); iterator.hasNext();) {
-        String element2 = iterator.next();
+      for (String element2 : t2Supers) {
         if (element != element2 && isSubtypeOf(hierarchy, element2, element) == YES) {
           subsumed = true;
           break;
@@ -384,7 +378,7 @@
         if (ch2 == '[') {
           char ch1_1 = t1.charAt(1);
           if (ch1_1 == '[' || ch1_1 == 'L') {
-            return "[" + findCommonSupertype(hierarchy, t1.substring(1), t2.substring(1));
+            return '[' + findCommonSupertype(hierarchy, t1.substring(1), t2.substring(1));
           } else {
             return Constants.TYPE_Object;
           }
@@ -405,4 +399,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/ClassHierarchyProvider.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/ClassHierarchyProvider.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/ClassHierarchyProvider.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/ClassHierarchyProvider.java	2019-01-29 17:08:39.000000000 +0000
@@ -35,4 +35,4 @@
    * @return whether or not cl is an interface, or Constants.MAYBE if not known
    */
   public int isInterface(String cl);
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/ClassHierarchyStore.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/ClassHierarchyStore.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/ClassHierarchyStore.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/ClassHierarchyStore.java	2019-01-29 17:08:39.000000000 +0000
@@ -39,7 +39,7 @@
     }
   }
 
-  final private HashMap<String, ClassInfo> contents = new HashMap<String, ClassInfo>();
+  final private HashMap<String, ClassInfo> contents = new HashMap<>();
 
   /**
    * Create an empty store.
@@ -47,6 +47,10 @@
   public ClassHierarchyStore() {
   }
 
+  public boolean containsClass(String cl) {
+    return contents.containsKey(cl);
+  }
+  
   /**
    * Append some class information to the store.
    * 
@@ -78,9 +82,6 @@
     return contents.keySet().iterator();
   }
 
-  /**
-   * @see ClassHierarchyProvider#getSuperClass(String)
-   */
   @Override
   public String getSuperClass(String cl) {
     ClassInfo info = contents.get(cl);
@@ -113,4 +114,4 @@
     ClassInfo info = contents.get(cl);
     return info == null ? Constants.MAYBE : (info.isInterface ? Constants.YES : Constants.NO);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/Verifier.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/Verifier.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/Verifier.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/analysis/Verifier.java	2019-01-29 17:08:39.000000000 +0000
@@ -331,4 +331,4 @@
   public void computeTypes() throws FailureException {
     computeTypes(null, getBasicBlockStarts(), false);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ArrayLengthInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ArrayLengthInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ArrayLengthInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ArrayLengthInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -63,4 +63,4 @@
   public boolean isPEI() {
     return true;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ArrayLoadInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ArrayLoadInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ArrayLoadInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ArrayLoadInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -59,7 +59,7 @@
 
   @Override
   public String toString() {
-    return "ArrayLoad(" + getType() + ")";
+    return "ArrayLoad(" + getType() + ')';
   }
 
   @Override
@@ -114,4 +114,4 @@
     return false;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ArrayStoreInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ArrayStoreInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ArrayStoreInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ArrayStoreInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -59,12 +59,12 @@
 
   @Override
   public String getType() {
-    return Decoder.indexedTypes[opcode - OP_iastore];
+    return Constants.indexedTypes[opcode - OP_iastore];
   }
 
   @Override
   public String toString() {
-    return "ArrayStore(" + getType() + ")";
+    return "ArrayStore(" + getType() + ')';
   }
 
   @Override
@@ -76,4 +76,4 @@
   public boolean isPEI() {
     return true;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/BinaryOpInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/BinaryOpInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/BinaryOpInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/BinaryOpInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -120,7 +120,7 @@
 
   @Override
   public String toString() {
-    return "BinaryOp(" + getType() + "," + getOperator() + ")";
+    return "BinaryOp(" + getType() + ',' + getOperator() + ')';
   }
 
   @Override
@@ -137,4 +137,4 @@
   public boolean isUnsigned() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/BytecodeConstants.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/BytecodeConstants.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/BytecodeConstants.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/BytecodeConstants.java	2019-01-29 17:08:39.000000000 +0000
@@ -660,4 +660,4 @@
       "invokeinterface", " xxxunusedxxx", "new", "newarray", "anewarray", "arraylength", "athrow", "checkcast", "instanceof",
       "monitorenter", "monitorexit", " wide", "multianewarray", "ifnull", "ifnonnull", "goto_w", "jsr_w", };
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/CheckCastInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/CheckCastInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/CheckCastInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/CheckCastInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -76,7 +76,7 @@
 
   @Override
   public String toString() {
-    return "CheckCast(" + type + ")";
+    return "CheckCast(" + type + ')';
   }
 
   @Override
@@ -88,4 +88,4 @@
   public boolean firstClassTypes() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ComparisonInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ComparisonInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ComparisonInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ComparisonInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -123,11 +123,11 @@
 
   @Override
   public String toString() {
-    return "Comparison(" + getType() + "," + getOperator() + ")";
+    return "Comparison(" + getType() + ',' + getOperator() + ')';
   }
 
   @Override
   public boolean isPEI() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Compiler.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Compiler.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Compiler.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Compiler.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,12 +13,11 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.BitSet;
-import java.util.Iterator;
-
 import com.ibm.wala.shrikeBT.ConstantInstruction.ClassToken;
 import com.ibm.wala.shrikeBT.IBinaryOpInstruction.Operator;
 import com.ibm.wala.shrikeBT.analysis.ClassHierarchyProvider;
 import com.ibm.wala.shrikeBT.analysis.Verifier;
+import com.ibm.wala.shrikeCT.BootstrapMethodsReader.BootstrapMethod;
 import com.ibm.wala.shrikeCT.ConstantPoolParser.ReferenceToken;
 
 /**
@@ -172,8 +171,10 @@
 
   protected abstract int allocateConstantPoolInterfaceMethod(String c, String name, String sig);
 
-  protected abstract String createHelperMethod(boolean isStatic, String sig);
+  protected abstract int allocateConstantPoolInvokeDynamic(BootstrapMethod b, String name, String type);
 
+  protected abstract String createHelperMethod(boolean isStatic, String sig);
+  
   private void collectInstructionInfo() {
     final BitSet s = new BitSet(instructions.length);
     final BitSet localsUsed = new BitSet(32);
@@ -182,8 +183,8 @@
     IInstruction.Visitor visitor = new IInstruction.Visitor() {
       private void visitTargets(IInstruction instr) {
         int[] ts = instr.getBranchTargets();
-        for (int k = 0; k < ts.length; k++) {
-          s.set(ts[k]);
+        for (int element : ts) {
+          s.set(element);
         }
       }
 
@@ -212,14 +213,13 @@
       }
     };
 
-    for (int i = 0; i < instructions.length; i++) {
-      instructions[i].visit(visitor);
+    for (IInstruction instruction : instructions) {
+      instruction.visit(visitor);
     }
 
     String[] paramTypes = Util.getParamsTypes(isStatic ? null : TYPE_Object, signature);
     int index = 0;
-    for (int i = 0; i < paramTypes.length; i++) {
-      String t = paramTypes[i];
+    for (String t : paramTypes) {
       localsUsed.set(index);
       if (t.equals(TYPE_long) || t.equals(TYPE_double)) {
         localsWide.set(index);
@@ -230,11 +230,10 @@
     }
 
     ExceptionHandler[] lastHS = null;
-    for (int i = 0; i < handlers.length; i++) {
-      ExceptionHandler[] hs = handlers[i];
+    for (ExceptionHandler[] hs : handlers) {
       if (hs != lastHS) {
-        for (int j = 0; j < hs.length; j++) {
-          s.set(hs[j].handler);
+        for (ExceptionHandler element : hs) {
+          s.set(element.handler);
         }
         lastHS = hs;
       }
@@ -359,20 +358,20 @@
       }
 
       int[] bt = instr.getBranchTargets();
-      for (int j = 0; j < bt.length; j++) {
-        int t = bt[j];
+      for (int element : bt) {
+        int t = element;
         if (t < 0 || t >= visited.length) {
           throw new IllegalArgumentException("Branch target at offset " + i + " is out of bounds: " + t + " (max " + visited.length
-              + ")");
+              + ')');
         }
         if (!visited[t]) {
-          computeStackWordsAt(bt[j], stackLen, stackWords.clone(), visited);
+          computeStackWordsAt(element, stackLen, stackWords.clone(), visited);
         }
       }
 
       ExceptionHandler[] hs = handlers[i];
-      for (int j = 0; j < hs.length; j++) {
-        int t = hs[j].handler;
+      for (ExceptionHandler element : hs) {
+        int t = element.handler;
         if (!visited[t]) {
           byte[] newWords = stackWords.clone();
           newWords[0] = 1;
@@ -448,9 +447,8 @@
     }
   }
 
-  private boolean applyPatches(ArrayList<Patch> patches) {
-    for (Iterator<Patch> i = patches.iterator(); i.hasNext();) {
-      Patch p = i.next();
+  private static boolean applyPatches(ArrayList<Patch> patches) {
+    for (Patch p : patches) {
       if (!p.apply()) {
         return false;
       }
@@ -479,7 +477,7 @@
     instructionsToOffsets = new int[instructions.length];
     code = makeCodeBuf();
 
-    ArrayList<Patch> patches = new ArrayList<Patch>();
+    ArrayList<Patch> patches = new ArrayList<>();
 
     int curOffset = startOffset;
     final int[] curOffsetRef = new int[1];
@@ -579,6 +577,7 @@
           if (!fallToConditional) {
             break;
           }
+          //$FALL-THROUGH$
         case OP_aconst_null:
           if (!fallToConditional && inBasicBlock(i, 2) && instructions[i + 1] instanceof ConditionalBranchInstruction) {
             ConditionalBranchInstruction cbr = (ConditionalBranchInstruction) instructions[i + 1];
@@ -593,6 +592,7 @@
             break;
           }
           // by Xiangyu
+          //$FALL-THROUGH$
         case OP_ifeq:
         case OP_ifge:
         case OP_ifgt:
@@ -798,6 +798,7 @@
             break;
           }
         }
+          //$FALL-THROUGH$
         case OP_lload:
         case OP_fload:
         case OP_dload:
@@ -952,14 +953,14 @@
         }
         case OP_invokedynamic: {
           InvokeDynamicInstruction inv = (InvokeDynamicInstruction) instr;
-          String sig = inv.getMethodSignature();
+          
           int cpIndex;
-
           if (presetConstants != null && presetConstants == inv.getLazyConstantPool()) {
             cpIndex = ((InvokeDynamicInstruction.Lazy) inv).getCPIndex();
           } else {
-            cpIndex = allocateConstantPoolInterfaceMethod(inv.getClassType(), inv.getMethodName(), sig);
+            cpIndex = allocateConstantPoolInvokeDynamic(inv.getBootstrap(), inv.getMethodName(), inv.getMethodSignature());
           }
+
           writeShort(curOffset, cpIndex);
           code[curOffset + 2] = 0;
           code[curOffset + 3] = 0;
@@ -1009,6 +1010,8 @@
           writeShort(curOffset, allocateConstantPoolClassType(((InstanceofInstruction) instr).getType()));
           curOffset += 2;
           break;
+        default:
+          // do nothing
         }
       } else {
         stackLenRef[0] = stackLen;
@@ -1119,7 +1122,7 @@
     if (maxCount == 0) {
       return noRawHandlers;
     } else {
-      ArrayList<int[]> rawHandlerList = new ArrayList<int[]>();
+      ArrayList<int[]> rawHandlerList = new ArrayList<>();
 
       for (int i = maxCount; i > 0; i--) {
         for (int j = start; j < end; j++) {
@@ -1144,8 +1147,7 @@
 
       int[] rawHandlers = new int[4 * rawHandlerList.size()];
       int count = 0;
-      for (Iterator<int[]> iter = rawHandlerList.iterator(); iter.hasNext();) {
-        int[] element = iter.next();
+      for (int[] element : rawHandlerList) {
         System.arraycopy(element, 0, rawHandlers, count, 4);
         count += 4;
       }
@@ -1215,8 +1217,7 @@
       }
       oldEdges[left] = to;
     } else {
-      int[] newEdges = new int[oldEdges.length * 2];
-      System.arraycopy(oldEdges, 0, newEdges, 0, oldEdges.length);
+      int[] newEdges = Arrays.copyOf(oldEdges, oldEdges.length * 2);
       newEdges[oldEdges.length] = to;
       for (int i = oldEdges.length + 1; i < newEdges.length; i++) {
         newEdges[i] = -1;
@@ -1239,8 +1240,8 @@
       liveLocals[instruction].set(index);
       int[] back = backEdges[instruction];
       if (back != null) {
-        for (int i = 0; i < back.length; i++) {
-          addLiveVar(back[i], index);
+        for (int element : back) {
+          addLiveVar(element, index);
         }
       }
 
@@ -1259,12 +1260,12 @@
     for (int i = 0; i < instructions.length; i++) {
       IInstruction instr = instructions[i];
       int[] targets = instr.getBranchTargets();
-      for (int j = 0; j < targets.length; j++) {
-        addBackEdge(targets[j], i);
+      for (int target : targets) {
+        addBackEdge(target, i);
       }
       ExceptionHandler[] hs = handlers[i];
-      for (int j = 0; j < hs.length; j++) {
-        addBackEdge(hs[j].handler, i);
+      for (ExceptionHandler element : hs) {
+        addBackEdge(element.handler, i);
       }
       liveLocals[i] = new BitSet();
     }
@@ -1311,11 +1312,11 @@
   private HelperPatch makeHelperPatch(int start, int len, int retVar, int unreadStack, int untouchedStack) {
     String retType = retVar >= 0 ? getAndCheckLocalType(start + len, retVar) : "V";
 
-    ArrayList<Instruction> callWrapper = new ArrayList<Instruction>();
+    ArrayList<Instruction> callWrapper = new ArrayList<>();
     int curStackLen = stackTypes[start].length;
 
-    StringBuffer sigBuf = new StringBuffer();
-    sigBuf.append("(");
+    StringBuilder sigBuf = new StringBuilder();
+    sigBuf.append('(');
     // spill needed stack variables to allocated locals;
     allocateLocals(curStackLen - unreadStack);
     for (int i = curStackLen - 1; i >= unreadStack; i--) {
@@ -1336,7 +1337,7 @@
         }
       } else {
         // dummy
-        sigBuf.append("I");
+        sigBuf.append('I');
         callWrapper.add(ConstantInstruction.make(0));
       }
     }
@@ -1345,11 +1346,11 @@
       callWrapper.add(LoadInstruction.make(stackTypes[start][i], allocatedLocals + 2 * (i - unreadStack)));
       sigBuf.append(stackTypes[start][i]);
       if (Util.getWordSize(stackTypes[start][i]) == 2) {
-        sigBuf.append("I");
+        sigBuf.append('I');
         callWrapper.add(ConstantInstruction.make(0));
       }
     }
-    sigBuf.append(")");
+    sigBuf.append(')');
     sigBuf.append(retType);
     String sig = sigBuf.toString();
 
@@ -1404,11 +1405,11 @@
     callWrapper.toArray(patch);
 
     ExceptionHandler[] startHS = handlers[start];
-    ArrayList<ExceptionHandler> newHS = new ArrayList<ExceptionHandler>();
-    for (int i = 0; i < startHS.length; i++) {
-      int t = startHS[i].handler;
+    ArrayList<ExceptionHandler> newHS = new ArrayList<>();
+    for (ExceptionHandler element : startHS) {
+      int t = element.handler;
       if (t < start || t >= start + len) {
-        newHS.add(startHS[i]);
+        newHS.add(element);
       }
     }
     ExceptionHandler[] patchHS = new ExceptionHandler[newHS.size()];
@@ -1453,8 +1454,8 @@
         if (instructions[i] instanceof ReturnInstruction) {
           outsideBranch = true;
         }
-        for (int j = 0; j < targets.length; j++) {
-          if (targets[j] < start || targets[j] >= start + len) {
+        for (int target : targets) {
+          if (target < start || target >= start + len) {
             outsideBranch = true;
           }
         }
@@ -1474,15 +1475,14 @@
       for (int i = start; i < start + len; i++) {
         boolean out = false;
         ExceptionHandler[] hs = handlers[i];
-        for (int j = 0; j < hs.length; j++) {
-          int h = hs[j].handler;
+        for (ExceptionHandler element : hs) {
+          int h = element.handler;
           if (h < start || h >= start + len) {
             out = true;
           }
         }
         int[] targets = instructions[i].getBranchTargets();
-        for (int j = 0; j < targets.length; j++) {
-          int t = targets[j];
+        for (int t : targets) {
           if (t < start || t >= start + len) {
             out = true;
           }
@@ -1601,8 +1601,8 @@
       // make sure that the same external handlers are used all the way through
       ExceptionHandler[] startHS = handlers[start];
       int numOuts = 0;
-      for (int j = 0; j < startHS.length; j++) {
-        int t = startHS[j].handler;
+      for (ExceptionHandler element : startHS) {
+        int t = element.handler;
         if (t < start || t >= start + len) {
           numOuts++;
         }
@@ -1612,12 +1612,12 @@
       for (int i = start + 1; i < start + len; i++) {
         ExceptionHandler[] hs = handlers[i];
         int matchingOuts = 0;
-        for (int j = 0; j < hs.length; j++) {
-          int t = hs[j].handler;
+        for (ExceptionHandler element : hs) {
+          int t = element.handler;
           if (t < start || t >= start + len) {
             boolean match = false;
-            for (int k = 0; k < startHS.length; k++) {
-              if (startHS[k].equals(hs[j])) {
+            for (ExceptionHandler element2 : startHS) {
+              if (element2.equals(element)) {
                 match = true;
                 break;
               }
@@ -1663,7 +1663,7 @@
 
   private void makeHelpers() {
     int offset = 0;
-    ArrayList<HelperPatch> patches = new ArrayList<HelperPatch>();
+    ArrayList<HelperPatch> patches = new ArrayList<>();
 
     while (offset + 5000 < instructions.length) {
       HelperPatch p = findBlock(offset, 5000);
@@ -1675,9 +1675,7 @@
       }
     }
 
-    for (Iterator<HelperPatch> i = patches.iterator(); i.hasNext();) {
-      HelperPatch p = i.next();
-
+    for (HelperPatch p : patches) {
       System.arraycopy(p.code, 0, instructions, p.start, p.code.length);
       for (int j = 0; j < p.length; j++) {
         int index = j + p.start;
@@ -1722,7 +1720,7 @@
       allocatedLocals = maxLocals;
       makeLiveLocals();
       makeTypes();
-      auxMethods = new ArrayList<Output>();
+      auxMethods = new ArrayList<>();
       makeHelpers();
 
       computeStackWords();
@@ -1865,4 +1863,4 @@
       return maxLocals;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConditionalBranchInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConditionalBranchInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConditionalBranchInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConditionalBranchInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -64,7 +64,7 @@
 
   @Override
   public String toString() {
-    return "ConditionalBranch(" + getType() + "," + getOperator() + "," + label + ")";
+    return "ConditionalBranch(" + getType() + ',' + getOperator() + ',' + label + ')';
   }
 
   @Override
@@ -126,4 +126,4 @@
   public boolean isPEI() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConstantInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConstantInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConstantInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConstantInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -318,7 +318,7 @@
 
     @Override
     final public Object getValue() {
-      return new Float(getFloatValue());
+      return Float.valueOf(getFloatValue());
     }
 
     @Override
@@ -390,7 +390,7 @@
 
     @Override
     final public Object getValue() {
-      return new Double(getDoubleValue());
+      return Double.valueOf(getDoubleValue());
     }
 
     @Override
@@ -845,7 +845,7 @@
   private static String quote(Object o) {
     if (o instanceof String) {
       String s = (String) o;
-      StringBuffer buf = new StringBuffer("\"");
+      StringBuilder buf = new StringBuilder("\"");
       int len = s.length();
       for (int i = 0; i < len; i++) {
         char ch = s.charAt(i);
@@ -864,7 +864,7 @@
           buf.append(ch);
         }
       }
-      buf.append("\"");
+      buf.append('\"');
       return buf.toString();
     } else if (o == null) {
       return "null";
@@ -875,7 +875,7 @@
 
   @Override
   final public String toString() {
-    return "Constant(" + getType() + "," + quote(getValue()) + ")";
+    return "Constant(" + getType() + ',' + quote(getValue()) + ')';
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConstantPoolReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConstantPoolReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConstantPoolReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConstantPoolReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -131,4 +131,4 @@
 
   public abstract String getConstantPoolDynamicType(int index);
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Constants.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Constants.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Constants.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Constants.java	2019-01-29 17:08:39.000000000 +0000
@@ -464,6 +464,8 @@
 
   public static final short ACC_STRICT = 0x800;
 
+  public static final short ACC_SYNTHETIC = 0x1000;
+
   public static final byte CONSTANT_Utf8 = 1;
 
   public static final byte CONSTANT_Integer = 3;
@@ -581,4 +583,4 @@
   public static final int YES = 2;
 
   public static final int MAYBE = 3;
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConversionInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConversionInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConversionInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ConversionInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -110,7 +110,7 @@
 
   @Override
   public String toString() {
-    return "Conversion(" + getFromType() + "," + getToType() + ")";
+    return "Conversion(" + getFromType() + ',' + getToType() + ')';
   }
 
   @Override
@@ -127,4 +127,4 @@
   public boolean throwsExceptionOnOverflow() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Decoder.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Decoder.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Decoder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Decoder.java	2019-01-29 17:08:39.000000000 +0000
@@ -55,16 +55,16 @@
 
     table[OP_aconst_null] = ConstantInstruction.make(TYPE_null, null);
     for (int i = OP_iconst_m1; i <= OP_iconst_5; i++) {
-      table[i] = ConstantInstruction.make(TYPE_int, new Integer(i - OP_iconst_m1 - 1));
+      table[i] = ConstantInstruction.make(TYPE_int, Integer.valueOf(i - OP_iconst_m1 - 1));
     }
     for (int i = OP_lconst_0; i <= OP_lconst_1; i++) {
-      table[i] = ConstantInstruction.make(TYPE_long, new Long(i - OP_lconst_0));
+      table[i] = ConstantInstruction.make(TYPE_long, Long.valueOf(i - OP_lconst_0));
     }
     for (int i = OP_fconst_0; i <= OP_fconst_2; i++) {
-      table[i] = ConstantInstruction.make(TYPE_float, new Float(i - OP_fconst_0));
+      table[i] = ConstantInstruction.make(TYPE_float, Float.valueOf(i - OP_fconst_0));
     }
     for (int i = OP_dconst_0; i <= OP_dconst_1; i++) {
-      table[i] = ConstantInstruction.make(TYPE_double, new Double(i - OP_dconst_0));
+      table[i] = ConstantInstruction.make(TYPE_double, Double.valueOf(i - OP_dconst_0));
     }
 
     for (int i = OP_iload_0; i <= OP_aload_3; i++) {
@@ -90,7 +90,7 @@
           .make(indexedTypes[(i - OP_iadd) % 4], BinaryOpInstruction.Operator.values()[(i - OP_iadd) / 4]);
     }
     for (int i = OP_ineg; i <= OP_dneg; i++) {
-      table[i] = UnaryOpInstruction.make(indexedTypes[i - OP_ineg], IUnaryOpInstruction.Operator.NEG);
+      table[i] = UnaryOpInstruction.make(indexedTypes[i - OP_ineg]);
     }
     for (int i = OP_ishl; i <= OP_lushr; i++) {
       table[i] = ShiftInstruction.make(indexedTypes[(i - OP_ishl) % 2], ShiftInstruction.Operator.values()[(i - OP_ishl) / 2]);
@@ -214,7 +214,7 @@
     }
   }
 
-  private String getPrimitiveType(int t) throws InvalidBytecodeException {
+  private static String getPrimitiveType(int t) throws InvalidBytecodeException {
     switch (t) {
     case T_BOOLEAN:
       return TYPE_boolean;
@@ -255,8 +255,8 @@
   }
 
   private boolean doesSubroutineReturn(int sub) {
-    for (int j = 0; j < retInfo.length; j++) {
-      if (retInfo[j] != null && retInfo[j].sub == sub) {
+    for (RetInfo element : retInfo) {
+      if (element != null && element.sub == sub) {
         return true;
       }
     }
@@ -314,9 +314,9 @@
             }
 
             int[] targets = instr.getBranchTargets();
-            for (int k = 0; k < targets.length; k++) {
-              if (targets[k] >= 0) {
-                int r = findReturnToVar(v, targets[k], visited);
+            for (int target : targets) {
+              if (target >= 0) {
+                int r = findReturnToVar(v, target, visited);
                 if (r != 0) {
                   return r;
                 }
@@ -407,10 +407,10 @@
         int offset = decodedOffset[addr];
         instr = decoded.get(offset + size - 1);
         int[] targets = instr.getBranchTargets();
-        for (int k = 0; k < targets.length; k++) {
-          if (targets[k] >= 0) {
+        for (int target : targets) {
+          if (target >= 0) {
             // only chase real gotos; ignore rets
-            assignReachablesToSubroutine(targets[k], sub);
+            assignReachablesToSubroutine(target, sub);
           }
         }
       }
@@ -513,10 +513,11 @@
       case OP_dup2_x1:
         i = DupInstruction.make(elemCount(stackWords, stackLen - 1), 1);
         break;
-      case OP_dup2_x2:
-        i = DupInstruction.make(elemCount(stackWords, stackLen - 1), elemCount(stackWords, stackLen - 2));
+      case OP_dup2_x2: {
+        int twoDown = elemCount(stackWords, stackLen - 1);
+        i = DupInstruction.make(twoDown, elemCount(stackWords, stackLen - twoDown - 1));
         break;
-      case OP_iinc: {
+      } case OP_iinc: {
         int v = wide ? decodeUShort(index) : (code[index] & 0xFF);
         int c = wide ? decodeShort(index + 2) : code[index + 1];
 
@@ -698,7 +699,7 @@
     return index;
   }
 
-  private int applyInstructionToStack(Instruction i, int stackLen, byte[] stackWords) throws InvalidBytecodeException {
+  private static int applyInstructionToStack(Instruction i, int stackLen, byte[] stackWords) throws InvalidBytecodeException {
     stackLen -= i.getPoppedCount();
 
     if (stackLen < 0) {
@@ -761,9 +762,7 @@
           Instruction instr = decoded.get(s + instrCount - 1);
           int[] targets = instr.getBranchTargets();
 
-          for (int i = 0; i < targets.length; i++) {
-            int t = targets[i];
-
+          for (int t : targets) {
             if (t >= 0) {
               decodeAt(t, stackLen, stackWords.clone());
             }
@@ -949,7 +948,7 @@
   final public void decode() throws InvalidBytecodeException {
     byte[] stackWords = new byte[code.length * 2];
 
-    decoded = new ArrayList<Instruction>();
+    decoded = new ArrayList<>();
     decodedOffset = new int[code.length];
     for (int i = 0; i < decodedOffset.length; i++) {
       decodedOffset[i] = UNSEEN;
@@ -1101,4 +1100,14 @@
     }
     return instructionsToBytecodes;
   }
-}
\ No newline at end of file
+
+  /**
+   * @return true iff the method decoded by this Decoder contains subroutines (JSRs)
+   */
+  final public boolean containsSubroutines() {
+    if (instructions == null) {
+      throw new Error("Call decode() before calling containsSubroutines()");
+    }
+    return JSRs != null;
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Disassembler.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Disassembler.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Disassembler.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Disassembler.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,7 +49,7 @@
     for (int j = 0; j < instructions.length; j++) {
       w.write(prefix + j + ": " + instructions[j] + " (" + instructionsToBytecodes[j] + ")\n");
       for (int k = 0; k < handlers[j].length; k++) {
-        w.write(prefix + "    Handles " + handlers[j][k].catchClass + " at " + handlers[j][k].handler + "\n");
+        w.write(prefix + "    Handles " + handlers[j][k].catchClass + " at " + handlers[j][k].handler + '\n');
       }
     }
   }
@@ -60,4 +60,4 @@
   public void disassembleTo(Writer w) throws IOException {
     disassembleTo("", w);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/DupInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/DupInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/DupInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/DupInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,7 +13,7 @@
 /**
  * This class represents dup instructions. There are two kinds of dup instructions, dup and dup_x1:
  * 
- * dup: a::rest => a::a::rest dup_x1: a::b::rest => a::b::a::rest
+ * dup: a::rest =&gt; a::a::rest dup_x1: a::b::rest =&gt; a::b::a::rest
  */
 public final class DupInstruction extends Instruction {
   final private int size;
@@ -94,7 +94,7 @@
 
   @Override
   public String toString() {
-    return "Dup(" + size + "," + delta + ")";
+    return "Dup(" + size + ',' + delta + ')';
   }
 
   @Override
@@ -109,4 +109,4 @@
   public boolean isPEI() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ExceptionHandler.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ExceptionHandler.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ExceptionHandler.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ExceptionHandler.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,17 +34,24 @@
   int handler;
 
   final String catchClass;
+  
+  final Object catchClassLoader;
 
   /**
    * @param handler the label for the handler code
    * @param catchClass the type of exception that should be caught (in JVM format), or null if all exceptions should be caught (as
    *          with 'finally')
    */
-  public ExceptionHandler(int handler, String catchClass) {
+  public ExceptionHandler(int handler, String catchClass, Object catchClassLoader) {
     this.handler = handler;
     this.catchClass = catchClass;
+    this.catchClassLoader = catchClassLoader;
   }
 
+  public ExceptionHandler(int handler, String catchClass) {
+    this(handler, catchClass, null);
+  }
+  
   /**
    * @return the label of the handler code
    */
@@ -52,6 +59,10 @@
     return handler;
   }
 
+  public Object getCatchClassLoader() {
+    return catchClassLoader;
+  }
+
   /**
    * @return the type of exceptions to be caught, or null if all exceptions should be caught
    */
@@ -79,4 +90,4 @@
       return false;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/GetInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/GetInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/GetInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/GetInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -146,8 +146,8 @@
 
   @Override
   public String toString() {
-    return "Get(" + getFieldType() + "," + (isStatic() ? "STATIC" : "NONSTATIC") + "," + getClassType() + "," + getFieldName()
-        + ")";
+    return "Get(" + getFieldType() + ',' + (isStatic() ? "STATIC" : "NONSTATIC") + ',' + getClassType() + ',' + getFieldName()
+        + ')';
   }
 
   @Override
@@ -171,4 +171,4 @@
     return false;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/GotoInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/GotoInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/GotoInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/GotoInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -83,7 +83,7 @@
 
   @Override
   public String toString() {
-    return "Goto(" + getLabel() + ")";
+    return "Goto(" + getLabel() + ')';
   }
 
   @Override
@@ -98,4 +98,4 @@
   public boolean isPEI() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/IComparisonInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/IComparisonInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/IComparisonInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/IComparisonInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,4 +25,4 @@
 
   String getType();
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/IInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/IInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/IInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/IInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,6 +20,7 @@
   /**
    * This class is used by IInstruction.visit to dispatch based on the instruction type.
    */
+  @SuppressWarnings("unused")
   public static abstract class Visitor {
     public void visitConstant(ConstantInstruction instruction) {
     }
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/info/InstructionTypeCounter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/info/InstructionTypeCounter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/info/InstructionTypeCounter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/info/InstructionTypeCounter.java	2019-01-29 17:08:39.000000000 +0000
@@ -265,8 +265,8 @@
       }
     };
 
-    for (int i = 0; i < instructions.length; i++) {
-      instructions[i].visit(visitor);
+    for (IInstruction instruction : instructions) {
+      instruction.visit(visitor);
     }
   }
 
@@ -473,4 +473,4 @@
 
     return c;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/info/LocalAllocator.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/info/LocalAllocator.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/info/LocalAllocator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/info/LocalAllocator.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,8 +52,8 @@
       }
     };
 
-    for (int i = 0; i < instructions.length; i++) {
-      instructions[i].visit(visitor);
+    for (IInstruction instruction : instructions) {
+      instruction.visit(visitor);
     }
 
     nextLocal = max[0];
@@ -100,4 +100,4 @@
   public static int allocate(MethodData info) throws IllegalArgumentException {
     return allocate(info, null);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/info/ThisAssignmentChecker.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/info/ThisAssignmentChecker.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/info/ThisAssignmentChecker.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/info/ThisAssignmentChecker.java	2019-01-29 17:08:39.000000000 +0000
@@ -33,8 +33,7 @@
     if (!info.getIsStatic()) {
       IInstruction[] instructions = info.getInstructions();
 
-      for (int i = 0; i < instructions.length; i++) {
-        IInstruction instr = instructions[i];
+      for (IInstruction instr : instructions) {
         if (instr instanceof StoreInstruction) {
           StoreInstruction st = (StoreInstruction) instr;
           if (st.getVarIndex() == 0) {
@@ -70,4 +69,4 @@
 
     return c.assignmentToThis;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InstanceofInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InstanceofInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InstanceofInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InstanceofInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -73,7 +73,7 @@
 
   @Override
   public String toString() {
-    return "Instanceof(" + type + ")";
+    return "Instanceof(" + type + ')';
   }
 
   @Override
@@ -85,4 +85,4 @@
   public boolean firstClassType() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Instruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Instruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Instruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Instruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -130,4 +130,4 @@
   final public Object clone() {
     return this;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InvokeDynamicInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InvokeDynamicInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InvokeDynamicInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InvokeDynamicInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,7 +26,7 @@
   protected String methodName;
   protected String methodType;
   
-  private InvokeDynamicInstruction(short opcode, BootstrapMethod bootstrap, String methodName, String methodType) {
+  public InvokeDynamicInstruction(short opcode, BootstrapMethod bootstrap, String methodName, String methodType) {
     super(opcode);
     this.bootstrap = bootstrap;
     this.methodName = methodName;
@@ -93,7 +93,7 @@
 
   @Override
   public String getClassType() {
-    return "L" + getBootstrap().methodClass();
+    return 'L' + getBootstrap().methodClass();
   }
 
   @Override
@@ -151,7 +151,7 @@
     }
   }
 
-  public CallSite bootstrap(Class cl) throws ClassNotFoundException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchFieldException {
+  public CallSite bootstrap(Class<?> cl) throws ClassNotFoundException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchFieldException {
     ClassLoader classLoader = cl.getClassLoader();
     ClassLoader bootstrapCL = classLoader;
 
@@ -180,9 +180,9 @@
 
   public static MethodType makeMethodType(ClassLoader classLoader, String descriptor) throws ClassNotFoundException {
     String returnType = Util.makeClass(Util.getReturnType(descriptor));
-    Class returnClass = Class.forName(returnType, false, classLoader);
+    Class<?> returnClass = Class.forName(returnType, false, classLoader);
     String[] paramTypes = Util.getParamsTypes(null, descriptor);
-    Class[] paramClasses = new Class[ paramTypes.length ];
+    Class<?>[] paramClasses = new Class[ paramTypes.length ];
     for(int i = 0; i < paramTypes.length; i++) {
       paramClasses[i] = Class.forName(Util.makeClass(paramTypes[i]), false, classLoader);
     }
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InvokeInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InvokeInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InvokeInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/InvokeInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -195,7 +195,7 @@
 
   @Override
   final public String toString() {
-    return "Invoke(" + getInvocationModeString() + "," + getClassType() + "," + getMethodName() + "," + getMethodSignature() + ")";
+    return "Invoke(" + getInvocationModeString() + ',' + getClassType() + ',' + getMethodName() + ',' + getMethodSignature() + ')';
   }
 
   @Override
@@ -218,4 +218,4 @@
       throw new Error("Unknown mode: " + opcode);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/LoadInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/LoadInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/LoadInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/LoadInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -97,7 +97,7 @@
 
   @Override
   public String toString() {
-    return "LocalLoad(" + getType() + "," + index + ")";
+    return "LocalLoad(" + getType() + ',' + index + ')';
   }
 
   @Override
@@ -114,4 +114,4 @@
     return false;
   }
 
- }
\ No newline at end of file
+ }
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/MethodData.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/MethodData.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/MethodData.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/MethodData.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,7 +23,7 @@
  * for caching analysis results for a method.
  */
 public final class MethodData {
-  final private HashMap<Object, Results> map = new HashMap<Object, Results>();
+  final private HashMap<Object, Results> map = new HashMap<>();
 
   final private int access;
 
@@ -238,6 +238,6 @@
 
   @Override
   public String toString() {
-    return getClassType() + "." + getName() + getSignature();
+    return getClassType() + '.' + getName() + getSignature();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/MethodEditor.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/MethodEditor.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/MethodEditor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/MethodEditor.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.shrikeBT;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.IdentityHashMap;
 
 /**
@@ -145,7 +146,7 @@
     }
   }
 
-  private String getStateMessage(int state) {
+  private static String getStateMessage(int state) {
     switch (state) {
     case BEFORE_PASS:
       return "This operation can only be performed before or after an editing pass";
@@ -190,8 +191,7 @@
     } else if (h2.length == 0) {
       return h1;
     } else {
-      ExceptionHandler[] r = new ExceptionHandler[h1.length + h2.length];
-      System.arraycopy(h1, 0, r, 0, h1.length);
+      ExceptionHandler[] r = Arrays.copyOf(h1, h1.length + h2.length);
       System.arraycopy(h2, 0, r, h1.length, h2.length);
       return r;
     }
@@ -201,9 +201,9 @@
    * Output is the interface that patches use to emit their code into a method body.
    */
   public final static class Output {
-    final ArrayList<IInstruction> newInstructions = new ArrayList<IInstruction>();
+    final ArrayList<IInstruction> newInstructions = new ArrayList<>();
 
-    final ArrayList<ExceptionHandler[]> newInstructionHandlers = new ArrayList<ExceptionHandler[]>();
+    final ArrayList<ExceptionHandler[]> newInstructionHandlers = new ArrayList<>();
 
     int[] instructionsToBytecodes = new int[10];
 
@@ -243,9 +243,7 @@
 
       int s = newInstructions.size();
       if (s + 1 > instructionsToBytecodes.length) {
-        int[] t = new int[instructionsToBytecodes.length * 2];
-        System.arraycopy(instructionsToBytecodes, 0, t, 0, instructionsToBytecodes.length);
-        instructionsToBytecodes = t;
+        instructionsToBytecodes = Arrays.copyOf(instructionsToBytecodes, instructionsToBytecodes.length * 2);
       }
 
       instructionsToBytecodes[s] = originalBytecode;
@@ -256,9 +254,7 @@
     void internalEmitInstruction(IInstruction i) {
       int s = newInstructions.size();
       if (s + 1 > instructionsToBytecodes.length) {
-        int[] t = new int[instructionsToBytecodes.length * 2];
-        System.arraycopy(instructionsToBytecodes, 0, t, 0, instructionsToBytecodes.length);
-        instructionsToBytecodes = t;
+        instructionsToBytecodes = Arrays.copyOf(instructionsToBytecodes, instructionsToBytecodes.length * 2);
       }
 
       instructionsToBytecodes[s] = originalBytecode;
@@ -285,9 +281,7 @@
 
       int s = newInstructions.size();
       if (s + instrs.length > instructionsToBytecodes.length) {
-        int[] t = new int[instructionsToBytecodes.length * 2 + instrs.length];
-        System.arraycopy(instructionsToBytecodes, 0, t, 0, instructionsToBytecodes.length);
-        instructionsToBytecodes = t;
+        instructionsToBytecodes = Arrays.copyOf(instructionsToBytecodes, instructionsToBytecodes.length * 2 + instrs.length);
       }
 
       ExceptionHandler[] hs = mergeHandlers(handlers, additionalHandlers);
@@ -415,7 +409,7 @@
       }
       patchCount++;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid i");
+      throw new IllegalArgumentException("invalid i", e);
     }
   }
 
@@ -454,7 +448,7 @@
       instructionHandlerPatches[i] = new HandlerPatch(instructionHandlerPatches[i], catchClass, allocateLabel(), p);
       patchCount++;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid i: " + i);
+      throw new IllegalArgumentException("invalid i: " + i, e);
     }
   }
 
@@ -640,11 +634,11 @@
       ExceptionHandler[] hs = handlers[i];
       if (hs.length > 0 && (i == 0 || hs != handlers[i - 1])) {
         if (adjustedHandlers == null) {
-          adjustedHandlers = new IdentityHashMap<ExceptionHandler, Object>();
+          adjustedHandlers = new IdentityHashMap<>();
         }
 
-        for (int j = 0; j < hs.length; j++) {
-          ExceptionHandler h = hs[j];
+        for (ExceptionHandler element : hs) {
+          ExceptionHandler h = element;
           if (!adjustedHandlers.containsKey(h)) {
             adjustedHandlers.put(h, null);
             h.handler = labelDefs[h.handler]; // breaks invariant of ExceptionHandler: immutable!
@@ -732,4 +726,4 @@
       editor.addInstructionExceptionHandler(index, catchClass, p);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/MonitorInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/MonitorInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/MonitorInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/MonitorInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -60,11 +60,11 @@
 
   @Override
   public String toString() {
-    return "Monitor(" + (isEnter() ? "ENTER" : "EXIT") + ")";
+    return "Monitor(" + (isEnter() ? "ENTER" : "EXIT") + ')';
   }
 
   @Override
   public boolean isPEI() {
     return true;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/NewInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/NewInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/NewInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/NewInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -102,7 +102,7 @@
 
   @Override
   public String toString() {
-    return "New(" + type + "," + arrayBoundsCount + ")";
+    return "New(" + type + ',' + arrayBoundsCount + ')';
   }
 
   @Override
@@ -117,4 +117,4 @@
   public boolean isPEI() {
     return true;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/PopInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/PopInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/PopInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/PopInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -62,11 +62,11 @@
 
   @Override
   public String toString() {
-    return "Pop(" + size + ")";
+    return "Pop(" + size + ')';
   }
 
   @Override
   public boolean isPEI() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/PutInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/PutInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/PutInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/PutInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -136,8 +136,8 @@
 
   @Override
   final public String toString() {
-    return "Put(" + getFieldType() + "," + (isStatic() ? "STATIC" : "NONSTATIC") + "," + getClassType() + "," + getFieldName()
-        + ")";
+    return "Put(" + getFieldType() + ',' + (isStatic() ? "STATIC" : "NONSTATIC") + ',' + getClassType() + ',' + getFieldName()
+        + ')';
   }
 
   @Override
@@ -149,4 +149,4 @@
   public boolean isPEI() {
     return !isStatic();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ReturnInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ReturnInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ReturnInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ReturnInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -81,11 +81,11 @@
 
   @Override
   public String toString() {
-    return "Return(" + getType() + ")";
+    return "Return(" + getType() + ')';
   }
 
   @Override
   public boolean isPEI() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ShiftInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ShiftInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ShiftInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ShiftInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -88,7 +88,7 @@
 
   @Override
   public String toString() {
-    return "Shift(" + getType() + "," + getOperator() + ")";
+    return "Shift(" + getType() + ',' + getOperator() + ')';
   }
 
   @Override
@@ -100,4 +100,4 @@
   public boolean isUnsigned() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/ClassInstrumenter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/ClassInstrumenter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/ClassInstrumenter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/ClassInstrumenter.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,7 +16,6 @@
 
 import com.ibm.wala.shrikeBT.Compiler;
 import com.ibm.wala.shrikeBT.ConstantPoolReader;
-import com.ibm.wala.shrikeBT.Constants;
 import com.ibm.wala.shrikeBT.Decoder.InvalidBytecodeException;
 import com.ibm.wala.shrikeBT.ExceptionHandler;
 import com.ibm.wala.shrikeBT.Instruction;
@@ -63,13 +62,11 @@
   
   private final ClassHierarchyProvider cha;
   
-  private final boolean reuseStackMaps;
-  
   /**
    * Create a class instrumenter from raw bytes.
    */
-  public ClassInstrumenter(String inputName, byte[] bytes, ClassHierarchyProvider cha, boolean reuseStackMaps) throws InvalidClassFileException {
-    this(inputName, new ClassReader(bytes), cha, reuseStackMaps);
+  public ClassInstrumenter(String inputName, byte[] bytes, ClassHierarchyProvider cha) throws InvalidClassFileException {
+    this(inputName, new ClassReader(bytes), cha);
   }
 
   /**
@@ -93,13 +90,12 @@
    * 
    * @throws IllegalArgumentException if cr is null
    */
-  public ClassInstrumenter(String inputName, ClassReader cr, ClassHierarchyProvider cha, boolean reuseStackMaps) throws InvalidClassFileException {
+  public ClassInstrumenter(String inputName, ClassReader cr, ClassHierarchyProvider cha) {
     if (cr == null) {
       throw new IllegalArgumentException("cr is null");
     }
     this.cr = cr;
     this.cha = cha;
-    this.reuseStackMaps = reuseStackMaps;
     methods = new MethodData[cr.getMethodCount()];
     oldCode = new CodeReader[methods.length];
     cpr = CTDecoder.makeConstantPoolReader(cr);
@@ -165,7 +161,11 @@
   public MethodData createEmptyMethodData(String name, String sig, int access) {
     // Instruction[] instructions=new Instruction[0];
     Instruction[] instructions = new Instruction[1];
-    instructions[0] = ReturnInstruction.make(Constants.TYPE_void);
+    String type = Util.getReturnType(sig);
+    if ("C".equals(type) || "B".equals(type) || "Z".equals(type) || "S".equals(type)) {
+      type = "I";
+    }
+    instructions[0] = ReturnInstruction.make(type);
     ExceptionHandler[][] handlers = new ExceptionHandler[instructions.length][];
     Arrays.fill(handlers, noHandlers);
     int[] i2b = new int[instructions.length];
@@ -315,8 +315,7 @@
           w.addMethod(flags, cr.getMethodNameIndex(i), cr.getMethodTypeIndex(i), makeMethodAttributes(i, w, oc, comp.getOutput(), md));
           Compiler.Output[] aux = comp.getAuxiliaryMethods();
           if (aux != null) {
-            for (int j = 0; j < aux.length; j++) {
-              Compiler.Output a = aux[j];
+            for (Compiler.Output a : aux) {
               w.addMethod(a.getAccessFlags(), a.getMethodName(), a.getMethodSignature(), makeMethodAttributes(i, w, oc, a, md));
             }
           }
@@ -492,4 +491,4 @@
 
     return methodAttributes;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/CTCompiler.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/CTCompiler.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/CTCompiler.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/CTCompiler.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,6 +15,7 @@
 import com.ibm.wala.shrikeBT.Compiler;
 import com.ibm.wala.shrikeBT.MethodData;
 import com.ibm.wala.shrikeCT.ClassWriter;
+import com.ibm.wala.shrikeCT.BootstrapMethodsReader.BootstrapMethod;
 import com.ibm.wala.shrikeCT.ConstantPoolParser.ReferenceToken;
 
 /**
@@ -73,6 +74,11 @@
     return cw.addCPMethodHandle(c);
   }
 
+  @Override
+  protected int allocateConstantPoolInvokeDynamic(BootstrapMethod b, String name, String type) {
+    return cw.addCPInvokeDynamic(b, name, type);
+  }
+
   /**
    * Convert a JVM type to the internal JVM class name (e.g., Ljava/lang/Object; to java/lang/Object)
    * 
@@ -118,4 +124,4 @@
 
     return name;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/CTDecoder.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/CTDecoder.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/CTDecoder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/CTDecoder.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,7 +51,7 @@
       throw new IllegalArgumentException("s is null");
     }
     if (s.length() > 0 && s.charAt(0) != '[') {
-      return "L" + s + ";";
+      return 'L' + s + ';';
     } else {
       return s;
     }
@@ -79,45 +79,29 @@
       return cp.getItemType(index);
     }
 
-    private Error convertToError(InvalidClassFileException e) {
+    private static Error convertToError(InvalidClassFileException e) {
       e.printStackTrace();
       return new Error("Invalid class file: " + e.getMessage());
     }
 
     @Override
     public int getConstantPoolInteger(int index) {
-      try {
-        return cp.getCPInt(index);
-      } catch (InvalidClassFileException e) {
-        throw convertToError(e);
-      }
+      return cp.getCPInt(index);
     }
 
     @Override
     public float getConstantPoolFloat(int index) {
-      try {
-        return cp.getCPFloat(index);
-      } catch (InvalidClassFileException e) {
-        throw convertToError(e);
-      }
+      return cp.getCPFloat(index);
     }
 
     @Override
     public long getConstantPoolLong(int index) {
-      try {
-        return cp.getCPLong(index);
-      } catch (InvalidClassFileException e) {
-        throw convertToError(e);
-      }
+      return cp.getCPLong(index);
     }
 
     @Override
     public double getConstantPoolDouble(int index) {
-      try {
-        return cp.getCPDouble(index);
-      } catch (InvalidClassFileException e) {
-        throw convertToError(e);
-      }
+      return cp.getCPDouble(index);
     }
 
     @Override
@@ -237,4 +221,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/CTUtils.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/CTUtils.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/CTUtils.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/CTUtils.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,7 +52,7 @@
    * 
    * @param md the method data
    * @param classWriter the target class writer
-   * @param rawLines line number information if available, otherwise <code>null</code>
+   * @param rawLines line number information if available, otherwise {@code null}
    */
   public static void compileAndAddMethodToClassWriter(MethodData md, ClassWriter classWriter, ClassWriter.Element rawLines) {
     if (classWriter == null) {
@@ -94,4 +94,4 @@
     // System.out.println("Name:"+md.getName()+" Sig:"+md.getSignature());
     classWriter.addMethod(md.getAccess(), md.getName(), md.getSignature(), elements);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/OfflineInstrumenter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/OfflineInstrumenter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/OfflineInstrumenter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/OfflineInstrumenter.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,7 +15,6 @@
 import java.io.OutputStream;
 
 import com.ibm.wala.shrikeBT.Util;
-import com.ibm.wala.shrikeBT.analysis.ClassHierarchyProvider;
 import com.ibm.wala.shrikeBT.tools.OfflineInstrumenterBase;
 import com.ibm.wala.shrikeCT.ClassWriter;
 import com.ibm.wala.shrikeCT.InvalidClassFileException;
@@ -25,20 +24,13 @@
  * specialization of OfflineInstrumenterBase to use the shrikeCT functionality.
  */
 final public class OfflineInstrumenter extends OfflineInstrumenterBase {
-  private final boolean reuseStackMaps;
-  /**
-   * Create an empty collection of classes to instrument.
-   */
-  public OfflineInstrumenter(boolean reuseStackMaps) {
-    this.reuseStackMaps = reuseStackMaps;
-  }
 
   @Override
   protected Object makeClassFromStream(String inputName, BufferedInputStream s) throws IOException {
     byte[] bytes = new byte[s.available()];
     Util.readFully(s, bytes);
     try {
-      return new ClassInstrumenter(inputName, bytes, cha, reuseStackMaps);
+      return new ClassInstrumenter(inputName, bytes, cha);
     } catch (InvalidClassFileException e) {
       throw new IOException("Class is invalid: " + e.getMessage());
     }
@@ -93,4 +85,4 @@
       throw new IOException("Invalid class file");
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/AddSerialVersion.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/AddSerialVersion.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/AddSerialVersion.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/AddSerialVersion.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,9 +19,9 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
-import java.util.Comparator;
 
 import com.ibm.wala.shrikeBT.Util;
+import com.ibm.wala.shrikeCT.ClassConstants;
 import com.ibm.wala.shrikeCT.ClassReader;
 import com.ibm.wala.shrikeCT.ClassWriter;
 import com.ibm.wala.shrikeCT.ConstantValueWriter;
@@ -52,7 +52,7 @@
     }
 
     long UID = computeSerialVersionUID(r);
-    w.addField(ClassReader.ACC_PUBLIC | ClassReader.ACC_STATIC | ClassReader.ACC_FINAL, "serialVersionUID", "J",
+    w.addField(ClassConstants.ACC_PUBLIC | ClassConstants.ACC_STATIC | ClassConstants.ACC_FINAL, "serialVersionUID", "J",
         new ClassWriter.Element[] { new ConstantValueWriter(w, UID) });
   }
 
@@ -89,73 +89,69 @@
     } catch (NoSuchAlgorithmException e) {
       throw new Error("SHA algorithm not supported: " + e.getMessage());
     }
-    SinkOutputStream sink = new SinkOutputStream();
-    DataOutputStream out = new DataOutputStream(new DigestOutputStream(sink, digest));
-
-    try {
-      // step 1
-      out.writeUTF(r.getName());
-      // step 2
-      out.writeInt(r.getAccessFlags());
-
-      // step 3
-      String[] interfaces = r.getInterfaceNames();
-      Arrays.sort(interfaces);
-      for (int i = 0; i < interfaces.length; i++) {
-        out.writeUTF(interfaces[i]);
-      }
-
-      // step 4
-      Integer[] fields = new Integer[r.getFieldCount()];
-      final String[] fieldNames = new String[fields.length];
-      int fieldCount = 0;
-      for (int f = 0; f < fields.length; f++) {
-        int flags = r.getFieldAccessFlags(f);
-        if ((flags & ClassReader.ACC_PRIVATE) == 0 || (flags & (ClassReader.ACC_STATIC | ClassReader.ACC_TRANSIENT)) == 0) {
-          fields[fieldCount] = new Integer(f);
-          fieldNames[f] = r.getFieldName(f);
-          fieldCount++;
+    try (
+      SinkOutputStream sink = new SinkOutputStream();
+      DataOutputStream out = new DataOutputStream(new DigestOutputStream(sink, digest));
+    ) {
+      try {
+        // step 1
+        out.writeUTF(r.getName());
+        // step 2
+        out.writeInt(r.getAccessFlags());
+  
+        // step 3
+        String[] interfaces = r.getInterfaceNames();
+        Arrays.sort(interfaces);
+        for (String interface1 : interfaces) {
+          out.writeUTF(interface1);
         }
-      }
-      Arrays.sort(fields, 0, fieldCount, new Comparator<Integer>() {
-        @Override
-        public int compare(Integer o1, Integer o2) {
+  
+        // step 4
+        Integer[] fields = new Integer[r.getFieldCount()];
+        final String[] fieldNames = new String[fields.length];
+        int fieldCount = 0;
+        for (int f = 0; f < fields.length; f++) {
+          int flags = r.getFieldAccessFlags(f);
+          if ((flags & ClassConstants.ACC_PRIVATE) == 0 || (flags & (ClassConstants.ACC_STATIC | ClassConstants.ACC_TRANSIENT)) == 0) {
+            fields[fieldCount] = Integer.valueOf(f);
+            fieldNames[f] = r.getFieldName(f);
+            fieldCount++;
+          }
+        }
+        Arrays.sort(fields, 0, fieldCount, (o1, o2) -> {
           String name1 = fieldNames[o1.intValue()];
           String name2 = fieldNames[o2.intValue()];
           return name1.compareTo(name2);
+        });
+        for (int i = 0; i < fieldCount; i++) {
+          int f = fields[i].intValue();
+          out.writeUTF(fieldNames[f]);
+          out.writeInt(r.getFieldAccessFlags(f));
+          out.writeUTF(r.getFieldType(f));
         }
-      });
-      for (int i = 0; i < fieldCount; i++) {
-        int f = fields[i].intValue();
-        out.writeUTF(fieldNames[f]);
-        out.writeInt(r.getFieldAccessFlags(f));
-        out.writeUTF(r.getFieldType(f));
-      }
-
-      // steps 5, 6 and 7
-      Integer[] methods = new Integer[r.getMethodCount()];
-      final int[] methodKinds = new int[methods.length];
-      final String[] methodSigs = new String[methods.length];
-      int methodCount = 0;
-      for (int m = 0; m < methodSigs.length; m++) {
-        String name = r.getMethodName(m);
-        int flags = r.getMethodAccessFlags(m);
-        if (name.equals("<clinit>") || (flags & ClassReader.ACC_PRIVATE) == 0) {
-          methods[methodCount] = new Integer(m);
-          methodSigs[m] = name + r.getMethodType(m);
-          if (name.equals("<clinit>")) {
-            methodKinds[m] = 0;
-          } else if (name.equals("<init>")) {
-            methodKinds[m] = 1;
-          } else {
-            methodKinds[m] = 2;
+  
+        // steps 5, 6 and 7
+        Integer[] methods = new Integer[r.getMethodCount()];
+        final int[] methodKinds = new int[methods.length];
+        final String[] methodSigs = new String[methods.length];
+        int methodCount = 0;
+        for (int m = 0; m < methodSigs.length; m++) {
+          String name = r.getMethodName(m);
+          int flags = r.getMethodAccessFlags(m);
+          if (name.equals("<clinit>") || (flags & ClassConstants.ACC_PRIVATE) == 0) {
+            methods[methodCount] = Integer.valueOf(m);
+            methodSigs[m] = name + r.getMethodType(m);
+            if (name.equals("<clinit>")) {
+              methodKinds[m] = 0;
+            } else if (name.equals("<init>")) {
+              methodKinds[m] = 1;
+            } else {
+              methodKinds[m] = 2;
+            }
+            methodCount++;
           }
-          methodCount++;
         }
-      }
-      Arrays.sort(methods, 0, methodCount, new Comparator<Integer>() {
-        @Override
-        public int compare(Integer o1, Integer o2) {
+        Arrays.sort(methods, 0, methodCount, (o1, o2) -> {
           int m1 = o1.intValue();
           int m2 = o2.intValue();
           if (methodKinds[m1] != methodKinds[m2]) {
@@ -164,21 +160,17 @@
           String name1 = methodSigs[m1];
           String name2 = methodSigs[m2];
           return name1.compareTo(name2);
+        });
+        for (int i = 0; i < methodCount; i++) {
+          int m = methods[i].intValue();
+          out.writeUTF(r.getMethodName(m));
+          out.writeInt(r.getMethodAccessFlags(m));
+          out.writeUTF(r.getMethodType(m));
         }
-      });
-      for (int i = 0; i < methodCount; i++) {
-        int m = methods[i].intValue();
-        out.writeUTF(r.getMethodName(m));
-        out.writeInt(r.getMethodAccessFlags(m));
-        out.writeUTF(r.getMethodType(m));
-      }
-    } catch (IOException e1) {
-      throw new Error("Unexpected IOException: " + e1.getMessage());
-    } finally {
-      try {
-        out.close();
-      } catch (IOException e2) {
+      } catch (IOException e1) {
+        throw new Error("Unexpected IOException: " + e1.getMessage());
       }
+    } catch (IOException e2) {
     }
 
     byte[] hash = digest.digest();
@@ -191,8 +183,8 @@
       if (args[i] == null) {
         throw new IllegalArgumentException("args[" + i + "] is null");
       }
-      try {
-        byte[] data = Util.readFully(new FileInputStream(args[i]));
+      try (final FileInputStream in = new FileInputStream(args[i])) {
+        byte[] data = Util.readFully(in);
         ClassReader r = new ClassReader(data);
         System.out.println(Util.makeClass(r.getName()) + ": serialVersionUID = " + computeSerialVersionUID(r));
       } catch (FileNotFoundException e) {
@@ -204,4 +196,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BatchVerifier.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BatchVerifier.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BatchVerifier.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BatchVerifier.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,27 +48,28 @@
   private static int errors = 0;
 
   public static void main(String[] args) throws Exception {
-    OfflineInstrumenter oi = new OfflineInstrumenter(true);
+    OfflineInstrumenter oi = new OfflineInstrumenter();
     args = oi.parseStandardArgs(args);
 
-    for (int i = 0; i < args.length; i++) {
-      if (args[i].equals("-d")) {
+    for (String arg : args) {
+      if (arg.equals("-d")) {
         disasm = true;
       }
     }
 
-    PrintWriter w = new PrintWriter(new BufferedWriter(new FileWriter("report", false)));
+    try (final PrintWriter w = new PrintWriter(new BufferedWriter(new FileWriter("report", false)))) {
 
-    oi.beginTraversal();
-    ClassInstrumenter ci;
-    while ((ci = oi.nextClass()) != null) {
-      ClassReader cr = ci.getReader();
-      CTUtils.addClassToHierarchy(store, cr);
-    }
+      oi.beginTraversal();
+      ClassInstrumenter ci;
+      while ((ci = oi.nextClass()) != null) {
+        ClassReader cr = ci.getReader();
+        CTUtils.addClassToHierarchy(store, cr);
+      }
 
-    oi.beginTraversal();
-    while ((ci = oi.nextClass()) != null) {
-      doClass(ci.getReader(), w);
+      oi.beginTraversal();
+      while ((ci = oi.nextClass()) != null) {
+        doClass(ci.getReader(), w);
+      }
     }
 
     oi.close();
@@ -80,7 +81,7 @@
 
   private static void doClass(final ClassReader cr, PrintWriter w) throws Exception {
     int methodCount = cr.getMethodCount();
-    w.write("Verifying " + cr.getName() + "\n");
+    w.write("Verifying " + cr.getName() + '\n');
     w.flush();
 
     ClassReader.AttrIterator iter = new ClassReader.AttrIterator();
@@ -89,7 +90,7 @@
       cr.initMethodAttributeIterator(i, iter);
       for (; iter.isValid(); iter.advance()) {
         if (iter.getName().equals("Code")) {
-          w.write("Verifying " + cr.getName() + "." + cr.getMethodName(i) + " " + cr.getMethodType(i) + ":\n");
+          w.write("Verifying " + cr.getName() + '.' + cr.getMethodName(i) + ' ' + cr.getMethodType(i) + ":\n");
           w.flush();
 
           CodeReader code = new CodeReader(iter);
@@ -124,4 +125,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BootstrapDumper.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BootstrapDumper.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BootstrapDumper.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BootstrapDumper.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,6 @@
 
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.lang.invoke.CallSite;
@@ -41,7 +40,7 @@
   }
 
   public static void main(String[] args) throws Exception {
-    OfflineInstrumenter oi = new OfflineInstrumenter(true);
+    OfflineInstrumenter oi = new OfflineInstrumenter();
     String[] classpathEntries = oi.parseStandardArgs(args);
     
     PrintWriter w = new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out)));
@@ -55,25 +54,25 @@
       assert f.exists();
       urls[i-1] = f.toURI().toURL(); 
     }
-    URLClassLoader image = URLClassLoader.newInstance(urls, BootstrapDumper.class.getClassLoader().getParent());
-    
-    System.err.println(image);
-    
-    ClassInstrumenter ci;
-    oi.beginTraversal();
-    while ((ci = oi.nextClass()) != null) {
-      try {
-        p.doClass(image, ci.getReader());
-      } finally {
-        w.flush();
+    try (final URLClassLoader image = URLClassLoader.newInstance(urls, BootstrapDumper.class.getClassLoader().getParent())) {
+      System.err.println(image);
+
+      ClassInstrumenter ci;
+      oi.beginTraversal();
+      while ((ci = oi.nextClass()) != null) {
+        try {
+          p.doClass(image, ci.getReader());
+        } finally {
+          w.flush();
+        }
       }
     }
 
     oi.close();
   }
 
-  private void dumpAttributes(Class cl, ClassReader cr, int i, ClassReader.AttrIterator attrs) throws InvalidClassFileException,
-      InvalidBytecodeException, IOException, ClassNotFoundException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchFieldException {
+  private void dumpAttributes(Class<?> cl, ClassReader.AttrIterator attrs) throws InvalidClassFileException,
+      InvalidBytecodeException, ClassNotFoundException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchFieldException {
     for (; attrs.isValid(); attrs.advance()) {
       String name = attrs.getName();
       if (name.equals("Code")) {
@@ -105,16 +104,10 @@
 
   /**
    * Print a class.
-   * @throws InvocationTargetException 
-   * @throws IllegalAccessException 
-   * @throws SecurityException 
-   * @throws NoSuchMethodException 
-   * @throws ClassNotFoundException 
-   * 
+   *
    * @throws IllegalArgumentException if cr is null
-   * @throws NoSuchFieldException 
    */
-  public void doClass(ClassLoader image, final ClassReader cr) throws InvalidClassFileException, InvalidBytecodeException, IOException, ClassNotFoundException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchFieldException {
+  public void doClass(ClassLoader image, final ClassReader cr) throws InvalidClassFileException, InvalidBytecodeException, ClassNotFoundException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchFieldException {
     if (cr == null) {
       throw new IllegalArgumentException("cr is null");
     }
@@ -125,7 +118,7 @@
     
     for (int i = 0; i < methodCount; i++) {
       cr.initMethodAttributeIterator(i, attrs);
-      dumpAttributes(Class.forName(cr.getName().replace('/', '.'), false, image), cr, i, attrs);
+      dumpAttributes(Class.forName(cr.getName().replace('/', '.'), false, image), attrs);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BootstrapInstrumentor.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BootstrapInstrumentor.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BootstrapInstrumentor.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/BootstrapInstrumentor.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,10 +11,8 @@
 package com.ibm.wala.shrikeBT.shrikeCT.tools;
 
 import java.io.BufferedWriter;
-import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
 import java.util.Set;
 
 import com.ibm.wala.shrikeBT.ConstantInstruction;
@@ -57,7 +55,7 @@
   }
 
   public void doit(String[] args) throws Exception {
-    OfflineInstrumenter oi = new OfflineInstrumenter(true);
+    OfflineInstrumenter oi = new OfflineInstrumenter();
     oi.parseStandardArgs(args);
    
     oi.setPassUnmodifiedClasses(true);
@@ -81,8 +79,8 @@
     oi.close();
   }
 
-  private Set<MethodData> dumpAttributes(ClassInstrumenter ci, int i, ClassReader.AttrIterator attrs) throws InvalidClassFileException,
-      InvalidBytecodeException, IOException, ClassNotFoundException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchFieldException {
+  private Set<MethodData> dumpAttributes(ClassInstrumenter ci, ClassReader.AttrIterator attrs) throws InvalidClassFileException,
+      InvalidBytecodeException, SecurityException, IllegalArgumentException {
     Set<MethodData> result = HashSetFactory.make();
     ClassReader cr = ci.getReader();
     for (; attrs.isValid(); attrs.advance()) {
@@ -131,16 +129,9 @@
 
   /**
    * Print a class.
-   * @throws InvocationTargetException 
-   * @throws IllegalAccessException 
-   * @throws SecurityException 
-   * @throws NoSuchMethodException 
-   * @throws ClassNotFoundException 
-   * 
    * @throws IllegalArgumentException if cr is null
-   * @throws NoSuchFieldException 
    */
-  public Set<MethodData> doClass(final ClassInstrumenter ci) throws InvalidClassFileException, InvalidBytecodeException, IOException, ClassNotFoundException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchFieldException {
+  public Set<MethodData> doClass(final ClassInstrumenter ci) throws InvalidClassFileException, InvalidBytecodeException, SecurityException, IllegalArgumentException {
     ClassReader cr = ci.getReader();
     ClassReader.AttrIterator attrs = new ClassReader.AttrIterator();
     cr.initClassAttributeIterator(attrs);
@@ -149,9 +140,9 @@
     Set<MethodData> result = HashSetFactory.make();
     for (int i = 0; i < methodCount; i++) {
       cr.initMethodAttributeIterator(i, attrs);
-      result.addAll(dumpAttributes(ci, i, attrs));
+      result.addAll(dumpAttributes(ci, attrs));
     }
     
     return result;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/ClassPrinter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/ClassPrinter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/ClassPrinter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/ClassPrinter.java	2019-01-29 17:08:39.000000000 +0000
@@ -72,7 +72,7 @@
   }
 
   public static void main(String[] args) throws Exception {
-    OfflineInstrumenter oi = new OfflineInstrumenter(true);
+    OfflineInstrumenter oi = new OfflineInstrumenter();
     args = oi.parseStandardArgs(args);
 
     PrintWriter w = new PrintWriter(new BufferedWriter(new OutputStreamWriter(System.out)));
@@ -95,7 +95,7 @@
   private static final char[] hexChars = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
 
   private static String makeHex(byte[] bytes, int pos, int len, int padTo) {
-    StringBuffer b = new StringBuffer();
+    StringBuilder b = new StringBuilder();
     for (int i = pos; i < pos + len; i++) {
       byte v = bytes[i];
       b.append(hexChars[(v >> 4) & 0xF]);
@@ -108,7 +108,7 @@
   }
 
   private static String makeChars(byte[] bytes, int pos, int len) {
-    StringBuffer b = new StringBuffer();
+    StringBuilder b = new StringBuilder();
     for (int i = pos; i < pos + len; i++) {
       char ch = (char) bytes[i];
       if (ch < 32 || ch > 127) {
@@ -129,15 +129,15 @@
   }
 
   private static String dumpFlags(int flags) {
-    StringBuffer buf = new StringBuffer();
+    StringBuilder buf = new StringBuilder();
     Class<Constants> c = Constants.class;
     Field[] fs = c.getDeclaredFields();
-    for (int i = 0; i < fs.length; i++) {
-      String name = fs[i].getName();
+    for (Field element : fs) {
+      String name = element.getName();
       if (name.startsWith("ACC_")) {
         int val;
         try {
-          val = fs[i].getInt(null);
+          val = element.getInt(null);
         } catch (IllegalArgumentException e) {
           throw new Error(e.getMessage());
         } catch (IllegalAccessException e) {
@@ -145,25 +145,25 @@
         }
         if ((flags & val) != 0) {
           if (buf.length() > 0) {
-            buf.append(" ");
+            buf.append(' ');
           }
           buf.append(name.substring(4).toLowerCase());
         }
       }
     }
-    return "0x" + Integer.toString(16, flags) + "(" + buf.toString() + ")";
+    return "0x" + Integer.toString(16, flags) + '(' + buf + ')';
   }
 
-  private void dumpAttributes(ClassReader cr, int i, ClassReader.AttrIterator attrs) throws InvalidClassFileException,
+  private void dumpAttributes(ClassReader cr, ClassReader.AttrIterator attrs) throws InvalidClassFileException,
       InvalidBytecodeException, IOException {
     for (; attrs.isValid(); attrs.advance()) {
       String name = attrs.getName();
-      w.write("  " + name + ": @" + Integer.toString(attrs.getRawOffset(), 16) + "\n");
+      w.write("  " + name + ": @" + Integer.toString(attrs.getRawOffset(), 16) + '\n');
       if (name.equals("Code")) {
         CodeReader code = new CodeReader(attrs);
 
-        w.write("    maxstack: " + code.getMaxStack() + "\n");
-        w.write("    maxlocals: " + code.getMaxLocals() + "\n");
+        w.write("    maxstack: " + code.getMaxStack() + '\n');
+        w.write("    maxlocals: " + code.getMaxLocals() + '\n');
 
         w.write("    bytecode:\n");
         int[] rawHandlers = code.getRawHandlers();
@@ -176,14 +176,14 @@
         w.write("    exception handlers:\n");
         for (int e = 0; e < rawHandlers.length; e += 4) {
           w.write("      " + rawHandlers[e] + " to " + rawHandlers[e + 1] + " catch " + getClassName(cr, rawHandlers[e + 3])
-              + " at " + rawHandlers[e + 2] + "\n");
+              + " at " + rawHandlers[e + 2] + '\n');
         }
 
         ClassReader.AttrIterator codeAttrs = new ClassReader.AttrIterator();
         code.initAttributeIterator(codeAttrs);
         for (; codeAttrs.isValid(); codeAttrs.advance()) {
           String cName = codeAttrs.getName();
-          w.write("    " + cName + ": " + Integer.toString(codeAttrs.getRawOffset(), 16) + "\n");
+          w.write("    " + cName + ": " + Integer.toString(codeAttrs.getRawOffset(), 16) + '\n');
         }
 
         if (printLineNumberInfo) {
@@ -194,7 +194,7 @@
             int count = 0;
             for (int j = 0; j < map.length; j++) {
               String line2 = "      " + j + ": " + map[j];
-              if (line == null || line2 == null || !line2.substring(line2.indexOf(':')).equals(line.substring(line.indexOf(':')))) {
+              if (line == null || !line2.substring(line2.indexOf(':')).equals(line.substring(line.indexOf(':')))) {
                 if (count > 1) {
                   w.write(" (" + count + " times)\n");
                 } else if (count > 0) {
@@ -223,12 +223,12 @@
             int[] vars = locals[j];
             String line2 = null;
             if (vars != null) {
-              StringBuffer buf = new StringBuffer();
-              buf.append("      " + j + ":");
+              StringBuilder buf = new StringBuilder();
+              buf.append("      ").append(j).append(':');
               for (int k = 0; k < vars.length; k += 2) {
                 if (vars[k] != 0) {
-                  String n = cr.getCP().getCPUtf8(vars[k]) + "(" + cr.getCP().getCPUtf8(vars[k + 1]) + ")";
-                  buf.append(" " + (k / 2) + ":" + n);
+                  String n = cr.getCP().getCPUtf8(vars[k]) + '(' + cr.getCP().getCPUtf8(vars[k + 1]) + ')';
+                  buf.append(' ').append(k / 2).append(':').append(n);
                 }
               }
               line2 = buf.toString();
@@ -257,22 +257,22 @@
         }
       } else if (name.equals("ConstantValue")) {
         ConstantValueReader cv = new ConstantValueReader(attrs);
-        w.write("    value: " + getCPItemString(cr.getCP(), cv.getValueCPIndex()) + "\n");
+        w.write("    value: " + getCPItemString(cr.getCP(), cv.getValueCPIndex()) + '\n');
       } else if (name.equals("SourceFile")) {
         SourceFileReader sr = new SourceFileReader(attrs);
-        w.write("    file: " + cr.getCP().getCPUtf8(sr.getSourceFileCPIndex()) + "\n");
+        w.write("    file: " + cr.getCP().getCPUtf8(sr.getSourceFileCPIndex()) + '\n');
       } else if (name.equals("Signature")) {
         SignatureReader sr = new SignatureReader(attrs);
-        w.write("    signature: " + cr.getCP().getCPUtf8(sr.getSignatureCPIndex()) + "\n");
+        w.write("    signature: " + cr.getCP().getCPUtf8(sr.getSignatureCPIndex()) + '\n');
       } else if (AnnotationsReader.isKnownAnnotation(name)) {
         AnnotationsReader r = new AnnotationsReader(attrs, name);
-        printAnnotations(cr, attrs, r);
+        printAnnotations(r);
       } else {
         int len = attrs.getDataSize();
         int pos = attrs.getDataOffset();
         while (len > 0) {
           int amount = Math.min(16, len);
-          w.write("    " + makeHex(cr.getBytes(), pos, amount, 32) + " " + makeChars(cr.getBytes(), pos, amount) + "\n");
+          w.write("    " + makeHex(cr.getBytes(), pos, amount, 32) + ' ' + makeChars(cr.getBytes(), pos, amount) + '\n');
           len -= amount;
           pos += amount;
         }
@@ -280,10 +280,10 @@
     }
   }
 
-  private void printAnnotations(ClassReader cr, ClassReader.AttrIterator attrs, AnnotationsReader r)
+  private void printAnnotations(AnnotationsReader r)
       throws InvalidClassFileException {
     for (AnnotationAttribute annot : r.getAllAnnotations()) {
-      w.write("    Annotation type: " + annot.type + "\n");      
+      w.write("    Annotation type: " + annot.type + '\n');
     }
   }
 
@@ -305,20 +305,20 @@
     case ClassConstants.CONSTANT_Long:
       return "Long " + cp.getCPLong(i);
     case ClassConstants.CONSTANT_MethodRef:
-      return "Method " + cp.getCPRefClass(i) + " " + cp.getCPRefName(i) + " " + cp.getCPRefType(i);
+      return "Method " + cp.getCPRefClass(i) + ' ' + cp.getCPRefName(i) + ' ' + cp.getCPRefType(i);
     case ClassConstants.CONSTANT_FieldRef:
-      return "Field " + cp.getCPRefClass(i) + " " + cp.getCPRefName(i) + " " + cp.getCPRefType(i);
+      return "Field " + cp.getCPRefClass(i) + ' ' + cp.getCPRefName(i) + ' ' + cp.getCPRefType(i);
     case ClassConstants.CONSTANT_InterfaceMethodRef:
-      return "InterfaceMethod " + cp.getCPRefClass(i) + " " + cp.getCPRefName(i) + " " + cp.getCPRefType(i);
+      return "InterfaceMethod " + cp.getCPRefClass(i) + ' ' + cp.getCPRefName(i) + ' ' + cp.getCPRefType(i);
     case ClassConstants.CONSTANT_NameAndType:
-      return "NameAndType " + cp.getCPNATType(i) + " " + cp.getCPNATName(i);
+      return "NameAndType " + cp.getCPNATType(i) + ' ' + cp.getCPNATName(i);
     default:
       return "Unknown type " + t;
     }
   }
 
   private static String quoteString(String string) {
-    StringBuffer buf = new StringBuffer();
+    StringBuilder buf = new StringBuilder();
     buf.append('"');
     for (int i = 0; i < string.length(); i++) {
       char ch = string.charAt(i);
@@ -364,7 +364,7 @@
     if (cr == null) {
       throw new IllegalArgumentException("cr is null");
     }
-    w.write("Class: " + cr.getName() + "\n");
+    w.write("Class: " + cr.getName() + '\n');
 
     if (printConstantPool) {
       ConstantPoolParser cp = cr.getCP();
@@ -380,25 +380,25 @@
 
     ClassReader.AttrIterator attrs = new ClassReader.AttrIterator();
     cr.initClassAttributeIterator(attrs);
-    dumpAttributes(cr, 0, attrs);
+    dumpAttributes(cr, attrs);
     w.write("\n");
 
     int fieldCount = cr.getFieldCount();
     w.write(fieldCount + " fields:\n");
     for (int i = 0; i < fieldCount; i++) {
-      w.write(cr.getFieldName(i) + " " + cr.getFieldType(i) + " " + dumpFlags(cr.getFieldAccessFlags(i)) + "\n");
+      w.write(cr.getFieldName(i) + ' ' + cr.getFieldType(i) + ' ' + dumpFlags(cr.getFieldAccessFlags(i)) + '\n');
       cr.initFieldAttributeIterator(i, attrs);
-      dumpAttributes(cr, i, attrs);
+      dumpAttributes(cr, attrs);
     }
     w.write("\n");
 
     int methodCount = cr.getMethodCount();
     w.write(methodCount + " methods:\n");
     for (int i = 0; i < methodCount; i++) {
-      w.write(cr.getMethodName(i) + " " + cr.getMethodType(i) + " " + dumpFlags(cr.getMethodAccessFlags(i)) + "\n");
+      w.write(cr.getMethodName(i) + ' ' + cr.getMethodType(i) + ' ' + dumpFlags(cr.getMethodAccessFlags(i)) + '\n');
       cr.initMethodAttributeIterator(i, attrs);
-      dumpAttributes(cr, i, attrs);
+      dumpAttributes(cr, attrs);
     }
     w.write("\n");
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/ClassSearcher.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/ClassSearcher.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/ClassSearcher.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/ClassSearcher.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,6 +16,7 @@
 
 import com.ibm.wala.shrikeBT.shrikeCT.ClassInstrumenter;
 import com.ibm.wala.shrikeBT.shrikeCT.OfflineInstrumenter;
+import com.ibm.wala.shrikeCT.ClassConstants;
 import com.ibm.wala.shrikeCT.ClassReader;
 import com.ibm.wala.shrikeCT.ConstantPoolParser;
 
@@ -36,18 +37,18 @@
   private static int scanned = 0;
 
   public static void main(String[] args) throws Exception {
-    instrumenter = new OfflineInstrumenter(true);
+    instrumenter = new OfflineInstrumenter();
 
-    Writer w = new BufferedWriter(new FileWriter("report", true));
+    try (final Writer w = new BufferedWriter(new FileWriter("report", true))) {
 
-    instrumenter.parseStandardArgs(args);
-    instrumenter.beginTraversal();
-    ClassInstrumenter ci;
-    while ((ci = instrumenter.nextClass()) != null) {
-      doClass(ci, w, instrumenter.getLastClassResourceName());
+      instrumenter.parseStandardArgs(args);
+      instrumenter.beginTraversal();
+      ClassInstrumenter ci;
+      while ((ci = instrumenter.nextClass()) != null) {
+        doClass(ci, w, instrumenter.getLastClassResourceName());
+      }
+      instrumenter.close();
     }
-    instrumenter.close();
-    w.close();
 
     System.out.println("Classes scanned: " + scanned);
   }
@@ -60,9 +61,9 @@
     ClassReader r = ci.getReader();
     ConstantPoolParser cp = r.getCP();
     for (int i = 1; i < cp.getItemCount(); i++) {
-      if (cp.getItemType(i) == ConstantPoolParser.CONSTANT_Class && (cp.getCPClass(i).equals(cl1) || cp.getCPClass(i).equals(cl2))) {
-        w.write(cp.getCPClass(i) + " " + resource + " " + r.getName() + "\n");
+      if (cp.getItemType(i) == ClassConstants.CONSTANT_Class && (cp.getCPClass(i).equals(cl1) || cp.getCPClass(i).equals(cl2))) {
+        w.write(cp.getCPClass(i) + ' ' + resource + ' ' + r.getName() + '\n');
       }
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/MethodTracer.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/MethodTracer.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/MethodTracer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/shrikeCT/tools/MethodTracer.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,16 +51,17 @@
 
   public static void main(String[] args) throws Exception {
     for (int i = 0; i < 1; i++) {
-      instrumenter = new OfflineInstrumenter(true);
+      instrumenter = new OfflineInstrumenter();
 
-      Writer w = new BufferedWriter(new FileWriter("report", false));
+      try (final Writer w = new BufferedWriter(new FileWriter("report", false))) {
 
-      instrumenter.parseStandardArgs(args);
-      instrumenter.setPassUnmodifiedClasses(false);
-      instrumenter.beginTraversal();
-      ClassInstrumenter ci;
-      while ((ci = instrumenter.nextClass()) != null) {
-        doClass(ci, w);
+        instrumenter.parseStandardArgs(args);
+        instrumenter.setPassUnmodifiedClasses(false);
+        instrumenter.beginTraversal();
+        ClassInstrumenter ci;
+        while ((ci = instrumenter.nextClass()) != null) {
+          doClass(ci, w);
+        }
       }
       instrumenter.close();
     }
@@ -74,7 +75,7 @@
   static final Instruction callPrintln = Util.makeInvoke(PrintStream.class, "println", new Class[] { String.class });
 
   private static void doClass(final ClassInstrumenter ci, Writer w) throws Exception {
-    w.write("Class: " + ci.getReader().getName() + "\n");
+    w.write("Class: " + ci.getReader().getName() + '\n');
     w.flush();
 
     for (int i = 0; i < ci.getReader().getMethodCount(); i++) {
@@ -82,7 +83,7 @@
 
       // d could be null, e.g., if the method is abstract or native
       if (d != null) {
-        w.write("Instrumenting " + ci.getReader().getMethodName(i) + " " + ci.getReader().getMethodType(i) + ":\n");
+        w.write("Instrumenting " + ci.getReader().getMethodName(i) + ' ' + ci.getReader().getMethodType(i) + ":\n");
         w.flush();
 
         if (disasm) {
@@ -99,7 +100,7 @@
 
         MethodEditor me = new MethodEditor(d);
         me.beginPass();
-        final String msg0 = "Call to " + Util.makeClass("L" + ci.getReader().getName() + ";") + "."
+        final String msg0 = "Call to " + Util.makeClass('L' + ci.getReader().getName() + ';') + '.'
             + ci.getReader().getMethodName(i);
 
         me.insertAtStart(new MethodEditor.Patch() {
@@ -115,8 +116,8 @@
           for (int k = 0; k < ins.length; k++) {
             if (ins[k] instanceof InvokeInstruction) {
               InvokeInstruction instr = (InvokeInstruction) ins[k];
-              final String msg = "Call from " + Util.makeClass("L" + ci.getReader().getName() + ";") + "."
-                  + ci.getReader().getMethodName(i) + ":" + k + " to target " + Util.makeClass(instr.getClassType()) + "."
+              final String msg = "Call from " + Util.makeClass('L' + ci.getReader().getName() + ';') + '.'
+                  + ci.getReader().getMethodName(i) + ':' + k + " to target " + Util.makeClass(instr.getClassType()) + '.'
                   + instr.getMethodName();
               me.insertBefore(k, new MethodEditor.Patch() {
                 @Override
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/StoreInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/StoreInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/StoreInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/StoreInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -87,7 +87,7 @@
 
   @Override
   public String toString() {
-    return "LocalStore(" + getType() + "," + index + ")";
+    return "LocalStore(" + getType() + ',' + index + ')';
   }
 
   @Override
@@ -99,4 +99,4 @@
   public boolean isPEI() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/SwapInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/SwapInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/SwapInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/SwapInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -57,4 +57,4 @@
   public boolean isPEI() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/SwitchInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/SwitchInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/SwitchInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/SwitchInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -129,13 +129,13 @@
 
   @Override
   public String toString() {
-    StringBuffer b = new StringBuffer("Switch(");
+    StringBuilder b = new StringBuilder("Switch(");
     b.append(defaultLabel);
-    for (int i = 0; i < casesAndLabels.length; i++) {
+    for (int casesAndLabel : casesAndLabels) {
       b.append(',');
-      b.append(casesAndLabels[i]);
+      b.append(casesAndLabel);
     }
-    b.append(")");
+    b.append(')');
     return b.toString();
   }
 
@@ -151,4 +151,4 @@
   public boolean isPEI() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ThrowInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ThrowInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ThrowInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/ThrowInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -74,4 +74,4 @@
   public boolean isPEI() {
     return true;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/tools/MethodOptimizer.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/tools/MethodOptimizer.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/tools/MethodOptimizer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/tools/MethodOptimizer.java	2019-01-29 17:08:39.000000000 +0000
@@ -134,14 +134,14 @@
 
     for (int i = 0; i < instructions.length; i++) {
       int[] targets = instructions[i].getBranchTargets();
-      for (int j = 0; j < targets.length; j++) {
-        int target = targets[j];
+      for (int target2 : targets) {
+        int target = target2;
         backEdges[target][backEdgeCount[target]] = i;
         backEdgeCount[target]++;
       }
       ExceptionHandler[] hs = handlers[i];
-      for (int j = 0; j < hs.length; j++) {
-        int target = hs[j].getHandler();
+      for (ExceptionHandler element : hs) {
+        int target = element.getHandler();
         backEdges[target][backEdgeCount[target]] = i;
         backEdgeCount[target]++;
       }
@@ -155,8 +155,8 @@
     checkStackSizesAt(0, 0);
 
     int result = 0;
-    for (int i = 0; i < stackSizes.length; i++) {
-      result = Math.max(result, stackSizes[i]);
+    for (int stackSize : stackSizes) {
+      result = Math.max(result, stackSize);
     }
     return result;
   }
@@ -189,13 +189,13 @@
       }
 
       int[] targets = instr.getBranchTargets();
-      for (int i = 0; i < targets.length; i++) {
-        checkStackSizesAt(targets[i], stackSize);
+      for (int target : targets) {
+        checkStackSizesAt(target, stackSize);
       }
 
       ExceptionHandler[] hs = handlers[instruction];
-      for (int i = 0; i < hs.length; i++) {
-        checkStackSizesAt(hs[i].getHandler(), 1);
+      for (ExceptionHandler element : hs) {
+        checkStackSizesAt(element.getHandler(), 1);
       }
 
       if (!instr.isFallThrough()) {
@@ -384,13 +384,13 @@
       }
 
       int[] targets = instructions[instruction].getBranchTargets();
-      for (int i = 0; i < targets.length; i++) {
-        followStackDef(abstractDefStacks, def, targets[i], stackPointer);
+      for (int target : targets) {
+        followStackDef(abstractDefStacks, def, target, stackPointer);
       }
 
       ExceptionHandler[] hs = handlers[instruction];
-      for (int i = 0; i < hs.length; i++) {
-        followStackDef(abstractDefStacks, -1, hs[i].getHandler(), 0);
+      for (ExceptionHandler element : hs) {
+        followStackDef(abstractDefStacks, -1, element.getHandler(), 0);
       }
 
       if (!instructions[instruction].isFallThrough()) {
@@ -418,8 +418,8 @@
       }
 
       int[] back = backEdges[instruction];
-      for (int i = 0; i < back.length; i++) {
-        followStackUse(abstractUseStacks, use, back[i], stackPointer);
+      for (int element : back) {
+        followStackUse(abstractUseStacks, use, element, stackPointer);
       }
 
       if (instruction == 0 || !instructions[instruction - 1].isFallThrough()) {
@@ -447,8 +447,8 @@
       bits.set(from);
 
       int[] targets = instructions[from].getBranchTargets();
-      for (int i = 0; i < targets.length; i++) {
-        getReachableInstructions(bits, targets[i], to);
+      for (int target : targets) {
+        getReachableInstructions(bits, target, to);
       }
 
       if (!instructions[from].isFallThrough()) {
@@ -467,8 +467,8 @@
       bits.set(to);
 
       int[] targets = backEdges[to];
-      for (int i = 0; i < targets.length; i++) {
-        getReachingInstructions(bits, from, targets[i]);
+      for (int target : targets) {
+        getReachingInstructions(bits, from, target);
       }
 
       if (to == 0 || !instructions[to - 1].isFallThrough()) {
@@ -477,4 +477,4 @@
       to--;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/tools/OfflineInstrumenterBase.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/tools/OfflineInstrumenterBase.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/tools/OfflineInstrumenterBase.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/tools/OfflineInstrumenterBase.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,13 +13,13 @@
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.BitSet;
 import java.util.Enumeration;
 import java.util.HashSet;
@@ -27,7 +27,6 @@
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
 
 import com.ibm.wala.shrikeBT.analysis.ClassHierarchyProvider;
 
@@ -38,9 +37,9 @@
 public abstract class OfflineInstrumenterBase {
   private int inputIndex;
 
-  final private HashSet<String> entryNames = new HashSet<String>();
+  final private HashSet<String> entryNames = new HashSet<>();
 
-  final private ArrayList<Input> inputs = new ArrayList<Input>();
+  final private ArrayList<Input> inputs = new ArrayList<>();
 
   final private BitSet ignoringInputs = new BitSet();
 
@@ -128,6 +127,7 @@
     }
 
     @Override
+    @SuppressWarnings("resource")
     public InputStream open() throws IOException {
       JarFile cachedJar = openCachedJar(file);
       return cachedJar.getInputStream(cachedJar.getEntry(name));
@@ -135,7 +135,7 @@
 
     @Override
     public String toString() {
-      return file.getPath() + "#" + name;
+      return file.getPath() + '#' + name;
     }
 
     @Override
@@ -151,6 +151,7 @@
     /**
      * Get the underlying ZipEntry corresponding to this resource.
      */
+    @SuppressWarnings("resource")
     public ZipEntry getEntry() throws IOException {
       JarFile cachedJar = openCachedJar(file);
       return cachedJar.getEntry(name);
@@ -170,7 +171,7 @@
         cachedJar.close();
       }
       cachedJarFile = file;
-      cachedJar = new JarFile(file);
+      cachedJar = new JarFile(file, false);
       return cachedJar;
     }
   }
@@ -230,19 +231,19 @@
    * Add a JAR file containing source classes to instrument.
    */
   final public void addInputJar(File f) throws IOException {
-    JarFile jf = new JarFile(f);
-    for (Enumeration<JarEntry> e = jf.entries(); e.hasMoreElements();) {
-      JarEntry entry = e.nextElement();
-      String name = entry.getName();
-      inputs.add(new JarInput(f, name));
+    try (final JarFile jf = new JarFile(f, false)) {
+      for (Enumeration<JarEntry> e = jf.entries(); e.hasMoreElements();) {
+        JarEntry entry = e.nextElement();
+        String name = entry.getName();
+        inputs.add(new JarInput(f, name));
+      }
     }
-    jf.close();
   }
 
   /**
    * Add a JAR entry containing a source class to instrument.
    */
-  final public void addInputJarEntry(File f, String name) throws IOException {
+  final public void addInputJarEntry(File f, String name) {
     inputs.add(new JarInput(f, name));
   }
 
@@ -262,17 +263,11 @@
     if (d == null) {
       throw new IllegalArgumentException("d is null");
     }
-    File[] fs = d.listFiles(new FileFilter() {
-      @Override
-      public boolean accept(File f) {
-        return f.isDirectory() || f.getName().endsWith(".class");
-      }
-    });
+    File[] fs = d.listFiles(f -> f.isDirectory() || f.getName().endsWith(".class"));
     if (fs == null) {
       throw new IllegalArgumentException("bad directory " + d.getAbsolutePath());
     }
-    for (int i = 0; i < fs.length; i++) {
-      File f = fs[i];
+    for (File f : fs) {
       if (f.isDirectory()) {
         addInputDirectory(baseDirectory, f);
       } else {
@@ -329,7 +324,7 @@
     if (args == null) {
       throw new IllegalArgumentException("args == null");
     }
-    ArrayList<String> leftover = new ArrayList<String>();
+    ArrayList<String> leftover = new ArrayList<>();
 
     for (int i = 0; i < args.length; i++) {
       String a = args[i];
@@ -345,9 +340,7 @@
           continue;
         }
       } else if (a.startsWith("--")) {
-        for (int j = i; j < args.length; j++) {
-          leftover.add(args[j]);
-        }
+        leftover.addAll(Arrays.asList(args).subList(i, args.length));
         break;
       }
       leftover.add(a);
@@ -388,14 +381,11 @@
         if (ignoringInputs.get(inputIndex - 1) || !in.isClass()) {
           continue;
         }
-        BufferedInputStream s = new BufferedInputStream(in.open());
-        try {
+        try (final BufferedInputStream s = new BufferedInputStream(in.open())) {
           Object r = makeClassFromStream(in.getInputName(), s);
           String name = getClassName(r);
           in.setClassName(name);
           return r;
-        } finally {
-          s.close();
         }
       }
     }
@@ -455,14 +445,16 @@
         throw new IllegalStateException("Output file was not set");
       }
 
-      outputJar = new JarOutputStream(new FileOutputStream(outputFile));
+      @SuppressWarnings("resource")
+      final FileOutputStream out = new FileOutputStream(outputFile);
+      outputJar = new JarOutputStream(out);
     }
   }
 
   /**
    * Skip the last class returned in every future traversal of the class list.
    */
-  final public void setIgnore(boolean ignore) throws IllegalArgumentException {
+  final public void setIgnore() throws IllegalArgumentException {
     if (inputIndex == 0) {
       throw new IllegalArgumentException("Must get a class before ignoring it");
     }
@@ -540,8 +532,7 @@
         if (in instanceof JarInput) {
           JarInput jin = (JarInput) in;
           ZipEntry entry = jin.getEntry();
-          InputStream s = jin.open();
-          try {
+          try (final InputStream s = jin.open()) {
             ZipEntry newEntry = new ZipEntry(entry.getName());
             newEntry.setComment(entry.getComment());
             newEntry.setExtra(entry.getExtra());
@@ -549,8 +540,6 @@
             putNextEntry(newEntry);
             copyStream(s, outputJar);
             outputJar.closeEntry();
-          } finally {
-            s.close();
           }
         } else {
           throw new Error("Unknown non-class input: " + in);
@@ -558,8 +547,7 @@
       } else {
         String name = in.getClassName();
         if (name == null) {
-          BufferedInputStream s = new BufferedInputStream(in.open(), 65536);
-          try {
+          try (final BufferedInputStream s = new BufferedInputStream(in.open(), 65536)) {
             Object cl = makeClassFromStream(in.getInputName(), s);
             String entryName = toEntryName(getClassName(cl));
             if (!entryNames.contains(entryName)) {
@@ -569,21 +557,16 @@
               clOut.flush();
               outputJar.closeEntry();
             }
-          } finally {
-            s.close();
           }
         } else {
           String entryName = toEntryName(name);
           if (!entryNames.contains(entryName)) {
-            BufferedInputStream s = new BufferedInputStream(in.open());
-            try {
+            try (final BufferedInputStream s = new BufferedInputStream(in.open())) {
               putNextEntry(new ZipEntry(entryName));
               BufferedOutputStream clOut = new BufferedOutputStream(outputJar);
               copyStream(s, clOut);
               clOut.flush();
               outputJar.closeEntry();
-            } finally {
-              s.close();
             }
           }
         }
@@ -618,4 +601,4 @@
       manifestBuilder.addEntry(newEntry);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/UnaryOpInstruction.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/UnaryOpInstruction.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/UnaryOpInstruction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/UnaryOpInstruction.java	2019-01-29 17:08:39.000000000 +0000
@@ -28,7 +28,7 @@
     return r;
   }
 
-  public static UnaryOpInstruction make(String type, IUnaryOpInstruction.Operator operator) throws IllegalArgumentException {
+  public static UnaryOpInstruction make(String type) throws IllegalArgumentException {
     int t = Util.getTypeIndex(type);
     if (t < 0 || t > TYPE_double_index) {
       throw new IllegalArgumentException("Type " + type + " cannot have a unary operator applied");
@@ -83,11 +83,11 @@
 
   @Override
   public String toString() {
-    return "UnaryOp(" + getType() + "," + getOperator() + ")";
+    return "UnaryOp(" + getType() + ',' + getOperator() + ')';
   }
 
   @Override
   public boolean isPEI() {
     return false;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Util.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Util.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Util.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/Util.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,6 @@
 import java.util.HashMap;
 
 import com.ibm.wala.shrikeBT.IInvokeInstruction.Dispatch;
-import com.ibm.wala.shrikeCT.BootstrapMethodsReader.BootstrapMethod;
 import com.ibm.wala.util.collections.Pair;
 
 /**
@@ -110,7 +109,7 @@
     if (c.startsWith("[")) {
       return c.replace('.', '/');
     } else if (!c.endsWith(";")) {
-      return "L" + c.replace('.', '/') + ";";
+      return 'L' + c.replace('.', '/') + ';';
     } else {
       return c;
     }
@@ -169,8 +168,8 @@
   }
 
   static {
-    typeAliases = new HashMap<String, String>();
-    classAliases = new HashMap<String, String>();
+    typeAliases = new HashMap<>();
+    classAliases = new HashMap<>();
     addAlias("void", "V");
     addAlias("int", "I");
     addAlias("long", "J");
@@ -206,7 +205,7 @@
    * 
    * @throws IllegalArgumentException if type == null
    */
-  static int getParamsCount(String type) throws IllegalArgumentException {
+  public static int getParamsCount(String type) throws IllegalArgumentException {
     if (type == null || type.length() < 2) {
       throw new IllegalArgumentException("invalid type: " + type);
     }
@@ -220,7 +219,7 @@
       }
       return count;
     } catch (StringIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid type: " + type);
+      throw new IllegalArgumentException("invalid type: " + type, e);
     }
   }
 
@@ -306,7 +305,7 @@
    * Compute the type "array of t".
    */
   public static String makeArray(String t) {
-    return ("[" + t).intern();
+    return ('[' + t).intern();
   }
 
   /**
@@ -371,12 +370,12 @@
     if (params == null) {
       throw new IllegalArgumentException("params == null");
     }
-    StringBuffer buf = new StringBuffer();
-    buf.append("(");
-    for (int i = 0; i < params.length; i++) {
-      buf.append(makeType(params[i]));
+    StringBuilder buf = new StringBuilder();
+    buf.append('(');
+    for (Class<?> param : params) {
+      buf.append(makeType(param));
     }
-    buf.append(")");
+    buf.append(')');
     buf.append(makeType(result));
     return buf.toString();
   }
@@ -425,15 +424,15 @@
     if (paramTypes == null) {
       return name;
     } else {
-      StringBuffer buf = new StringBuffer(name);
-      buf.append("(");
+      StringBuilder buf = new StringBuilder(name);
+      buf.append('(');
       for (int i = 0; i < paramTypes.length; i++) {
         if (i > 0) {
-          buf.append(",");
+          buf.append(',');
         }
         buf.append(paramTypes[i].getName());
       }
-      buf.append(")");
+      buf.append(')');
       return buf.toString();
     }
   }
@@ -448,8 +447,7 @@
     }
     Method[] methods = c.getMethods();
     Method result = null;
-    for (int i = 0; i < methods.length; i++) {
-      Method m = methods[i];
+    for (Method m : methods) {
       if (m.getName().equals(name) && (paramTypes == null || Arrays.equals(m.getParameterTypes(), paramTypes))) {
         if (result != null) {
           throw new IllegalArgumentException("Method " + makeName(name, paramTypes) + " is ambiguous in class " + c);
@@ -474,8 +472,7 @@
 
     if (name.equals("<init>")) {
       Constructor<?>[] cs = c.getConstructors();
-      for (int i = 0; i < cs.length; i++) {
-        Constructor<?> con = cs[i];
+      for (Constructor<?> con : cs) {
         if (paramTypes == null || Arrays.equals(con.getParameterTypes(), paramTypes)) {
           if (result != null) {
             throw new IllegalArgumentException("Constructor " + makeName(name, paramTypes) + " is ambiguous in class " + c);
@@ -593,8 +590,7 @@
     if (b < 0) {
       return bytes;
     } else {
-      byte[] big = new byte[bytes.length * 2 + 1];
-      System.arraycopy(bytes, 0, big, 0, bytes.length);
+      byte[] big = Arrays.copyOf(bytes, bytes.length * 2 + 1);
       big[bytes.length] = (byte) b;
       int offset = bytes.length + 1;
       do {
@@ -660,4 +656,4 @@
 
     return Pair.make(r, catchers);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AnnotationsReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AnnotationsReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AnnotationsReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AnnotationsReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,7 +27,7 @@
   /**
    * offset in class file where this attribute begins
    */
-  private final int beginOffset;
+  protected final int beginOffset;
 
   public AnnotationsReader(ClassReader.AttrIterator iter, String label) throws InvalidClassFileException {
     super(iter, label);
@@ -36,7 +36,6 @@
 
   /**
    * @return number of annotations in this attribute
-   * @throws InvalidClassFileException
    */
   public int getAnnotationCount() throws InvalidClassFileException {
     int offset = beginOffset + 6;
@@ -45,9 +44,8 @@
   }
 
   /**
-   * @return total length of this attribute in bytes, <bf>including</bf> the
+   * @return total length of this attribute in bytes, <b>including</b> the
    *         first 6 bytes
-   * @throws InvalidClassFileException
    */
   public int getAttributeSize() throws InvalidClassFileException {
     int offset = beginOffset + 2;
@@ -63,7 +61,7 @@
    *          offset in the class file at which the constant pool offset is
    *          given
    */
-  private String getUtf8ConstantPoolValue(int offset) throws InvalidClassFileException {
+  protected String getUtf8ConstantPoolValue(int offset) throws InvalidClassFileException {
     checkSize(offset, 2);
     int cpOffset = cr.getUShort(offset);
     return cr.getCP().getCPUtf8(cpOffset);
@@ -73,15 +71,13 @@
    * Marker interface for possible element values in an annotation attribute.
    * 
    * @see AnnotationsReader#readElementValueAndSize(int)
-   * 
    */
-  @SuppressWarnings("javadoc")
   public static interface ElementValue {
   }
 
   /**
    * Represents a constant argument to an annotation. Class arguments (e.g.,
-   * <code>Foo.class</code>) are also represented with this type, with the value
+   * {@code Foo.class}) are also represented with this type, with the value
    * being the String class name.
    */
   public static class ConstantElementValue implements ElementValue {
@@ -100,6 +96,30 @@
       return String.valueOf(val);
     }
 
+    @Override
+    public int hashCode() {
+      final int prime = 31;
+      int result = 1;
+      result = prime * result + ((val == null) ? 0 : val.hashCode());
+      return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if (this == obj)
+        return true;
+      if (obj == null)
+        return false;
+      if (getClass() != obj.getClass())
+        return false;
+      ConstantElementValue other = (ConstantElementValue) obj;
+      if (val == null) {
+        if (other.val != null)
+          return false;
+      } else if (!val.equals(other.val))
+        return false;
+      return true;
+    }
   }
 
   /**
@@ -125,7 +145,7 @@
 
     @Override
     public String toString() {
-      return "EnumElementValue [type=" + enumType + ", val=" + enumVal + "]";
+      return "EnumElementValue [type=" + enumType + ", val=" + enumVal + ']';
     }
 
   }
@@ -147,15 +167,23 @@
 
     @Override
     public String toString() {
-      return "ArrayElementValue [vals=" + Arrays.toString(vals) + "]";
+      return "ArrayElementValue [vals=" + Arrays.toString(vals) + ']';
     }
 
   }
 
   /**
    * get all the annotations declared in this attribute.
+   * <pre>
+   * RuntimeVisibleAnnotations_attribute {
+   *   u2         attribute_name_index;
+   *   u4         attribute_length;
+   *   u2         num_annotations;
+   *   annotation annotations[num_annotations];
+   * }
+   * </pre>
    * 
-   * @throws InvalidClassFileException
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.16"> JLS (SE8), 4.7.16</a>
    */
   public AnnotationAttribute[] getAllAnnotations() throws InvalidClassFileException {
     AnnotationAttribute[] result = new AnnotationAttribute[getAnnotationCount()];
@@ -168,7 +196,7 @@
     }
     return result;
   }
-
+  
   /**
    * <pre>
    * param_annotations {
@@ -200,6 +228,9 @@
     }
     return result;
   }
+  
+  
+  
   /**
    * <pre>
    * annotation { 
@@ -209,10 +240,8 @@
    *     element_value value; 
    *   } element_value_pairs[num_element_value_pairs]
    * </pre>
-   * 
-   * @throws InvalidClassFileException
    */
-  private Pair<AnnotationAttribute, Integer> getAttributeAndSize(int begin) throws InvalidClassFileException {
+  protected Pair<AnnotationAttribute, Integer> getAttributeAndSize(int begin) throws InvalidClassFileException {
     String type = getUtf8ConstantPoolValue(begin);
     int numElementValuePairs = cr.getUShort(begin + 2);
     int size = 4;
@@ -266,7 +295,7 @@
 
     @Override
     public String toString() {
-      return "AnnotationElementValue [type=" + type + ", elementValues=" + elementValues + "]";
+      return "AnnotationElementValue [type=" + type + ", elementValues=" + elementValues + ']';
     }
 
   }
@@ -293,11 +322,8 @@
    * {@link EnumElementValue}. An array value is represented by an
    * {@link ArrayElementValue}. Finally, a nested annotation is represented by
    * an {@link AnnotationAttribute}.
-   * 
-   * @throws InvalidClassFileException
-   * @throws IllegalArgumentException
    */
-  private Pair<ElementValue, Integer> readElementValueAndSize(int offset) throws IllegalArgumentException,
+  protected Pair<ElementValue, Integer> readElementValueAndSize(int offset) throws IllegalArgumentException,
       InvalidClassFileException {
     char tag = (char) cr.getByte(offset);
     // meaning of this short depends on the tag
@@ -351,6 +377,7 @@
   public static enum AnnotationType {
     RuntimeVisibleAnnotations, RuntimeInvisibleAnnotations,RuntimeVisibleParameterAnnotations, RuntimeInvisibleParameterAnnotations
   }
+
   
   public static boolean isKnownAnnotation(String name) {
     for (AnnotationType t : AnnotationType.values()) {
@@ -375,4 +402,4 @@
     }
     return null;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AttributeReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AttributeReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AttributeReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/AttributeReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -85,4 +85,4 @@
           + (length + attr - offset));
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/BootstrapMethodsReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/BootstrapMethodsReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/BootstrapMethodsReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/BootstrapMethodsReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,7 +21,7 @@
 public class BootstrapMethodsReader extends AttributeReader {
 
   public interface BootstrapMethod {
-    int invokeType();
+    byte invokeType();
     String methodClass();
     String methodName();
     String methodType();
@@ -52,18 +52,18 @@
       
       final int argumentCount = cr.getUShort(attr + base + 2);
       entries[i] = new BootstrapMethod() {
-        private final int invokeType = cp.getCPHandleKind(methodHandleOffset);
+        private final byte invokeType = cp.getCPHandleKind(methodHandleOffset);
         private final String methodClass = cp.getCPHandleClass(methodHandleOffset);
         private final String methodName = cp.getCPHandleName(methodHandleOffset);
         private final String methodType = cp.getCPHandleType(methodHandleOffset);
         
         @Override
         public String toString() {
-          return methodClass + ":" + methodName + methodType;
+          return methodClass + ':' + methodName + methodType;
         }
         
         @Override
-        public int invokeType() {
+        public byte invokeType() {
           return invokeType;
         }
 
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassConstants.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassConstants.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassConstants.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassConstants.java	2019-01-29 17:08:39.000000000 +0000
@@ -88,4 +88,4 @@
   
   public static final byte REF_invokeInterface = 9;
   
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -65,7 +65,7 @@
       throw new InvalidClassFileException(offset, "bad magic number: " + magic);
     }
     if (majorVersion < 45 || majorVersion > 52) {
-      throw new InvalidClassFileException(offset, "unknown class file version: " + majorVersion + "." + minorVersion);
+      throw new InvalidClassFileException(offset, "unknown class file version: " + majorVersion + '.' + minorVersion);
     }
     
     cpParser = new ConstantPoolParser(bytes, offset, constantPoolCount);
@@ -325,6 +325,13 @@
   public byte getByte(int i) {
     return bytes[i];
   }
+  
+  /**
+   * @return the unsigned 8-bit value at offset i in the class data
+   */
+  public int getUnsignedByte(int i) {
+    return bytes[i] & 0xff;
+  }
 
   /**
    * @return the number of fields in the class
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassWriter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassWriter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassWriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassWriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,6 +13,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import com.ibm.wala.shrikeCT.BootstrapMethodsReader.BootstrapMethod;
 import com.ibm.wala.shrikeCT.ConstantPoolParser.ReferenceToken;
 
 /**
@@ -26,17 +27,17 @@
 
   private ConstantPoolParser rawCP;
 
-  private HashMap<Object, Integer> cachedCPEntries = new HashMap<Object, Integer>(1);
+  private HashMap<Object, Integer> cachedCPEntries = new HashMap<>(1);
 
-  final private ArrayList<Object> newCPEntries = new ArrayList<Object>(1);
+  final private ArrayList<Object> newCPEntries = new ArrayList<>(1);
 
   private int nextCPIndex = 1;
 
-  final private ArrayList<Element> fields = new ArrayList<Element>(1);
+  final private ArrayList<Element> fields = new ArrayList<>(1);
 
-  final private ArrayList<Element> methods = new ArrayList<Element>(1);
+  final private ArrayList<Element> methods = new ArrayList<>(1);
 
-  final private ArrayList<Element> classAttributes = new ArrayList<Element>(1);
+  final private ArrayList<Element> classAttributes = new ArrayList<>(1);
 
   private int thisClass;
 
@@ -202,6 +203,40 @@
     }
   }
 
+  static class CWInvokeDynamic extends CWItem {
+    final private BootstrapMethod b;
+
+    final private String n;
+
+    final private String t;
+
+    CWInvokeDynamic(BootstrapMethod b, String n, String t) {
+      this.b = b;
+      this.n = n;
+      this.t = t;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (o instanceof CWInvokeDynamic) {
+        CWInvokeDynamic r = (CWInvokeDynamic) o;
+        return r.b.equals(b) && r.n.equals(n) && r.t.equals(t);
+      } else {
+        return false;
+      }
+    }
+
+    @Override
+    public int hashCode() {
+      return (b.hashCode() << 10) + (n.hashCode() << 3) + t.hashCode();
+    }
+
+    @Override
+    byte getType() {
+      return CONSTANT_InvokeDynamic;
+    }
+  }
+
   /**
    * Copy a constant pool from some ClassReader into this class. This must be done before any entries are allocated in this
    * ClassWriter's constant pool, and it can only be done once. If and only if this is done, it is safe to copy "raw" fields,
@@ -230,38 +265,43 @@
         byte t = cp.getItemType(i);
         switch (t) {
         case CONSTANT_String:
-          cachedCPEntries.put(new CWStringItem(cp.getCPString(i), CONSTANT_String), new Integer(i));
+          cachedCPEntries.put(new CWStringItem(cp.getCPString(i), CONSTANT_String), Integer.valueOf(i));
           break;
         case CONSTANT_Class:
-          cachedCPEntries.put(new CWStringItem(cp.getCPClass(i), CONSTANT_Class), new Integer(i));
+          cachedCPEntries.put(new CWStringItem(cp.getCPClass(i), CONSTANT_Class), Integer.valueOf(i));
           break;
         case CONSTANT_MethodType:
-          cachedCPEntries.put(new CWStringItem(cp.getCPMethodType(i), CONSTANT_MethodType), new Integer(i));
+          cachedCPEntries.put(new CWStringItem(cp.getCPMethodType(i), CONSTANT_MethodType), Integer.valueOf(i));
           break;
         case CONSTANT_MethodHandle:
         case CONSTANT_FieldRef:
         case CONSTANT_InterfaceMethodRef:
         case CONSTANT_MethodRef:
-          cachedCPEntries.put(new CWRef(t, cp.getCPRefClass(i), cp.getCPRefName(i), cp.getCPRefType(i)), new Integer(i));
+          cachedCPEntries.put(new CWRef(t, cp.getCPRefClass(i), cp.getCPRefName(i), cp.getCPRefType(i)), Integer.valueOf(i));
           break;
         case CONSTANT_NameAndType:
-          cachedCPEntries.put(new CWNAT(cp.getCPNATName(i), cp.getCPNATType(i)), new Integer(i));
+          cachedCPEntries.put(new CWNAT(cp.getCPNATName(i), cp.getCPNATType(i)), Integer.valueOf(i));
+          break;
+        case CONSTANT_InvokeDynamic:
+          cachedCPEntries.put(new CWInvokeDynamic(cp.getCPDynBootstrap(i), cp.getCPDynName(i), cp.getCPDynType(i)), Integer.valueOf(i));
           break;
         case CONSTANT_Integer:
-          cachedCPEntries.put(new Integer(cp.getCPInt(i)), new Integer(i));
+          cachedCPEntries.put(Integer.valueOf(cp.getCPInt(i)), Integer.valueOf(i));
           break;
         case CONSTANT_Float:
-          cachedCPEntries.put(new Float(cp.getCPFloat(i)), new Integer(i));
+          cachedCPEntries.put(Float.valueOf(cp.getCPFloat(i)), Integer.valueOf(i));
           break;
         case CONSTANT_Long:
-          cachedCPEntries.put(new Long(cp.getCPLong(i)), new Integer(i));
+          cachedCPEntries.put(Long.valueOf(cp.getCPLong(i)), Integer.valueOf(i));
           break;
         case CONSTANT_Double:
-          cachedCPEntries.put(new Double(cp.getCPDouble(i)), new Integer(i));
+          cachedCPEntries.put(Double.valueOf(cp.getCPDouble(i)), Integer.valueOf(i));
           break;
         case CONSTANT_Utf8:
-          cachedCPEntries.put(cp.getCPUtf8(i), new Integer(i));
+          cachedCPEntries.put(cp.getCPUtf8(i), Integer.valueOf(i));
           break;
+        default:
+          throw new UnsupportedOperationException(String.format("unexpected constant-pool item type %s", t));
         }
       }
     }
@@ -286,7 +326,7 @@
     } else {
       int index = nextCPIndex;
       nextCPIndex += size;
-      i = new Integer(index);
+      i = Integer.valueOf(index);
       cachedCPEntries.put(o, i);
       newCPEntries.add(o);
       if (nextCPIndex > 0xFFFF) {
@@ -311,7 +351,7 @@
    * @return the index of a constant pool item with the right value
    */
   public int addCPInt(int i) {
-    return addCPEntry(new Integer(i), 1);
+    return addCPEntry(Integer.valueOf(i), 1);
   }
 
   /**
@@ -320,7 +360,7 @@
    * @return the index of a constant pool item with the right value
    */
   public int addCPFloat(float f) {
-    return addCPEntry(new Float(f), 1);
+    return addCPEntry(Float.valueOf(f), 1);
   }
 
   /**
@@ -329,7 +369,7 @@
    * @return the index of a constant pool item with the right value
    */
   public int addCPLong(long l) {
-    return addCPEntry(new Long(l), 2);
+    return addCPEntry(Long.valueOf(l), 2);
   }
 
   /**
@@ -338,7 +378,7 @@
    * @return the index of a constant pool item with the right value
    */
   public int addCPDouble(double d) {
-    return addCPEntry(new Double(d), 2);
+    return addCPEntry(Double.valueOf(d), 2);
   }
 
   private int addCPString(String s, byte type) {
@@ -432,6 +472,18 @@
   }
 
   /**
+   * Add an InvokeDynamic to the constant pool if necessary.
+   * 
+   * @param n the name
+   * @param t the type, in JVM format
+   * @return the index of a constant pool item with the right value
+   */
+  public int addCPInvokeDynamic(BootstrapMethod b, String n, String t) {
+    return addCPEntry(new CWInvokeDynamic(b, n, t), 1);
+  }
+
+  
+  /**
    * Set the access flags for the class.
    */
   public void setAccessFlags(int f) {
@@ -469,8 +521,7 @@
       if (ifaces.length > 0xFFFF) {
         throw new IllegalArgumentException("Too many interfaces implemented: " + ifaces.length);
       }
-      for (int i = 0; i < ifaces.length; i++) {
-        int c = ifaces[i];
+      for (int c : ifaces) {
         if (c < 1 || c > 0xFFFF) {
           throw new IllegalArgumentException("Interface name index out of range: " + c);
         }
@@ -635,8 +686,8 @@
     public int getSize() {
       int size = 8;
       if (attributes != null) {
-        for (int i = 0; i < attributes.length; i++) {
-          size += attributes[i].getSize();
+        for (Element attribute : attributes) {
+          size += attribute.getSize();
         }
       }
       return size;
@@ -650,8 +701,8 @@
       if (attributes != null) {
         setUShort(buf, offset + 6, attributes.length);
         offset += 8;
-        for (int i = 0; i < attributes.length; i++) {
-          offset = attributes[i].copyInto(buf, offset);
+        for (Element attribute : attributes) {
+          offset = attribute.copyInto(buf, offset);
         }
       } else {
         setUShort(buf, offset + 6, 0);
@@ -760,11 +811,19 @@
           setUShort(buf, offset + 3, addCPUtf8(nat.t));
           break;
         }
+        case CONSTANT_InvokeDynamic: {
+          offset = reserveBuf(5);
+          CWInvokeDynamic inv = (CWInvokeDynamic) item;
+          setUShort(buf, offset+1, inv.b.getIndexInClassFile());
+          setUShort(buf, offset+3, addCPNAT(inv.n, inv.t));
+          break;
+        }
         case CONSTANT_MethodHandle: {
           offset = reserveBuf(4);
           CWHandle handle = (CWHandle) item;
-          setUByte(buf, offset + 1, handle.getKind());
-          switch (handle.getKind()) {
+          final byte kind = handle.getKind();
+          setUByte(buf, offset + 1, kind);
+          switch (kind) {
           case REF_getStatic:
           case REF_getField:
           case REF_putField:
@@ -790,6 +849,8 @@
             setUShort(buf, offset + 2, x);
             break;
           }
+          default:
+            throw new UnsupportedOperationException(String.format("unexpected ref kind %s", kind));
           }
          break; 
         }
@@ -952,7 +1013,7 @@
     try {
       buf[offset] = (byte) v;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid offset: " + offset);
+      throw new IllegalArgumentException("invalid offset: " + offset, e);
     }
   }
 
@@ -971,7 +1032,7 @@
       buf[offset + 2] = (byte) (v >> 8);
       buf[offset + 3] = (byte) v;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("illegal offset " + offset);
+      throw new IllegalArgumentException("illegal offset " + offset, e);
     }
   }
 
@@ -1007,13 +1068,13 @@
       throw new IllegalArgumentException("buf is null");
     }
     if (offset < 0 || offset + 1 >= buf.length) {
-      throw new IllegalArgumentException("buf is too short " + buf.length + " " + offset);
+      throw new IllegalArgumentException("buf is too short " + buf.length + ' ' + offset);
     }
     try {
       buf[offset] = (byte) (v >> 8);
       buf[offset + 1] = (byte) v;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid offset: " + offset);
+      throw new IllegalArgumentException("invalid offset: " + offset, e);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/CodeReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/CodeReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/CodeReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/CodeReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -97,4 +97,4 @@
     }
     iter.init(cr, attr + 14 + codeLen + 2 + exnTableLen * 8);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/CodeWriter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/CodeWriter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/CodeWriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/CodeWriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -65,8 +65,8 @@
 
     int size = 14 + code.length + 2 + (exnHandlers == null ? 0 : exnHandlers.length) * 2 + 2;
     if (attributes != null) {
-      for (int i = 0; i < attributes.length; i++) {
-        size += attributes[i].getSize();
+      for (ClassWriter.Element attribute : attributes) {
+        size += attribute.getSize();
       }
     }
     return size;
@@ -87,8 +87,8 @@
     ClassWriter.setUShort(buf, offset, (exnHandlers == null ? 0 : exnHandlers.length) / 4);
     offset += 2;
     if (exnHandlers != null) {
-      for (int i = 0; i < exnHandlers.length; i++) {
-        ClassWriter.setUShort(buf, offset, exnHandlers[i]);
+      for (int exnHandler : exnHandlers) {
+        ClassWriter.setUShort(buf, offset, exnHandler);
         offset += 2;
       }
     }
@@ -96,8 +96,8 @@
     ClassWriter.setUShort(buf, offset, (attributes == null ? 0 : attributes.length));
     offset += 2;
     if (attributes != null) {
-      for (int i = 0; i < attributes.length; i++) {
-        offset = attributes[i].copyInto(buf, offset);
+      for (ClassWriter.Element attribute : attributes) {
+        offset = attribute.copyInto(buf, offset);
       }
     }
     ClassWriter.setInt(buf, start + 2, offset - start - 6);
@@ -169,4 +169,4 @@
   public void setAttributes(ClassWriter.Element[] attributes) {
     this.attributes = attributes;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ConstantPoolParser.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ConstantPoolParser.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ConstantPoolParser.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ConstantPoolParser.java	2019-01-29 17:08:39.000000000 +0000
@@ -119,7 +119,6 @@
    * @param bytes the raw class file data
    * @param offset the start of the constant pool data
    * @param itemCount the number of items in the pool
-   * @param classReader 
    */
   public ConstantPoolParser(byte[] bytes, int offset, int itemCount) throws InvalidClassFileException {
     this.bytes = bytes;
@@ -438,7 +437,7 @@
   /**
    * @return the value of the Integer at constant pool item i
    */
-  public int getCPInt(int i) throws InvalidClassFileException, IllegalArgumentException {
+  public int getCPInt(int i) throws IllegalArgumentException {
     if (i < 1 || i >= cpItems.length) {
       throw new IllegalArgumentException("Constant pool item #" + i + " out of range");
     }
@@ -452,7 +451,7 @@
   /**
    * @return the value of the Float at constant pool item i
    */
-  public float getCPFloat(int i) throws InvalidClassFileException, IllegalArgumentException {
+  public float getCPFloat(int i) throws IllegalArgumentException {
     if (i < 1 || i >= cpItems.length) {
       throw new IllegalArgumentException("Constant pool item #" + i + " out of range");
     }
@@ -466,7 +465,7 @@
   /**
    * @return the value of the Long at constant pool item i
    */
-  public long getCPLong(int i) throws InvalidClassFileException, IllegalArgumentException {
+  public long getCPLong(int i) throws IllegalArgumentException {
     if (i < 1 || i >= cpItems.length) {
       throw new IllegalArgumentException("Constant pool item #" + i + " out of range");
     }
@@ -480,7 +479,7 @@
   /**
    * @return the value of the Double at constant pool item i
    */
-  public double getCPDouble(int i) throws InvalidClassFileException, IllegalArgumentException {
+  public double getCPDouble(int i) throws IllegalArgumentException {
     if (i < 1 || i >= cpItems.length) {
       throw new IllegalArgumentException("Constant pool item #" + i + " out of range");
     }
@@ -543,7 +542,7 @@
 
   private InvalidClassFileException invalidUtf8(int item, int offset) {
     return new InvalidClassFileException(offset, "Constant pool item #" + item + " starting at " + cpOffsets[item]
-        + ", is an invalid Java Utf8 string (byte is " + getByte(offset) + ")");
+        + ", is an invalid Java Utf8 string (byte is " + getByte(offset) + ')');
   }
 
   /**
@@ -561,7 +560,7 @@
     if (s == null) {
       int count = getUShort(offset + 1);
       int end = count + offset + 3;
-      StringBuffer buf = new StringBuffer(count);
+      StringBuilder buf = new StringBuilder(count);
       offset += 3;
       while (offset < end) {
         byte x = getByte(offset);
@@ -676,4 +675,4 @@
   private double getDouble(int i) {
     return Double.longBitsToDouble(getLong(i));
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ConstantValueReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ConstantValueReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ConstantValueReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ConstantValueReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -29,4 +29,4 @@
   public int getValueCPIndex() {
     return cr.getUShort(attr + 6);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ConstantValueWriter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ConstantValueWriter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ConstantValueWriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ConstantValueWriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -144,4 +144,4 @@
 
     this.index = index;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ExceptionsReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ExceptionsReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ExceptionsReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ExceptionsReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -49,4 +49,4 @@
     }
     return r;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ExceptionsWriter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ExceptionsWriter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ExceptionsWriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ExceptionsWriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,8 +42,8 @@
     ClassWriter.setUShort(buf, offset + 6, table == null ? 0 : table.length);
     offset += 8;
     if (table != null) {
-      for (int i = 0; i < table.length; i++) {
-        ClassWriter.setUShort(buf, offset, table[i]);
+      for (int element : table) {
+        ClassWriter.setUShort(buf, offset, element);
         offset += 2;
       }
     }
@@ -60,12 +60,12 @@
     if (exceptions == null) {
       throw new IllegalArgumentException("exceptions is null");
     }
-    for (int i = 0; i < exceptions.length; i++) {
-      if (exceptions[i] < 1 || exceptions[i] > 0xFFFF) {
-        throw new IllegalArgumentException("Invalid CP index: " + exceptions[i]);
+    for (int exception : exceptions) {
+      if (exception < 1 || exception > 0xFFFF) {
+        throw new IllegalArgumentException("Invalid CP index: " + exception);
       }
     }
 
     this.table = exceptions;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/InnerClassesReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/InnerClassesReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/InnerClassesReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/InnerClassesReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,8 +52,6 @@
 
   /**
    * return the name of the outer class recorded as the enclosing class for a class named s. return null if not found.
-   * 
-   * @throws InvalidClassFileException
    */
   public String getOuterClass(String s) throws InvalidClassFileException {
     String[] inner = getInnerClasses();
@@ -71,8 +69,6 @@
 
   /**
    * return the mask of flags recorded in the InnerClasses attribute for a class named s. return 0 if not found.
-   * 
-   * @throws InvalidClassFileException
    */
   public int getAccessFlags(String s) throws InvalidClassFileException {
     String[] inner = getInnerClasses();
@@ -84,4 +80,4 @@
     return 0;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/InnerClassesWriter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/InnerClassesWriter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/InnerClassesWriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/InnerClassesWriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,8 +47,8 @@
     ClassWriter.setUShort(buf, offset + 6, table == null ? 0 : table.length);
     offset += 8;
     if (table != null) {
-      for (int i = 0; i < table.length; i++) {
-        ClassWriter.setUShort(buf, offset, table[i]);
+      for (int element : table) {
+        ClassWriter.setUShort(buf, offset, element);
         offset += 2;
       }
     }
@@ -81,4 +81,4 @@
 
     this.table = classes;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/InvalidClassFileException.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/InvalidClassFileException.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/InvalidClassFileException.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/InvalidClassFileException.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,4 +37,4 @@
   public int getOffset() {
     return offset;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LineNumberTableReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LineNumberTableReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LineNumberTableReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LineNumberTableReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -68,7 +68,8 @@
         }
 
         // check length
-        new LineNumberTableReader(iter);
+        @SuppressWarnings("unused")
+        LineNumberTableReader lineNumberTableReader = new LineNumberTableReader(iter);
         int attr = iter.getRawOffset();
         int count = cr.getUShort(attr + 6);
         int offset = attr + 8;
@@ -100,4 +101,4 @@
 
     return r;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LineNumberTableWriter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LineNumberTableWriter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LineNumberTableWriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LineNumberTableWriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -69,8 +69,8 @@
     ClassWriter.setInt(buf, offset + 2, 2 + rawTable.length * 2);
     ClassWriter.setUShort(buf, offset + 6, rawTable.length / 2);
     offset += 8;
-    for (int i = 0; i < rawTable.length; i++) {
-      ClassWriter.setUShort(buf, offset, rawTable[i]);
+    for (int element : rawTable) {
+      ClassWriter.setUShort(buf, offset, element);
       offset += 2;
     }
 
@@ -89,8 +89,7 @@
     }
     int rawCount = 0;
     int last = -1;
-    for (int i = 0; i < newLineMap.length; i++) {
-      int next = newLineMap[i];
+    for (int next : newLineMap) {
       if (next != last) {
         rawCount++;
       }
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LocalVariableTableReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LocalVariableTableReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LocalVariableTableReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LocalVariableTableReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package com.ibm.wala.shrikeCT;
 
+import java.util.Arrays;
+
 /**
  * This class reads LocalVariableTable attributes.
  * 
@@ -46,8 +48,7 @@
     if (curVector == null) {
       newVector = new int[(varIndex + 1) * 2];
     } else {
-      newVector = new int[Math.max(curVector.length, (varIndex + 1) * 2)];
-      System.arraycopy(curVector, 0, newVector, 0, curVector.length);
+      newVector = Arrays.copyOf(curVector, Math.max(curVector.length, (varIndex + 1) * 2));
     }
     newVector[varIndex * 2] = nameIndex;
     newVector[varIndex * 2 + 1] = typeIndex;
@@ -76,7 +77,8 @@
         }
 
         // check length
-        new LocalVariableTableReader(iter);
+        @SuppressWarnings("unused")
+        LocalVariableTableReader localVariableTableReader = new LocalVariableTableReader(iter);
         int attr = iter.getRawOffset();
         int count = cr.getUShort(attr + 6);
         int offset = attr + 8;
@@ -107,4 +109,4 @@
 
     return r;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LocalVariableTableWriter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LocalVariableTableWriter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LocalVariableTableWriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/LocalVariableTableWriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -73,8 +73,8 @@
     ClassWriter.setInt(buf, offset + 2, 2 + rawTable.length * 2);
     ClassWriter.setUShort(buf, offset + 6, rawTable.length / 5);
     offset += 8;
-    for (int i = 0; i < rawTable.length; i++) {
-      ClassWriter.setUShort(buf, offset, rawTable[i]);
+    for (int element : rawTable) {
+      ClassWriter.setUShort(buf, offset, element);
       offset += 2;
     }
 
@@ -95,9 +95,9 @@
     }
     try {
       int varCount = 0;
-      for (int i = 0; i < varMap.length; i++) {
-        if (varMap[i] != null) {
-          varCount = Math.max(varCount, varMap[i].length);
+      for (int[] element : varMap) {
+        if (element != null) {
+          varCount = Math.max(varCount, element.length);
         }
       }
       varCount /= 2;
@@ -117,9 +117,7 @@
                 int entryOffset = entryCount * 5;
                 entryCount++;
                 if (entryCount * 5 > entries.length) {
-                  int[] newEntries = new int[entries.length * 2];
-                  System.arraycopy(entries, 0, newEntries, 0, entries.length);
-                  entries = newEntries;
+                  entries = Arrays.copyOf(entries, entries.length * 2);
                 }
                 int nameIndex = lastVector[k * 2];
                 int typeIndex = lastVector[k * 2 + 1];
@@ -151,7 +149,7 @@
         return r;
       }
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("malformed varMap");
+      throw new IllegalArgumentException("malformed varMap", e);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SignatureReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SignatureReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SignatureReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SignatureReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -33,4 +33,4 @@
   public String getSignature() throws InvalidClassFileException {
     return cr.getCP().getCPUtf8(getSignatureCPIndex());
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourceDebugExtensionWriter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourceDebugExtensionWriter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourceDebugExtensionWriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourceDebugExtensionWriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -35,8 +35,8 @@
     ClassWriter.setInt(buf, offset + 2, getSize() - 6);
     offset += 6;
     if (table != null) {
-      for (int i = 0; i < table.length; i++) {
-        ClassWriter.setUByte(buf, offset, table[i]);
+      for (byte element : table) {
+        ClassWriter.setUByte(buf, offset, element);
         offset++;
       }
     }
@@ -47,9 +47,9 @@
     if (sourceDebug == null) {
       throw new IllegalArgumentException("sourceDebug is null");
     }
-    for (int i = 0; i < sourceDebug.length; i++) {
-      if (sourceDebug[i] < 1) {
-        throw new IllegalArgumentException("Invalid CP index: " + sourceDebug[i]);
+    for (byte element : sourceDebug) {
+      if (element < 1) {
+        throw new IllegalArgumentException("Invalid CP index: " + element);
       }
     }
     this.table = sourceDebug;
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourceFileReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourceFileReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourceFileReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourceFileReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -29,4 +29,8 @@
   public int getSourceFileCPIndex() {
     return cr.getUShort(attr + 6);
   }
-}
\ No newline at end of file
+  
+  public String getSourceFile() throws IllegalArgumentException, InvalidClassFileException {
+    return cr.getCP().getCPUtf8(getSourceFileCPIndex());
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourceFileWriter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourceFileWriter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourceFileWriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourceFileWriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -63,4 +63,4 @@
 
     this.index = index;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourcePositionTableReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourcePositionTableReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourcePositionTableReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/SourcePositionTableReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -38,6 +38,7 @@
       this.lastCol = lastCol;
     }
     
+    @Override
     public int compareTo(Object o) {
       if (o instanceof Position) {
         Position p = (Position) o;
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/StackMapConstants.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/StackMapConstants.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/StackMapConstants.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/StackMapConstants.java	2019-01-29 17:08:39.000000000 +0000
@@ -190,18 +190,18 @@
 
     @Override
     public String toString() {
-      StringBuffer sb = new StringBuffer();
-      sb.append("frame type: ").append(frameType).append("\n");
-      sb.append("  offset: ").append(offset).append("\n");
+      StringBuilder sb = new StringBuilder();
+      sb.append("frame type: ").append(frameType).append('\n');
+      sb.append("  offset: ").append(offset).append('\n');
       
       sb.append("  locals\n");
-      for(int i = 0; i < localTypes.length; i++) {
-        sb.append("  ").append(localTypes[i]).append("\n");
+      for (StackMapType localType : localTypes) {
+        sb.append("  ").append(localType).append('\n');
       }
 
       sb.append("  stack\n");
-      for(int i = 0; i < stackTypes.length; i++) {
-        sb.append("  ").append(stackTypes[i]).append("\n");
+      for (StackMapType stackType : stackTypes) {
+        sb.append("  ").append(stackType).append('\n');
       }
 
       return sb.toString();
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/StackMapTableReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/StackMapTableReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/StackMapTableReader.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/StackMapTableReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -30,7 +30,7 @@
   
   public StackMapTableReader(AttrIterator iter) throws InvalidClassFileException {
     super(iter, "StackMapTable");
-    frames = new ArrayList<StackMapFrame>();
+    frames = new ArrayList<>();
     int entries = cr.getUShort(attr+6);
     int ptr = attr + 8;
     for(int i = 0; i < entries; i++) {
@@ -96,4 +96,4 @@
     
     return null;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/StackMapTableWriter.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/StackMapTableWriter.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/StackMapTableWriter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/StackMapTableWriter.java	2019-01-29 17:08:39.000000000 +0000
@@ -1,6 +1,10 @@
 package com.ibm.wala.shrikeCT;
 
-import static com.ibm.wala.shrikeBT.Constants.*;
+import static com.ibm.wala.shrikeBT.Constants.TYPE_double;
+import static com.ibm.wala.shrikeBT.Constants.TYPE_float;
+import static com.ibm.wala.shrikeBT.Constants.TYPE_int;
+import static com.ibm.wala.shrikeBT.Constants.TYPE_long;
+import static com.ibm.wala.shrikeBT.Constants.TYPE_null;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -34,7 +38,7 @@
     this.data = serialize(writer, frames);
   }
   
-  private byte[] serialize(ClassWriter writer, List<StackMapFrame> frames) throws IOException {
+  private static byte[] serialize(ClassWriter writer, List<StackMapFrame> frames) throws IOException {
     ByteArrayOutputStream data = new ByteArrayOutputStream();
     
     for(StackMapFrame frame : frames) {
@@ -52,11 +56,11 @@
   }
   
   public StackMapTableWriter(ClassWriter writer, MethodData method, Output output, ClassHierarchyProvider cha, String[][] vars) throws FailureException, IOException {
-    this(writer, stackMapTable(writer, method, output, cha, vars, null));
+    this(writer, stackMapTable(method, output, cha, vars, null));
   }
 
   public StackMapTableWriter(ClassWriter writer, MethodData method, Output output, ClassHierarchyProvider cha, String[][] vars, List<StackMapFrame> reuseFrames) throws FailureException, IOException {
-    this(writer, stackMapTable(writer, method, output, cha, vars, reuseFrames));
+    this(writer, stackMapTable(method, output, cha, vars, reuseFrames));
   }
 
   private static List<StackMapFrame> remapStackFrames(List<StackMapFrame> sm, int[] newBytecodesToOldBytecodes) {
@@ -83,7 +87,7 @@
     }
     
     // frames with new offsets
-    List<StackMapFrame> newFrames = new ArrayList<StackMapFrame>(sm.size());
+    List<StackMapFrame> newFrames = new ArrayList<>(sm.size());
     for(i = 0; i < sm.size(); i++) {
       newFrames.add(new StackMapFrame(sm.get(i), positions[i]));
     }
@@ -160,7 +164,7 @@
     if (type == null) {
       return type;
     } else if (type.startsWith("[")) {
-      return "[" + hackUnknown(type.substring(1));
+      return '[' + hackUnknown(type.substring(1));
     } else if ("L?;".equals(type)) {
       return "Ljava/lang/Object;";
     } else {
@@ -193,10 +197,10 @@
     return false;
   }
   
-  public static List<StackMapFrame> stackMapTable(ClassWriter writer, MethodData method, Output output, ClassHierarchyProvider cha, String[][] vars, List<StackMapFrame> reuseFrames) throws FailureException, IOException {
+  public static List<StackMapFrame> stackMapTable(MethodData method, Output output, ClassHierarchyProvider cha, String[][] vars, List<StackMapFrame> reuseFrames) throws FailureException {
     int idx = 0;
     
-    List<StackMapFrame> frames = new ArrayList<StackMapFrame>();
+    List<StackMapFrame> frames = new ArrayList<>();
     
     int[] instructionToBytecode = output.getInstructionOffsets();
     IInstruction[] insts = method.getInstructions();
@@ -267,9 +271,7 @@
 
   @Override
   public int copyInto(byte[] buf, int offset) {
-    for(int i = 0; i < data.length; i++) {
-      buf[offset+i] = data[i];
-    }
+    System.arraycopy(data, 0, buf, offset + 0, data.length);
     return data.length+offset;
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/TypeAnnotationsReader.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/TypeAnnotationsReader.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/TypeAnnotationsReader.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/TypeAnnotationsReader.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,780 @@
+/*******************************************************************************
+ * Copyright (c) 2016 IBM Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Martin Hecker, KIT - initial API and implementation
+ *******************************************************************************/
+package com.ibm.wala.shrikeCT;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.Pair;
+import com.ibm.wala.util.debug.Assertions;
+
+/**
+ * This class reads TypeAnnotations attributes, i.e.: RuntimeInvisibleTypeAnnotations and RuntimeVisibleTypeAnnotations
+ * 
+ * @author Martin Hecker martin.hecker@kit.edu
+ */
+public class TypeAnnotationsReader extends AnnotationsReader {
+
+  /** 
+   * required for {@link TypeAnnotationLocation#method_info} readers
+   */
+  private final ExceptionsReader exceptionReader;
+  
+  
+  /**
+   * required for {@link TypeAnnotationLocation#Code} readers
+   */
+  private final CodeReader codeReader;
+  
+  /** 
+   * required for {@link TypeAnnotationLocation#method_info} 
+   * and for  {@link TypeAnnotationLocation#ClassFile} readers
+   */
+  private final SignatureReader signatureReader;
+  
+  private final TypeAnnotationLocation location;
+  
+  protected TypeAnnotationsReader(
+      ClassReader.AttrIterator iter,
+      String label,
+      ExceptionsReader exceptionReader,
+      CodeReader codeReader,
+      SignatureReader signatureReader,
+      TypeAnnotationLocation location
+    ) throws InvalidClassFileException {
+    super(iter, label);
+    this.exceptionReader = exceptionReader;
+    this.codeReader = codeReader;
+    this.signatureReader = signatureReader;
+    this.location = location;
+  }
+  
+  
+  /**
+   * @return a TypeAnnotationReader for reading type annotations in the attributes table of a ClassFile structure
+   */
+  public static TypeAnnotationsReader getTypeAnnotationReaderAtClassfile(
+      ClassReader.AttrIterator iter,
+      String label,
+      SignatureReader signatureReader
+    ) throws InvalidClassFileException {
+    return new TypeAnnotationsReader(iter, label, null, null, signatureReader, TypeAnnotationLocation.ClassFile);
+  }
+
+  /**
+   * @return a TypeAnnotationReader for reading type annotations in the attributes table of a method_info structure
+   */
+  public static TypeAnnotationsReader getTypeAnnotationReaderAtMethodInfo(
+      ClassReader.AttrIterator iter,
+      String label,
+      ExceptionsReader exceptionReader,
+      SignatureReader signatureReader
+    ) throws InvalidClassFileException {
+    return new TypeAnnotationsReader(iter, label, exceptionReader, null, signatureReader, TypeAnnotationLocation.method_info);
+  }
+
+  /**
+   * @return a TypeAnnotationReader for reading type annotations in the attributes table of a field_info structure
+   */
+  public static TypeAnnotationsReader getTypeAnnotationReaderAtFieldInfo(
+      ClassReader.AttrIterator iter,
+      String label
+    ) throws InvalidClassFileException {
+    return new TypeAnnotationsReader(iter, label, null, null, null, TypeAnnotationLocation.field_info);
+  }
+  
+  /**
+   * @return a TypeAnnotationReader for reading type annotations in the attributes table of a Code attribute
+   */
+  public static TypeAnnotationsReader getTypeAnnotationReaderAtCode(
+      ClassReader.AttrIterator iter,
+      String label,
+      CodeReader codeReader
+    ) throws InvalidClassFileException {
+    return new TypeAnnotationsReader(iter, label, null, codeReader, null, TypeAnnotationLocation.Code);
+  }
+  
+  
+  /**
+   * @return an array TypeAnnotationAttribute[] corresponding to the annotations[num_annotations] table
+   * specified as:
+   * <pre>
+   * RuntimeVisibleTypeAnnotations_attribute {
+   *   u2              attribute_name_index;
+   *   u4              attribute_length;
+   *   u2              num_annotations;
+   *   type_annotation annotations[num_annotations];
+   * }
+   * </pre>
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20"> JLS (SE8), 4.7.20</a>
+   */
+  public TypeAnnotationAttribute[] getAllTypeAnnotations() throws InvalidClassFileException {
+    TypeAnnotationAttribute[] result = new TypeAnnotationAttribute[getAnnotationCount()];
+    int offset = beginOffset + 8; // skip attribute_name_index,
+                                  // attribute_length, and num_annotations
+    for (int i = 0; i < result.length; i++) {
+      Pair<TypeAnnotationAttribute, Integer> attributeAndSize = getTypeAttributeAndSize(offset);
+      result[i] = attributeAndSize.fst;
+      offset += attributeAndSize.snd;
+    }
+    return result;
+  }
+
+  
+  /**
+   * @param begin the offset from which to read a type annotation
+   * @return a Pair (a,i) such that "i" is the number of bytes read in order to construct "a", which is
+   * the {@link TypeAnnotationAttribute} that corresponds to the type_annotation structure at offset begin specified as:  
+   * <pre>
+   * type_annotation {
+   *   u1 target_type;
+   *   union {
+   *     type_parameter_target;
+   *     supertype_target;
+   *     type_parameter_bound_target;
+   *     empty_target;
+   *     method_formal_parameter_target;
+   *     throws_target;
+   *     localvar_target;
+   *     catch_target;
+   *     offset_target;
+   *     type_argument_target;
+   *   } target_info;
+   *   type_path target_path;
+   *   u2        type_index;
+   *   u2        num_element_value_pairs;
+   *   {   u2            element_name_index;
+   *       element_value value;
+   *   } element_value_pairs[num_element_value_pairs];
+   * }
+   * </pre> 
+   * 
+   */
+  private Pair<TypeAnnotationAttribute, Integer> getTypeAttributeAndSize(int begin) throws InvalidClassFileException {
+    TargetType target_type = TargetType.fromValue(cr.getUnsignedByte(begin));
+    
+    if (target_type == null) {
+      throw new InvalidClassFileException(begin, "Unknown target_type: " + cr.getUnsignedByte(begin));
+    }
+    
+    if (target_type.location != this.location) {
+      throw new InvalidClassFileException(
+        begin,
+        target_type + " annotation found while reading " + this.location + " annotations."
+                    + " Only valid at " + target_type.location
+      );
+    }
+    
+    final Pair<TypeAnnotationTarget, Integer> pAnnotationTargetAndSize =
+      getTypeAnnotationTargetAndSize(begin+1, target_type.target_info); 
+    
+    final int type_path_offset = begin + 1 + pAnnotationTargetAndSize.snd;
+    checkSize(type_path_offset, 1);
+    final int path_length = cr.getUnsignedByte(type_path_offset);
+    checkSize(type_path_offset + 1, 2 * path_length);
+    
+    ArrayList<Pair<TypePathKind, Integer>> type_path = new ArrayList<>(path_length);
+    int current_path_element = type_path_offset + 1;
+    for (int i = 0; i < path_length; i++) {
+      TypePathKind type_path_kind = TypePathKind.fromValue(cr.getUnsignedByte(current_path_element));
+      int type_argument_index = cr.getUnsignedByte(current_path_element + 1);
+      type_path.add(i, Pair.make(type_path_kind, type_argument_index));
+      current_path_element += 2;
+    }
+    
+    final int annotation_begin = type_path_offset + 1 + 2*path_length;
+    
+    Pair<AnnotationAttribute, Integer> pAttributeAndSize = getAttributeAndSize(annotation_begin);
+    
+    
+    return Pair.make(
+      new TypeAnnotationAttribute(
+        pAnnotationTargetAndSize.fst,
+        pAttributeAndSize.fst,
+        type_path,
+        target_type
+      ),
+      1 + pAnnotationTargetAndSize.snd + 1 + 2*path_length + pAttributeAndSize.snd
+    );
+  }
+  
+  private Pair<TypeAnnotationTarget, Integer> getTypeAnnotationTargetAndSize(int begin, TargetInfo target_info) throws InvalidClassFileException {
+    switch (target_info) {
+      case type_parameter_target: {
+        checkSize(begin, 1);
+        return Pair.<TypeAnnotationTarget, Integer>make(new TypeParameterTarget(cr.getUnsignedByte(begin)), 1);
+      }
+      case supertype_target: {
+        checkSize(begin, 2);
+        final int interfaceIndex = cr.getUShort(begin);
+        final String superType;
+        if (interfaceIndex == 65535) {
+          superType = cr.getSuperName();
+        } else {
+          superType = cr.getInterfaceName(interfaceIndex);
+        }
+        return Pair.<TypeAnnotationTarget, Integer>make(new SuperTypeTarget(superType), 2);
+      }
+      case type_parameter_bound_target: {
+        checkSize(begin, 2);
+        return Pair.<TypeAnnotationTarget, Integer>make(new TypeParameterBoundTarget(
+          cr.getUnsignedByte(begin),
+          cr.getUnsignedByte(begin+1),
+          signatureReader.getSignature()
+        ), 2);
+      }
+      case empty_target: {
+        return Pair.<TypeAnnotationTarget, Integer>make(new EmptyTarget(), 0);
+      }
+      case formal_parameter_target: {
+        checkSize(begin, 1);
+        return Pair.<TypeAnnotationTarget, Integer>make(new FormalParameterTarget(cr.getUnsignedByte(begin)), 1);
+      }
+      case throws_target: {
+        assert exceptionReader != null;
+        checkSize(begin, 2);
+        final int throwsIndex = cr.getUShort(begin);
+        return Pair.<TypeAnnotationTarget, Integer>make(new ThrowsTarget(exceptionReader.getClasses()[throwsIndex]), 2);
+      }
+      /*
+       * localvar_target {
+       * u2 table_length;
+       *   { u2 start_pc;
+             u2 length;
+             u2 index;
+       *   } table[table_length];
+       * }
+       */
+      case localvar_target: {
+        checkSize(begin, 2);
+        final int table_length = cr.getUShort(begin);
+        final int offset = begin+2;
+        checkSize(offset, (2+2+2)*table_length);
+        int[] start_pc = new int[table_length];
+        int[] length = new int[table_length];
+        int[] index = new int[table_length];
+        
+        for (int i = 0; i < table_length; i++) {
+          start_pc[i] = cr.getUShort(offset +     (2+2+2)*i);
+          length[i]   = cr.getUShort(offset + 2 + (2+2+2)*i);
+          index[i]    = cr.getUShort(offset + 4 + (2+2+2)*i);
+        }
+        return Pair.<TypeAnnotationTarget, Integer>make(new LocalVarTarget(start_pc, length, index), 2 + (2+2+2)*table_length);
+      }
+      case catch_target: {
+        assert codeReader != null;
+        checkSize(begin, 2);
+        int exception_table_index = cr.getUShort(begin);
+        int[] rawHandler = new int[4];
+        System.arraycopy(codeReader.getRawHandlers(), exception_table_index*4, rawHandler, 0, 4);
+        final String catchType = 
+            rawHandler[3] == 0 ? CatchTarget.ALL_EXCEPTIONS
+                               : cr.getCP().getCPClass(rawHandler[3]);
+        return Pair.<TypeAnnotationTarget, Integer>make(new CatchTarget(rawHandler, catchType), 2);
+      }
+      case offset_target: {
+        checkSize(begin, 2);
+        int offset  = cr.getUShort(begin);
+        return Pair.<TypeAnnotationTarget, Integer>make(new OffsetTarget(offset), 2);
+      }
+      case type_argument_target: {
+        checkSize(begin, 3);
+        int offset  = cr.getUShort(begin);
+        int type_argument_index = cr.getUnsignedByte(begin);
+        return Pair.<TypeAnnotationTarget, Integer>make(new TypeArgumentTarget(offset, type_argument_index), 3);
+      }
+      default:
+        Assertions.UNREACHABLE();
+        return null;
+    }
+  }
+  
+  /**
+   * Enumeration of those Bytecode locations where type annotation may appear (in the corresponding attribute table).
+   *  
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20"> JLS (SE8), 4.7.20</a>
+   */
+  public static enum TypeAnnotationLocation {
+    ClassFile, method_info, field_info, Code;
+  }
+  
+  /**
+   * Possible target_type items. 
+   *  
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20"> JLS (SE8), 4.7.20</a>
+   */
+  public static enum TargetInfo {
+    type_parameter_target, supertype_target, type_parameter_bound_target, empty_target, formal_parameter_target, throws_target,
+    localvar_target, catch_target, offset_target, type_argument_target
+  }
+  
+  /**
+   * Known target_types for JSR 308 Type-Annotation.
+   * 
+   * Constant names taken from <a href="http://types.cs.washington.edu/jsr308/">http://types.cs.washington.edu/jsr308/</a>
+   * 
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20"> JLS (SE8), 4.7.20</a>
+   */
+  // TODO: This somewhat mirrors com.sun.tools.javac.code.TargetType, maybe just use that instead?
+  public static enum TargetType {
+    CLASS_TYPE_PARAMETER(                0x00, TargetInfo.type_parameter_target,       TypeAnnotationLocation.ClassFile),
+    METHOD_TYPE_PARAMETER(               0x01, TargetInfo.type_parameter_target,       TypeAnnotationLocation.method_info),
+    
+    CLASS_EXTENDS(                       0x10, TargetInfo.supertype_target,            TypeAnnotationLocation.ClassFile),
+    CLASS_TYPE_PARAMETER_BOUND(          0x11, TargetInfo.type_parameter_bound_target, TypeAnnotationLocation.ClassFile),
+    METHOD_TYPE_PARAMETER_BOUND(         0x12, TargetInfo.type_parameter_bound_target, TypeAnnotationLocation.method_info),
+    FIELD(                               0x13, TargetInfo.empty_target,                TypeAnnotationLocation.field_info),
+    METHOD_RETURN(                       0x14, TargetInfo.empty_target,                TypeAnnotationLocation.method_info),
+    METHOD_RECEIVER(                     0x15, TargetInfo.empty_target,                TypeAnnotationLocation.method_info),
+    METHOD_FORMAL_PARAMETER(             0x16, TargetInfo.formal_parameter_target,     TypeAnnotationLocation.method_info),
+    THROWS(                              0x17, TargetInfo.throws_target,               TypeAnnotationLocation.method_info),
+
+    LOCAL_VARIABLE(                      0x40, TargetInfo.localvar_target,             TypeAnnotationLocation.Code),
+    RESOURCE_VARIABLE(                   0x41, TargetInfo.localvar_target,             TypeAnnotationLocation.Code),
+    EXCEPTION_PARAMETER(                 0x42, TargetInfo.catch_target,                TypeAnnotationLocation.Code),
+    INSTANCEOF(                          0x43, TargetInfo.offset_target,               TypeAnnotationLocation.Code),
+    NEW(                                 0x44, TargetInfo.offset_target,               TypeAnnotationLocation.Code),
+    CONSTRUCTOR_REFERENCE(               0x45, TargetInfo.offset_target,               TypeAnnotationLocation.Code),
+    METHOD_REFERENCE(                    0x46, TargetInfo.offset_target,               TypeAnnotationLocation.Code),
+    CAST(                                0x47, TargetInfo.type_argument_target,        TypeAnnotationLocation.Code),
+    CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT(0x48, TargetInfo.type_argument_target,        TypeAnnotationLocation.Code),
+    METHOD_INVOCATION_TYPE_ARGUMENT(     0x49, TargetInfo.type_argument_target,        TypeAnnotationLocation.Code),
+    CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT( 0x4A, TargetInfo.type_argument_target,        TypeAnnotationLocation.Code),
+    METHOD_REFERENCE_TYPE_ARGUMENT(      0x4B, TargetInfo.type_argument_target,        TypeAnnotationLocation.Code);
+    
+    private static final Map<Integer, TargetType> fromValue;
+    
+    static {
+      final TargetType[] targetTypes = TargetType.values();
+      fromValue = HashMapFactory.make(targetTypes.length);
+      for (TargetType targetType : targetTypes) {
+        fromValue.put(targetType.target_type, targetType);
+      }
+    }
+    
+    public static TargetType fromValue(int value) {
+      return fromValue.get(value);
+    }
+    
+    public final int target_type;
+    public final TargetInfo target_info;
+    public final TypeAnnotationLocation location;
+    TargetType(int target_type, TargetInfo target_info, TypeAnnotationLocation location) {
+      if (!(0 <= target_type && target_type <= Byte.MAX_VALUE)) {
+        throw new IllegalArgumentException(
+          "Code may break for target_type that does not fit in a Java (signed!) byte"
+        );  
+      }
+      
+      this.target_type = target_type;
+      this.target_info = target_info;
+      this.location = location;
+    }
+    
+  }
+  
+  /**
+   * A {@link TypeAnnotationTarget} represents one of the possible target_info structure 
+   * <pre>
+   * union {
+   *     type_parameter_target;
+   *     supertype_target;
+   *     type_parameter_bound_target;
+   *     empty_target;
+   *     method_formal_parameter_target;
+   *     throws_target;
+   *     localvar_target;
+   *     catch_target;
+   *     offset_target;
+   *     type_argument_target;
+   * } target_info;
+   * </pre>
+   * @author Martin Hecker martin.hecker@kit.edu  
+   */
+  public static abstract class TypeAnnotationTarget {
+    private final TargetInfo targetInfo;
+    protected TypeAnnotationTarget(TargetInfo targetInfo) {
+      this.targetInfo = targetInfo;
+    }
+    public TargetInfo getTargetInfo() {
+      return targetInfo;
+    }
+    
+    public abstract <R> R acceptVisitor(TypeAnnotationTargetVisitor<R> visitor);
+  }
+  
+  public static interface TypeAnnotationTargetVisitor<R> {
+    R visitTypeParameterTarget(TypeParameterTarget target);
+    R visitSuperTypeTarget(SuperTypeTarget target );
+    R visitTypeParameterBoundTarget(TypeParameterBoundTarget target);
+    R visitEmptyTarget(EmptyTarget target);
+    R visitFormalParameterTarget(FormalParameterTarget target);
+    R visitThrowsTarget(ThrowsTarget target);
+    R visitLocalVarTarget(LocalVarTarget target);
+    R visitCatchTarget(CatchTarget target);
+    R visitOffsetTarget(OffsetTarget target);
+    R visitTypeArgumentTarget(TypeArgumentTarget target);
+  }
+  
+  /**
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20.1-100-A.1"> JLS (SE8), 4.7.20.1 A</a>
+   */
+  public static class TypeParameterTarget extends TypeAnnotationTarget {
+    private final int type_parameter_index;
+    public TypeParameterTarget(int type_parameter_index) {
+      super(TargetInfo.type_parameter_target);
+      this.type_parameter_index = type_parameter_index;
+    }
+
+    public int getIndex() {
+      return type_parameter_index;
+    }
+    
+    @Override
+    public <R> R acceptVisitor(TypeAnnotationTargetVisitor<R> visitor) {
+      return visitor.visitTypeParameterTarget(this);
+    }
+  }
+
+  /**
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20.1-100-B.1"> JLS (SE8), 4.7.20.1 B</a>
+   */
+  public static class SuperTypeTarget extends TypeAnnotationTarget {
+    private final String superType;
+    public SuperTypeTarget(String superType) {
+      super(TargetInfo.supertype_target);
+      this.superType = superType;
+    }
+
+    public String getSuperType() {
+      return superType;
+    }
+    
+    @Override
+    public <R> R acceptVisitor(TypeAnnotationTargetVisitor<R> visitor) {
+      return visitor.visitSuperTypeTarget(this);
+    }
+  }
+  
+  /**
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20.1-100-C.1"> JLS (SE8), 4.7.20.1 C</a>
+   */
+  public static class TypeParameterBoundTarget extends TypeAnnotationTarget {
+    private final int type_parameter_index;
+    private final int bound_index;
+    private final String boundSignature;
+    
+    public TypeParameterBoundTarget(int type_parameter_index, int bound_index, String boundSignature) {
+      super(TargetInfo.type_parameter_bound_target);
+      this.type_parameter_index = type_parameter_index;
+      this.bound_index = bound_index;
+      this.boundSignature = boundSignature;
+    }
+
+    public int getParameterIndex() {
+      return type_parameter_index;
+    }
+
+    public int getBoundIndex() {
+      return bound_index;
+    }
+    
+    @Override
+    public <R> R acceptVisitor(TypeAnnotationTargetVisitor<R> visitor) {
+      return visitor.visitTypeParameterBoundTarget(this);
+    }
+
+    public String getBoundSignature() {
+      return boundSignature;
+    }
+  }
+
+  /**
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20.1-100-D.1"> JLS (SE8), 4.7.20.1 D</a>
+   */
+  public static class EmptyTarget extends TypeAnnotationTarget {
+    public EmptyTarget() {
+      super(TargetInfo.empty_target);
+    }
+    
+    @Override
+    public <R> R acceptVisitor(TypeAnnotationTargetVisitor<R> visitor) {
+      return visitor.visitEmptyTarget(this);
+    }
+  }
+
+  
+  /**
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20.1-100-E.1"> JLS (SE8), 4.7.20.1 E</a>
+   */
+  public static class FormalParameterTarget  extends TypeAnnotationTarget {
+    private final int formal_parameter_index;
+    public FormalParameterTarget(int index) {
+      super(TargetInfo.formal_parameter_target);
+      this.formal_parameter_index = index;
+    }
+
+    public int getIndex() {
+      return formal_parameter_index;
+    }
+    
+    @Override
+    public <R> R acceptVisitor(TypeAnnotationTargetVisitor<R> visitor) {
+      return visitor.visitFormalParameterTarget(this);
+    }
+  }
+  
+  /**
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20.1-100-F.1"> JLS (SE8), 4.7.20.1 F</a>
+   */
+  public static class ThrowsTarget extends TypeAnnotationTarget {
+    private final String throwType;
+    public ThrowsTarget(String throwType) {
+      super(TargetInfo.supertype_target);
+      this.throwType = throwType;
+    }
+
+    public String getThrowType() {
+      return throwType;
+    }
+    
+    @Override
+    public <R> R acceptVisitor(TypeAnnotationTargetVisitor<R> visitor) {
+      return visitor.visitThrowsTarget(this);
+    }
+  }
+  
+  /**
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20.1-100-G.1"> JLS (SE8), 4.7.20.1 G</a>
+   */
+  public static class LocalVarTarget extends TypeAnnotationTarget {
+    private final int[] start_pc;
+    private final int[] length;
+    private final int[] index;
+    public LocalVarTarget(int[] start_pc, int[] length, int[] index) {
+      super(TargetInfo.localvar_target);
+      if (!(start_pc.length == length.length && length.length == index.length)) throw new IllegalArgumentException();
+      // TODO: do we really need to copy here? Can't we trust callees not to change arrays after the fact?
+      this.start_pc = Arrays.copyOf(start_pc, start_pc.length);
+      this.length   = Arrays.copyOf(length, length.length);
+      this.index    = Arrays.copyOf(index, index.length);
+    }
+    
+    public int getNrOfRanges() {
+      return start_pc.length;
+    }
+    
+    public int getStartPc(int range) {
+      return start_pc[range];
+    }
+
+    public int getLength(int range) {
+      return length[range];
+    }
+
+    public int getIndex(int range) {
+      return index[range];
+    }
+    
+    @Override
+    public <R> R acceptVisitor(TypeAnnotationTargetVisitor<R> visitor) {
+      return visitor.visitLocalVarTarget(this);
+    }
+  }
+  
+  /**
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20.1-100-H.1"> JLS (SE8), 4.7.20.1 H</a>
+   */
+  public static class CatchTarget extends TypeAnnotationTarget {
+    private final int[] rawHandler;
+    private final String catchType;
+    
+    public static final String ALL_EXCEPTIONS = null;
+    
+    public CatchTarget(int[] rawHandler, String catchType) {
+      super(TargetInfo.catch_target);
+      this.rawHandler = rawHandler;
+      this.catchType = catchType;
+    }
+    /**
+     * @return The type-annotations targets raw handler, i.e.: a 4 tuple (startPC, endPC, catchPC, catchClassIndex)
+     * @see CodeReader
+     */
+    public int[] getRawHandler() {
+      // TODO: do we really need to copy here? Can't we trust callees not to change arrays after the fact?
+      return Arrays.copyOf(rawHandler, rawHandler.length);
+    }
+    
+    @Override
+    public <R> R acceptVisitor(TypeAnnotationTargetVisitor<R> visitor) {
+      return visitor.visitCatchTarget(this);
+    }
+
+    public String getCatchType() {
+      return catchType;
+    }
+    
+    public int getStartPC() {
+      return rawHandler[0];
+    }
+    
+    public int getEndPC() {
+      return rawHandler[1];
+    }
+    
+    public int getCatchPC() {
+      return rawHandler[2];
+    }
+  }
+  
+  /**
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20.1-100-I.1"> JLS (SE8), 4.7.20.1 I</a>
+   */
+  public static class OffsetTarget extends TypeAnnotationTarget {
+    private final int offset;
+    
+    public OffsetTarget(int offset) {
+      super(TargetInfo.offset_target);
+      this.offset = offset;
+    }
+    public int getOffset() {
+      return offset;
+    }
+    
+    @Override
+    public <R> R acceptVisitor(TypeAnnotationTargetVisitor<R> visitor) {
+      return visitor.visitOffsetTarget(this);
+    }
+  }
+  
+  /**
+   * @see <a href="https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20.1-100-J.1"> JLS (SE8), 4.7.20.1 J</a>
+   */
+  public static class TypeArgumentTarget extends TypeAnnotationTarget {
+    private final int offset;
+    private final int type_argument_index;
+    
+    public TypeArgumentTarget(int offset, int type_argument_index) {
+      super(TargetInfo.type_argument_target);
+      this.offset = offset;
+      this.type_argument_index = type_argument_index;
+    }
+    public int getOffset() {
+      return offset;
+    }
+    public int getTypeArgumentIndex() {
+      return type_argument_index;
+    }
+    
+    @Override
+    public <R> R acceptVisitor(TypeAnnotationTargetVisitor<R> visitor) {
+      return visitor.visitTypeArgumentTarget(this);
+    }
+  }
+  
+  public static enum AnnotationType {
+    RuntimeInvisibleTypeAnnotations, RuntimeVisibleTypeAnnotations
+  }
+
+  public static enum TypePathKind {
+    DEEPER_IN_ARRAY(0),
+    DEEPER_IN_NESTED(1),
+    WILDCARD_BOUND(2),
+    TYPE_ARGUMENT(3);
+    
+    private final int type_path_kind;
+    private TypePathKind(int type_path_kind) {
+      this.type_path_kind = type_path_kind;
+    }
+    
+    private static final Map<Integer, TypePathKind> fromValue;
+    
+    static {
+      final TypePathKind[] typePathKinds = TypePathKind.values();
+      fromValue = HashMapFactory.make(typePathKinds.length);
+      for (TypePathKind typePathKind : typePathKinds) {
+        fromValue.put(typePathKind.type_path_kind, typePathKind);
+      }
+    }
+    
+    public static TypePathKind fromValue(int value) {
+      return fromValue.get(value);
+    }
+  }
+  
+  public static final List<Pair<TypePathKind, Integer>> TYPEPATH_EMPTY = Collections.emptyList();
+  
+  public static class TypeAnnotationAttribute {
+    public final TypeAnnotationTarget annotationTarget;
+    public final AnnotationAttribute annotationAttribute;
+    public final List<Pair<TypePathKind, Integer>> typePath;
+    public final TargetType targetType;
+    
+    public TypeAnnotationAttribute(
+      TypeAnnotationTarget annotationTarget,
+      AnnotationAttribute annotationAttribute,
+      List<Pair<TypePathKind, Integer>> typePath,
+      TargetType targetType
+    ) {
+      this.annotationTarget = annotationTarget;
+      this.annotationAttribute = annotationAttribute;
+      this.typePath = Collections.unmodifiableList(typePath);
+      this.targetType = targetType;
+    }
+  }
+  
+  public static boolean isKnownAnnotation(String name) {
+    for (AnnotationType t : AnnotationType.values()) {
+      if (t.name().equals(name)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  private static interface Action {
+    TypeAnnotationsReader apply() throws InvalidClassFileException;
+  }
+  public static TypeAnnotationsReader getReaderForAnnotationAtClassfile(final AnnotationType type, final ClassReader.AttrIterator iter, final SignatureReader signatureReader) {
+      return advanceIter(type, iter, () -> getTypeAnnotationReaderAtClassfile(iter, type.toString(), signatureReader));
+  }
+  
+  public static TypeAnnotationsReader getReaderForAnnotationAtMethodInfo(final AnnotationType type, final ClassReader.AttrIterator iter, final ExceptionsReader exceptionReader, final SignatureReader signatureReader) {
+    return advanceIter(type, iter, () -> getTypeAnnotationReaderAtMethodInfo(iter, type.toString(), exceptionReader, signatureReader));
+  }
+
+  public static TypeAnnotationsReader getReaderForAnnotationAtFieldInfo(final AnnotationType type, final ClassReader.AttrIterator iter) {
+    return advanceIter(type, iter, () -> getTypeAnnotationReaderAtFieldInfo(iter, type.toString()));
+  }
+  
+  
+  public static TypeAnnotationsReader getReaderForAnnotationAtCode(final AnnotationType type, final ClassReader.AttrIterator iter, final CodeReader codereader) {
+    return advanceIter(type, iter, () -> getTypeAnnotationReaderAtCode(iter, type.toString(), codereader));
+  }
+
+  
+  private static TypeAnnotationsReader advanceIter(AnnotationType type, ClassReader.AttrIterator iter, Action newReader){
+    // search for the desired attribute
+    final String attrName = type.toString();
+    try {
+      for (; iter.isValid(); iter.advance()) {
+        if (iter.getName().equals(attrName)) return newReader.apply();
+      }
+    } catch (InvalidClassFileException e) {
+      Assertions.UNREACHABLE();
+    }
+    return null;
+  }
+}
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,7 +27,7 @@
  * @see CRTData
  * @see CRTFlags
  * @author Siegfried Weber
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  */
 public final class CRTable extends PositionsAttribute {
 
@@ -72,7 +72,7 @@
       } catch (InvalidCRTDataException e) {
         LinkedList<Object> l = e.getData();
         if (l == null)
-          l = new LinkedList<Object>();
+          l = new LinkedList<>();
         l.addFirst(i);
         Debug.warn(e.getMessage(), l.toArray());
       }
@@ -121,9 +121,9 @@
     StringBuilder sb = new StringBuilder();
 
     for (int i = 0; i < crt.length; i++) {
-      sb.append(i + " -> ");
+      sb.append(i).append(" -> ");
       sb.append(crt[i] == null ? "<null>" : crt[i]);
-      sb.append("\n");
+      sb.append('\n');
     }
 
     return sb.toString();
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTData.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTData.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTData.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTData.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,13 +17,15 @@
 
 package com.ibm.wala.sourcepos;
 
+import com.ibm.wala.sourcepos.InvalidRangeException.Cause;
+
 /**
  * This class represents an entry in the CharacterRangeTable.
  * 
  * @see CRTFlags
  * @see CRTable
  * @author Siegfried Weber
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  */
 public final class CRTData {
 
@@ -117,13 +119,16 @@
     try {
       range = new Range(source_start, source_end);
     } catch (InvalidRangeException e) {
-      switch (e.getThisCause()) {
+      final Cause cause = e.getThisCause();
+      switch (cause) {
       case END_BEFORE_START:
         throw new InvalidCRTDataException(WARN_END_BEFORE_START, source_start.toString(), source_end.toString());
       case START_UNDEFINED:
         throw new InvalidCRTDataException(WARN_START_UNDEFINED);
       case END_UNDEFINED:
         throw new InvalidCRTDataException(WARN_END_UNDEFINED);
+      default:
+        throw new UnsupportedOperationException(String.format("cannot convert %s into an InvalidCRTDataException", cause));
       }
     } finally {
       this.source_positions = range;
@@ -197,6 +202,6 @@
 
   @Override
   public String toString() {
-    return "(Range [pc]: " + pc_start_index + "-" + pc_end_index + ") => " + source_positions.toString();
+    return "(Range [pc]: " + pc_start_index + '-' + pc_end_index + ") => " + source_positions.toString();
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTFlags.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTFlags.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTFlags.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTFlags.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,7 +26,7 @@
  * @see CRTData
  * @see CRTable
  * @author Siegfried Weber
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  */
 public final class CRTFlags {
 
@@ -70,7 +70,7 @@
    * @return An array of Strings containing the flag names.
    */
   public final String[] getFlagNames() {
-    LinkedList<String> names = new LinkedList<String>();
+    LinkedList<String> names = new LinkedList<>();
     int index = 0;
     short tFlags = flags;
     while (tFlags > 0) {
@@ -80,13 +80,13 @@
         else {
           // assert false
           // because exception was thrown in the constructor.
-          names.add("UNKNOWN (" + Integer.toHexString(2 << index) + ")");
+          names.add("UNKNOWN (" + Integer.toHexString(2 << index) + ')');
         }
       }
       tFlags >>= 1;
       ++index;
     }
-    return names.toArray(new String[names.size()]);
+    return names.toArray(new String[0]);
   }
 
   /**
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Debug.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Debug.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Debug.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Debug.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,6 +16,7 @@
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -23,7 +24,7 @@
 import java.util.Set;
 
 /**
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  * 
  */
 public final class Debug {
@@ -45,17 +46,15 @@
     public boolean isHigherPriority(LogLevel l) {
       return priority > l.priority;
     }
-  };
+  }
 
   private static PrintStream OUT_STREAM = System.out;
 
-  private static final Map<LogLevel, LogStream> logStreams = new HashMap<LogLevel, LogStream>();
+  private static final Map<LogLevel, LogStream> logStreams = new HashMap<>();
 
-  private static Set<LogLevel> allowed = new HashSet<LogLevel>();
+  private static Set<LogLevel> allowed = new HashSet<>();
   static {
-    for (int i = 0; i < LogLevel.values().length; i++) {
-      allowed.add(LogLevel.values()[i]);
-    }
+      allowed.addAll(Arrays.asList(LogLevel.values()));
   }
 
   public static void setLogFile(String file) throws FileNotFoundException {
@@ -70,8 +69,6 @@
 
   /**
    * Set to log all events with the given or higher priority
-   * 
-   * @param level
    */
   public static void setMinLogLevel(LogLevel level) {
     for (LogLevel l : LogLevel.values()) {
@@ -96,36 +93,36 @@
   }
 
   public static void error(String str, Object... obj) {
-    log(LogLevel.ERROR, str + "\n", obj);
+    log(LogLevel.ERROR, str + '\n', obj);
   }
 
   public static void warn(String str, Object... obj) {
-    log(LogLevel.WARN, str + "\n", obj);
+    log(LogLevel.WARN, str + '\n', obj);
   }
 
   public static void info(String str, Object... obj) {
-    log(LogLevel.INFO, str + "\n", obj);
+    log(LogLevel.INFO, str + '\n', obj);
   }
 
   public static void debug(String str, Object... obj) {
-    log(LogLevel.DEBUG, str + "\n", obj);
+    log(LogLevel.DEBUG, str + '\n', obj);
   }
 
   public static void error(String str) {
-    log(LogLevel.ERROR, str + "\n");
+    log(LogLevel.ERROR, str + '\n');
   }
 
   public static void warn(String str) {
-    log(LogLevel.WARN, str + "\n");
+    log(LogLevel.WARN, str + '\n');
   }
 
   public static void logTime() {
     Date date = new Date();
-    log(LogLevel.INFO, "Current time: " + date + "\n");
+    log(LogLevel.INFO, "Current time: " + date + '\n');
   }
 
   public static void info(String str) {
-    log(LogLevel.INFO, str + "\n");
+    log(LogLevel.INFO, str + '\n');
   }
 
   public static void appendInfo(String str) {
@@ -135,7 +132,7 @@
   }
 
   public static void debug(String str) {
-    log(LogLevel.DEBUG, str + "\n");
+    log(LogLevel.DEBUG, str + '\n');
   }
 
   public static void error(Throwable t) {
@@ -196,7 +193,7 @@
 
     @Override
     public void println(String str) {
-      Debug.log(level, str + "\n");
+      Debug.log(level, str + '\n');
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidCRTDataException.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidCRTDataException.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidCRTDataException.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidCRTDataException.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,6 +17,7 @@
 
 package com.ibm.wala.sourcepos;
 
+import java.util.Arrays;
 import java.util.LinkedList;
 
 /**
@@ -26,7 +27,7 @@
  * @see CRTData
  * @see CRTFlags
  * @author Siegfried Weber
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  */
 class InvalidCRTDataException extends Exception {
 
@@ -36,14 +37,14 @@
   private LinkedList<Object> data;
 
   /**
-   * Creates a new instance of <code>InvalidCRTDataException</code> without
+   * Creates a new instance of {@code InvalidCRTDataException} without
    * detail message.
    */
   InvalidCRTDataException() {
   }
 
   /**
-   * Constructs an instance of <code>InvalidCRTDataException</code> with the
+   * Constructs an instance of {@code InvalidCRTDataException} with the
    * specified detail message.
    * 
    * @param msg
@@ -54,7 +55,7 @@
   }
 
   /**
-   * Constructs an instance of <code>InvalidCRTDataException</code> with the
+   * Constructs an instance of {@code InvalidCRTDataException} with the
    * specified detail message and additional information.
    * 
    * @param msg
@@ -64,9 +65,8 @@
    */
   InvalidCRTDataException(String msg, Object... data) {
     super(msg);
-    this.data = new LinkedList<Object>();
-    for (Object o : data)
-      this.data.add(o);
+    this.data = new LinkedList<>();
+    this.data.addAll(Arrays.asList(data));
   }
 
   /**
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidPositionException.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidPositionException.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidPositionException.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidPositionException.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,7 +21,7 @@
  * An exception for invalid positions.
  * 
  * @author Siegfried Weber
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  */
 class InvalidPositionException extends Exception {
 
@@ -36,7 +36,7 @@
   private Cause cause;
 
   /**
-   * Constructs an instance of <code>InvalidRangeException</code> with the
+   * Constructs an instance of {@code InvalidRangeException} with the
    * specified cause.
    * 
    * @param c
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidRangeException.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidRangeException.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidRangeException.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidRangeException.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,7 +21,7 @@
  * An exception for invalid ranges.
  * 
  * @author Siegfried Weber
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  */
 class InvalidRangeException extends Exception {
 
@@ -36,7 +36,7 @@
   private Cause cause;
 
   /**
-   * Constructs an instance of <code>InvalidRangeException</code> with the
+   * Constructs an instance of {@code InvalidRangeException} with the
    * specified cause.
    * 
    * @param c
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidSourceInfoException.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidSourceInfoException.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidSourceInfoException.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidSourceInfoException.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,21 +23,21 @@
  * CharacterRangeTable.
  * 
  * @author Siegfried Weber
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  */
 public class InvalidSourceInfoException extends Exception {
 
   private static final long serialVersionUID = -5895195422989965097L;
 
   /**
-   * Creates a new instance of <code>InvalidSourceInfoException</code> without
+   * Creates a new instance of {@code InvalidSourceInfoException} without
    * detail message.
    */
   public InvalidSourceInfoException() {
   }
 
   /**
-   * Constructs an instance of <code>InvalidSourceInfoException</code> with the
+   * Constructs an instance of {@code InvalidSourceInfoException} with the
    * specified detail message.
    * 
    * @param msg
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,11 +20,13 @@
 import java.io.DataInputStream;
 import java.io.IOException;
 
+import com.ibm.wala.sourcepos.InvalidRangeException.Cause;
+
 /**
  * This class represents the MethodPositions attribute.
  * 
  * @author Siegfried Weber
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  */
 public final class MethodPositions extends PositionsAttribute {
 
@@ -43,6 +45,8 @@
 
   private static final String ERR_END_BEFORE_START = "Error in MethodPositions attribute: %2$s (%4$s) is before %1$s (%3$s).";
 
+  private static final String ERR_UNKNOWN_REASON = "Error in MethodPositions attribute: unknown reason %1$s.";
+
   private static final String WARN_INVALID_BLOCK_END = "Warning in MethodPositions attribute: Invalid method block end position.";
 
   private static final String WARN_PARAMETER_NOT_IN_DECLARATION = "Warning in MethodPositions attribute: Parameter not in the declaration range.";
@@ -98,7 +102,7 @@
    * @throws IOException
    *           if the input stream cannot be read
    */
-  private Range readRange(DataInputStream in, String startVarName, String endVarName, boolean undefinedAllowed) throws IOException {
+  private static Range readRange(DataInputStream in, String startVarName, String endVarName, boolean undefinedAllowed) throws IOException {
     boolean valid = true;
     Range range = null;
     Position start = null;
@@ -117,13 +121,19 @@
       try {
         range = new Range(start, end);
       } catch (InvalidRangeException e) {
-        switch (e.getThisCause()) {
+        final Cause thisCause = e.getThisCause();
+        switch (thisCause) {
         case END_BEFORE_START:
           Debug.warn(ERR_END_BEFORE_START, startVarName, endVarName, start, end);
+          break;
         case START_UNDEFINED:
           Debug.warn(ERR_POSITION_UNDEFINED, startVarName);
+          break;
         case END_UNDEFINED:
           Debug.warn(ERR_POSITION_UNDEFINED, endVarName);
+          break;
+        default:
+          Debug.warn(ERR_UNKNOWN_REASON, thisCause);
         }
       }
     }
@@ -150,7 +160,7 @@
    * @throws InvalidPositionException
    *           if the read position is invalid
    */
-  private Position readPosition(DataInputStream in, String varName) throws IOException, InvalidPositionException {
+  private static Position readPosition(DataInputStream in, String varName) throws IOException, InvalidPositionException {
     Position pos = null;
     try {
       pos = new Position(in.readInt());
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Position.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Position.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Position.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Position.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,7 +22,7 @@
  * format: {@code line-number << LINESHIFT + column-number}
  * 
  * @author Siegfried Weber
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  */
 public final class Position {
 
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/PositionsAttribute.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/PositionsAttribute.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/PositionsAttribute.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/PositionsAttribute.java	2019-01-29 17:08:39.000000000 +0000
@@ -25,7 +25,7 @@
  * This is the super class of all position attributes.
  * 
  * @author Siegfried Weber
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  */
 abstract class PositionsAttribute {
 
diff -Nru wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Range.java wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Range.java
--- wala-1.3.9/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Range.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Range.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,7 +21,7 @@
  * This class represents a range in the source file.
  * 
  * @author Siegfried Weber
- * @author Juergen Graf <juergen.graf@gmail.com>
+ * @author Juergen Graf &lt;juergen.graf@gmail.com&gt;
  */
 public class Range {
 
@@ -115,6 +115,6 @@
 
   @Override
   public String toString() {
-    return (start.isUndefined() ? "<undefined>" : "(" + getStartPosition() + ") - (" + getEndPosition() + ")");
+    return (start.isUndefined() ? "<undefined>" : "(" + getStartPosition() + ") - (" + getEndPosition() + ')');
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.tests_feature/build.properties wala-1.5.1/com.ibm.wala.tests_feature/build.properties
--- wala-1.3.9/com.ibm.wala.tests_feature/build.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests_feature/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               license.html,\
+               notice.html
diff -Nru wala-1.3.9/com.ibm.wala.tests_feature/feature.properties wala-1.5.1/com.ibm.wala.tests_feature/feature.properties
--- wala-1.3.9/com.ibm.wala.tests_feature/feature.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests_feature/feature.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+
+
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_VAR
+
+#
+# Feature details
+#
+featureName = WALA Test Bundles
+providerName = IBM
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.tests_feature/feature.xml wala-1.5.1/com.ibm.wala.tests_feature/feature.xml
--- wala-1.3.9/com.ibm.wala.tests_feature/feature.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests_feature/feature.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.ibm.wala.tests_feature"
+      label="%featureName"
+      version="1.5.1"
+      provider-name="%providerName">
+
+   <plugin
+         id="com.ibm.wala.cast.java.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.ibm.wala.cast.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.ibm.wala.core.testdata"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.ibm.wala.core.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff -Nru wala-1.3.9/com.ibm.wala.tests_feature/pom.xml wala-1.5.1/com.ibm.wala.tests_feature/pom.xml
--- wala-1.3.9/com.ibm.wala.tests_feature/pom.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests_feature/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>WALA</artifactId>
+    <groupId>com.ibm.wala</groupId>
+    <version>1.5.1</version>
+  </parent>
+  <artifactId>com.ibm.wala.tests_feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
diff -Nru wala-1.3.9/com.ibm.wala.tests_feature/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.tests_feature/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.tests_feature/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests_feature/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,9 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude06113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T02111contentType131org.eclipse.pde.featureManifestF
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.tests-feature/build.properties wala-1.5.1/com.ibm.wala.tests-feature/build.properties
--- wala-1.3.9/com.ibm.wala.tests-feature/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests-feature/build.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html,\
-               notice.html
diff -Nru wala-1.3.9/com.ibm.wala.tests-feature/feature.properties wala-1.5.1/com.ibm.wala.tests-feature/feature.properties
--- wala-1.3.9/com.ibm.wala.tests-feature/feature.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests-feature/feature.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-
-
-# NLS_ENCODING=UTF-8
-# NLS_MESSAGEFORMAT_VAR
-
-#
-# Feature details
-#
-featureName = WALA Test Bundles
-providerName = IBM
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.tests-feature/feature.xml wala-1.5.1/com.ibm.wala.tests-feature/feature.xml
--- wala-1.3.9/com.ibm.wala.tests-feature/feature.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests-feature/feature.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.ibm.wala.tests-feature"
-      label="%featureName"
-      version="1.3.9"
-      provider-name="%providerName">
-
-   <plugin
-         id="com.ibm.wala.cast.java.test"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.ibm.wala.cast.test"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.ibm.wala.core.testdata"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.ibm.wala.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff -Nru wala-1.3.9/com.ibm.wala.tests-feature/pom.xml wala-1.5.1/com.ibm.wala.tests-feature/pom.xml
--- wala-1.3.9/com.ibm.wala.tests-feature/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests-feature/pom.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>WALA</artifactId>
-    <groupId>com.ibm.wala</groupId>
-    <version>1.3.9</version>
-  </parent>
-  <artifactId>com.ibm.wala.tests-feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.tests-feature/.project wala-1.5.1/com.ibm.wala.tests-feature/.project
--- wala-1.3.9/com.ibm.wala.tests-feature/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests-feature/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.tests-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.tests.ide_feature/build.properties wala-1.5.1/com.ibm.wala.tests.ide_feature/build.properties
--- wala-1.3.9/com.ibm.wala.tests.ide_feature/build.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests.ide_feature/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               feature.properties,\
+               license.html,\
+               notice.html
diff -Nru wala-1.3.9/com.ibm.wala.tests.ide_feature/feature.properties wala-1.5.1/com.ibm.wala.tests.ide_feature/feature.properties
--- wala-1.3.9/com.ibm.wala.tests.ide_feature/feature.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests.ide_feature/feature.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+
+
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_VAR
+
+#
+# Feature details
+#
+featureName = WALA Test IDE Bundles
+providerName = IBM
diff -Nru wala-1.3.9/com.ibm.wala.tests.ide_feature/feature.xml wala-1.5.1/com.ibm.wala.tests.ide_feature/feature.xml
--- wala-1.3.9/com.ibm.wala.tests.ide_feature/feature.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests.ide_feature/feature.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.ibm.wala.tests.ide"
+      label="%featureName"
+      version="1.5.1"
+      provider-name="%providerName">
+
+   <plugin
+         id="com.ibm.wala.ide.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff -Nru wala-1.3.9/com.ibm.wala.tests.ide_feature/pom.xml wala-1.5.1/com.ibm.wala.tests.ide_feature/pom.xml
--- wala-1.3.9/com.ibm.wala.tests.ide_feature/pom.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests.ide_feature/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>WALA</artifactId>
+    <groupId>com.ibm.wala</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <groupId>com.ibm.wala</groupId>
+  <artifactId>com.ibm.wala.tests.ide</artifactId>
+  <version>1.1.3-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff -Nru wala-1.3.9/com.ibm.wala.tests.ide_feature/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.tests.ide_feature/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.tests.ide_feature/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests.ide_feature/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,9 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude06113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T02111contentType131org.eclipse.pde.featureManifestF
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.tests.ide-feature/build.properties wala-1.5.1/com.ibm.wala.tests.ide-feature/build.properties
--- wala-1.3.9/com.ibm.wala.tests.ide-feature/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests.ide-feature/build.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html,\
-               notice.html
diff -Nru wala-1.3.9/com.ibm.wala.tests.ide-feature/feature.properties wala-1.5.1/com.ibm.wala.tests.ide-feature/feature.properties
--- wala-1.3.9/com.ibm.wala.tests.ide-feature/feature.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests.ide-feature/feature.properties	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-
-
-# NLS_ENCODING=UTF-8
-# NLS_MESSAGEFORMAT_VAR
-
-#
-# Feature details
-#
-featureName = WALA Test IDE Bundles
-providerName = IBM
diff -Nru wala-1.3.9/com.ibm.wala.tests.ide-feature/feature.xml wala-1.5.1/com.ibm.wala.tests.ide-feature/feature.xml
--- wala-1.3.9/com.ibm.wala.tests.ide-feature/feature.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests.ide-feature/feature.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.ibm.wala.tests.ide"
-      label="%featureName"
-      version="1.3.9"
-      provider-name="%providerName">
-
-   <plugin
-         id="com.ibm.wala.ide.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff -Nru wala-1.3.9/com.ibm.wala.tests.ide-feature/pom.xml wala-1.5.1/com.ibm.wala.tests.ide-feature/pom.xml
--- wala-1.3.9/com.ibm.wala.tests.ide-feature/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests.ide-feature/pom.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>WALA</artifactId>
-    <groupId>com.ibm.wala</groupId>
-    <version>0.0.1-SNAPSHOT</version>
-  </parent>
-  <groupId>com.ibm.wala</groupId>
-  <artifactId>com.ibm.wala.tests.ide</artifactId>
-  <version>1.1.3-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-</project>
diff -Nru wala-1.3.9/com.ibm.wala.tests.ide-feature/.project wala-1.5.1/com.ibm.wala.tests.ide-feature/.project
--- wala-1.3.9/com.ibm.wala.tests.ide-feature/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.tests.ide-feature/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.tests.ide-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.util/build.gradle wala-1.5.1/com.ibm.wala.util/build.gradle
--- wala-1.3.9/com.ibm.wala.util/build.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/build.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,16 @@
+plugins {
+	id 'eclipse'
+}
+
+eclipse.project.natures 'org.eclipse.pde.PluginNature'
+
+sourceSets.main.java.srcDirs = ['src']
+
+javadoc {
+	def coreCompileJava = project(':com.ibm.wala.core').compileJava
+	dependsOn coreCompileJava
+	doFirst {
+		classpath += files coreCompileJava
+	}
+	options.links 'https://docs.oracle.com/javase/8/docs/api/'
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/build.properties wala-1.5.1/com.ibm.wala.util/build.properties
--- wala-1.3.9/com.ibm.wala.util/build.properties	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/build.properties	2019-01-29 17:08:39.000000000 +0000
@@ -1,7 +1,7 @@
 bin.includes = META-INF/,\
                .,\
-               walaUtil.jar
-source.walaUtil.jar = src/
+               OSGI-INF/
 jars.compile.order = .
 source.. = src/
-output.. = bin/
+output.. = bin/main
+javacProjectSettings = true
diff -Nru wala-1.3.9/com.ibm.wala.util/.classpath wala-1.5.1/com.ibm.wala.util/.classpath
--- wala-1.3.9/com.ibm.wala.util/.classpath	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/.classpath	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff -Nru wala-1.3.9/com.ibm.wala.util/META-INF/MANIFEST.MF wala-1.5.1/com.ibm.wala.util/META-INF/MANIFEST.MF
--- wala-1.3.9/com.ibm.wala.util/META-INF/MANIFEST.MF	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/META-INF/MANIFEST.MF	2019-01-29 17:08:39.000000000 +0000
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: WALA Util
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.ibm.wala.util
-Bundle-Version: 1.3.9
+Bundle-Version: 1.5.1
 Export-Package: com.ibm.wala.dataflow.graph,
  com.ibm.wala.fixedpoint.impl,
  com.ibm.wala.fixpoint,
@@ -10,7 +10,6 @@
  com.ibm.wala.util.collections,
  com.ibm.wala.util.config,
  com.ibm.wala.util.debug,
- com.ibm.wala.util.functions,
  com.ibm.wala.util.graph,
  com.ibm.wala.util.graph.dominators,
  com.ibm.wala.util.graph.impl,
@@ -24,6 +23,6 @@
  com.ibm.wala.util.processes,
  com.ibm.wala.util.tables,
  com.ibm.wala.viz
-Bundle-ClassPath: walaUtil.jar
-Bundle-Vendor: IBM
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Vendor: %Bundle-Vendor
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: com.ibm.wala.util
diff -Nru wala-1.3.9/com.ibm.wala.util/mvncentral.xml wala-1.5.1/com.ibm.wala.util/mvncentral.xml
--- wala-1.3.9/com.ibm.wala.util/mvncentral.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/mvncentral.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.wala</groupId>
   <artifactId>com.ibm.wala.util</artifactId>
-  <version>1.3.9</version>  
+  <version>1.5.1</version>
   <packaging>jar</packaging>
   <name>WALA utilities</name>
   <description>Utility library included with the T. J. Watson
@@ -42,6 +42,17 @@
     </snapshotRepository>
   </distributionManagement>
 
+  <profiles>
+    <profile>
+      <id>jdk18</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <javadoc.options>-Xdoclint:none</javadoc.options>
+      </properties>
+    </profile>
+  </profiles>
   
   <build>
     <sourceDirectory>${src.dir}</sourceDirectory>
@@ -49,11 +60,44 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.5</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <compilerId>javac-with-errorprone</compilerId>
+          <forceJavacCompilerUse>true</forceJavacCompilerUse>
+          <source>1.8</source>
+          <target>1.8</target>
+          <showWarnings>true</showWarnings>
+          <!-- <annotationProcessorPaths> -->
+          <!--   <path> -->
+          <!--     <groupId>com.uber.nullaway</groupId> -->
+          <!--     <artifactId>nullaway</artifactId> -->
+          <!--     <version>0.1.3</version> -->
+          <!--   </path> -->
+          <!-- </annotationProcessorPaths> -->
+          <compilerArgs>
+            <!-- <arg>-Xep:NullAway:ERROR</arg> -->
+            <!-- <arg>-XepOpt:NullAway:AnnotatedPackages=com.ibm.wala</arg> -->
+            <arg>-Werror</arg>
+            <arg>-Xep:IterableAndIterator:OFF</arg>
+            <arg>-Xep:AmbiguousMethodReference:OFF</arg>
+            <arg>-Xep:ReferenceEquality:OFF</arg>
+            <arg>-Xep:ClassNewInstance:OFF</arg>
+          </compilerArgs>
         </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-compiler-javac-errorprone</artifactId>
+            <version>2.8</version>
+          </dependency>
+          <!-- override plexus-compiler-javac-errorprone's dependency on
+               Error Prone with the latest version -->
+          <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_core</artifactId>
+            <version>2.1.1</version>
+          </dependency>
+        </dependencies>        
       </plugin>
 
       <plugin>
@@ -84,6 +128,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <additionalparam>${javadoc.options}</additionalparam>
+        </configuration>        
         <version>2.9.1</version>
         <executions>
           <execution>
@@ -111,5 +158,5 @@
     </plugin>
     
     </plugins>
-  </build>  
+  </build>
 </project>
diff -Nru wala-1.3.9/com.ibm.wala.util/OSGI-INF/l10n/bundle.properties wala-1.5.1/com.ibm.wala.util/OSGI-INF/l10n/bundle.properties
--- wala-1.3.9/com.ibm.wala.util/OSGI-INF/l10n/bundle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/OSGI-INF/l10n/bundle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,3 @@
+#Properties file for com.ibm.wala.util
+Bundle-Vendor = IBM
+Bundle-Name = WALA Util
\ No newline at end of file
diff -Nru wala-1.3.9/com.ibm.wala.util/pom.xml wala-1.5.1/com.ibm.wala.util/pom.xml
--- wala-1.3.9/com.ibm.wala.util/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>WALA</artifactId>
     <groupId>com.ibm.wala</groupId>
-    <version>1.3.9</version>
+    <version>1.5.1</version>
   </parent>
   <artifactId>com.ibm.wala.util</artifactId>
   <packaging>eclipse-plugin</packaging>
diff -Nru wala-1.3.9/com.ibm.wala.util/.project wala-1.5.1/com.ibm.wala.util/.project
--- wala-1.3.9/com.ibm.wala.util/.project	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/.project	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.ibm.wala.util</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff -Nru wala-1.3.9/com.ibm.wala.util/.settings/org.eclipse.jdt.core.prefs wala-1.5.1/com.ibm.wala.util/.settings/org.eclipse.jdt.core.prefs
--- wala-1.3.9/com.ibm.wala.util/.settings/org.eclipse.jdt.core.prefs	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/.settings/org.eclipse.jdt.core.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -1,78 +1,127 @@
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=error
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.discouragedReference=error
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=error
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=error
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=error
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=error
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=error
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=error
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=error
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=error
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=error
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=error
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=error
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=error
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=error
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=error
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff -Nru wala-1.3.9/com.ibm.wala.util/.settings/org.eclipse.pde.prefs wala-1.5.1/com.ibm.wala.util/.settings/org.eclipse.pde.prefs
--- wala-1.3.9/com.ibm.wala.util/.settings/org.eclipse.pde.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/.settings/org.eclipse.pde.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=0
+compilers.f.unresolved-plugins=0
+compilers.incompatible-environment=0
+compilers.p.build=0
+compilers.p.build.bin.includes=0
+compilers.p.build.encodings=0
+compilers.p.build.java.compiler=0
+compilers.p.build.java.compliance=0
+compilers.p.build.missing.output=0
+compilers.p.build.output.library=0
+compilers.p.build.source.library=0
+compilers.p.build.src.includes=0
+compilers.p.deprecated=0
+compilers.p.discouraged-class=0
+compilers.p.internal=0
+compilers.p.missing-packages=0
+compilers.p.missing-version-export-package=2
+compilers.p.missing-version-import-package=0
+compilers.p.missing-version-require-bundle=0
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=0
+compilers.p.unknown-attribute=0
+compilers.p.unknown-class=0
+compilers.p.unknown-element=0
+compilers.p.unknown-identifier=0
+compilers.p.unknown-resource=0
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=0
+eclipse.preferences.version=1
diff -Nru wala-1.3.9/com.ibm.wala.util/.settings/org.eclipse.wst.validation.prefs wala-1.5.1/com.ibm.wala.util/.settings/org.eclipse.wst.validation.prefs
--- wala-1.3.9/com.ibm.wala.util/.settings/org.eclipse.wst.validation.prefs	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/.settings/org.eclipse.wst.validation.prefs	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorList
+USER_MANUAL_PREFERENCE=enabledManualValidatorList
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.700.v201610061600
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.html.core.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0104file139target/site/dependency-convergence.htmlT03
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude07113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file122target/p2artifacts.xmlT0304file120target/p2content.xmlT03
+vf.version=3
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/AbstractMeetOperator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/AbstractMeetOperator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/AbstractMeetOperator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/AbstractMeetOperator.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,8 +16,7 @@
 /**
  * Abstract superclass for meet operators
  */
-@SuppressWarnings("rawtypes")
-public abstract class AbstractMeetOperator<T extends IVariable> extends AbstractOperator<T> {
+public abstract class AbstractMeetOperator<T extends IVariable<T>> extends AbstractOperator<T> {
 
   /**
    * subclasses can override if needed
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BasicFramework.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BasicFramework.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BasicFramework.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BasicFramework.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,8 +16,7 @@
 /**
  * a basic implementation of the dataflow framework
  */
-@SuppressWarnings("rawtypes")
-public class BasicFramework<T, V extends IVariable> implements IKilldallFramework<T, V> {
+public class BasicFramework<T, V extends IVariable<V>> implements IKilldallFramework<T, V> {
 
   private final Graph<T> flowGraph;
   private final ITransferFunctionProvider<T, V> transferFunctionProvider;
@@ -42,4 +41,4 @@
   public ITransferFunctionProvider<T, V> getTransferFunctionProvider() {
     return transferFunctionProvider;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorFramework.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorFramework.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorFramework.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorFramework.java	2019-01-29 17:08:39.000000000 +0000
@@ -33,4 +33,4 @@
     return latticeValues;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorIdentity.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorIdentity.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorIdentity.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorIdentity.java	2019-01-29 17:08:39.000000000 +0000
@@ -63,4 +63,4 @@
   public boolean isIdentity() {
     return true;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorIntersection.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorIntersection.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorIntersection.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorIntersection.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,14 +12,12 @@
 package com.ibm.wala.dataflow.graph;
 
 import com.ibm.wala.fixpoint.BitVectorVariable;
-import com.ibm.wala.fixpoint.FixedPointConstants;
 import com.ibm.wala.util.intset.IntSet;
-import com.ibm.wala.util.intset.IntSetAction;
 
 /**
  * Operator U(n) = U(n) n U(j)
  */
-public final class BitVectorIntersection extends AbstractMeetOperator<BitVectorVariable> implements FixedPointConstants {
+public final class BitVectorIntersection extends AbstractMeetOperator<BitVectorVariable> {
 
   private static final BitVectorIntersection INSTANCE = new BitVectorIntersection();
 
@@ -60,12 +58,7 @@
       return NOT_CHANGED;
     } else {
       final BitVectorVariable bvv = new BitVectorVariable();
-      intersect.foreach(new IntSetAction() {
-        @Override
-        public void act(final int x) {
-          bvv.set(x);
-        }
-      });
+      intersect.foreach(bvv::set);
       lhs.copyState(bvv);
 
       return CHANGED;
@@ -87,4 +80,4 @@
     return "INTERSECTION";
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorKillGen.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorKillGen.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorKillGen.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorKillGen.java	2019-01-29 17:08:39.000000000 +0000
@@ -78,4 +78,4 @@
       return false;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorMinusVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorMinusVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorMinusVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorMinusVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -68,4 +68,4 @@
       return false;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorOr.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorOr.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorOr.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorOr.java	2019-01-29 17:08:39.000000000 +0000
@@ -68,4 +68,4 @@
       return false;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnionConstant.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnionConstant.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnionConstant.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnionConstant.java	2019-01-29 17:08:39.000000000 +0000
@@ -65,4 +65,4 @@
       return false;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnion.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnion.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnion.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnion.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,12 +11,11 @@
 package com.ibm.wala.dataflow.graph;
 
 import com.ibm.wala.fixpoint.BitVectorVariable;
-import com.ibm.wala.fixpoint.FixedPointConstants;
 
 /**
  * Operator U(n) = U(n) U U(j)
  */
-public class BitVectorUnion extends AbstractMeetOperator<BitVectorVariable> implements FixedPointConstants {
+public class BitVectorUnion extends AbstractMeetOperator<BitVectorVariable> {
 
   private final static BitVectorUnion SINGLETON = new BitVectorUnion();
 
@@ -58,8 +57,7 @@
     }
     BitVectorVariable U = new BitVectorVariable();
     U.copyState(lhs);
-    for (int i = 0; i < rhs.length; i++) {
-      BitVectorVariable R = rhs[i];
+    for (BitVectorVariable R : rhs) {
       U.addAll(R);
     }
     if (!lhs.sameValue(U)) {
@@ -69,4 +67,4 @@
       return NOT_CHANGED;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnionVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnionVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnionVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BitVectorUnionVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -66,4 +66,4 @@
       return false;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BooleanIdentity.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BooleanIdentity.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BooleanIdentity.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BooleanIdentity.java	2019-01-29 17:08:39.000000000 +0000
@@ -61,4 +61,4 @@
   public boolean isIdentity() {
     return true;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BooleanUnion.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BooleanUnion.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BooleanUnion.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/BooleanUnion.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,12 +11,11 @@
 package com.ibm.wala.dataflow.graph;
 
 import com.ibm.wala.fixpoint.BooleanVariable;
-import com.ibm.wala.fixpoint.FixedPointConstants;
 
 /**
  * Operator U(n) = U(n) U U(j)
  */
-public class BooleanUnion extends AbstractMeetOperator<BooleanVariable> implements FixedPointConstants {
+public class BooleanUnion extends AbstractMeetOperator<BooleanVariable> {
 
   private final static BooleanUnion SINGLETON = new BooleanUnion();
 
@@ -52,8 +51,7 @@
     }
     BooleanVariable U = new BooleanVariable();
     U.copyState(lhs);
-    for (int i = 0; i < rhs.length; i++) {
-      BooleanVariable R = rhs[i];
+    for (BooleanVariable R : rhs) {
       if (R != null) {
         U.or(R);
       }
@@ -65,4 +63,4 @@
       return NOT_CHANGED;
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/DataflowSolver.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/DataflowSolver.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/DataflowSolver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/DataflowSolver.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,13 +10,13 @@
  *******************************************************************************/
 package com.ibm.wala.dataflow.graph;
 
-import java.util.Iterator;
 import java.util.Map;
 
 import com.ibm.wala.fixedpoint.impl.DefaultFixedPointSolver;
 import com.ibm.wala.fixpoint.IVariable;
 import com.ibm.wala.fixpoint.UnaryOperator;
 import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.ObjectArrayMapping;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.graph.Graph;
@@ -25,7 +25,7 @@
 /**
  * Iterative solver for a Killdall dataflow framework
  */
-public abstract class DataflowSolver<T, V extends IVariable<?>> extends DefaultFixedPointSolver<V> {
+public abstract class DataflowSolver<T, V extends IVariable<V>> extends DefaultFixedPointSolver<V> {
 
   /**
    * the dataflow problem to solve
@@ -69,8 +69,7 @@
     Graph<T> G = problem.getFlowGraph();
     ITransferFunctionProvider<T,V> functions = problem.getTransferFunctionProvider();
     // create a variable for each node.
-    for (Iterator<? extends T> it = G.iterator(); it.hasNext();) {
-      T N = it.next();
+    for (T N : G) {
       assert N != null;
       V v = makeNodeVariable(N, true);
       node2In.put(N, v);
@@ -81,8 +80,7 @@
       }
 
       if (functions.hasEdgeTransferFunctions()) {
-        for (Iterator<? extends T> it2 = G.getSuccNodes(N); it2.hasNext();) {
-          T S = it2.next();
+        for (T S : Iterator2Iterable.make(G.getSuccNodes(N))) {
           v = makeEdgeVariable(N, S);
           edge2Var.put(Pair.make(N, S), v);
         }
@@ -128,8 +126,7 @@
     final private Object[] allKeys;
 
     private int mapIt(int i, Object[] allVars, Map<Object, V> varMap) {
-      for (Iterator<Object> it = varMap.keySet().iterator(); it.hasNext();) {
-        Object key = it.next();
+      for (Object key : varMap.keySet()) {
         allKeys[i] = key;
         allVars[i++] = varMap.get(key);
       }
@@ -146,7 +143,7 @@
       mapIt(i, allVars, edge2Var);
 
       uf = new IntegerUnionFind(allVars.length);
-      map = new ObjectArrayMapping<Object>(allVars);
+      map = new ObjectArrayMapping<>(allVars);
     }
 
     /**
@@ -195,15 +192,14 @@
 
     // add meet operations
     int meetThreshold = (meet.isUnaryNoOp() ? 2 : 1);
-    for (Iterator<? extends T> it = G.iterator(); it.hasNext();) {
-      T node = it.next();
+    for (T node : G) {
       int nPred = G.getPredNodeCount(node);
       if (nPred >= meetThreshold) {
         // todo: optimize further using unary operators when possible?
         V[] rhs = makeStmtRHS(nPred);
         int i = 0;
-        for (Iterator<?> it2 = G.getPredNodes(node); it2.hasNext();) {
-          rhs[i++] = (functions.hasEdgeTransferFunctions()) ? getEdge(it2.next(), node) : getOut(it2.next());
+        for (Object o : Iterator2Iterable.make(G.getPredNodes(node))) {
+          rhs[i++] = (functions.hasEdgeTransferFunctions()) ? getEdge(o, node) : getOut(o);
         }
         newStatement(getIn(node), meet, rhs, toWorkList, eager);
       }
@@ -211,8 +207,7 @@
 
     // add node transfer operations, if requested
     if (functions.hasNodeTransferFunctions()) {
-      for (Iterator<? extends T> it = G.iterator(); it.hasNext();) {
-        T node = it.next();
+      for (T node : G) {
         UnaryOperator<V> f = functions.getNodeTransferFunction(node);
         if (!f.isIdentity()) {
           newStatement(getOut(node), f, getIn(node), toWorkList, eager);
@@ -222,10 +217,8 @@
 
     // add edge transfer operations, if requested
     if (functions.hasEdgeTransferFunctions()) {
-      for (Iterator<? extends T> it = G.iterator(); it.hasNext();) {
-        T node = it.next();
-        for (Iterator<? extends T> it2 = G.getSuccNodes(node); it2.hasNext();) {
-          T succ = it2.next();
+      for (T node : G) {
+        for (T succ : Iterator2Iterable.make(G.getSuccNodes(node))) {
           UnaryOperator<V> f = functions.getEdgeTransferFunction(node, succ);
           if (!f.isIdentity()) {
             newStatement(getEdge(node, succ), f, (functions.hasNodeTransferFunctions()) ? getOut(node) : getIn(node), toWorkList,
@@ -241,8 +234,7 @@
    */
   private void shortCircuitIdentities(Graph<T> G, ITransferFunctionProvider<T, V> functions, UnionFind uf) {
     if (functions.hasNodeTransferFunctions()) {
-      for (Iterator<? extends T> it = G.iterator(); it.hasNext();) {
-        T node = it.next();
+      for (T node : G) {
         UnaryOperator<V> f = functions.getNodeTransferFunction(node);
         if (f.isIdentity()) {
           uf.union(getIn(node), getOut(node));
@@ -251,10 +243,8 @@
     }
 
     if (functions.hasEdgeTransferFunctions()) {
-      for (Iterator<? extends T> it = G.iterator(); it.hasNext();) {
-        T node = it.next();
-        for (Iterator<? extends T> it2 = G.getSuccNodes(node); it2.hasNext();) {
-          T succ = it2.next();
+      for (T node : G) {
+        for (T succ : Iterator2Iterable.make(G.getSuccNodes(node))) {
           UnaryOperator<V> f = functions.getEdgeTransferFunction(node, succ);
           if (f.isIdentity()) {
             uf.union(getEdge(node, succ), (functions.hasNodeTransferFunctions()) ? getOut(node) : getIn(node));
@@ -305,8 +295,7 @@
   }
 
   private void shortCircuitUnaryMeets(Graph<T> G, ITransferFunctionProvider<T,V> functions, UnionFind uf) {
-    for (Iterator<? extends T> it = G.iterator(); it.hasNext();) {
-      T node = it.next();
+    for (T node : G) {
       assert node != null;
       int nPred = G.getPredNodeCount(node);
       if (nPred == 1) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/IKilldallFramework.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/IKilldallFramework.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/IKilldallFramework.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/IKilldallFramework.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,8 +19,7 @@
  * 
  * @param <T> type of nodes in the graph
  */
-@SuppressWarnings("rawtypes")
-public interface IKilldallFramework<T,V extends IVariable> {
+public interface IKilldallFramework<T,V extends IVariable<V>> {
 
   /**
    * @return the flow graph which induces this dataflow problem
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/ITransferFunctionProvider.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/ITransferFunctionProvider.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/ITransferFunctionProvider.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/ITransferFunctionProvider.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,11 +21,10 @@
  * @param <T> type of node in the graph 
  * @param <V> type of abstract states computed 
  */
-@SuppressWarnings("rawtypes")
-public interface ITransferFunctionProvider<T, V extends IVariable> {
+public interface ITransferFunctionProvider<T, V extends IVariable<V>> {
 
   /**
-   * @return the transfer function from IN_node -> OUT_node
+   * @return the transfer function from IN_node -&gt; OUT_node
    */
   public UnaryOperator<V> getNodeTransferFunction(T node);
 
@@ -35,7 +34,7 @@
   public boolean hasNodeTransferFunctions();
 
   /**
-   * @return the transfer function from OUT_src -> EDGE_<src,dst>
+   * @return the transfer function from OUT_src -&gt; EDGE_&lt;src,dst&gt;
    */
   public UnaryOperator<V> getEdgeTransferFunction(T src, T dst);
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/UnaryBitVectorUnion.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/UnaryBitVectorUnion.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/UnaryBitVectorUnion.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/dataflow/graph/UnaryBitVectorUnion.java	2019-01-29 17:08:39.000000000 +0000
@@ -60,4 +60,4 @@
   public boolean equals(Object o) {
     return (o instanceof UnaryBitVectorUnion);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/AbstractFixedPointSolver.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/AbstractFixedPointSolver.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/AbstractFixedPointSolver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/AbstractFixedPointSolver.java	2019-01-29 17:08:39.000000000 +0000
@@ -24,7 +24,9 @@
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.MonitorUtil;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.VerboseAction;
+import com.ibm.wala.util.graph.INodeWithNumber;
 
 /**
  * Represents a set of {@link IFixedPointStatement}s to be solved by a {@link IFixedPointSolver}
@@ -37,7 +39,7 @@
  * Fixed-point iteration proceeds in a topological order according to these edges.
  */
 @SuppressWarnings("rawtypes")
-public abstract class AbstractFixedPointSolver<T extends IVariable<?>> implements IFixedPointSolver<T>, FixedPointConstants,
+public abstract class AbstractFixedPointSolver<T extends IVariable<T>> implements IFixedPointSolver<T>, FixedPointConstants,
     VerboseAction {
 
   static final boolean DEBUG = false;
@@ -148,8 +150,8 @@
         System.err.println(("Before evaluation " + s));
       }
       byte code = s.evaluate();
+      nEvaluated++;
       if (verbose) {
-        nEvaluated++;
         if (nEvaluated % getVerboseInterval() == 0) {
           performVerboseAction();
         }
@@ -159,7 +161,7 @@
 
       }
       if (DEBUG) {
-        System.err.println(("After evaluation  " + s + " " + isChanged(code)));
+        System.err.println(("After evaluation  " + s + ' ' + isChanged(code)));
       }
       if (isChanged(code)) {
         globalChange = true;
@@ -194,11 +196,11 @@
       throw new IllegalArgumentException("string is null");
     }
     if (string.length() > wrap) {
-      StringBuffer result = new StringBuffer();
+      StringBuilder result = new StringBuilder();
       int start = 0;
       while (start < string.length()) {
         int end = Math.min(start + wrap, string.length());
-        result.append(string.substring(start, end));
+        result.append(string, start, end);
         result.append("\n  ");
         start = end;
       }
@@ -214,14 +216,14 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer("Fixed Point System:\n");
-    for (Iterator it = getStatements(); it.hasNext();) {
-      result.append(it.next()).append("\n");
+    StringBuilder result = new StringBuilder("Fixed Point System:\n");
+    for (INodeWithNumber nwn : Iterator2Iterable.make(getStatements())) {
+      result.append(nwn).append('\n');
     }
     return result.toString();
   }
 
-  public Iterator getStatements() {
+  public Iterator<? extends INodeWithNumber> getStatements() {
     return getFixedPointSystem().getStatements();
   }
 
@@ -238,8 +240,8 @@
    * Add all to the work list.
    */
   public void addAllStatementsToWorkList() {
-    for (Iterator i = getStatements(); i.hasNext();) {
-      AbstractStatement eq = (AbstractStatement) i.next();
+    for (INodeWithNumber nwn : Iterator2Iterable.make(getStatements())) {
+      AbstractStatement eq = (AbstractStatement) nwn;
       addToWorkList(eq);
     }
   }
@@ -251,8 +253,8 @@
    * @param v the variable that has changed
    */
   public void changedVariable(T v) {
-    for (Iterator it = getFixedPointSystem().getStatementsThatUse(v); it.hasNext();) {
-      AbstractStatement s = (AbstractStatement) it.next();
+    for (INodeWithNumber nwn : Iterator2Iterable.make(getFixedPointSystem().getStatementsThatUse(v))) {
+      AbstractStatement s = (AbstractStatement) nwn;
       addToWorkList(s);
     }
   }
@@ -273,7 +275,7 @@
     }
     // add to the list of graph
     lhs.setOrderNumber(nextOrderNumber++);
-    final NullaryStatement<T> s = new BasicNullaryStatement<T>(lhs, operator);
+    final NullaryStatement<T> s = new BasicNullaryStatement<>(lhs, operator);
     if (getFixedPointSystem().containsStatement(s)) {
       return false;
     }
@@ -469,13 +471,13 @@
   private void orderStatementsInternal() {
     if (verbose) {
       if (nEvaluated > 0) {
-        System.err.println("Reorder " + nEvaluated + " " + nCreated);
+        System.err.println("Reorder " + nEvaluated + ' ' + nCreated);
       }
     }
     reorder();
     if (verbose) {
       if (nEvaluated > 0) {
-        System.err.println("Reorder finished " + nEvaluated + " " + nCreated);
+        System.err.println("Reorder finished " + nEvaluated + ' ' + nCreated);
       }
     }
     topologicalCounter = 0;
@@ -505,7 +507,7 @@
    */
   private void reorder() {
     // drain the worklist
-    LinkedList<AbstractStatement> temp = new LinkedList<AbstractStatement>();
+    LinkedList<AbstractStatement> temp = new LinkedList<>();
     while (!workList.isEmpty()) {
       AbstractStatement eq = workList.takeStatement();
       temp.add(eq);
@@ -516,8 +518,7 @@
     getFixedPointSystem().reorder();
 
     // re-populate worklist
-    for (Iterator<AbstractStatement> it = temp.iterator(); it.hasNext();) {
-      AbstractStatement s = it.next();
+    for (AbstractStatement s : temp) {
       workList.insertStatement(s);
     }
   }
@@ -538,9 +539,6 @@
     return minSizeForTopSort;
   }
 
-  /**
-   * @param i
-   */
   public void setMinEquationsForTopSort(int i) {
     minSizeForTopSort = i;
   }
@@ -553,16 +551,10 @@
     return topologicalGrowthFactor;
   }
 
-  /**
-   * @param i
-   */
   public void setMaxEvalBetweenTopo(int i) {
     maxEvalBetweenTopo = i;
   }
 
-  /**
-   * @param d
-   */
   public void setTopologicalGrowthFactor(double d) {
     topologicalGrowthFactor = d;
   }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/BasicNullaryStatement.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/BasicNullaryStatement.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/BasicNullaryStatement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/BasicNullaryStatement.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,8 +15,7 @@
 /**
  * An implementation of NullaryStep that carries its operator explicitly
  */
-@SuppressWarnings("rawtypes")
-public class BasicNullaryStatement<T extends IVariable> extends NullaryStatement<T> {
+public class BasicNullaryStatement<T extends IVariable<T>> extends NullaryStatement<T> {
 
   /**
    * The operator in the equation
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/DefaultFixedPointSolver.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/DefaultFixedPointSolver.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/DefaultFixedPointSolver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/DefaultFixedPointSolver.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,7 @@
 /**
  * Default implementation of a fixed point solver.
  */
-public abstract class DefaultFixedPointSolver<T extends IVariable<?>> extends AbstractFixedPointSolver<T> {
+public abstract class DefaultFixedPointSolver<T extends IVariable<T>> extends AbstractFixedPointSolver<T> {
 
   private final DefaultFixedPointSystem<T> graph;
   
@@ -27,16 +27,16 @@
    */
   public DefaultFixedPointSolver(int expectedOut) {
     super();
-    graph = new DefaultFixedPointSystem<T>(expectedOut);
+    graph = new DefaultFixedPointSystem<>(expectedOut);
   }
   
   public DefaultFixedPointSolver() {
     super();
-    graph = new DefaultFixedPointSystem<T>();
+    graph = new DefaultFixedPointSystem<>();
   }
   
   @Override
   public IFixedPointSystem<T> getFixedPointSystem() {
     return graph;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/DefaultFixedPointSystem.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/DefaultFixedPointSystem.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/DefaultFixedPointSystem.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/DefaultFixedPointSystem.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,6 @@
 import com.ibm.wala.fixpoint.IVariable;
 import com.ibm.wala.fixpoint.UnaryStatement;
 import com.ibm.wala.util.collections.EmptyIterator;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.debug.Assertions;
@@ -33,7 +32,7 @@
 /**
  * Default implementation of a dataflow graph
  */
-public class DefaultFixedPointSystem<T extends IVariable<?>> implements IFixedPointSystem<T>  {
+public class DefaultFixedPointSystem<T extends IVariable<T>> implements IFixedPointSystem<T>  {
   static final boolean DEBUG = false;
 
   /**
@@ -61,7 +60,7 @@
    */
   public DefaultFixedPointSystem(int expectedOut) {
     super();
-    graph = new SparseNumberedGraph<INodeWithNumber>(expectedOut);
+    graph = new SparseNumberedGraph<>(expectedOut);
   }
   
   /**
@@ -95,11 +94,7 @@
   @Override
   @SuppressWarnings({ "unchecked", "rawtypes" })
   public Iterator<AbstractStatement> getStatements() {
-    return new FilterIterator(graph.iterator(), new Predicate() {
-      @Override public boolean test(Object x) {
-        return x instanceof AbstractStatement;
-      }
-    });
+    return new FilterIterator(graph.iterator(), AbstractStatement.class::isInstance);
   }
 
   @Override
@@ -133,8 +128,7 @@
       graph.addNode(lhs);
       graph.addEdge(s, lhs);
     }
-    for (int i = 0; i < rhs.length; i++) {
-      IVariable<?> v = rhs[i];
+    for (IVariable<?> v : rhs) {
       IVariable<?> variable = v;
       if (variable != null) {
         variables.add(variable);
@@ -208,7 +202,7 @@
       checkGraph();
     }
 
-    Iterator<INodeWithNumber> order = Topological.makeTopologicalIter(graph);
+    Iterator<INodeWithNumber> order = Topological.makeTopologicalIter(graph).iterator();
     int number = 0;
     while (order.hasNext()) {
       Object elt = order.next();
@@ -233,12 +227,12 @@
   }
 
   @Override
-  public Iterator<?> getStatementsThatUse(T v) {
-    return (graph.containsNode(v) ? graph.getSuccNodes(v) : EmptyIterator.instance());
+  public Iterator<? extends INodeWithNumber> getStatementsThatUse(T v) {
+	  return (graph.containsNode(v) ? graph.getSuccNodes(v) : EmptyIterator.instance());
   }
 
   @Override
-  public Iterator<?> getStatementsThatDef(T v) {
+  public Iterator<? extends INodeWithNumber> getStatementsThatDef(T v) {
     return (graph.containsNode(v) ? graph.getPredNodes(v) : EmptyIterator.instance());
   }
 
@@ -258,12 +252,8 @@
   }
 
   @Override
-  public Iterator<T> getVariables() {
-    return new FilterIterator<T>(graph.iterator(), new Predicate<T>() {
-      @Override public boolean test(T x) {
-        return x instanceof IVariable;
-      }
-    });
+  public Iterator<? extends INodeWithNumber> getVariables() {
+    return new FilterIterator<>(graph.iterator(), x -> x != null);
   }
 
   public int getNumberOfNodes() {
@@ -289,4 +279,4 @@
     return variables.contains(v);
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/GeneralStatement.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/GeneralStatement.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/GeneralStatement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/GeneralStatement.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,7 @@
 /**
  * Represents a single step in an iterative solver
  */
-public abstract class GeneralStatement<T extends IVariable<?>> extends AbstractStatement<T, AbstractOperator<T>> {
+public abstract class GeneralStatement<T extends IVariable<T>> extends AbstractStatement<T, AbstractOperator<T>> {
 
   protected final T lhs;
 
@@ -61,8 +61,8 @@
     if (lhs == cell) {
       return true;
     }
-    for (int i = 0; i < rhs.length; i++) {
-      if (rhs[i] == cell)
+    for (T rh : rhs) {
+      if (rh == cell)
         return true;
     }
     return false;
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/NullaryOperator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/NullaryOperator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/NullaryOperator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/NullaryOperator.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,14 +12,12 @@
 package com.ibm.wala.fixedpoint.impl;
 
 import com.ibm.wala.fixpoint.AbstractOperator;
-import com.ibm.wala.fixpoint.FixedPointConstants;
 import com.ibm.wala.fixpoint.IVariable;
 
 /**
  * An operator of the form lhs = op
  */
-@SuppressWarnings("rawtypes")
-public abstract class NullaryOperator<T extends IVariable> extends AbstractOperator<T> implements FixedPointConstants {
+public abstract class NullaryOperator<T extends IVariable<T>> extends AbstractOperator<T> {
 
   @Override
   public byte evaluate(T lhs, T[] rhs) throws UnsupportedOperationException {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/NullaryStatement.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/NullaryStatement.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/NullaryStatement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/NullaryStatement.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,8 +17,7 @@
  * Represents a single step, restricted to a nullary
  * operator.
  */
-@SuppressWarnings("rawtypes")
-public abstract class NullaryStatement<T extends IVariable> extends AbstractStatement<T, NullaryOperator<T>> {
+public abstract class NullaryStatement<T extends IVariable<T>> extends AbstractStatement<T, NullaryOperator<T>> {
 
   /**
    * The operands
@@ -70,7 +69,7 @@
   @Override
   public boolean equals(Object o) {
     if (o instanceof NullaryStatement) {
-      NullaryStatement other = (NullaryStatement) o;
+      NullaryStatement<?> other = (NullaryStatement<?>) o;
 
       if (!getOperator().equals(other.getOperator())) {
         return false;
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/Worklist.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/Worklist.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/Worklist.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixedpoint/impl/Worklist.java	2019-01-29 17:08:39.000000000 +0000
@@ -41,10 +41,9 @@
   }
   
   public void insertStatement(AbstractStatement eq) {
-    if (!contents.contains(eq)) {
-      contents.add(eq);
+    if (contents.add(eq)) {
       super.insert(eq);
     }
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/AbstractOperator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/AbstractOperator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/AbstractOperator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/AbstractOperator.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,8 +16,7 @@
  * 
  * This is an abstract class and not an interface in order to force subclasses to re-implement equals(), hashCode(), and toString()
  */
-@SuppressWarnings("rawtypes")
-public abstract class AbstractOperator<T extends IVariable> implements FixedPointConstants {
+public abstract class AbstractOperator<T extends IVariable<T>> implements FixedPointConstants {
 
   /**
    * Evaluate this equation, setting a new value for the left-hand side.
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/AbstractStatement.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/AbstractStatement.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/AbstractStatement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/AbstractStatement.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,7 +15,7 @@
 /**
  * Represents a single step in an iterative solver
  */
-public abstract class AbstractStatement<T extends IVariable, O extends AbstractOperator<T>> extends NodeWithNumber implements IFixedPointStatement<T>{
+public abstract class AbstractStatement<T extends IVariable<T>, O extends AbstractOperator<T>> extends NodeWithNumber implements IFixedPointStatement<T>{
 
   public abstract O getOperator();
 
@@ -30,29 +30,29 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer("");
+    StringBuilder result = new StringBuilder();
     if (getLHS() == null) {
       result.append("null ");
     } else {
       result.append(getLHS().toString());
-      result.append(" ");
+      result.append(' ');
     }
     result.append(getOperator().toString());
-    result.append(" ");
+    result.append(' ');
     for (int i = 0; i < getRHS().length; i++) {
       if (getRHS()[i] == null) {
         result.append("null");
       } else {
         result.append(getRHS()[i].toString());
       }
-      result.append(" ");
+      result.append(' ');
     }
     return result.toString();
   }
   
   public final int getOrderNumber() {
-    IVariable lhs = getLHS();
+    T lhs = getLHS();
     return (lhs == null) ? 0 : lhs.getOrderNumber();
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/AbstractVariable.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/AbstractVariable.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/AbstractVariable.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/AbstractVariable.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,8 +15,7 @@
 /**
  * Represents a single variable in a fixed-point system.
  */
-@SuppressWarnings("rawtypes")
-public abstract class AbstractVariable<T extends AbstractVariable> extends NodeWithNumber implements IVariable<T> {
+public abstract class AbstractVariable<T extends AbstractVariable<T>> extends NodeWithNumber implements IVariable<T> {
 
   private static int nextHashCode = 0;
   
@@ -61,4 +60,4 @@
   public void setOrderNumber(int orderNumber) {
     this.orderNumber = orderNumber;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/BasicUnaryStatement.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/BasicUnaryStatement.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/BasicUnaryStatement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/BasicUnaryStatement.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,8 +14,7 @@
 /**
  * An implementation of UnaryStatement that carries its operator explicitly
  */
-@SuppressWarnings("rawtypes")
-public class BasicUnaryStatement<T extends IVariable> extends UnaryStatement<T> {
+public class BasicUnaryStatement<T extends IVariable<T>> extends UnaryStatement<T> {
 
   private final UnaryOperator<T> operator;
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/BooleanVariable.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/BooleanVariable.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/BooleanVariable.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/BooleanVariable.java	2019-01-29 17:08:39.000000000 +0000
@@ -56,14 +56,13 @@
   }
 
   /**
-   * @param other
    * @throws IllegalArgumentException if other is null
    */
   public void or(BooleanVariable other) {
     if (other == null) {
       throw new IllegalArgumentException("other is null");
     }
-    B = B | other.B;
+    B = B || other.B;
   }
 
   public void set(boolean b) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/FixedPointConstants.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/FixedPointConstants.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/FixedPointConstants.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/FixedPointConstants.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,4 +48,4 @@
    * The bit-mask which defines the "SIDE EFFECT" flag
    */
   final static int SIDE_EFFECT_MASK = 0x4;
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IFixedPointSolver.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IFixedPointSolver.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IFixedPointSolver.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IFixedPointSolver.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,7 +18,7 @@
 /**
  * Solves a set of constraints
  */
-public interface IFixedPointSolver<T extends IVariable>  {
+public interface IFixedPointSolver<T extends IVariable<T>>  {
 
   /**
    * @return the set of statements solved by this {@link IFixedPointSolver}
@@ -34,4 +34,4 @@
    *         value of some variable.
    */
   public boolean solve(IProgressMonitor monitor) throws CancelException;
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IFixedPointStatement.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IFixedPointStatement.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IFixedPointStatement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IFixedPointStatement.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,8 +27,7 @@
  * Intuitively, a statement definition corresponds to an "equation" in dataflow parlance, or
  * a "constraint" in constraint solvers.
  */
-@SuppressWarnings("rawtypes")
-public interface IFixedPointStatement<T extends IVariable> extends INodeWithNumber {
+public interface IFixedPointStatement<T extends IVariable<T>> extends INodeWithNumber {
   /**
    * @return the left-hand side of this statement.
    */
@@ -44,10 +43,10 @@
    * Evaluate this statement, setting a new value for the left-hand side. The
    * return value is one of the following:
    * <ul>
-   * {@link FixedPointConstants#CHANGED},
-   * {@link FixedPointConstants#CHANGED_AND_FIXED},
-   * {@link FixedPointConstants#NOT_CHANGED}or
-   * {@link FixedPointConstants#NOT_CHANGED_AND_FIXED}.
+   * <li>{@link FixedPointConstants#CHANGED},</li>
+   * <li>{@link FixedPointConstants#CHANGED_AND_FIXED},</li>
+   * <li>{@link FixedPointConstants#NOT_CHANGED}, or</li>
+   * <li>{@link FixedPointConstants#NOT_CHANGED_AND_FIXED}.</li>
    * </ul>
    */
   abstract byte evaluate();
@@ -58,4 +57,4 @@
    * @param v the variable in question
    */
   public boolean hasVariable(T v);
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IFixedPointSystem.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IFixedPointSystem.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IFixedPointSystem.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IFixedPointSystem.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,11 +12,12 @@
 
 import java.util.Iterator;
 
+import com.ibm.wala.util.graph.INodeWithNumber;
+
 /**
  * Represents a set of {@link IFixedPointStatement}s to be solved by a {@link IFixedPointSolver}
  */
-@SuppressWarnings("rawtypes")
-public interface IFixedPointSystem<T extends IVariable> {
+public interface IFixedPointSystem<T extends IVariable<T>> {
 
   /**
    * removes a given statement
@@ -31,16 +32,16 @@
   /**
    * Return an Iterator of the {@link IFixedPointStatement}s in this system
    * 
-   * @return Iterator <Constraint>
+   * @return {@link Iterator}&lt;Constraint&gt;
    */
-  public Iterator getStatements();
+  public Iterator<? extends INodeWithNumber> getStatements();
 
   /**
    * Return an Iterator of the variables in this graph
    * 
-   * @return Iterator <IVariable>
+   * @return {@link Iterator}&lt;{@link IVariable}&gt;
    */
-  public Iterator getVariables();
+  public Iterator<? extends INodeWithNumber> getVariables();
 
   /**
    * @return true iff this system already contains an equation that is equal() to s
@@ -53,14 +54,14 @@
   boolean containsVariable(T v);
 
   /**
-   * @return Iterator <statement>, the statements that use the variable
+   * @return {@link Iterator}&lt;statement&gt;, the statements that use the variable
    */
-  Iterator getStatementsThatUse(T v);
+  Iterator<? extends INodeWithNumber> getStatementsThatUse(T v);
 
   /**
-   * @return Iterator <statement>, the statements that def the variable
+   * @return {@link Iterator}&lt;statement&gt;, the statements that def the variable
    */
-  Iterator getStatementsThatDef(T v);
+  Iterator<? extends INodeWithNumber> getStatementsThatDef(T v);
 
   int getNumberOfStatementsThatUse(T v);
 
@@ -71,4 +72,4 @@
    */
   void reorder();
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IntSetVariable.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IntSetVariable.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IntSetVariable.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IntSetVariable.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,7 @@
  * TODO: optimize the representation more; e.g. BitVectors with non-zero lower bound.
  */
 @SuppressWarnings("rawtypes")
-public abstract class IntSetVariable<T extends IntSetVariable> extends AbstractVariable<T> {
+public abstract class IntSetVariable<T extends IntSetVariable<T>> extends AbstractVariable<T> {
 
   MutableIntSet V;
 
@@ -99,11 +99,11 @@
    * 
    * @param b the bit to set
    */
-  public void add(int b) {
+  public boolean add(int b) {
     if (V == null) {
       V = IntSetUtil.getDefaultIntSetFactory().make();
     }
-    V.add(b);
+    return V.add(b);
   }
 
   /**
@@ -126,9 +126,6 @@
     return V;
   }
 
-  /**
-   * @param i
-   */
   public void remove(int i) {
     if (V != null) {
       V.remove(i);
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IVariable.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IVariable.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IVariable.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/IVariable.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,8 +16,7 @@
 /**
  * Represents a single variable in a fixed-point iterative system.
  */
-@SuppressWarnings("rawtypes")
-public interface IVariable<T extends IVariable> extends INodeWithNumber {
+public interface IVariable<T extends IVariable<T>> extends INodeWithNumber {
   
   /**
    * Variables must allow the solver implementation to get/set an order number,
@@ -44,4 +43,4 @@
     */
   public void copyState(T v);
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/TrueOperator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/TrueOperator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/TrueOperator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/TrueOperator.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,4 +52,4 @@
   public boolean equals(Object o) {
     return (o instanceof TrueOperator);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryOperator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryOperator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryOperator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryOperator.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,8 +16,7 @@
 /**
  * An operator of the form lhs = op (rhs)
  */
-@SuppressWarnings("rawtypes")
-public abstract class UnaryOperator<T extends IVariable> extends AbstractOperator<T> implements FixedPointConstants {
+public abstract class UnaryOperator<T extends IVariable<T>> extends AbstractOperator<T> {
 
   /**
    * Evaluate this equation, setting a new value for the left-hand side.
@@ -31,7 +30,7 @@
    * efficiency.
    */
   public UnaryStatement<T> makeEquation(T lhs, T rhs) {
-    return new BasicUnaryStatement<T>(lhs, this, rhs);
+    return new BasicUnaryStatement<>(lhs, this, rhs);
   }
 
   public boolean isIdentity() {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryOr.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryOr.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryOr.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryOr.java	2019-01-29 17:08:39.000000000 +0000
@@ -50,4 +50,4 @@
   public boolean equals(Object o) {
     return (o instanceof UnaryOr);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryStatement.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryStatement.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryStatement.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/fixpoint/UnaryStatement.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,8 +15,7 @@
 /**
  * Represents a single step, restricted to a unary operator.
  */
-@SuppressWarnings("rawtypes")
-public abstract class UnaryStatement<T extends IVariable> extends AbstractStatement<T, UnaryOperator<T>> {
+public abstract class UnaryStatement<T extends IVariable<T>> extends AbstractStatement<T, UnaryOperator<T>> {
 
   /**
    * The operands
@@ -56,8 +55,9 @@
   /** 
    * Return the operands in this equation.
    */
-  public IVariable[] getOperands() {
-    IVariable[] result = new IVariable[2];
+  public IVariable<T>[] getOperands() {
+    @SuppressWarnings("unchecked")
+    IVariable<T>[] result = new IVariable[2];
     result[0] = lhs;
     result[1] = rhs;
     return result;
@@ -89,7 +89,7 @@
     } else {
       result = lhs.toString();
     }
-    result = result + " " + getOperator() + " " + rhs;
+    result = result + ' ' + getOperator() + ' ' + rhs;
     return result;
   }
 
@@ -108,7 +108,7 @@
   @Override
   public boolean equals(Object o) {
     if (o instanceof UnaryStatement) {
-      UnaryStatement other = (UnaryStatement) o;
+      UnaryStatement<?> other = (UnaryStatement<?>) o;
 
       if (!getOperator().equals(other.getOperator())) {
         return false;
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/CancelException.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/CancelException.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/CancelException.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/CancelException.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,10 +12,12 @@
 
 /**
  * An exception for when work is canceled in eclipse. This version forces every API that uses it to declare it. Use
- * {@link CancelRuntimeException} to avoid the need to declare a cancel exception.
+ * {@code CancelRuntimeException} to avoid the need to declare a cancel exception.
  */
 public class CancelException extends Exception {
 
+  private static final long serialVersionUID = 3728159810629412928L;
+
   protected CancelException(String msg) {
     super(msg);
   }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/AbstractMultiMap.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/AbstractMultiMap.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/AbstractMultiMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/AbstractMultiMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,13 +37,19 @@
  */
 package com.ibm.wala.util.collections;
 
+import java.io.Serializable;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
 
-abstract class AbstractMultiMap<K, V> implements MultiMap<K, V> {
+abstract class AbstractMultiMap<K, V> implements Serializable, MultiMap<K, V> {
+
+  /**
+   * 
+   */
+  private static final long serialVersionUID = 4064901973301954076L;
 
   protected final Map<K, Set<V>> map = HashMapFactory.make();
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ArraySet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ArraySet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ArraySet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ArraySet.java	2019-01-29 17:08:39.000000000 +0000
@@ -38,6 +38,7 @@
 package com.ibm.wala.util.collections;
 
 import java.util.AbstractSet;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
@@ -45,8 +46,6 @@
 /**
  * A set implementation backed by an array. This implementation is space-efficient for small sets, but several operations like
  * {@link #contains(Object)} are linear time.
- * 
- * @param <T>
  */
 
 public class ArraySet<T> extends AbstractSet<T> {
@@ -106,6 +105,7 @@
   /**
    * @throws UnsupportedOperationException if this {@link ArraySet} is immutable (optional)
    */
+  @Override
   @SuppressWarnings("all")
   public boolean add(T o) {
     if (o == null) {
@@ -116,9 +116,7 @@
     }
     if (_curIndex == _elems.length) {
       // lengthen array
-      Object[] tmp = _elems;
-      _elems = (T[]) new Object[tmp.length * 2];
-      System.arraycopy(tmp, 0, _elems, 0, tmp.length);
+      _elems = Arrays.copyOf(_elems, _elems.length * 2);
     }
     _elems[_curIndex] = o;
     _curIndex++;
@@ -193,7 +191,7 @@
   }
 
   /**
-   * @return <code>true</code> (SJF: So why return a value?)
+   * @return {@code true} (SJF: So why return a value?)
    */
   public boolean remove(int ind) {
     try {
@@ -202,7 +200,7 @@
       _curIndex--;
       return true;
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid ind: " + ind);
+      throw new IllegalArgumentException("invalid ind: " + ind, e);
     }
   }
 
@@ -249,14 +247,14 @@
   }
 
   public static <T> ArraySet<T> make() {
-    return new ArraySet<T>();
+    return new ArraySet<>();
   }
 
   public static <T> ArraySet<T> make(Collection<T> other) throws IllegalArgumentException {
     if (other == null) {
       throw new IllegalArgumentException("other == null");
     }
-    return new ArraySet<T>(other);
+    return new ArraySet<>(other);
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ArraySetMultiMap.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ArraySetMultiMap.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ArraySetMultiMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ArraySetMultiMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -44,9 +44,19 @@
  */
 public class ArraySetMultiMap<K, V> extends AbstractMultiMap<K, V> {
 
+  /**
+   * 
+   */
+  private static final long serialVersionUID = -3475591699051060160L;
+  
   @SuppressWarnings("rawtypes")
   public static final ArraySetMultiMap EMPTY = new ArraySetMultiMap<Object, Object>() {
 
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1839857029830528896L;
+
     @Override
     public boolean put(Object key, Object val) {
       throw new RuntimeException();
@@ -69,7 +79,7 @@
 
   @Override
   protected Set<V> createSet() {
-    return new ArraySet<V>();
+    return new ArraySet<>();
   }
 
   @Override
@@ -83,6 +93,6 @@
   }
   
   public static <K,V> ArraySetMultiMap<K, V> make() {
-    return new ArraySetMultiMap<K,V>();
+    return new ArraySetMultiMap<>();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/BimodalMap.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/BimodalMap.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/BimodalMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/BimodalMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,6 @@
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -87,7 +86,7 @@
   @Override
   public V put(K key, V value) {
     if (backingStore == null) {
-      backingStore = new SmallMap<K, V>();
+      backingStore = new SmallMap<>();
       backingStore.put(key, value);
       return null;
     } else {
@@ -110,10 +109,8 @@
     assert backingStore instanceof SmallMap;
     SmallMap<K, V> S = (SmallMap<K, V>) backingStore;
     backingStore = HashMapFactory.make(2 * S.size());
-    for (Iterator<K> it = S.keySet().iterator(); it.hasNext();) {
-      K key = it.next();
-      V value = S.get(key);
-      backingStore.put(key, value);
+    for (Entry<K, V> entry : S.entrySet()) {
+      backingStore.put(entry.getKey(), entry.getValue());
     }
   }
 
@@ -139,7 +136,7 @@
       if (size > cutOff) {
         backingStore = HashMapFactory.make();
       } else {
-        backingStore = new SmallMap<K, V>();
+        backingStore = new SmallMap<>();
       }
       backingStore.putAll(t);
       return;
@@ -196,4 +193,4 @@
   public Set<Map.Entry<K, V>> entrySet() {
     return (Set<Entry<K, V>>) ((backingStore == null) ? Collections.emptySet() : backingStore.entrySet());
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/CollectionFilter.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/CollectionFilter.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/CollectionFilter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/CollectionFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,12 +12,11 @@
 package com.ibm.wala.util.collections;
 
 import java.util.Collection;
-import com.ibm.wala.util.Predicate;
-
+import java.util.function.Predicate;
 /**
  * A filter defined by set membership
  */
-public class CollectionFilter<T> extends Predicate<T> {
+public class CollectionFilter<T> implements Predicate<T> {
 
   private final Collection<? extends T> S;
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ComposedIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ComposedIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ComposedIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ComposedIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -57,4 +57,4 @@
     return result;
   }
   
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/CompoundIntIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/CompoundIntIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/CompoundIntIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/CompoundIntIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -60,4 +60,4 @@
     Assertions.UNREACHABLE("define a custom hash code to avoid non-determinism");
     return 0;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/CompoundIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/CompoundIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/CompoundIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/CompoundIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,9 +42,6 @@
     }
   }
 
-  /**
-   * @see java.util.Iterator#remove()
-   */
   @Override
   public void remove() {
   }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/EmptyIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/EmptyIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/EmptyIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/EmptyIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,7 +22,6 @@
   @SuppressWarnings("rawtypes")
   private static final EmptyIterator EMPTY = new EmptyIterator();
 
-  @SuppressWarnings("unchecked")
   public static <T> EmptyIterator<T> instance() {
     return EMPTY;
   }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Factory.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Factory.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Factory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Factory.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,4 +12,4 @@
 
 public interface Factory<T>{
   T make();
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/FifoQueue.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/FifoQueue.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/FifoQueue.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/FifoQueue.java	2019-01-29 17:08:39.000000000 +0000
@@ -24,7 +24,7 @@
   /**
    * The work queue. Items are references to Object instances.
    */
-  final List<T> qItems = new LinkedList<T>();
+  final List<T> qItems = new LinkedList<>();
 
   /**
    * Set representing items currently enqueue. This is used to keep an item from
@@ -78,8 +78,8 @@
   /**
    * Returns whether or not this queue is empty (no enqueued elements).
    * 
-   * @return <code>true</code> when there are no enqueued objects.
-   *         <code>false</code> if there are objects remaining in the queue.
+   * @return {@code true} when there are no enqueued objects.
+   *         {@code false} if there are objects remaining in the queue.
    * @see #size
    */
   public boolean isEmpty() {
@@ -91,8 +91,8 @@
    * 
    * @param element
    *          determine whether this object is in the queue.
-   * @return <code>true</code> if <code>element</code> is in the queue.
-   *         Otherwise <code>false</code> if not currently in the queue.
+   * @return {@code true} if {@code element} is in the queue.
+   *         Otherwise {@code false} if not currently in the queue.
    */
   public boolean contains(T element) {
     return inQueue.contains(element);
@@ -103,8 +103,8 @@
    * queue. If the Object is already in the queue, the queue remains unmodified.
    * <p>
    * This method determines whether an element is already in the queue using the
-   * element's <code>equals()</code> method. If the element's class does not
-   * implement <code>equals()</code>, the default implementation assumes they
+   * element's {@code equals()} method. If the element's class does not
+   * implement {@code equals()}, the default implementation assumes they
    * are equal only if it is the same object.
    * 
    * @param element
@@ -124,8 +124,8 @@
    * already in the queue is ignored.
    * <p>
    * This method determines whether an element is already in the queue using the
-   * element's <code>equals()</code> method. If the element's class does not
-   * implement <code>equals()</code>, the default implementation assumes they
+   * element's {@code equals()} method. If the element's class does not
+   * implement {@code equals()}, the default implementation assumes they
    * are equal if it is the same object.
    * 
    * @param elements
@@ -148,7 +148,7 @@
 
   /**
    * Remove the next Object from the queue and return it to the caller. Throws
-   * <code>IllegalStateException</code> if the queue is empty when this method
+   * {@code IllegalStateException} if the queue is empty when this method
    * is called.
    * 
    * @return the next Object in the queue.
@@ -172,7 +172,7 @@
 
   /**
    * Returns the next Object in the queue, but leaves it in the queue. Throws
-   * <code>IllegalStateException</code> if the queue is empty when this method
+   * {@code IllegalStateException} if the queue is empty when this method
    * is called.
    * 
    * @return the next Object in the queue.
@@ -186,4 +186,4 @@
     // get & remove the top of the queue.
     return qItems.get(0);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/FifoQueueNoDuplicates.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/FifoQueueNoDuplicates.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/FifoQueueNoDuplicates.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/FifoQueueNoDuplicates.java	2019-01-29 17:08:39.000000000 +0000
@@ -41,8 +41,8 @@
    * the queue.
    * <p>
    * This method determines whether an element was ever in the queue using the
-   * element's <code>equals()</code> method. If the element's class does not
-   * implement <code>equals()</code>, the default implementation assumes they
+   * element's {@code equals()} method. If the element's class does not
+   * implement {@code equals()}, the default implementation assumes they
    * are equal if it is the same object.
    * 
    * @param element
@@ -62,8 +62,8 @@
    * queue if never previously pushed into the queue.
    * <p>
    * This method determines whether an element was ever pushed into the queue
-   * using the element's <code>equals()</code> method. If the element's class
-   * does not implement <code>equals()</code>, the default implementation
+   * using the element's {@code equals()} method. If the element's class
+   * does not implement {@code equals()}, the default implementation
    * assumes that two elements are equal if they are the same object.
    * 
    * @param elements
@@ -90,8 +90,8 @@
    * 
    * @param element
    *          determine whether this object is in the queue.
-   * @return <code>true</code> if <code>element</code> is in the queue.
-   *         Otherwise <code>false</code>.
+   * @return {@code true} if {@code element} is in the queue.
+   *         Otherwise {@code false}.
    */
   public boolean everContained(T element) {
     return wasInQueue.contains(element);
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/FilterIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/FilterIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/FilterIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/FilterIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,17 +12,15 @@
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-
-import com.ibm.wala.util.Predicate;
+import java.util.function.Predicate;
 
 /**
- * A <code>FilterIterator</code> filters an <code>Iterator</code> to generate a new one.
+ * A {@code FilterIterator} filters an {@code Iterator} to generate a new one.
  */
 public class FilterIterator<T> implements java.util.Iterator<T> {
-  final Iterator<?> i;
+  final Iterator<? extends T> i;
 
-  @SuppressWarnings("rawtypes")
-  final Predicate f;
+  final Predicate<? super T> f;
 
   private T next = null;
 
@@ -32,8 +30,7 @@
    * @param i the original iterator
    * @param f a filter which defines which elements belong to the generated iterator
    */
-  @SuppressWarnings("rawtypes")
-  public FilterIterator(Iterator<?> i, Predicate f) {
+  public FilterIterator(Iterator<? extends T> i, Predicate<? super T> f) {
     if (i == null) {
       throw new IllegalArgumentException("null i");
     }
@@ -48,12 +45,11 @@
   /**
    * update the internal state to prepare for the next access to this iterator
    */
-  @SuppressWarnings("unchecked")
   private void advance() {
     while (i.hasNext()) {
-      Object o = i.next();
+      T o = i.next();
       if (f.test(o)) {
-        next = (T) o;
+        next = o;
         return;
       }
     }
@@ -84,4 +80,4 @@
   public String toString() {
     return "filter " + f + " of " + i;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/FilterPredicate.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/FilterPredicate.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/FilterPredicate.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/FilterPredicate.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package com.ibm.wala.util.collections;
-
-import com.ibm.wala.util.Predicate;
-
-/**
- * A migration aid, to move from Filter to Predicate
- */
-@Deprecated
-public class FilterPredicate<T> extends Predicate<T> {
-  
-  public static <T> FilterPredicate<T> toPredicate(Predicate<T> f) {
-    return new FilterPredicate<T>(f);
-  }
-  
-  private final Predicate<T> f;
-  
-  private FilterPredicate(Predicate<T> f) {
-    this.f = f;
-  }
-
-  @Override
-  public boolean test(T t) {
-    return f.test(t);
-  }
- 
-}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Filtersection.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Filtersection.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Filtersection.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Filtersection.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,12 +10,12 @@
  *******************************************************************************/
 package com.ibm.wala.util.collections;
 
-import com.ibm.wala.util.Predicate;
+import java.util.function.Predicate;
 
 /**
  * intersection of two filters
  */
-public class Filtersection<T> extends Predicate<T> {
+public class Filtersection<T> implements Predicate<T> {
 
   final private Predicate<T> a;
   final private Predicate<T> b;
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashCodeComparator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashCodeComparator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashCodeComparator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashCodeComparator.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package com.ibm.wala.util.collections;
-
-import java.util.Comparator;
-
-/**
- * A comparator based on hash codes
- */
-public class HashCodeComparator<T> implements Comparator<T> {
-
-  @SuppressWarnings("rawtypes")
-  private static final HashCodeComparator INSTANCE = new HashCodeComparator();
-
-  /*
-   * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-   */
-  @Override
-  public int compare(T o1, T o2) throws NullPointerException {
-    // by convention null is less than non-null
-    if (o1 == null) {
-      return o2 == null ? 0 : -1;
-    } else if (o2 == null) {
-      return 1;
-    }
-    return o1.hashCode() - o2.hashCode();
-  }
-
-  @SuppressWarnings("unchecked")
-  public static <T> HashCodeComparator<T> instance() {
-    return INSTANCE;
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashMapFactory.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashMapFactory.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashMapFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashMapFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,14 +21,13 @@
 public class HashMapFactory {
 
   /**
-   * @param size
    * @return A ParanoidHashMap if DEBUG = true, a LinkedHashMap otherwise
    */
   public static <K,V> HashMap<K,V> make(int size) {
     if (HashSetFactory.DEBUG) {
-      return new ParanoidHashMap<K,V>(size);
+      return new ParanoidHashMap<>(size);
     } else {
-      return new LinkedHashMap<K,V>(size);
+      return new LinkedHashMap<>(size);
     }
   }
 
@@ -37,15 +36,14 @@
    */
   public static <K,V> HashMap<K,V> make() {
     if (HashSetFactory.DEBUG) {
-      return new ParanoidHashMap<K,V>();
+      return new ParanoidHashMap<>();
     } else {
-      return new LinkedHashMap<K,V>();
+      return new LinkedHashMap<>();
     }
   }
 
 
   /**
-   * @param t
    * @return A ParanoidHashMap if DEBUG = true, a LinkedHashMap otherwise
    */
   public static <K,V> HashMap<K,V> make(Map<K,V> t) {
@@ -53,9 +51,9 @@
       throw new IllegalArgumentException("null t");
     }
     if (HashSetFactory.DEBUG) {
-      return new ParanoidHashMap<K,V>(t);
+      return new ParanoidHashMap<>(t);
     } else {
-      return new LinkedHashMap<K,V>(t);
+      return new LinkedHashMap<>(t);
     }
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashSetFactory.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashSetFactory.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashSetFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashSetFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -30,9 +30,9 @@
    */
   public static <T> HashSet<T> make(int size) {
     if (DEBUG) {
-      return new ParanoidHashSet<T>(size);
+      return new ParanoidHashSet<>(size);
     } else {
-      return new LinkedHashSet<T>(size);
+      return new LinkedHashSet<>(size);
     }
   }
 
@@ -41,9 +41,9 @@
    */
   public static <T> HashSet<T> make() {
     if (DEBUG) {
-      return new ParanoidHashSet<T>();
+      return new ParanoidHashSet<>();
     } else {
-      return new LinkedHashSet<T>();
+      return new LinkedHashSet<>();
     }
   }
 
@@ -55,9 +55,9 @@
       throw new IllegalArgumentException("null s");
     }
     if (DEBUG) {
-      return new ParanoidHashSet<T>(s);
+      return new ParanoidHashSet<>(s);
     } else {
-      return new LinkedHashSet<T>(s);
+      return new LinkedHashSet<>(s);
     }
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashSetMultiMap.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashSetMultiMap.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashSetMultiMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/HashSetMultiMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -42,6 +42,11 @@
 
 public class HashSetMultiMap<K, V> extends AbstractMultiMap<K, V> {
 
+  /**
+   * 
+   */
+  private static final long serialVersionUID = 1699856257459175263L;
+
   public HashSetMultiMap() {
     super(false);
   }
@@ -56,7 +61,7 @@
   }
 
   public static <K, V> HashSetMultiMap<K, V> make() {
-    return new HashSetMultiMap<K, V>();
+    return new HashSetMultiMap<>();
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Heap.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Heap.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Heap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Heap.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.util.collections;
 
+import java.util.Arrays;
 import java.util.NoSuchElementException;
 
 /**
@@ -18,7 +19,7 @@
 public abstract class Heap<T> {
 
   /**
-   * @return true iff elt1 is considered < elt2
+   * @return true iff elt1 is considered &lt; elt2
    */
   abstract protected boolean compareElements(T elt1, T elt2);
 
@@ -78,20 +79,15 @@
   }
 
 
-  @SuppressWarnings("unchecked")
   final private void ensureCapacity(int min) {
     if (backingStore.length < min) {
-      T newStore[] = (T[])new Object[2 * min];
-      System.arraycopy(backingStore, 0, newStore, 0, backingStore.length);
-      backingStore = newStore;
+      backingStore = Arrays.copyOf(backingStore, 2 * min);
     }
   }
 
   /**
    * SJF: I know this is horribly uglified ... I've attempted to make things as
    * easy as possible on the JIT, since this is performance critical.
-   * 
-   * @param index
    */
   final private void removeElement(int index) {
     int ne = numberOfElements;
@@ -129,9 +125,6 @@
   /**
    * SJF: I know this is uglified ... I've attempted to make things as easy as
    * possible on the JIT, since this is performance critical.
-   * 
-   * @param elt
-   * @param index
    */
   final private void bubbleUp(T elt, int index) {
     T[] bs = backingStore;
@@ -155,16 +148,16 @@
   
   @Override
   public String toString() {
-    StringBuffer s = new StringBuffer();
-    s.append("[");
+    StringBuilder s = new StringBuilder();
+    s.append('[');
     for (int i = 0; i < size(); i++) {
       if (backingStore[i] != null) {
         if (i > 0)
-          s.append(",");
+          s.append(',');
         s.append(backingStore[i].toString());
       }
     }
-    s.append("]");
+    s.append(']');
     return s.toString();
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ImmutableStack.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ImmutableStack.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ImmutableStack.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ImmutableStack.java	2019-01-29 17:08:39.000000000 +0000
@@ -45,12 +45,10 @@
 /**
  * An immutable stack of objects. The {@link #push(Object)} and {@link #pop()}
  * operations create new stacks.
- * 
- * @param <T>
  */
 public class ImmutableStack<T> implements Iterable<T> {
 
-	private static final ImmutableStack<Object> EMPTY = new ImmutableStack<Object>(
+	private static final ImmutableStack<Object> EMPTY = new ImmutableStack<>(
 			new Object[0]);
 
 	private static final int MAX_SIZE = Integer.MAX_VALUE;
@@ -120,7 +118,7 @@
 	}
 
 	protected ImmutableStack<T> makeStack(T[] tmpEntries) {
-		return new ImmutableStack<T>(tmpEntries);
+		return new ImmutableStack<>(tmpEntries);
 	}
 
 	/**
@@ -161,7 +159,7 @@
 		try {
 			return entries[i];
 		} catch (ArrayIndexOutOfBoundsException e) {
-			throw new IllegalArgumentException("invalid i: " + i);
+			throw new IllegalArgumentException("invalid i: " + i, e);
 		}
 	}
 
@@ -176,15 +174,15 @@
 		if (entry == null) {
 			return false;
 		}
-		for (int i = 0; i < entries.length; i++) {
-			if (entries[i] != null && entries[i].equals(entry))
+		for (T entrie : entries) {
+			if (entrie != null && entrie.equals(entry))
 				return true;
 		}
 		return false;
 	}
 
 	/**
-	 * @return <code>true</code> iff other.size() = k, k <= this.size(), and the
+	 * @return {@code true} iff {@code other.size() = k}, {@code k <= this.size()}, and the
 	 *         top k elements of this equal other
 	 * @throws IllegalArgumentException
 	 *             if other == null
@@ -210,7 +208,7 @@
 		for (int i = entries.length - 1, j = 0; i >= 0; i--, j++) {
 			tmpEntries[j] = entries[i];
 		}
-		return new ImmutableStack<T>(tmpEntries);
+		return new ImmutableStack<>(tmpEntries);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -221,7 +219,7 @@
 		int size = entries.length - other.entries.length;
 		T[] tmpEntries = (T[]) new Object[size];
 		System.arraycopy(entries, 0, tmpEntries, 0, size);
-		return new ImmutableStack<T>(tmpEntries);
+		return new ImmutableStack<>(tmpEntries);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -247,7 +245,7 @@
 			System.arraycopy(other.entries, 0, tmpEntries, numFromThis,
 					other.entries.length);
 		}
-		return new ImmutableStack<T>(tmpEntries);
+		return new ImmutableStack<>(tmpEntries);
 	}
 
 	@Override
@@ -255,13 +253,11 @@
 		if (entries.length == 0) {
 			return EmptyIterator.instance();
 		}
-		return new ArrayIterator<T>(entries);
+		return new ArrayIterator<>(entries);
 	}
 
 	/**
 	 * return a new stack with the top replaced with t
-	 * 
-	 * @throws EmptyStackException
 	 */
 	public ImmutableStack<T> replaceTop(T t) {
 		if (isEmpty()) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/IndiscriminateFilter.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/IndiscriminateFilter.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/IndiscriminateFilter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/IndiscriminateFilter.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,15 +10,16 @@
  *******************************************************************************/
 
 package com.ibm.wala.util.collections;
-import com.ibm.wala.util.Predicate;
+
+import java.util.function.Predicate;
 
 /**
  * A filter that accepts everything.
  */
-public class IndiscriminateFilter<T> extends Predicate<T> {
+public class IndiscriminateFilter<T> implements Predicate<T> {
 
   public static <T> IndiscriminateFilter<T> singleton() {
-    return new IndiscriminateFilter<T>();
+    return new IndiscriminateFilter<>();
   }
 
   /*
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/IntMapIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/IntMapIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/IntMapIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/IntMapIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,12 +11,12 @@
 package com.ibm.wala.util.collections;
 
 import java.util.Iterator;
+import java.util.function.IntFunction;
 
-import com.ibm.wala.util.functions.IntFunction;
 import com.ibm.wala.util.intset.IntIterator;
 
 /**
- * An <code>IntMapIterator</code> maps an <code>Iterator</code> contents to produce a new Iterator
+ * An {@code IntMapIterator} maps an {@code Iterator} contents to produce a new Iterator
  */
 public class IntMapIterator<T> implements Iterator<T> {
   final IntIterator i;
@@ -54,4 +54,4 @@
     return "map: " + f + " of " + i;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/IntStack.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/IntStack.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/IntStack.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/IntStack.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.util.collections;
 
-import java.util.EmptyStackException;
+import java.util.Arrays;
 
 /**
  * A stack of integer primitives.  This should be more efficient than a java.util.Stack
@@ -18,22 +18,17 @@
 public class IntStack {
 
   /**
-   * Comment for <code>top</code>
+   * Comment for {@code top}
    */
   private int top = -1;
   /**
-   * Comment for <code>state</code>
+   * Comment for {@code state}
    */
   private int state[] = new int[0];
 
-  /**
-   * @param i
-   */
   public void push(int i) {
     if (state.length <= (top+1)) {
-      int newState[] = new int[ state.length*2 + 1 ];
-      System.arraycopy(state, 0, newState, 0, state.length);
-      state = newState;
+      state = Arrays.copyOf(state, state.length * 2 + 1);
     }
 
     state[++top] = i;
@@ -42,10 +37,7 @@
   /**
    * @return the int at the top of the stack
    */
-  public int peek() throws EmptyStackException {
-    if (isEmpty()) {
-      throw new EmptyStackException();
-    }
+  public int peek()  {
     return state[top];
   }
 
@@ -53,10 +45,7 @@
    * pop the stack
    * @return the int at the top of the stack
    */
-  public int pop() throws EmptyStackException{
-    if (isEmpty()) {
-      throw new EmptyStackException();
-    }
+  public int pop() {
     return state[top--];
   }
 
@@ -67,4 +56,21 @@
       return top == -1;
   }
 
+  /**
+   * @return the number of elements in the stack.
+   */
+  public int size() {
+    return top + 1;
+  }
+
+  /**
+   * @return the ith int from the bottom of the stack
+   */
+  public int get(int i) {
+    if (i < 0 || i > top) {
+      throw new IndexOutOfBoundsException();
+    }
+    return state[i];
+  }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Iterator2Collection.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Iterator2Collection.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Iterator2Collection.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Iterator2Collection.java	2019-01-29 17:08:39.000000000 +0000
@@ -33,7 +33,7 @@
     if (i == null) {
       throw new IllegalArgumentException("i == null");
     }
-    return new Iterator2Set<T>(i, new LinkedHashSet<T>(5));
+    return new Iterator2Set<>(i, new LinkedHashSet<T>(5));
   }
 
   /**
@@ -43,7 +43,7 @@
     if (i == null) {
       throw new IllegalArgumentException("i == null");
     }
-    return new Iterator2List<T>(i, new ArrayList<T>(5));
+    return new Iterator2List<>(i, new ArrayList<T>(5));
   }
 
   @Override
@@ -148,8 +148,7 @@
   }
 
   @Override
-  @SuppressWarnings("hiding")
-  public <T> T[] toArray(T[] a) {
+  public <U> U[] toArray(U[] a) {
     return getDelegate().toArray(a);
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Iterator2Iterable.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Iterator2Iterable.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Iterator2Iterable.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Iterator2Iterable.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,7 @@
   private final Iterator<T> iter;
 
   public static <T> Iterator2Iterable<T> make(Iterator<T> iter) {
-    return new Iterator2Iterable<T>(iter);
+    return new Iterator2Iterable<>(iter);
   }
 
   public Iterator2Iterable(Iterator<T> iter) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/IteratorPlusOne.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/IteratorPlusOne.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/IteratorPlusOne.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/IteratorPlusOne.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,7 @@
     if (it == null) {
       throw new IllegalArgumentException("null it");
     }
-    return new IteratorPlusOne<T>(it, xtra);
+    return new IteratorPlusOne<>(it, xtra);
   }
 
   private final Iterator<? extends T> it;
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/IteratorUtil.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/IteratorUtil.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/IteratorUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/IteratorUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,9 +11,6 @@
 package com.ibm.wala.util.collections;
 
 import java.util.Iterator;
-
-import com.ibm.wala.util.functions.Function;
-import com.ibm.wala.util.Predicate;
 /**
  * utilities dealing with Iterators
  */
@@ -46,20 +43,7 @@
     return count;
   }
 
-  @SuppressWarnings("deprecation")
   public static <T, S extends T> Iterator<S> filter(Iterator<T> iterator, final Class<S> cls) {
-    return new MapIterator<T,S>(
-        new FilterIterator<T>(iterator, new Predicate<T>() {
-          @Override public boolean test(T o) {
-            return cls.isInstance(o);
-          }
-        }), 
-        new Function<T,S>() {
-          @SuppressWarnings("unchecked")
-          @Override
-          public S apply(T object) {
-            return (S) object;
-          }
-        });
+    return new MapIterator<>(new FilterIterator<>(iterator, cls::isInstance), cls::cast);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/IVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/IVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/IVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/IVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,4 +37,4 @@
    * @return max i s.t get(i) != null
    */
   public abstract int getMaxIndex();
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/MapIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/MapIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/MapIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/MapIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,11 +13,10 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
-
-import com.ibm.wala.util.functions.Function;
+import java.util.function.Function;
 
 /**
- * An <code>MapIterator</code> maps an <code>Iterator</code> contents to produce a new Iterator
+ * An {@code MapIterator} maps an {@code Iterator} contents to produce a new Iterator
  */
 public class MapIterator<X, Y> implements Iterator<Y> {
   final Iterator<? extends X> i;
@@ -53,10 +52,10 @@
   }
 
   public static <X,Y> Iterator<Y> map(Function<X, Y> f, Iterator<X> i) {
-    return new MapIterator<X,Y>(i, f);
+    return new MapIterator<>(i, f);
   }
 
   public static <X,Y> Set<Y> map(Function<X, Y> f, Collection<X> i) {
-    return Iterator2Collection.toSet(new MapIterator<X,Y>(i.iterator(), f));
+    return Iterator2Collection.toSet(new MapIterator<>(i.iterator(), f));
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/MapUtil.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/MapUtil.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/MapUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/MapUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -26,8 +25,7 @@
  */
 public class MapUtil {
   /**
-   * @param M a mapping from Object -> Set
-   * @param key
+   * @param M a mapping from Object -&gt; Set
    * @return the Set corresponding to key in M; create one if needed
    * @throws IllegalArgumentException if M is null
    * @throws ClassCastException if the key is of an inappropriate type for this map (optional)
@@ -90,15 +88,14 @@
     }
     List<T> result = M.get(key);
     if (result == null) {
-      result = new ArrayList<T>();
+      result = new ArrayList<>();
       M.put(key, result);
     }
     return result;
   }
 
   /**
-   * @param M a mapping from Object -> Map
-   * @param key
+   * @param M a mapping from Object -&gt; Map
    * @return the Map corresponding to key in M; create one if needed
    * @throws IllegalArgumentException if M is null
    * @throws ClassCastException if the key is of an inappropriate type for this map (optional)
@@ -133,8 +130,7 @@
   }
 
   /**
-   * @param M a mapping from Object -> WeakHashMap
-   * @param key
+   * @param M a mapping from Object -&gt; WeakHashMap
    * @return the WeakHashMap corresponding to key in M; create one if needed
    * @throws IllegalArgumentException if M is null
    * @throws ClassCastException if the key is of an inappropriate type for this map (optional)
@@ -146,15 +142,15 @@
     }
     WeakHashMap<K, V> result = M.get(key);
     if (result == null) {
-      result = new WeakHashMap<K, V>(2);
+      result = new WeakHashMap<>(2);
       M.put(key, result);
     }
     return result;
   }
 
   /**
-   * @param m a map from key -> Set <value>
-   * @return inverted map, value -> Set <key>
+   * @param m a map from key -&gt; {@link Set}&lt;value&gt;
+   * @return inverted map, value -&gt; {@link Set}&lt;key&gt;
    * @throws IllegalArgumentException if m is null
    */
   public static <K, V> Map<V, Set<K>> inverseMap(Map<K, Set<V>> m) {
@@ -162,12 +158,10 @@
       throw new IllegalArgumentException("m is null");
     }
     Map<V, Set<K>> result = HashMapFactory.make(m.size());
-    for (Iterator<Map.Entry<K, Set<V>>> it = m.entrySet().iterator(); it.hasNext();) {
-      Map.Entry<K, Set<V>> E = it.next();
+    for (Map.Entry<K, Set<V>> E : m.entrySet()) {
       K key = E.getKey();
       Set<V> values = E.getValue();
-      for (Iterator<V> it2 = values.iterator(); it2.hasNext();) {
-        V v = it2.next();
+      for (V v : values) {
         Set<K> s = findOrCreateSet(result, v);
         s.add(key);
       }
@@ -203,14 +197,12 @@
     }
     Map<Set<K>, V> result = HashMapFactory.make();
     Map<V, Set<K>> valueToKeys = HashMapFactory.make();
-    for (Iterator<Map.Entry<K, V>> it = m.entrySet().iterator(); it.hasNext();) {
-      Map.Entry<K, V> E = it.next();
+    for (Map.Entry<K, V> E : m.entrySet()) {
       K key = E.getKey();
       V value = E.getValue();
       findOrCreateSet(valueToKeys, value).add(key);
     }
-    for (Iterator<Map.Entry<V, Set<K>>> it = valueToKeys.entrySet().iterator(); it.hasNext();) {
-      Map.Entry<V, Set<K>> E = it.next();
+    for (Map.Entry<V, Set<K>> E : valueToKeys.entrySet()) {
       V value = E.getKey();
       Set<K> keys = E.getValue();
       result.put(keys, value);
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/MultiMap.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/MultiMap.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/MultiMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/MultiMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -64,4 +64,4 @@
     public void clear();
 
   public boolean isEmpty();
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/NonNullSingletonIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/NonNullSingletonIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/NonNullSingletonIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/NonNullSingletonIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -53,7 +53,7 @@
   }
 
   public static <T> NonNullSingletonIterator<T> make(T item) {
-    return new NonNullSingletonIterator<T>(item);
+    return new NonNullSingletonIterator<>(item);
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ObjectArrayMapping.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ObjectArrayMapping.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ObjectArrayMapping.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ObjectArrayMapping.java	2019-01-29 17:08:39.000000000 +0000
@@ -45,7 +45,7 @@
     try {
       return array[n];
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid n: " + n);
+      throw new IllegalArgumentException("invalid n: " + n, e);
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/OrFilter.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/OrFilter.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/OrFilter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/OrFilter.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package com.ibm.wala.util.collections;
-
-import com.ibm.wala.util.Predicate;
-
-/**
- * A filter "A or B"
- */
-public class OrFilter<T> extends Predicate<T> {
-
-  public static <T> OrFilter<T> createOrFilter(Predicate<T> a, Predicate<T> b) {
-    if (a == null || b == null) {
-      throw new IllegalArgumentException("cannot compose null filter");
-    }
-    return new OrFilter<T>(a, b);
-  }
-
-  private final Predicate<T> a;
-  private final Predicate<T> b;
-  
-  private OrFilter(Predicate<T> a, Predicate<T> b) {
-    this.a = a;
-    this.b = b;
-  }
-  
-  @Override public boolean test(T o) {
-    return a.test(o) || b.test(o);
-  }
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Pair.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Pair.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Pair.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Pair.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,6 +18,7 @@
 
 public class Pair<T,U> implements Serializable {
 
+  private static final long serialVersionUID = 1861211857872739247L;
   public final T fst;
   public final U snd;
 
@@ -26,7 +27,7 @@
     this.snd = snd;
   }
 
-  private boolean check(Object x, Object y) {
+  private static boolean check(Object x, Object y) {
     return (x == null) ? (y == null) : x.equals(y);
   }
 
@@ -36,7 +37,7 @@
     return (o instanceof Pair) && check(fst, ((Pair) o).fst) && check(snd, ((Pair) o).snd);
   }
 
-  private int hc(Object o) {
+  private static int hc(Object o) {
     return (o == null) ? 0 : o.hashCode();
   }
 
@@ -47,21 +48,21 @@
 
   public Iterator<Object> iterator() {
     return new Iterator<Object>() {
-      byte next = 1;
+      byte nextFlag = 1;
 
       @Override
       public boolean hasNext() {
-        return next > 0;
+        return nextFlag > 0;
       }
 
       @Override
       public Object next() {
-        switch (next) {
+        switch (nextFlag) {
           case 1 :
-            next++;
+            nextFlag++;
             return fst;
           case 2 :
-            next = 0;
+            nextFlag = 0;
             return snd;
           default :
             throw new NoSuchElementException();
@@ -77,10 +78,10 @@
   
   @Override
   public String toString() {
-    return "[" + fst + "," + snd +"]";
+    return "[" + fst + ',' + snd + ']';
   }
 
   public static <T,U> Pair<T, U> make(T x, U y) {
-    return new Pair<T, U>(x,y);
+    return new Pair<>(x,y);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashMap.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashMap.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,7 +23,6 @@
   public static final long serialVersionUID = 909018793791787198L;
 
   /**
-   * @param t
    * @throws NullPointerException if t is null
    */
   public ParanoidHashMap(Map<K, V> t) throws NullPointerException {
@@ -73,4 +72,4 @@
     }
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ParanoidHashSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,7 +12,6 @@
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
@@ -27,7 +26,7 @@
   public static final long serialVersionUID = 30919839181133333L;
 
   /**
-   * A mapping from Integer (hashcode) -> Set of objects
+   * A mapping from Integer (hashcode) -&gt; Set of objects
    */
   private final Map<Integer, Set<T>> hcFreq;
 
@@ -39,15 +38,12 @@
   private final int BAD_HC = 3;
 
   /**
-   * @param s
    * @throws NullPointerException if s is null
    */
   public ParanoidHashSet(Collection<T> s) throws NullPointerException {
     super(s.size());
     hcFreq = HashMapFactory.make(s.size());
-    for (Iterator<T> it = s.iterator(); it.hasNext();) {
-      add(it.next());
-    }
+    this.addAll(s);
   }
 
   /**
@@ -78,18 +74,18 @@
     if (result) {
       nAdded++;
       int hc = arg0.hashCode();
-      Set<T> s = hcFreq.get(new Integer(hc));
+      Set<T> s = hcFreq.get(hc);
       if (s == null) {
-        HashSet<T> h = new LinkedHashSet<T>(1);
+        HashSet<T> h = new LinkedHashSet<>(1);
         h.add(arg0);
-        hcFreq.put(new Integer(hc), h);
+        hcFreq.put(hc, h);
       } else {
         if (s.size() == BAD_HC) {
-          for (Iterator<T> it = s.iterator(); it.hasNext();) {
-            Object o = it.next();
+          for (T t : s) {
+            Object o = t;
             System.err.println(o + " " + o.hashCode());
           }
-          assert false : "bad hc " + arg0.getClass() + " " + arg0;
+          assert false : "bad hc " + arg0.getClass() + ' ' + arg0;
         } else {
           s.add(arg0);
         }
@@ -97,4 +93,4 @@
     }
     return result;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ReverseIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ReverseIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ReverseIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ReverseIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,7 +19,7 @@
  */
 public class ReverseIterator<T> implements Iterator<T> {
 
-  final ArrayList<T> list = new ArrayList<T>();
+  final ArrayList<T> list = new ArrayList<>();
 
   int nextIndex;
 
@@ -57,7 +57,7 @@
   }
 
   public static <T> Iterator<T> reverse(Iterator<T> it) {
-    return new ReverseIterator<T>(it);
+    return new ReverseIterator<>(it);
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/SimpleVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/SimpleVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/SimpleVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/SimpleVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.util.collections;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 
 /**
@@ -74,9 +75,7 @@
    */
   private void ensureCapacity(int capacity) {
     if (capacity >= store.length) {
-      Object[] old = store;
-      store = new Object[1 + (int) (GROWTH_FACTOR * capacity)];
-      System.arraycopy(old, 0, store, 0, old.length);
+      store = Arrays.copyOf(store, 1 + (int) (GROWTH_FACTOR * capacity));
     }
   }
 
@@ -94,8 +93,8 @@
    */
   private double computeOccupancy() {
     int count = 0;
-    for (int i = 0; i < store.length; i++) {
-      if (store[i] != null) {
+    for (Object element : store) {
+      if (element != null) {
         count++;
       }
     }
@@ -106,7 +105,7 @@
   @Override
   @SuppressWarnings("unchecked")
   public Iterator<T> iterator() {
-    ArrayList<T> result = new ArrayList<T>();
+    ArrayList<T> result = new ArrayList<>();
     for (int i =0; i <= maxIndex; i++) {
       result.add((T) store[i]);
     }
@@ -117,4 +116,4 @@
   public int getMaxIndex() {
     return maxIndex;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/SmallMap.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/SmallMap.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/SmallMap.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/SmallMap.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,14 +10,16 @@
  *******************************************************************************/
 package com.ibm.wala.util.collections;
 
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Set;
 
 import com.ibm.wala.util.debug.Assertions;
-import com.ibm.wala.util.debug.UnimplementedError;
 
 /**
  * A simple implementation of Map; intended for Maps with few elements. Optimized for space, not time -- use with care.
@@ -57,7 +59,7 @@
     try {
       return (K) keysAndValues[i];
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid i: " + i);
+      throw new IllegalArgumentException("invalid i: " + i, e);
     }
   }
 
@@ -66,14 +68,15 @@
    * 
    * @return the ith key
    */
-  public Object getValue(int i) throws IllegalStateException {
+  @SuppressWarnings("unchecked")
+  public V getValue(int i) throws IllegalStateException {
     if (keysAndValues == null) {
       throw new IllegalStateException("getValue on empty map");
     }
     try {
-      return keysAndValues[size() + i];
+      return (V) keysAndValues[size() + i];
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("illegal i: " + i);
+      throw new IllegalArgumentException("illegal i: " + i, e);
     }
   }
 
@@ -139,14 +142,22 @@
   }
 
   private void growByOne() {
-    Object[] old = keysAndValues;
-    int length = (old == null) ? 0 : old.length;
-    keysAndValues = new Object[length + 2];
-    for (int i = 0; i < length / 2; i++) {
-      keysAndValues[i] = old[i];
-    }
-    for (int i = 0; i < length / 2; i++) {
-      keysAndValues[i + 1 + length / 2] = old[length / 2 + i];
+    if (keysAndValues == null)
+      keysAndValues = new Object[2];
+    else {
+      final int oldLength = keysAndValues.length;
+      final int oldEntryCount = oldLength / 2;
+      final int oldLastKeySlot = oldEntryCount - 1;
+      final int oldFirstValueSlot = oldLastKeySlot + 1;
+
+      final int newLength = oldLength + 2;
+      final int newEntryCount = newLength / 2;
+      final int newLastKeySlot = newEntryCount - 1;
+      final int newFirstValueSlot = newLastKeySlot + 1;
+
+      keysAndValues = Arrays.copyOf(keysAndValues, newLength);
+      System.arraycopy(keysAndValues, oldFirstValueSlot, keysAndValues, newFirstValueSlot, oldEntryCount);
+      keysAndValues[newLastKeySlot] = null;
     }
 
   }
@@ -200,44 +211,76 @@
     keysAndValues = null;
   }
 
-  /*
-   * @see java.util.Map#keySet()
-   */
   @Override
-  @SuppressWarnings("unchecked")
   public Set<K> keySet() {
-    // TODO: use a better set implementation, SOON!!
-    HashSet<K> result = HashSetFactory.make(size());
-    for (int i = 0; i < size(); i++) {
-      result.add((K) keysAndValues[i]);
-    }
-    return result;
+    return new SlotIteratingSet<K>() {
+      @Override
+      protected K getItemInSlot(int slot) {
+        return getKey(slot);
+      }
+    };
   }
 
-  /*
-   * @see java.util.Map#values()
-   */
   @Override
-  @SuppressWarnings("unchecked")
   public Collection<V> values() {
-    int s = size();
-    if (s == 0) {
-      return Collections.emptySet();
-    }
-    HashSet<V> result = HashSetFactory.make(s);
-    for (int i = s; i < keysAndValues.length; i++) {
-      result.add((V) keysAndValues[i]);
-    }
-    return result;
+    return new SlotIteratingSet<V>() {
+      @Override
+      protected V getItemInSlot(int slot) {
+        return getValue(slot);
+      }
+    };
   }
 
-  /**
-   * @throws UnimplementedError 
-   */
   @Override
-  public Set<Map.Entry<K, V>> entrySet() throws UnimplementedError {
-    Assertions.UNREACHABLE("must implement entrySet");
-    return null;
+  public Set<Map.Entry<K, V>> entrySet() {
+    return new SlotIteratingSet<Entry<K, V>>() {
+      @Override
+      protected Entry<K, V> getItemInSlot(int slot) {
+        return new AbstractMap.SimpleEntry<>(getKey(slot), getValue(slot));
+      }
+    };
   }
 
-}
\ No newline at end of file
+  /**
+   * Minimally functional {@link Set} that iterates over array slots.
+   *
+   * @param <E> the type of elements maintained by this set
+   */
+  abstract private class SlotIteratingSet<E> extends AbstractSet<E> {
+
+    @Override
+    public Iterator<E> iterator() {
+      return new SlotIterator();
+    }
+
+    @Override
+    public int size() {
+      return SmallMap.this.size();
+    }
+
+    private class SlotIterator implements Iterator<E> {
+
+      private int nextSlot = 0;
+
+      @Override
+      public boolean hasNext() {
+        return nextSlot < SmallMap.this.size();
+      }
+
+      @Override
+      public E next() {
+        final E result;
+        try {
+          result = getItemInSlot(nextSlot);
+        } catch (IllegalStateException | IllegalArgumentException problem) {
+          throw new NoSuchElementException(problem.getMessage());
+        }
+        ++nextSlot;
+        return result;
+      }
+
+    }
+
+    abstract protected E getItemInSlot(int slot);
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/SparseVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/SparseVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/SparseVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/SparseVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.util.collections;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
@@ -28,6 +29,8 @@
  */
 public class SparseVector<T> implements IVector<T>, Serializable {
 
+  private static final long serialVersionUID = -6220164684358954867L;
+
   private final static int DEF_INITIAL_SIZE = 5;
 
   /**
@@ -42,10 +45,6 @@
     indices = MutableSparseIntSet.makeEmpty();
   }
 
-  /**
-   * @param initialSize
-   * @param expansion
-   */
   public SparseVector(int initialSize, float expansion) {
     data = new Object[DEF_INITIAL_SIZE];
     indices = new TunedMutableSparseIntSet(initialSize, expansion);
@@ -86,9 +85,7 @@
 
   private void ensureCapacity(int capacity) {
     if (data.length < capacity + 1) {
-      Object[] old = data;
-      data = new Object[1 + (int) (capacity * indices.getExpansionFactor())];
-      System.arraycopy(old, 0, data, 0, old.length);
+      data = Arrays.copyOf(data, 1 + (int) (capacity * indices.getExpansionFactor()));
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ToStringComparator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ToStringComparator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/ToStringComparator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/ToStringComparator.java	2019-01-29 17:08:39.000000000 +0000
@@ -36,7 +36,6 @@
     return o1.toString().compareTo(o2.toString());
   }
   
-  @SuppressWarnings("unchecked")
   public static <T> ToStringComparator<T> instance() {
     return INSTANCE;
   }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/TwoLevelVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/TwoLevelVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/TwoLevelVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/TwoLevelVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,6 +22,8 @@
  */
 public class TwoLevelVector<T> implements IVector<T>, Serializable {
 
+  private static final long serialVersionUID = -835376054736611070L;
+
   private static final int PAGE_SIZE = 4096;
 
   private static final int LOG_PAGE_SIZE = Logs.log2(PAGE_SIZE);
@@ -30,7 +32,7 @@
    * Array of IVector: data.get(i) holds data[i*PAGE_SIZE] ...
    * data[(i+1)*PAGESIZE - 1]
    */
-  final private Vector<SparseVector<T>> data = new Vector<SparseVector<T>>(0);
+  final private Vector<SparseVector<T>> data = new Vector<>(0);
 
   private int maxPage = -1;
 
@@ -54,11 +56,11 @@
     return v.get(localX);
   }
 
-  private int getFirstIndexOnPage(int page) {
+  private static int getFirstIndexOnPage(int page) {
     return page << LOG_PAGE_SIZE;
   }
 
-  private int getPageNumber(int x) {
+  private static int getPageNumber(int x) {
     return x >> LOG_PAGE_SIZE;
   }
 
@@ -78,13 +80,13 @@
     v.set(localX, value);
   }
 
-  private int toLocalIndex(int x, int page) {
+  private static int toLocalIndex(int x, int page) {
     return x - getFirstIndexOnPage(page);
   }
 
   private IVector<T> findOrCreatePage(int page) {
     if (page >= data.size()) {
-      SparseVector<T> v = new SparseVector<T>();
+      SparseVector<T> v = new SparseVector<>();
       data.setSize(page + 1);
       data.add(page, v);
       maxPage = Math.max(page, maxPage);
@@ -92,7 +94,7 @@
     } else {
       SparseVector<T> v = data.get(page);
       if (v == null) {
-        v = new SparseVector<T>();
+        v = new SparseVector<>();
         data.set(page, v);
         maxPage = Math.max(page, maxPage);
       }
@@ -174,4 +176,4 @@
 
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Util.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Util.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/collections/Util.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/collections/Util.java	2019-01-29 17:08:39.000000000 +0000
@@ -37,20 +37,22 @@
  */
 package com.ibm.wala.util.collections;
 
+import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
 import java.security.Permission;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.BitSet;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-
-import com.ibm.wala.util.Predicate;
-import com.ibm.wala.util.functions.Function;
+import java.util.function.Function;
+import java.util.function.Predicate;
 
 /**
  * Miscellaneous utility functions.
@@ -71,14 +73,14 @@
     }
     // create a memory buffer to which to dump the trace
     ByteArrayOutputStream traceDump = new ByteArrayOutputStream();
-    PrintWriter w = new PrintWriter(traceDump);
-    thrown.printStackTrace(w);
-    w.close();
+    try (final PrintWriter w = new PrintWriter(new BufferedWriter(new OutputStreamWriter(traceDump, StandardCharsets.UTF_8)))) {
+      thrown.printStackTrace(w);
+    }
     return traceDump.toString();
   }
   
   /**
-   * Return those elements of <code>c</code> that are assignable to <code>klass</code>.
+   * Return those elements of {@code c} that are assignable to {@code klass}.
    */
   @SuppressWarnings("unchecked")
   public static <S, T> Set<T> filterByType(Iterable<S> c, Class<T> klass) {
@@ -116,8 +118,7 @@
     if (c == null) {
       throw new IllegalArgumentException("c == null");
     }
-    for (Iterator<T> iter = c.iterator(); iter.hasNext();) {
-      T obj = iter.next();
+    for (T obj : c) {
       if (p.test(obj))
         return obj;
     }
@@ -149,8 +150,8 @@
     if (c == null) {
       throw new IllegalArgumentException("c == null");
     }
-    for (Iterator<T> iter = c.iterator(); iter.hasNext();)
-      v.visit(iter.next());
+    for (T t : c)
+      v.visit(t);
   }
 
   /**
@@ -164,9 +165,9 @@
     if (srcList == null) {
       throw new IllegalArgumentException("srcList == null");
     }
-    ArrayList<U> result = new ArrayList<U>();
-    for (Iterator<T> srcIter = srcList.iterator(); srcIter.hasNext();) {
-      result.add(f.apply(srcIter.next()));
+    ArrayList<U> result = new ArrayList<>();
+    for (T t : srcList) {
+      result.add(f.apply(t));
     }
     return result;
   }
@@ -183,8 +184,8 @@
       throw new IllegalArgumentException("srcSet == null");
     }
     HashSet<U> result = HashSetFactory.make();
-    for (Iterator<T> srcIter = srcSet.iterator(); srcIter.hasNext();) {
-      result.add(f.apply(srcIter.next()));
+    for (T t : srcSet) {
+      result.add(f.apply(t));
     }
     return result;
   }
@@ -197,9 +198,7 @@
       throw new IllegalArgumentException("data == null");
     }
     if (data.length < newSize) {
-      int[] newData = new int[newSize];
-      System.arraycopy(data, 0, newData, 0, data.length);
-      return newData;
+      return Arrays.copyOf(data, newSize);
     } else
       return data;
   }
@@ -225,7 +224,7 @@
     });
 
     Class<?> c = obj.getClass();
-    StringBuffer buf = new StringBuffer(FULLY_QUALIFIED_NAMES ? c.getName() : removePackageName(c.getName()));
+    StringBuilder buf = new StringBuilder(FULLY_QUALIFIED_NAMES ? c.getName() : removePackageName(c.getName()));
     while (c != Object.class) {
       Field[] fields = c.getDeclaredFields();
 
@@ -243,7 +242,7 @@
 
           // name=value : type
           buf = buf.append(name);
-          buf = buf.append("=");
+          buf = buf.append('=');
           buf = buf.append(value == null ? "null" : value.toString());
           buf = buf.append(" : ");
           buf = buf.append(FULLY_QUALIFIED_NAMES ? type.getName() : removePackageName(type.getName()));
@@ -278,15 +277,10 @@
   /**
    * checks if two sets have a non-empty intersection
    * 
-   * @return <code>true</code> if the sets intersect; <code>false</code> otherwise
+   * @return {@code true} if the sets intersect; {@code false} otherwise
    */
   public static <T> boolean intersecting(final Set<T> s1, final Set<T> s2) {
-    return forSome(s1, new Predicate<T>() {
-      @Override
-      public boolean test(T obj) {
-        return s2.contains(obj);
-      }
-    });
+    return forSome(s1, s2::contains);
   }
 
   /**
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/config/FileOfClasses.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/config/FileOfClasses.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/config/FileOfClasses.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/config/FileOfClasses.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,14 +14,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
  * An object which represents a set of classes read from a text file.
  */
-public class FileOfClasses extends SetOfClasses implements Serializable {
+public class FileOfClasses extends SetOfClasses {
 
   /* Serial version */
   private static final long serialVersionUID = -3256390509887654322L;  
@@ -38,27 +38,26 @@
     if (input == null) {
       throw new IllegalArgumentException("null input");
     }
-    BufferedReader is = new BufferedReader(new InputStreamReader(input));
-
-    StringBuffer regex = null;
-    String line;
-    while ((line = is.readLine()) != null) {
-
-      if (line.startsWith("#")) continue;
-
-      if (regex == null) {
-        regex = new StringBuffer("(" + line + ")");
-      } else {
-        regex.append("|(" + line + ")");
+    try (final BufferedReader is = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8))) {
+  
+      StringBuilder regex = null;
+      String line;
+      while ((line = is.readLine()) != null) {
+  
+        if (line.startsWith("#")) continue;
+  
+        if (regex == null) {
+          regex = new StringBuilder('(' + line + ')');
+        } else {
+          regex.append("|(").append(line).append(')');
+        }
+      }
+  
+      if (regex != null) {
+        this.regex = regex.toString();
+        needsCompile = true;
       }
     }
-
-    if (regex != null) {
-      this.regex = regex.toString();
-      needsCompile = true;
-    }
-
-    is.close();
   }
 
   private void compile() {
@@ -80,9 +79,9 @@
     Matcher m = pattern.matcher(klassName);
     if (DEBUG) {
       if (m.matches()) {
-        System.err.println(klassName + " " + true);
+        System.err.println(klassName + ' ' + true);
       } else {
-        System.err.println(klassName + " " + false);
+        System.err.println(klassName + ' ' + false);
       }
     }
     return m.matches();
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/config/SetOfClasses.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/config/SetOfClasses.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/config/SetOfClasses.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/config/SetOfClasses.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,12 +14,14 @@
 import java.util.Set;
 
 /**
- * Logically, a set of {@link IClass}.
+ * Logically, a set of {@link Class}.
  * 
  * TODO: why does this not extend {@link Set}? Is there a good reason anymore?
  */
 public abstract class SetOfClasses implements Serializable {
 
+  private static final long serialVersionUID = -3048222852073799533L;
+
   public abstract boolean contains(String klassName);
 
   public abstract void add(String klass);
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/functions/Function.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/functions/Function.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/functions/Function.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/functions/Function.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package com.ibm.wala.util.functions;
-
-
-/**
- */
-public interface Function<X,Y> {
-
-  Y apply(X object);
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/functions/IntFunction.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/functions/IntFunction.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/functions/IntFunction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/functions/IntFunction.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 - 2006 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package com.ibm.wala.util.functions;
-
-/**
- */
-public interface IntFunction<T> {
-
-  T apply(int i);
-
-}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/functions/VoidFunction.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/functions/VoidFunction.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/functions/VoidFunction.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/functions/VoidFunction.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package com.ibm.wala.util.functions;
-
-public interface VoidFunction<T> {
-
-  void apply(T v);
-  
-}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/AbstractGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/AbstractGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/AbstractGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/AbstractGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,6 +12,8 @@
 
 import java.util.Iterator;
 
+import com.ibm.wala.util.collections.Iterator2Iterable;
+
 /**
  * Basic functionality for a {@link Graph} that delegates node and edge management.
  */
@@ -182,18 +184,20 @@
     getNodeManager().removeNode(n);
   }
 
+  @SuppressWarnings("unused")
+  protected String edgeString(T from, T to) {
+    return " --> ";
+  }
   @Override
   public String toString() {
-    StringBuffer sb = new StringBuffer();
-    for (Iterator<? extends T> ns = iterator(); ns.hasNext();) {
-      T n = ns.next();
-      sb.append(n.toString()).append("\n");
-      for (Iterator<?> ss = getSuccNodes(n); ss.hasNext();) {
-        Object s = ss.next();
-        sb.append("  --> ").append(s);
-        sb.append("\n");
+    StringBuilder sb = new StringBuilder();
+    for (T n : this) {
+      sb.append(n.toString()).append('\n');
+      for (T s : Iterator2Iterable.make(getSuccNodes(n))) {
+        sb.append(edgeString(n, s)).append(s);
+        sb.append('\n');
       }
-      sb.append("\n");
+      sb.append('\n');
     }
 
     return sb.toString();
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/AbstractNumberedGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/AbstractNumberedGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/AbstractNumberedGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/AbstractNumberedGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -64,7 +64,7 @@
    */
   @Override
   public Iterator<T> iterateNodes(final IntSet s) {
-    return new NumberedNodeIterator<T>(s, this);
+    return new NumberedNodeIterator<>(s, this);
   }
 
   /* 
@@ -83,4 +83,4 @@
   public IntSet getSuccNodeNumbers(T node) throws IllegalArgumentException {
     return getEdgeManager().getSuccNodeNumbers(node);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/Acyclic.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/Acyclic.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/Acyclic.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/Acyclic.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,6 +17,7 @@
 import java.util.Stack;
 
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.intset.BasicNaturalRelation;
 import com.ibm.wala.util.intset.IBinaryNaturalRelation;
 import com.ibm.wala.util.intset.IntIterator;
@@ -73,8 +74,7 @@
   private static <T> void dfs(BasicNaturalRelation result, T root, NumberedGraph<T> G, Set<T> visited, Set<T> onstack) {
     visited.add(root);
     onstack.add(root);
-    for (Iterator<? extends T> it = G.getSuccNodes(root); it.hasNext();) {
-      T dstNode = it.next();
+    for (T dstNode : Iterator2Iterable.make(G.getSuccNodes(root))) {
       if (onstack.contains(dstNode)) {
         int src = G.getNumber(root);
         int dst = G.getNumber(dstNode);
@@ -88,10 +88,10 @@
   }
 
   private static <T> void dfsNonRecursive(final BasicNaturalRelation result, final T root, final NumberedGraph<T> G) {
-    final Stack<T> stack = new Stack<T>();
-    final Set<T> stackSet = new HashSet<T>();
-    final Stack<Iterator<? extends T>> stackIt = new Stack<Iterator<? extends T>>();
-    final Set<T> finished = new HashSet<T>();
+    final Stack<T> stack = new Stack<>();
+    final Set<T> stackSet = new HashSet<>();
+    final Stack<Iterator<? extends T>> stackIt = new Stack<>();
+    final Set<T> finished = new HashSet<>();
     stack.push(root);
     stackSet.add(root);
     stackIt.push(G.getSuccNodes(root));
@@ -106,7 +106,7 @@
       while (isFinished && currentIt.hasNext() ) {
         final T succ = currentIt.next();
         if (!finished.contains(succ)) {
-          if (succ == current || stackSet.contains(succ)) {
+          if (succ == current || !stackSet.add(succ)) {
             // found a backedge
             final int src = G.getNumber(current);
             final int dst = G.getNumber(succ);
@@ -116,7 +116,6 @@
             stackSet.add(current);
             stackIt.push(currentIt);
             stack.push(succ);
-            stackSet.add(succ);
             stackIt.push(G.getSuccNodes(succ));
             isFinished = false;
           }
@@ -154,7 +153,7 @@
    */
   public static <T> Collection<Path> computeAcyclicPaths(NumberedGraph<T> G, T root, T src, T sink, int max) {
     Collection<Path> result = HashSetFactory.make();
-    EdgeFilteredNumberedGraph<T> acyclic = new EdgeFilteredNumberedGraph<T>(G, computeBackEdges(G, root));
+    EdgeFilteredNumberedGraph<T> acyclic = new EdgeFilteredNumberedGraph<>(G, computeBackEdges(G, root));
 
     Collection<Path> worklist = HashSetFactory.make();
     Path sinkPath = Path.make(G.getNumber(sink));
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/BasicTree.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/BasicTree.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/BasicTree.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/BasicTree.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,7 +18,7 @@
 public class BasicTree<T> {
 
   private final T value;
-  final private SimpleVector<BasicTree<T>> children = new SimpleVector<BasicTree<T>>();
+  final private SimpleVector<BasicTree<T>> children = new SimpleVector<>();
 
   protected BasicTree(T value) {
     this.value = value;
@@ -28,7 +28,7 @@
     if (value == null) {
       throw new IllegalArgumentException("null value");
     }
-    return new BasicTree<T>(value);
+    return new BasicTree<>(value);
   }
   
   public T getRootValue() {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/DominanceFrontiers.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/DominanceFrontiers.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/DominanceFrontiers.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/DominanceFrontiers.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,6 +16,7 @@
 
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.traverse.DFS;
@@ -69,25 +70,22 @@
   private void analyze() {
     Graph<T> DT = dom.dominatorTree();
 
-    Iterator<T> XS = DFS.iterateFinishTime(DT, new NonNullSingletonIterator<T>(root));
+    Iterator<T> XS = DFS.iterateFinishTime(DT, new NonNullSingletonIterator<>(root));
     while (XS.hasNext()) {
       T X = XS.next();
       Set<T> DF_X = HashSetFactory.make();
       DF.put(X, DF_X);
 
       // DF_local
-      for (Iterator<? extends T> YS = G.getSuccNodes(X); YS.hasNext();) {
-        T Y = YS.next();
+      for (T Y : Iterator2Iterable.make(G.getSuccNodes(X))) {
         if (dom.getIdom(Y) != X) {
           DF_X.add(Y);
         }
       }
 
       // DF_up
-      for (Iterator<? extends T> ZS = DT.getSuccNodes(X); ZS.hasNext();) {
-        T Z = ZS.next();
-        for (Iterator<T> YS2 = getDominanceFrontier(Z); YS2.hasNext();) {
-          T Y2 = YS2.next();
+      for (T Z : Iterator2Iterable.make(DT.getSuccNodes(X))) {
+        for (T Y2 : Iterator2Iterable.make(getDominanceFrontier(Z))) {
           if (dom.getIdom(Y2) != X)
             DF_X.add(Y2);
         }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/Dominators.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/Dominators.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/Dominators.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/Dominators.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,6 +18,7 @@
 import com.ibm.wala.util.collections.EmptyIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.graph.AbstractGraph;
@@ -79,9 +80,9 @@
 
   public static <T> Dominators<T> make(Graph<T> G, T root) {
     if (G instanceof NumberedGraph) {
-      return new NumberedDominators<T>((NumberedGraph<T>) G, root);
+      return new NumberedDominators<>((NumberedGraph<T>) G, root);
     } else {
-      return new GenericDominators<T>(G, root);
+      return new GenericDominators<>(G, root);
     }
   }
 
@@ -98,10 +99,6 @@
     return false;
   }
 
-  public Graph<T> getGraph() {
-    return G;
-  }
-
   /**
    * return the immediate dominator of node
    */
@@ -156,8 +153,7 @@
         private final Map<T, Set<T>> nextMap = HashMapFactory.make();
 
         {
-          for (Iterator<? extends T> ns = G.iterator(); ns.hasNext();) {
-            T n = ns.next();
+          for (T n : G) {
             if (n != root) {
               T prev = getIdom(n);
               Set<T> next = nextMap.get(prev);
@@ -173,7 +169,7 @@
           if (N == root)
             return EmptyIterator.instance();
           else
-            return new NonNullSingletonIterator<T>(getIdom(N));
+            return new NonNullSingletonIterator<>(getIdom(N));
         }
 
         @Override
@@ -304,7 +300,7 @@
       T node = vertex[i];
 
       if (DEBUG) {
-        System.out.println(" Processing: " + node + "\n");
+        System.out.println(" Processing: " + node + '\n');
       }
 
       // visit each predecessor
@@ -356,7 +352,7 @@
   /**
    * This method inspects the passed node and returns the following: node, if node is a root of a tree in the forest
    * 
-   * any vertex, u != r such that otherwise r is the root of the tree containing node and * semi(u) is minimum on the path r -> v
+   * any vertex, u != r such that otherwise r is the root of the tree containing node and * semi(u) is minimum on the path r -&gt; v
    * 
    * See TOPLAS 1(1), July 1979, p 128 for details.
    * 
@@ -584,13 +580,12 @@
 
   @Override
   public String toString() {
-    StringBuffer sb = new StringBuffer();
-    for (Iterator<? extends T> i = G.iterator(); i.hasNext();) {
-      T node = i.next();
-      sb.append("Dominators of " + node + ":\n");
-      for (Iterator<T> j = dominators(node); j.hasNext();)
-        sb.append("   " + j.next() + "\n");
-      sb.append("\n");
+    StringBuilder sb = new StringBuilder();
+    for (T node : G) {
+      sb.append("Dominators of ").append(node).append(":\n");
+      for (T dom : Iterator2Iterable.make(dominators(node)))
+        sb.append("   ").append(dom).append('\n');
+      sb.append('\n');
     }
     return sb.toString();
   }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/NumberedDominators.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/NumberedDominators.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/NumberedDominators.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/NumberedDominators.java	2019-01-29 17:08:39.000000000 +0000
@@ -34,11 +34,6 @@
     analyze();
   }
 
-  @Override
-  public NumberedGraph<T> getGraph() {
-    return (NumberedGraph<T>) G;
-  }
-
   /*
    * Look-aside table for DominatorInfo objects
    */
@@ -48,7 +43,7 @@
   @Override
   protected final DominatorInfo getInfo(T node) {
     assert node != null;
-    return (DominatorInfo) infoMap[getGraph().getNumber(node)];
+    return (DominatorInfo) infoMap[((NumberedGraph<T>)G).getNumber(node)];
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/EdgeFilteredNumberedGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/EdgeFilteredNumberedGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/EdgeFilteredNumberedGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/EdgeFilteredNumberedGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,8 +12,6 @@
 
 import java.util.Iterator;
 
-import javax.naming.OperationNotSupportedException;
-
 import com.ibm.wala.util.debug.Assertions;
 import com.ibm.wala.util.intset.IBinaryNaturalRelation;
 import com.ibm.wala.util.intset.IntIterator;
@@ -150,4 +148,4 @@
   protected NumberedNodeManager<T> getNodeManager() {
     return delegate;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/EdgeManager.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/EdgeManager.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/EdgeManager.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/EdgeManager.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,7 +22,7 @@
   /**
    * Return an {@link Iterator} over the immediate predecessor nodes of n
    * 
-   * This method never returns <code>null</code>.
+   * This method never returns {@code null}.
    * 
    * @return an {@link Iterator} over the immediate predecessor nodes of this Node.
    */
@@ -38,7 +38,7 @@
   /**
    * Return an Iterator over the immediate successor nodes of n
    * <p>
-   * This method never returns <code>null</code>.
+   * This method never returns {@code null}.
    * 
    * @return an Iterator over the immediate successor nodes of n
    */
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphIntegrity.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphIntegrity.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphIntegrity.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphIntegrity.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,6 +15,8 @@
 import java.util.Iterator;
 
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
+import com.ibm.wala.util.collections.IteratorUtil;
 import com.ibm.wala.util.graph.traverse.BFSIterator;
 import com.ibm.wala.util.graph.traverse.DFS;
 
@@ -43,24 +45,15 @@
   }
 
   private static <T> void checkEdgeCounts(Graph<T> G) throws UnsoundGraphException {
-    for (Iterator<? extends T> it = G.iterator(); it.hasNext();) {
-      T N = it.next();
+    for (T N : G) {
       int count1 = G.getSuccNodeCount(N);
-      int count2 = 0;
-      for (Iterator<T> it2 = G.getSuccNodes(N); it2.hasNext();) {
-        it2.next();
-        count2++;
-      }
+      int count2 = IteratorUtil.count(G.getSuccNodes(N));
       if (count1 != count2) {
         throw new UnsoundGraphException("getSuccNodeCount " + count1 + " is wrong for node " + N);
       }
 
       int count3 = G.getPredNodeCount(N);
-      int count4 = 0;
-      for (Iterator<T> it2 = G.getPredNodes(N); it2.hasNext();) {
-        it2.next();
-        count4++;
-      }
+      int count4 = IteratorUtil.count(G.getPredNodes(N));
       if (count3 != count4) {
         throw new UnsoundGraphException("getPredNodeCount " + count1 + " is wrong for node " + N);
       }
@@ -68,18 +61,15 @@
   }
 
   private static <T> void checkEdges(Graph<T> G) throws UnsoundGraphException {
-    for (Iterator<? extends T> it = G.iterator(); it.hasNext();) {
-      T N = it.next();
+    for (T N : G) {
       if (!G.containsNode(N)) {
         throw new UnsoundGraphException(N + " is not contained in the the graph " + G.containsNode(N));
       }
-      PRED: for (Iterator<? extends T> p = G.getPredNodes(N); p.hasNext();) {
-        T pred = p.next();
+      PRED: for (T pred : Iterator2Iterable.make(G.getPredNodes(N))) {
         if (!G.containsNode(pred)) {
           throw new UnsoundGraphException(pred + " is a predecessor of " + N + " but is not contained in the graph");
         }
-        for (Iterator<?> s = G.getSuccNodes(pred); s.hasNext();) {
-          Object succ = s.next();
+        for (Object succ : Iterator2Iterable.make(G.getSuccNodes(pred))) {
           if (succ.equals(N)) {
             continue PRED;
           }
@@ -89,13 +79,11 @@
         G.getSuccNodes(pred);
         throw new UnsoundGraphException(pred + " is a predecessor of " + N + " but inverse doesn't hold");
       }
-      SUCC: for (Iterator<? extends T> s = G.getSuccNodes(N); s.hasNext();) {
-        T succ = s.next();
+      SUCC: for (T succ : Iterator2Iterable.make(G.getSuccNodes(N))) {
         if (!G.containsNode(succ)) {
           throw new UnsoundGraphException(succ + " is a successor of " + N + " but is not contained in the graph");
         }
-        for (Iterator<?> p = G.getPredNodes(succ); p.hasNext();) {
-          Object pred = p.next();
+        for (Object pred : Iterator2Iterable.make(G.getPredNodes(succ))) {
           if (pred.equals(N)) {
             continue SUCC;
           }
@@ -117,28 +105,16 @@
     try {
       n1 = G.getNumberOfNodes();
       n2 = 0;
-      for (Iterator<T> it = G.iterator(); it.hasNext();) {
-        Object n = it.next();
+      for (T t : G) {
+        Object n = t;
         if (DEBUG_LEVEL > 1) {
           System.err.println(("n2 loop: " + n));
         }
         n2++;
       }
-      n3 = 0;
-      for (Iterator<T> it = new BFSIterator<T>(G); it.hasNext();) {
-        it.next();
-        n3++;
-      }
-      n4 = 0;
-      for (Iterator<T> it = DFS.iterateDiscoverTime(G); it.hasNext();) {
-        it.next();
-        n4++;
-      }
-      n5 = 0;
-      for (Iterator<T> it = DFS.iterateFinishTime(G); it.hasNext();) {
-        it.next();
-        n5++;
-      }
+      n3 = IteratorUtil.count(new BFSIterator<>(G));
+      n4 = IteratorUtil.count(DFS.iterateDiscoverTime(G));
+      n5 = IteratorUtil.count(DFS.iterateFinishTime(G));
     } catch (RuntimeException e) {
       e.printStackTrace();
       throw new UnsoundGraphException(e.toString());
@@ -147,7 +123,7 @@
       throw new UnsoundGraphException("n1: " + n1 + " n2: " + n2);
     }
     if (n1 != n3) {
-      throw setDiffException("n1: " + n1 + " n3: " + n3, G.iterator(), new BFSIterator<T>(G));
+      throw setDiffException("n1: " + n1 + " n3: " + n3, G.iterator(), new BFSIterator<>(G));
     }
     if (n1 != n4) {
       throw new UnsoundGraphException("n1: " + n1 + " n4: " + n3);
@@ -224,11 +200,11 @@
     if (c.isEmpty()) {
       System.err.println("none\n");
     } else {
-      for (Iterator<?> it = c.iterator(); it.hasNext();) {
-        System.err.println(it.next().toString());
+      for (Object name : c) {
+        System.err.println(name.toString());
       }
       System.err.println("\n");
     }
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphPrint.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphPrint.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphPrint.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphPrint.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,8 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.util.graph;
 
-import java.util.Iterator;
-
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.graph.impl.SlowSparseNumberedGraph;
 
 /**
@@ -24,13 +23,11 @@
       throw new IllegalArgumentException("G is null");
     }
     SlowSparseNumberedGraph<T> sg = SlowSparseNumberedGraph.make();
-    for (Iterator<? extends T> it = G.iterator(); it.hasNext(); ) {
-      sg.addNode(it.next());
+    for (T name : G) {
+      sg.addNode(name);
     }
-    for (Iterator<? extends T> it = G.iterator(); it.hasNext(); ) {
-      T n = it.next();
-      for (Iterator<? extends T> it2 = G.getSuccNodes(n); it2.hasNext(); ) {
-        T d = it2.next();
+    for (T n : G) {
+      for (T d : Iterator2Iterable.make(G.getSuccNodes(n))) {
         sg.addEdge(n,d);
       }
     }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphReachability.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphReachability.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphReachability.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphReachability.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.util.graph;
 
 import java.util.Iterator;
+import java.util.function.Predicate;
 
 import com.ibm.wala.dataflow.graph.AbstractMeetOperator;
 import com.ibm.wala.dataflow.graph.BitVectorFramework;
@@ -24,7 +25,6 @@
 import com.ibm.wala.fixpoint.UnaryOperator;
 import com.ibm.wala.util.CancelException;
 import com.ibm.wala.util.MonitorUtil.IProgressMonitor;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.Iterator2Collection;
 import com.ibm.wala.util.debug.Assertions;
@@ -58,17 +58,16 @@
    * @param filter "interesting" node definition
    * @throws IllegalArgumentException if g is null
    */
-  public GraphReachability(Graph<T> g, Predicate<?> filter) {
+  public GraphReachability(Graph<T> g, Predicate<? super T> filter) {
     if (g == null) {
       throw new IllegalArgumentException("g is null");
     }
     this.g = g;
-    Iterator<S> i = new FilterIterator<S>(g.iterator(), filter);
-    domain = new MutableMapping<S>((Iterator2Collection.toSet(i)).toArray());
+    Iterator<T> i = new FilterIterator<>(g.iterator(), filter);
+    domain = new MutableMapping<>((Iterator2Collection.toSet(i)).toArray());
   }
 
   /**
-   * @param n
    * @return the set of interesting nodes reachable from n
    */
   public OrdinalSet<S> getReachableSet(Object n) throws IllegalStateException {
@@ -80,7 +79,7 @@
     if (v.getValue() == null) {
       return OrdinalSet.empty();
     } else {
-      return new OrdinalSet<S>(v.getValue(), domain);
+      return new OrdinalSet<>(v.getValue(), domain);
     }
   }
 
@@ -138,9 +137,9 @@
       }
     };
 
-    BitVectorFramework<T, S> f = new BitVectorFramework<T, S>(GraphInverter.invert(g), functions, domain);
-    solver = new BitVectorSolver<T>(f);
+    BitVectorFramework<T, S> f = new BitVectorFramework<>(GraphInverter.invert(g), functions, domain);
+    solver = new BitVectorSolver<>(f);
     return solver.solve(monitor);
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphSlicer.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphSlicer.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphSlicer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/GraphSlicer.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,17 +17,14 @@
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Predicate;
 
-import com.ibm.wala.util.Predicate;
-import com.ibm.wala.util.WalaException;
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
-import com.ibm.wala.util.collections.FilterPredicate;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.Iterator2Collection;
 import com.ibm.wala.util.collections.IteratorUtil;
 import com.ibm.wala.util.debug.Assertions;
-import com.ibm.wala.util.functions.Function;
 import com.ibm.wala.util.graph.impl.GraphInverter;
 import com.ibm.wala.util.graph.traverse.DFS;
 
@@ -41,17 +38,15 @@
    * 
    * @param <T> type for nodes
    * @param g the graph to slice
-   * @param f identifies targets for the backward slice
+   * @param p identifies targets for the backward slice
    * @return the set of nodes in g, from which any of the targets (nodes that f accepts) is reachable.
-   * @throws WalaException
    */
   public static <T> Set<T> slice(Graph<T> g, Predicate<T> p){
     if (g == null) {
       throw new IllegalArgumentException("g is null");
     }
     HashSet<T> roots = HashSetFactory.make();
-    for (Iterator<? extends T> it = g.iterator(); it.hasNext();) {
-      T o = it.next();
+    for (T o : g) {
       if (p.test(o)) {
         roots.add(o);
       }
@@ -74,7 +69,7 @@
 
       @Override
       public Iterator<T> iterator() {
-        return Predicate.filter(g.iterator(), p).iterator();
+        return new FilterIterator<>(g.iterator(), p);
       }
 
       @Override
@@ -105,7 +100,7 @@
 
       @Override
       public Iterator<T> getPredNodes(T n) {
-        return Predicate.filter(g.getPredNodes(n), p).iterator();
+        return new FilterIterator<>(g.getPredNodes(n), p);
       }
 
       @Override
@@ -115,7 +110,7 @@
 
       @Override
       public Iterator<T> getSuccNodes(T n) {
-        return Predicate.filter(g.getSuccNodes(n), p).iterator();
+        return new FilterIterator<>(g.getSuccNodes(n), p);
       }
 
       @Override
@@ -195,7 +190,7 @@
 
       @Override
       public Iterator<E> iterator() {
-        return new FilterIterator<E>(G.iterator(), fmember);
+        return new FilterIterator<>(G.iterator(), fmember);
       }
 
       @Override
@@ -206,19 +201,18 @@
 
     final EdgeManager<E> edgeManager = new EdgeManager<E>() {
 
-      private Map<E, Collection<E>> succs = new HashMap<E, Collection<E>>();
+      private Map<E, Collection<E>> succs = new HashMap<>();
 
-      private Map<E, Collection<E>> preds = new HashMap<E, Collection<E>>();
+      private Map<E, Collection<E>> preds = new HashMap<>();
 
       private Set<E> getConnected(E inst, Function<E, Iterator<? extends E>> fconnected) {
-        Set<E> result = new LinkedHashSet<E>();
-        Set<E> seenInsts = new HashSet<E>();
+        Set<E> result = new LinkedHashSet<>();
+        Set<E> seenInsts = new HashSet<>();
         Set<E> newInsts = Iterator2Collection.toSet(fconnected.apply(inst));
         while (!newInsts.isEmpty()) {
-          Set<E> nextInsts = new HashSet<E>();
+          Set<E> nextInsts = new HashSet<>();
           for (E s : newInsts) {
-            if (!seenInsts.contains(s)) {
-              seenInsts.add(s);
+            if (seenInsts.add(s)) {
               if (nodeManager.containsNode(s)) {
                 result.add(s);
               } else {
@@ -238,21 +232,11 @@
       }
 
       private void setPredNodes(E N) {
-        preds.put(N, getConnected(N, new Function<E, Iterator<? extends E>>() {
-          @Override
-          public Iterator<? extends E> apply(E object) {
-            return G.getPredNodes(object);
-          }
-        }));
+        preds.put(N, getConnected(N, G::getPredNodes));
       }
 
       private void setSuccNodes(E N) {
-        succs.put(N, getConnected(N, new Function<E, Iterator<? extends E>>() {
-          @Override
-          public Iterator<? extends E> apply(E object) {
-            return G.getSuccNodes(object);
-          }
-        }));
+        succs.put(N, getConnected(N, G::getSuccNodes));
       }
 
       @Override
@@ -337,4 +321,4 @@
 
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/GXL.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/GXL.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/GXL.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/GXL.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,8 +12,7 @@
 
 import java.util.Iterator;
 import java.util.Map;
-
-import com.ibm.wala.util.functions.Function;
+import java.util.function.Function;
 
 public class GXL {
 
@@ -29,23 +28,23 @@
       Function<T,String> nodeIds, 
       Function<T,Map<String,String>> nodeProperties) 
   {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     
     sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
     sb.append("<!DOCTYPE gxl SYSTEM \"http://www.gupro.de/GXL/gxl-1.0.dtd\">\n");
     sb.append("<gxl xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n");
-    sb.append("  <graph id=\"" + graphId + "\" edgemode=\"directed\" hypergraph=\"false\">\n");
-    sb.append("    <type xlink:href=\"" + types.type(G) + "\"/>\n");
+    sb.append("  <graph id=\"").append(graphId).append("\" edgemode=\"directed\" hypergraph=\"false\">\n");
+    sb.append("    <type xlink:href=\"").append(types.type(G)).append("\"/>\n");
     
     for(T n : G) {
-      sb.append("    <node id=\"" + nodeIds.apply(n) + "\">\n");
-      sb.append("      <type xlink:href=\"" + types.type(n) + "\"/>\n");
+      sb.append("    <node id=\"").append(nodeIds.apply(n)).append("\">\n");
+      sb.append("      <type xlink:href=\"").append(types.type(n)).append("\"/>\n");
       Map<String,String> props = nodeProperties.apply(n);
       if (props != null) {
         for(Map.Entry<String,String> e : props.entrySet()) {
-          sb.append("      <attr name=\"" + e.getKey() + "\">\n");
+          sb.append("      <attr name=\"").append(e.getKey()).append("\">\n");
           if (e.getValue() != null) {
-            sb.append("        <string>" + e.getValue() + "</string>\n");
+            sb.append("        <string>").append(e.getValue()).append("</string>\n");
           } else {
             sb.append("        <string/>\n");            
           }
@@ -59,8 +58,8 @@
       Iterator<T> ss = G.getSuccNodes(n);
       while (ss.hasNext()) {
         T s = ss.next();
-        sb.append("    <edge from=\"" + nodeIds.apply(n) + "\" to=\"" + nodeIds.apply(s) + "\">\n");
-        sb.append("      <type xlink:href=\"" + types.type(n, s) + "\"/>\n");
+        sb.append("    <edge from=\"").append(nodeIds.apply(n)).append("\" to=\"").append(nodeIds.apply(s)).append("\">\n");
+        sb.append("      <type xlink:href=\"").append(types.type(n, s)).append("\"/>\n");
         
         sb.append("    </edge>\n");
       }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/BasicOrderedMultiGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/BasicOrderedMultiGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/BasicOrderedMultiGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/BasicOrderedMultiGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -45,7 +45,7 @@
     delegate.addEdge(src, dst);
     SimpleVector<T> s = successorEdges.get(src);
     if (s == null) {
-      s = new SimpleVector<T>();
+      s = new SimpleVector<>();
       successorEdges.put(src, s);
     }
     s.set(s.getMaxIndex() + 1, dst);
@@ -56,7 +56,7 @@
     delegate.addEdge(src, dst);
     SimpleVector<T> s = successorEdges.get(src);
     if (s == null) {
-      s = new SimpleVector<T>();
+      s = new SimpleVector<>();
       successorEdges.put(src, s);
     }
     s.set(i, dst);
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/DelegatingNumberedGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/DelegatingNumberedGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/DelegatingNumberedGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/DelegatingNumberedGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,9 +21,9 @@
  */
 public class DelegatingNumberedGraph<T extends INodeWithNumberedEdges> extends AbstractNumberedGraph<T> {
 
-  final private DelegatingNumberedNodeManager<T> nodeManager = new DelegatingNumberedNodeManager<T>();
+  final private DelegatingNumberedNodeManager<T> nodeManager = new DelegatingNumberedNodeManager<>();
 
-  final private DelegatingNumberedEdgeManager<T> edgeManager = new DelegatingNumberedEdgeManager<T>(nodeManager);
+  final private DelegatingNumberedEdgeManager<T> edgeManager = new DelegatingNumberedEdgeManager<>(nodeManager);
 
   /*
    * @see com.ibm.wala.util.graph.AbstractGraph#getNodeManager()
@@ -40,4 +40,4 @@
   protected NumberedEdgeManager<T> getEdgeManager() {
     return edgeManager;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/DelegatingNumberedNodeManager.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/DelegatingNumberedNodeManager.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/DelegatingNumberedNodeManager.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/DelegatingNumberedNodeManager.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.util.graph.impl;
 
+import java.util.Arrays;
 import java.util.Iterator;
 
 import com.ibm.wala.util.debug.Assertions;
@@ -50,7 +51,7 @@
     try {
       return (T) nodes[number];
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("Invalid number " + number);
+      throw new IllegalArgumentException("Invalid number " + number, e);
     }
   }
 
@@ -69,31 +70,31 @@
   public Iterator<T> iterator() {
     final INodeWithNumber[] arr = nodes;
     return new Iterator<T>() {
-      int next = -1;
+      int nextCounter = -1;
       {
         advance();
       }
 
       void advance() {
-        for (int i = next + 1; i < arr.length; i++) {
+        for (int i = nextCounter + 1; i < arr.length; i++) {
           if (arr[i] != null) {
-            next = i;
+            nextCounter = i;
             return;
           }
         }
-        next = -1;
+        nextCounter = -1;
       }
 
       @Override
       public boolean hasNext() {
-        return next != -1;
+        return nextCounter != -1;
       }
 
       @Override
       @SuppressWarnings("unchecked")
       public T next() {
         if (hasNext()) {
-          int r = next;
+          int r = nextCounter;
           advance();
           return (T) arr[r];
         } else {
@@ -146,15 +147,10 @@
     numberOfNodes++;
   }
 
-  /**
-   * @param number
-   */
   private void ensureCapacity(int number) {
     if (nodes.length < number + 1) {
       int newLength = (int) ((number + 1) * BUFFER_FACTOR);
-      INodeWithNumber[] old = nodes;
-      nodes = new INodeWithNumber[newLength];
-      System.arraycopy(old, 0, nodes, 0, old.length);
+      nodes = Arrays.copyOf(nodes, newLength);
     }
   }
 
@@ -179,13 +175,13 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer("Nodes:\n");
+    StringBuilder result = new StringBuilder("Nodes:\n");
     for (int i = 0; i <= maxNumber; i++) {
-      result.append(i).append(" ");
+      result.append(i).append(' ');
       if (nodes[i] != null) {
         result.append(nodes[i].toString());
       }
-      result.append("\n");
+      result.append('\n');
     }
     return result.toString();
   }
@@ -221,7 +217,7 @@
    */
   @Override
   public Iterator<T> iterateNodes(IntSet s) {
-    return new NumberedNodeIterator<T>(s, this);
+    return new NumberedNodeIterator<>(s, this);
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/ExtensionGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/ExtensionGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/ExtensionGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/ExtensionGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -23,13 +23,12 @@
 import com.ibm.wala.util.intset.EmptyIntSet;
 import com.ibm.wala.util.intset.IntIterator;
 import com.ibm.wala.util.intset.IntSet;
-import com.ibm.wala.util.intset.IntSetAction;
 import com.ibm.wala.util.intset.IntSetUtil;
 import com.ibm.wala.util.intset.MutableIntSet;
 
 public class ExtensionGraph<T> implements NumberedGraph<T> {
   private final NumberedGraph<T> original;
-  private final NumberedNodeManager<T> additionalNodes = new SlowNumberedNodeManager<T>();
+  private final NumberedNodeManager<T> additionalNodes = new SlowNumberedNodeManager<>();
   private final NumberedEdgeManager<T> edgeManager = new NumberedEdgeManager<T>() {
     private final Map<T, MutableIntSet> inEdges = HashMapFactory.make();
     private final Map<T, MutableIntSet> outEdges = HashMapFactory.make();
@@ -61,7 +60,7 @@
     @Override
     public Iterator<T> getPredNodes(T n) {
       Iterator<T> orig = (original.containsNode(n)? original.getPredNodes(n): EmptyIterator.<T>instance());
-      return new CompoundIterator<T>(orig, nodes(n, inEdges));
+      return new CompoundIterator<>(orig, nodes(n, inEdges));
     }
 
     @Override
@@ -74,7 +73,7 @@
     @Override
     public Iterator<T> getSuccNodes(T n) {
       Iterator<T> orig = (original.containsNode(n)? original.getSuccNodes(n): EmptyIterator.<T>instance());
-      return new CompoundIterator<T>(orig, nodes(n, outEdges));
+      return new CompoundIterator<>(orig, nodes(n, outEdges));
     }
 
     @Override
@@ -173,7 +172,7 @@
 
   @Override
   public Iterator<T> iterator() {
-    return new CompoundIterator<T>(original.iterator(), additionalNodes.iterator());
+    return new CompoundIterator<>(original.iterator(), additionalNodes.iterator());
   }
 
   @Override
@@ -229,17 +228,14 @@
   public Iterator<T> iterateNodes(IntSet s) {
     final MutableIntSet os = IntSetUtil.make();
     final MutableIntSet es = IntSetUtil.make();
-    s.foreach(new IntSetAction() {
-      @Override
-      public void act(int x) {
-        if (x <= original.getMaxNumber()) {
-          os.add(x);
-        } else {
-          es.add(x - original.getMaxNumber() - 1);
-        }
-      }      
+    s.foreach(x -> {
+      if (x <= original.getMaxNumber()) {
+        os.add(x);
+      } else {
+        es.add(x - original.getMaxNumber() - 1);
+      }
     });
-    return new CompoundIterator<T>(original.iterateNodes(os), additionalNodes.iterateNodes(es));
+    return new CompoundIterator<>(original.iterateNodes(os), additionalNodes.iterateNodes(es));
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/GraphInverter.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/GraphInverter.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/GraphInverter.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/GraphInverter.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,18 +19,17 @@
 public class GraphInverter {
 
   public static <T> NumberedGraph<T> invert(final NumberedGraph<T> G) {
-    return new InvertedNumberedGraph<T>(G);
+    return new InvertedNumberedGraph<>(G);
   }
   
-      /**
-   * @param G
+  /**
    * @return A graph view that reverses the edges in G
    */
   public static <T> Graph<T> invert(final Graph<T> G) {
     if (G instanceof NumberedGraph) {
-      return new InvertedNumberedGraph<T>((NumberedGraph<T>) G);
+      return new InvertedNumberedGraph<>((NumberedGraph<T>) G);
     } else {
-      return new InvertedGraph<T>(G);
+      return new InvertedGraph<>(G);
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/InvertedGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/InvertedGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/InvertedGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/InvertedGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -36,7 +36,7 @@
 
   public InvertedGraph(Graph<T> G) {
     nodes = G;
-    edges = new InvertingEdgeManager<T>(G);
+    edges = new InvertingEdgeManager<>(G);
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/InvertedNumberedGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/InvertedNumberedGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/InvertedNumberedGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/InvertedNumberedGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -35,7 +35,7 @@
 
   InvertedNumberedGraph(NumberedGraph<T> G) {
     nodes = G;
-    edges = new InvertingNumberedEdgeManager<T>(G);
+    edges = new InvertingNumberedEdgeManager<>(G);
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/NodeWithNumberedEdges.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/NodeWithNumberedEdges.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/NodeWithNumberedEdges.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/NodeWithNumberedEdges.java	2019-01-29 17:08:39.000000000 +0000
@@ -69,8 +69,6 @@
 
   /**
    * remove the edge that indicates this variable is Succd by a certain equation
-   * 
-   * @param eqNumber
    */
   public void deleteSucc(int eqNumber) {
     if (succNumbers != null) {
@@ -84,8 +82,6 @@
   /**
    * remove the edge that indicates this variable is Predined by a certain
    * equation
-   * 
-   * @param eqNumber
    */
   public void deletePred(int eqNumber) {
     if (predNumbers != null) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/NumberedNodeIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/NumberedNodeIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/NumberedNodeIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/NumberedNodeIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -52,4 +52,4 @@
   public void remove() throws UnsupportedOperationException {
     throw new UnsupportedOperationException();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SelfLoopAddedEdgeManager.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SelfLoopAddedEdgeManager.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SelfLoopAddedEdgeManager.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SelfLoopAddedEdgeManager.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,125 @@
+package com.ibm.wala.util.graph.impl;
+
+import java.util.Iterator;
+
+import com.ibm.wala.util.graph.EdgeManager;
+
+public class SelfLoopAddedEdgeManager<T> implements EdgeManager<T> {
+  private class PrependItterator implements Iterator<T>{
+    private boolean usedFirst = false;
+    private Iterator<T> original;
+    private T first;
+    
+    public PrependItterator(Iterator<T> original, T first) {
+      super();
+      this.original = original;
+      this.first = first;
+    }
+
+    @Override
+    public boolean hasNext() {
+      if (!usedFirst) {
+        return true;
+      } else {
+        return original.hasNext();  
+      }      
+    }
+
+    @Override
+    public T next() {
+      if (!usedFirst) {
+        T tmp = first;
+        first = null;
+        usedFirst = true;
+        return tmp;
+      } else {
+        return original.next();  
+      }      
+    }
+
+    @Override
+    public void remove() {
+      assert false;
+    }
+    
+  }
+ 
+  private final EdgeManager<T> original;
+
+  public SelfLoopAddedEdgeManager(EdgeManager<T> original) {
+    if (original == null) {
+      throw new IllegalArgumentException("original is null");
+    }
+    this.original = original;
+  }
+
+  @Override
+  public Iterator<T> getPredNodes(T n) {
+    if (original.hasEdge(n, n)) {
+      return original.getPredNodes(n);
+    } else {
+      return new PrependItterator(original.getPredNodes(n), n);
+    }
+  }
+
+  @Override
+  public int getPredNodeCount(T n) {
+    if (original.hasEdge(n, n)) {
+      return original.getPredNodeCount(n);
+    } else {
+      return original.getPredNodeCount(n) + 1;
+    }
+  }
+
+  @Override
+  public Iterator<T> getSuccNodes(T n) {
+    if (original.hasEdge(n, n)) {
+      return original.getSuccNodes(n);
+    } else {
+      return new PrependItterator(original.getSuccNodes(n), n);
+    }
+  }
+
+  @Override
+  public int getSuccNodeCount(T n) {
+    if (original.hasEdge(n, n)) {
+      return original.getSuccNodeCount(n);
+    } else {
+      return original.getSuccNodeCount(n) + 1;
+    }
+  }
+
+  @Override
+  public void addEdge(T src, T dst) {
+    original.addEdge(src, dst);
+  }
+
+  @Override
+  public void removeEdge(T src, T dst) throws UnsupportedOperationException {
+    original.removeEdge(src, dst);
+  }
+
+  @Override
+  public void removeAllIncidentEdges(T node) throws UnsupportedOperationException {
+    original.removeAllIncidentEdges(node);
+  }
+
+  @Override
+  public void removeIncomingEdges(T node) throws UnsupportedOperationException {
+    original.removeIncomingEdges(node);
+  }
+
+  @Override
+  public void removeOutgoingEdges(T node) throws UnsupportedOperationException {
+    original.removeOutgoingEdges(node);
+  }
+
+  @Override
+  public boolean hasEdge(T src, T dst) {
+    if (src.equals(dst)) {
+      return true;
+    } else {
+      return original.hasEdge(src, dst);
+    }
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SelfLoopAddedGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SelfLoopAddedGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SelfLoopAddedGraph.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SelfLoopAddedGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,30 @@
+package com.ibm.wala.util.graph.impl;
+
+import com.ibm.wala.util.graph.AbstractGraph;
+import com.ibm.wala.util.graph.EdgeManager;
+import com.ibm.wala.util.graph.Graph;
+import com.ibm.wala.util.graph.NodeManager;
+
+public class SelfLoopAddedGraph <T> extends AbstractGraph<T> {
+
+  final private NodeManager<T> nodes;
+
+  @Override
+  protected NodeManager<T> getNodeManager() {
+    return nodes;
+  }
+
+  final private EdgeManager<T> edges;
+
+  @Override
+  protected EdgeManager<T> getEdgeManager() {
+    return edges;
+  }
+
+  public SelfLoopAddedGraph(Graph<T> G) {
+    nodes = G;
+    edges = new SelfLoopAddedEdgeManager<>(G);
+  }
+
+}
+
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SlowNumberedNodeManager.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SlowNumberedNodeManager.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SlowNumberedNodeManager.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SlowNumberedNodeManager.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,8 +22,9 @@
  */
 public class SlowNumberedNodeManager<T> implements NumberedNodeManager<T>, Serializable {
 
+  private static final long serialVersionUID = 8956107128389624337L;
   /**
-   * A bijection between integer <-> node
+   * A bijection between integer &lt;-&gt; node
    */
   final private MutableMapping<T> map = MutableMapping.make();
 
@@ -81,11 +82,11 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer("Nodes:\n");
+    StringBuilder result = new StringBuilder("Nodes:\n");
     for (int i = 0; i <= getMaxNumber(); i++) {
       result.append(i).append("  ");
       result.append(map.getMappedObject(i));
-      result.append("\n");
+      result.append('\n');
     }
     return result.toString();
   }
@@ -103,7 +104,7 @@
    */
   @Override
   public Iterator<T> iterateNodes(IntSet s) {
-    return new NumberedNodeIterator<T>(s, this);
+    return new NumberedNodeIterator<>(s, this);
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SlowSparseNumberedGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SlowSparseNumberedGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SlowSparseNumberedGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SlowSparseNumberedGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,8 +11,7 @@
 package com.ibm.wala.util.graph.impl;
 
 import java.io.Serializable;
-import java.util.Iterator;
-
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.graph.AbstractNumberedGraph;
 import com.ibm.wala.util.graph.Graph;
 import com.ibm.wala.util.graph.NumberedEdgeManager;
@@ -24,7 +23,9 @@
  */
 public class SlowSparseNumberedGraph<T> extends AbstractNumberedGraph<T> implements Serializable {
 
-  private final SlowNumberedNodeManager<T> nodeManager = new SlowNumberedNodeManager<T>();
+  private static final long serialVersionUID = 7014361126159594838L;
+
+  private final SlowNumberedNodeManager<T> nodeManager = new SlowNumberedNodeManager<>();
 
   private final SparseNumberedEdgeManager<T> edgeManager;
 
@@ -39,7 +40,7 @@
    * @param normalOutCount what is the "normal" number of out edges for a node?
    */
   public SlowSparseNumberedGraph(int normalOutCount) {
-    edgeManager = new SparseNumberedEdgeManager<T>(nodeManager, normalOutCount, BasicNaturalRelation.TWO_LEVEL);
+    edgeManager = new SparseNumberedEdgeManager<>(nodeManager, normalOutCount, BasicNaturalRelation.TWO_LEVEL);
   }
 
   /*
@@ -71,18 +72,17 @@
     if (g == null) {
       throw new IllegalArgumentException("g is null");
     }
-    for (Iterator<? extends T> it = g.iterator(); it.hasNext();) {
-      into.addNode(it.next());
+    for (T name : g) {
+      into.addNode(name);
     }
-    for (Iterator<? extends T> it = g.iterator(); it.hasNext();) {
-      T n = it.next();
-      for (Iterator<? extends T> it2 = g.getSuccNodes(n); it2.hasNext();) {
-        into.addEdge(n, it2.next());
+    for (T n : g) {
+      for (T succ : Iterator2Iterable.make(g.getSuccNodes(n))) {
+        into.addEdge(n, succ);
       }
     }
   }
 
   public static <T> SlowSparseNumberedGraph<T> make() {
-    return new SlowSparseNumberedGraph<T>();
+    return new SlowSparseNumberedGraph<>();
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SparseNumberedEdgeManager.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SparseNumberedEdgeManager.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SparseNumberedEdgeManager.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SparseNumberedEdgeManager.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,13 +21,14 @@
 import com.ibm.wala.util.intset.BitVector;
 import com.ibm.wala.util.intset.IBinaryNaturalRelation;
 import com.ibm.wala.util.intset.IntSet;
-import com.ibm.wala.util.intset.IntSetAction;
 
 /**
  * An object which tracks edges for nodes that have numbers.
  */
 public final class SparseNumberedEdgeManager<T> implements NumberedEdgeManager<T>, Serializable {
 
+  private static final long serialVersionUID = 6751048618312429623L;
+
   private final NumberedNodeManager<T> nodeManager;
 
   /**
@@ -51,7 +52,7 @@
    *          an object to track nodes
    * @param normalCase
    *          what is the "normal" number of out edges for a node?
-   * @throws IllegalArgumentException  if normalCase < 0
+   * @throws IllegalArgumentException  if normalCase &lt; 0
    */
   public SparseNumberedEdgeManager(NumberedNodeManager<T> nodeManager, int normalCase, byte delegateImpl) throws IllegalArgumentException {
     if (nodeManager == null) {
@@ -202,22 +203,14 @@
     }
     IntSet succ = successors.getRelated(number);
     if (succ != null) {
-      succ.foreach(new IntSetAction() {
-        @Override
-        public void act(int x) {
-          predecessors.remove(x, number);
-        }
-      });
+      succ.foreach(x -> predecessors.remove(x, number));
     }
     IntSet pred = predecessors.getRelated(number);
     if (pred != null) {
-      pred.foreach(new IntSetAction() {
-        @Override
-        public void act(int x) {
-          successors.remove(x, number);
-          if (successors.getRelatedCount(x) == 0) {
-            hasSuccessor.clear(x);
-          }
+      pred.foreach(x -> {
+        successors.remove(x, number);
+        if (successors.getRelatedCount(x) == 0) {
+          hasSuccessor.clear(x);
         }
       });
     }
@@ -237,13 +230,10 @@
     }
     IntSet pred = predecessors.getRelated(number);
     if (pred != null) {
-      pred.foreach(new IntSetAction() {
-        @Override
-        public void act(int x) {
-          successors.remove(x, number);
-          if (successors.getRelatedCount(x) == 0) {
-            hasSuccessor.clear(x);
-          }
+      pred.foreach(x -> {
+        successors.remove(x, number);
+        if (successors.getRelatedCount(x) == 0) {
+          hasSuccessor.clear(x);
         }
       });
     }
@@ -278,12 +268,7 @@
     }
     IntSet succ = successors.getRelated(number);
     if (succ != null) {
-      succ.foreach(new IntSetAction() {
-        @Override
-        public void act(int x) {
-          predecessors.remove(x, number);
-        }
-      });
+      succ.foreach(x -> predecessors.remove(x, number));
     }
     successors.removeAll(number);
     hasSuccessor.clear(number);
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SparseNumberedGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SparseNumberedGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SparseNumberedGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/impl/SparseNumberedGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,8 +26,8 @@
   private final SparseNumberedEdgeManager<T> edgeManager;
 
   public SparseNumberedGraph() {
-    nodeManager = new DelegatingNumberedNodeManager<T>();
-    edgeManager = new SparseNumberedEdgeManager<T>(nodeManager);
+    nodeManager = new DelegatingNumberedNodeManager<>();
+    edgeManager = new SparseNumberedEdgeManager<>(nodeManager);
   }
 
   /**
@@ -37,8 +37,8 @@
    * @param normalCase what is the "normal" number of out edges for a node?
    */
   public SparseNumberedGraph(int normalCase) {
-    nodeManager = new DelegatingNumberedNodeManager<T>();
-    edgeManager = new SparseNumberedEdgeManager<T>(nodeManager, normalCase, BasicNaturalRelation.TWO_LEVEL);
+    nodeManager = new DelegatingNumberedNodeManager<>();
+    edgeManager = new SparseNumberedEdgeManager<>(nodeManager, normalCase, BasicNaturalRelation.TWO_LEVEL);
   }
 
   public SparseNumberedGraph(DelegatingNumberedNodeManager<T> nodeManager, SparseNumberedEdgeManager<T> edgeManager) {
@@ -61,4 +61,4 @@
   protected NumberedEdgeManager<T> getEdgeManager() {
     return edgeManager;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/InferGraphRoots.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/InferGraphRoots.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/InferGraphRoots.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/InferGraphRoots.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,9 +10,8 @@
  *******************************************************************************/
 package com.ibm.wala.util.graph;
 
-import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
+import java.util.Set;
 
 import com.ibm.wala.util.collections.HashSetFactory;
 
@@ -21,13 +20,12 @@
  */
 public class InferGraphRoots {
 
-  public static <T> Collection<T> inferRoots(Graph<T> g){
+  public static <T> Set<T> inferRoots(Graph<T> g){
     if (g == null) {
       throw new IllegalArgumentException("g is null");
     }
     HashSet<T> s = HashSetFactory.make();
-    for (Iterator<? extends T> it = g.iterator(); it.hasNext();) {
-      T node = it.next();
+    for (T node : g) {
       if (g.getPredNodeCount(node) == 0) {
         s.add(node);
       }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/INodeWithNumberedEdges.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/INodeWithNumberedEdges.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/INodeWithNumberedEdges.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/INodeWithNumberedEdges.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,4 +51,4 @@
    */
   public void removeOutgoingEdges();
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/INodeWithNumber.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/INodeWithNumber.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/INodeWithNumber.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/INodeWithNumber.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,9 +27,6 @@
    */
   public int getGraphNodeId();
 
-  /**
-   * @param number
-   */
   void setGraphNodeId(int number);
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/AbstractNumberedLabeledGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/AbstractNumberedLabeledGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/AbstractNumberedLabeledGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/AbstractNumberedLabeledGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,7 +16,7 @@
 import com.ibm.wala.util.graph.AbstractNumberedGraph;
 import com.ibm.wala.util.intset.IntSet;
 
-public abstract class AbstractNumberedLabeledGraph<T, U> extends AbstractNumberedGraph<T> implements LabeledGraph<T, U> {
+public abstract class AbstractNumberedLabeledGraph<T, U> extends AbstractNumberedGraph<T> implements LabeledGraph<T, U>, NumberedLabeledGraph<T, U> {
 
   /**
    * @return the object which manages edges in the graph
@@ -59,10 +59,12 @@
     return getEdgeManager().getSuccNodes(N, label);
   }
 
+  @Override
   public IntSet getPredNodeNumbers(T node, U label) throws IllegalArgumentException {
     return getEdgeManager().getPredNodeNumbers(node, label);
   }
 
+  @Override
   public IntSet getSuccNodeNumbers(T node, U label) throws IllegalArgumentException {
     return getEdgeManager().getSuccNodeNumbers(node, label);
   }
@@ -86,4 +88,14 @@
   public U getDefaultLabel() {
     return getEdgeManager().getDefaultLabel();
   }
+  
+  @Override
+  protected String edgeString(T from, T to) {
+      Set<? extends U> labels = getEdgeLabels(from, to);
+      if (labels != null && !labels.isEmpty()) {
+        return "-" + labels + "->";
+      } else {
+        return super.edgeString(from, to);
+      }
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/LabeledEdgeManager.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/LabeledEdgeManager.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/LabeledEdgeManager.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/LabeledEdgeManager.java	2019-01-29 17:08:39.000000000 +0000
@@ -70,15 +70,13 @@
   /**
    * Return an Iterator over the immediate predecessor nodes of this Node in the Graph on edges with some label.
    * 
-   * This method never returns <code>null</code>.
+   * This method never returns {@code null}.
    * 
    * @return an Iterator over the immediate predecessor nodes of this Node.
    */
   public Iterator<T> getPredNodes(T N, U label);
 
   /**
-   * 
-   * @param N
    * @return the labels on edges whose destination is N
    */
   public Iterator<? extends U> getPredLabels(T N);
@@ -93,7 +91,7 @@
   /**
    * Return an Iterator over the immediate successor nodes of this Node in the Graph on edges with some label.
    * <p>
-   * This method never returns <code>null</code>.
+   * This method never returns {@code null}.
    * 
    * @return an Iterator over the immediate successor Nodes of this Node.
    */
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/NumberedLabeledGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/NumberedLabeledGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/NumberedLabeledGraph.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/NumberedLabeledGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,7 @@
+package com.ibm.wala.util.graph.labeled;
+
+import com.ibm.wala.util.graph.NumberedGraph;
+
+public interface NumberedLabeledGraph<T, I> extends NumberedGraph<T>, NumberedLabeledEdgeManager<T,I> {
+
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/SlowSparseNumberedLabeledGraph.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/SlowSparseNumberedLabeledGraph.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/SlowSparseNumberedLabeledGraph.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/SlowSparseNumberedLabeledGraph.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,8 +48,7 @@
  */
 package com.ibm.wala.util.graph.labeled;
 
-import java.util.Iterator;
-
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.graph.NumberedNodeManager;
 import com.ibm.wala.util.graph.impl.SlowNumberedNodeManager;
 
@@ -62,7 +61,7 @@
    * @return a graph with the same nodes and edges as g
    */
   public static <T,U> SlowSparseNumberedLabeledGraph<T,U> duplicate(LabeledGraph<T,U> g) {
-    SlowSparseNumberedLabeledGraph<T,U> result = new SlowSparseNumberedLabeledGraph<T,U>(g.getDefaultLabel());
+    SlowSparseNumberedLabeledGraph<T,U> result = new SlowSparseNumberedLabeledGraph<>(g.getDefaultLabel());
     copyInto(g, result);
     return result;
   }
@@ -71,13 +70,11 @@
     if (g == null) {
       throw new IllegalArgumentException("g is null");
     }
-    for (Iterator<? extends T> it = g.iterator(); it.hasNext();) {
-      into.addNode(it.next());
+    for (T name : g) {
+      into.addNode(name);
     }
-    for (Iterator<? extends T> it = g.iterator(); it.hasNext();) {
-      T n = it.next();
-      for (Iterator<? extends T> it2 = g.getSuccNodes(n); it2.hasNext();) {
-        T s = it2.next();
+    for (T n : g) {
+      for (T s : Iterator2Iterable.make(g.getSuccNodes(n))) {
         for(U l : g.getEdgeLabels(n, s)) {
           into.addEdge(n, s, l);
         }
@@ -93,8 +90,8 @@
     if (defaultLabel == null) {
       throw new IllegalArgumentException("null default label");
     }
-    nodeManager = new SlowNumberedNodeManager<T>();
-    edgeManager = new SparseNumberedLabeledEdgeManager<T, U>(nodeManager, defaultLabel);
+    nodeManager = new SlowNumberedNodeManager<>();
+    edgeManager = new SparseNumberedLabeledEdgeManager<>(nodeManager, defaultLabel);
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/SparseNumberedLabeledEdgeManager.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/SparseNumberedLabeledEdgeManager.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/SparseNumberedLabeledEdgeManager.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/labeled/SparseNumberedLabeledEdgeManager.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,6 +48,7 @@
  */
 package com.ibm.wala.util.graph.labeled;
 
+import java.io.Serializable;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
@@ -64,7 +65,12 @@
 
 /**
  */
-public class SparseNumberedLabeledEdgeManager<T, U> implements NumberedLabeledEdgeManager<T, U> {
+public class SparseNumberedLabeledEdgeManager<T, U> implements Serializable, NumberedLabeledEdgeManager<T, U> {
+
+  /**
+   * 
+   */
+  private static final long serialVersionUID = 5298089288917726790L;
 
   /**
    * the label to be attached to an edge when no label is specified
@@ -78,14 +84,14 @@
    */
   private final Map<U, SparseNumberedEdgeManager<T>> edgeLabelToManager = HashMapFactory.make();
 
-  private final ArraySetMultiMap<T, U> nodeToPredLabels = new ArraySetMultiMap<T, U>();
+  private final ArraySetMultiMap<T, U> nodeToPredLabels = new ArraySetMultiMap<>();
 
-  private final ArraySetMultiMap<T, U> nodeToSuccLabels = new ArraySetMultiMap<T, U>();
+  private final ArraySetMultiMap<T, U> nodeToSuccLabels = new ArraySetMultiMap<>();
 
   private SparseNumberedEdgeManager<T> getManagerForLabel(U label) {
     SparseNumberedEdgeManager<T> ret = edgeLabelToManager.get(label);
     if (ret == null) {
-      ret = new SparseNumberedEdgeManager<T>(nodeManager);
+      ret = new SparseNumberedEdgeManager<>(nodeManager);
       edgeLabelToManager.put(label, ret);
     }
     return ret;
@@ -172,8 +178,7 @@
    */
   @Override
   public void removeIncomingEdges(T node) throws IllegalArgumentException {
-    for (Iterator<U> inLabelIter = nodeToPredLabels.get(node).iterator(); inLabelIter.hasNext();) {
-      U label = inLabelIter.next();
+    for (U label : nodeToPredLabels.get(node)) {
       getManagerForLabel(label).removeIncomingEdges(node);
     }
 
@@ -184,8 +189,7 @@
    */
   @Override
   public void removeOutgoingEdges(T node) throws IllegalArgumentException {
-    for (Iterator<U> outLabelIter = nodeToSuccLabels.get(node).iterator(); outLabelIter.hasNext();) {
-      U label = outLabelIter.next();
+    for (U label : nodeToSuccLabels.get(node)) {
       getManagerForLabel(label).removeOutgoingEdges(node);
     }
 
@@ -217,9 +221,9 @@
   public Set<? extends U> getEdgeLabels(T src, T dst) {
     Set<U> labels = HashSetFactory.make();
 
-    for (U key : edgeLabelToManager.keySet()) {
-      if (edgeLabelToManager.get(key).hasEdge(src, dst)) {
-        labels.add(key);
+    for (Map.Entry<U, SparseNumberedEdgeManager<T>> entry : edgeLabelToManager.entrySet()) {
+      if (entry.getValue().hasEdge(src, dst)) {
+        labels.add(entry.getKey());
       }
     }
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/NodeManager.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/NodeManager.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/NodeManager.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/NodeManager.java	2019-01-29 17:08:39.000000000 +0000
@@ -48,4 +48,4 @@
    * @return true iff the graph contains the specified node
    */
   public boolean containsNode(T n);
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/NumberedNodeManager.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/NumberedNodeManager.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/NumberedNodeManager.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/NumberedNodeManager.java	2019-01-29 17:08:39.000000000 +0000
@@ -28,9 +28,8 @@
   public abstract int getMaxNumber();
 
   /**
-   * @param s
    * @return iterator of nodes with the numbers in set s
    */
   public abstract Iterator<T> iterateNodes(IntSet s);
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/Path.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/Path.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/Path.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/Path.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,11 +13,12 @@
 import com.ibm.wala.util.intset.SimpleIntVector;
 
 /**
- * We represent a path in a numbered graph as a vector of integers <i_1, ...,
- * i_n> where node i_1 is the src and node i_n is the sink
+ * We represent a path in a numbered graph as a vector of integers &lt;i_1, ...,
+ * i_n&gt; where node i_1 is the src and node i_n is the sink
  */
 public class Path extends SimpleIntVector {
 
+  private static final long serialVersionUID = 5622964158500601280L;
   final int size;
 
   private Path(int defaultValue, int size) {
@@ -75,15 +76,15 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer("[");
+    StringBuilder result = new StringBuilder("[");
     for (int i = 0; i < size; i++) {
       result.append(get(i));
       if (i < size -1) {
-        result.append(",");
+        result.append(',');
       }
     }
-    result.append("]");
+    result.append(']');
     return result.toString();
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BFSIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BFSIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BFSIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BFSIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,6 +16,7 @@
 import java.util.NoSuchElementException;
 
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
 import com.ibm.wala.util.debug.UnimplementedError;
 import com.ibm.wala.util.graph.Graph;
@@ -30,7 +31,7 @@
   /**
    * List of nodes as discovered
    */
-  final ArrayList<T> Q = new ArrayList<T>();
+  final ArrayList<T> Q = new ArrayList<>();
 
   /**
    * Set of nodes that have been visited
@@ -57,7 +58,7 @@
     if (G == null) {
       throw new IllegalArgumentException("G is null");
     }
-    init(G, new NonNullSingletonIterator<T>(N));
+    init(G, new NonNullSingletonIterator<>(N));
   }
 
   /**
@@ -80,7 +81,6 @@
   /**
    * Constructor DFSFinishTimeIterator.
    * 
-   * @param G
    * @throws NullPointerException if G is null
    */
   public BFSIterator(Graph<T> G) throws NullPointerException {
@@ -92,9 +92,8 @@
 
     while (nodes.hasNext()) {
       T o = nodes.next();
-      if (!visited.contains(o)) {
+      if (visited.add(o)) {
         Q.add(o);
-        visited.add(o);
       }
     }
     index = 0;
@@ -105,11 +104,9 @@
   }
 
   private void visitChildren(T N) {
-    for (Iterator<? extends T> children = getConnected(N); children.hasNext();) {
-      T child = children.next();
-      if (!visited.contains(child)) {
+    for (T child : Iterator2Iterable.make(getConnected(N))) {
+      if (visited.add(child)) {
         Q.add(child);
-        visited.add(child);
       }
     }
   }
@@ -154,9 +151,6 @@
     return G.getSuccNodes(n);
   }
 
-  /**
-   * @see java.util.Iterator#remove()
-   */
   @Override
   public void remove() throws UnimplementedError {
     throw new UnimplementedError();
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BFSPathFinder.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BFSPathFinder.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BFSPathFinder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BFSPathFinder.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,8 +17,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Predicate;
 
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
@@ -64,7 +64,7 @@
       throw new IllegalArgumentException("null f");
     }
     this.G = G;
-    this.roots = new NonNullSingletonIterator<T>(N);
+    this.roots = new NonNullSingletonIterator<>(N);
     this.filter = f;
   }
 
@@ -79,15 +79,11 @@
       throw new IllegalArgumentException("G is null");
     }
     this.G = G;
-    this.roots = new NonNullSingletonIterator<T>(src);
+    this.roots = new NonNullSingletonIterator<>(src);
     if (!G.containsNode(src)) {
       throw new IllegalArgumentException("src is not in graph " + src);
     }
-    this.filter = new Predicate<T>() {
-      @Override public boolean test(T o) {
-        return target.equals(o);
-      }
-    };
+    this.filter = target::equals;
   }
 
   /**
@@ -105,13 +101,9 @@
     }
 
     this.G = G;
-    this.roots = new NonNullSingletonIterator<T>(src);
+    this.roots = new NonNullSingletonIterator<>(src);
 
-    this.filter = new Predicate<T>() {
-      @Override public boolean test(T o) {
-        return ts.contains(o);
-      }
-    };
+    this.filter = ts::contains;
   }
 
   /**
@@ -128,11 +120,7 @@
     }
     this.G = G;
     this.roots = sources;
-    this.filter = new Predicate<T>() {
-      @Override public boolean test(T o) {
-        return target.equals(o);
-      }
-    };
+    this.filter = target::equals;
   }
 
   /**
@@ -159,7 +147,7 @@
    */
   public List<T> find() {
 
-    LinkedList<T> Q = new LinkedList<T>();
+    LinkedList<T> Q = new LinkedList<>();
     HashMap<Object, T> history = HashMapFactory.make();
     while (roots.hasNext()) {
       T next = roots.next();
@@ -191,7 +179,7 @@
    * @return a List which represents a path in the breadth-first search to Q[i]. Q holds the nodes visited during the BFS, in order.
    */
   private List<T> makePath(T node, Map<Object, T> history) {
-    ArrayList<T> result = new ArrayList<T>();
+    ArrayList<T> result = new ArrayList<>();
     T n = node;
     result.add(n);
     while (true) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BoundedBFSIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BoundedBFSIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BoundedBFSIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BoundedBFSIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,6 +16,7 @@
 import java.util.NoSuchElementException;
 
 import com.ibm.wala.util.collections.HashSetFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
 import com.ibm.wala.util.graph.Graph;
 
@@ -31,7 +32,7 @@
   /**
    * List of nodes as discovered
    */
-  final ArrayList<T> Q = new ArrayList<T>();
+  final ArrayList<T> Q = new ArrayList<>();
 
   /**
    * Set of nodes that have been visited
@@ -54,7 +55,7 @@
   private final int k;
 
   /**
-   * boundary[i] is the first index which represents a child that is > i hops away.
+   * boundary[i] is the first index which represents a child that is &gt; i hops away.
    */
   private final int[] boundary;
 
@@ -78,7 +79,7 @@
     }
     this.k = k;
     boundary = new int[k];
-    init(G, new NonNullSingletonIterator<T>(N));
+    init(G, new NonNullSingletonIterator<>(N));
   }
 
   /**
@@ -108,9 +109,8 @@
     }
     while (nodes.hasNext()) {
       T o = nodes.next();
-      if (!visited.contains(o)) {
+      if (visited.add(o)) {
         Q.add(o);
-        visited.add(o);
       }
     }
     index = 0;
@@ -127,11 +127,9 @@
     if (boundary[currentHops] == 0) {
       boundary[currentHops] = Q.size();
     }
-    for (Iterator<? extends T> children = getConnected(N); children.hasNext();) {
-      T child = children.next();
-      if (!visited.contains(child)) {
+    for (T child : Iterator2Iterable.make(getConnected(N))) {
+      if (visited.add(child)) {
         Q.add(child);
-        visited.add(child);
       }
     }
   }
@@ -179,9 +177,6 @@
     return G.getSuccNodes(n);
   }
 
-  /**
-   * @see java.util.Iterator#remove()
-   */
   @Override
   public void remove() throws UnsupportedOperationException {
     throw new UnsupportedOperationException();
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSAllPathsFinder.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSAllPathsFinder.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSAllPathsFinder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSAllPathsFinder.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,8 +12,8 @@
 
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Predicate;
 
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.Pair;
 import com.ibm.wala.util.graph.Graph;
@@ -28,6 +28,8 @@
  */
 public class DFSAllPathsFinder<T> extends DFSPathFinder<T> {
 
+  private static final long serialVersionUID = 5413569289853649240L;
+
   public DFSAllPathsFinder(Graph<T> G, Iterator<T> nodes, Predicate<T> f) {
     super(G, nodes, f);
   }
@@ -39,11 +41,7 @@
   @Override
   protected Iterator<? extends T> getConnected(T n) {
     final List<T> cp = currentPath();
-    return new FilterIterator<T>(G.getSuccNodes(n), new Predicate<T>() {
-      @Override public boolean test(T o) {
-        return ! cp.contains(o);
-      }
-    });
+    return new FilterIterator<>(G.getSuccNodes(n), o -> ! cp.contains(o));
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSDiscoverTimeIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSDiscoverTimeIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSDiscoverTimeIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSDiscoverTimeIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,11 +10,12 @@
  *******************************************************************************/
 package com.ibm.wala.util.graph.traverse;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.Stack;
 
 import com.ibm.wala.util.collections.EmptyIterator;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
 import com.ibm.wala.util.debug.UnimplementedError;
 import com.ibm.wala.util.graph.NumberedGraph;
@@ -24,8 +25,9 @@
  * increasing discover time. This class follows the outNodes of the graph nodes to define the graph, but this behavior can be
  * changed by overriding the getConnected method.
  */
-public abstract class DFSDiscoverTimeIterator<T> extends Stack<T> implements Iterator<T> {
+public abstract class DFSDiscoverTimeIterator<T> extends ArrayList<T> implements Iterator<T> {
 
+  private static final long serialVersionUID = 4238700455408861924L;
   /**
    * an enumeration of all nodes to search from
    */
@@ -48,7 +50,7 @@
    * subclass constructors must call this!
    */
   protected void init(T N) {
-    init(new NonNullSingletonIterator<T>(N));
+    init(new NonNullSingletonIterator<>(N));
   }
 
   /**
@@ -84,8 +86,7 @@
     assert getPendingChildren(toReturn) != null;
     do {
       T stackTop = peek();
-      for (Iterator<? extends T> it = getPendingChildren(stackTop); it.hasNext();) {
-        T child = it.next();
+      for (T child : Iterator2Iterable.make(getPendingChildren(stackTop))) {
         if (getPendingChildren(child) == null) {
           // found a new child.
           visitEdge(stackTop, child);
@@ -136,4 +137,23 @@
   protected void visitEdge(T from, T to) {
     // do nothing. subclasses will override.
   }
+  
+  private boolean empty() {
+    return size() == 0;
+  }
+
+  private void push(T elt) {
+    add(elt);
+  }
+  
+  private T peek() {
+    return get(size()-1); 
+  }
+  
+  private T pop() {
+    T e = get(size()-1);
+    remove(size()-1);
+    return e;
+  }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSFinishTimeIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSFinishTimeIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSFinishTimeIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSFinishTimeIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,11 +10,12 @@
  *******************************************************************************/
 package com.ibm.wala.util.graph.traverse;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.Stack;
 
 import com.ibm.wala.util.collections.EmptyIterator;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.debug.UnimplementedError;
 import com.ibm.wala.util.graph.Graph;
 
@@ -23,7 +24,9 @@
  * finishing time. This class follows the outNodes of the graph nodes to define the graph, but this behavior can be changed by
  * overriding the getConnected method.
  */
-public abstract class DFSFinishTimeIterator<T> extends Stack<T> implements Iterator<T> {
+public abstract class DFSFinishTimeIterator<T> extends ArrayList<T> implements Iterator<T> {
+
+  private static final long serialVersionUID = 8440061593631309429L;
 
   /**
    * the current next element in finishing time order
@@ -42,9 +45,6 @@
 
   /**
    * Subclasses must call this in the constructor!
-   * 
-   * @param G
-   * @param nodes
    */
   protected void init(Graph<T> G, Iterator<? extends T> nodes) {
     this.G = G;
@@ -53,6 +53,10 @@
       theNextElement = roots.next();
   }
 
+  private boolean empty() {
+    return size() == 0;
+  }
+  
   /**
    * Return whether there are any more nodes left to enumerate.
    * 
@@ -67,6 +71,20 @@
 
   abstract void setPendingChildren(T v, Iterator<T> iterator);
 
+  private void push(T elt) {
+    add(elt);
+  }
+  
+  private T peek() {
+    return get(size()-1); 
+  }
+  
+  private T pop() {
+    T e = get(size()-1);
+    remove(size()-1);
+    return e;
+  }
+  
   /**
    * Find the next graph node in finishing time order.
    * 
@@ -86,8 +104,7 @@
     recurse: while (!empty()) {
       T v = peek();
       Iterator<? extends T> pc = getPendingChildren(v);
-      for (Iterator<? extends T> e = pc; e.hasNext();) {
-        T n = e.next();
+      for (T n : Iterator2Iterable.make(pc)) {
         assert n != null : "null node in pc";
         Iterator<T> nChildren = getPendingChildren(n);
         if (nChildren == null) {
@@ -121,9 +138,6 @@
     return G.getSuccNodes(n);
   }
 
-  /**
-   * @see java.util.Iterator#remove()
-   */
   @Override
   public void remove() throws UnimplementedError {
     throw new UnimplementedError();
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFS.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFS.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFS.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFS.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,8 +18,8 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.function.Predicate;
 
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.FilterIterator;
 import com.ibm.wala.util.collections.HashMapFactory;
 import com.ibm.wala.util.collections.HashSetFactory;
@@ -41,7 +41,7 @@
    * @throws IllegalArgumentException if C is null
    */
   @SuppressWarnings("serial")
-  public static <T> Collection<T> getReachableNodes(final Graph<T> G, Collection<? extends T> C, @SuppressWarnings("rawtypes") final Predicate filter) {
+  public static <T> Collection<T> getReachableNodes(final Graph<T> G, Collection<? extends T> C, final Predicate<? super T> filter) {
     if (C == null) {
       throw new IllegalArgumentException("C is null");
     }
@@ -49,7 +49,7 @@
 
       @Override
       protected Iterator<T> getConnected(T n) {
-        return new FilterIterator<T>(G.getSuccNodes(n), filter);
+        return new FilterIterator<>(G.getSuccNodes(n), filter);
       }
     };
     return Iterator2Collection.toSet(dfs);
@@ -104,13 +104,13 @@
    */
   public static <T> SortedSet<T> sortByDepthFirstOrder(Graph<T> G, T n) {
     Map<T, Integer> order = HashMapFactory.make();
-    TreeSet<T> result = new TreeSet<T>(new DFSComparator<T>(order));
+    TreeSet<T> result = new TreeSet<>(new DFSComparator<>(order));
 
-    Iterator<T> dfs = iterateFinishTime(G, new NonNullSingletonIterator<T>(n));
+    Iterator<T> dfs = iterateFinishTime(G, new NonNullSingletonIterator<>(n));
     int i = 0;
     while (dfs.hasNext()) {
       T nxt = dfs.next();
-      order.put(nxt, new Integer(i++));
+      order.put(nxt, Integer.valueOf(i++));
       result.add(nxt);
     }
     return result;
@@ -140,14 +140,13 @@
   }
 
   /**
-   * @param G
    * @return iterator of nodes of G in order of DFS discover time
    */
   public static <T> DFSDiscoverTimeIterator<T> iterateDiscoverTime(Graph<T> G) {
     if (G instanceof NumberedGraph) {
-      return new NumberedDFSDiscoverTimeIterator<T>((NumberedGraph<T>) G);
+      return new NumberedDFSDiscoverTimeIterator<>((NumberedGraph<T>) G);
     } else {
-      return new SlowDFSDiscoverTimeIterator<T>(G);
+      return new SlowDFSDiscoverTimeIterator<>(G);
     }
   }
 
@@ -161,9 +160,9 @@
       throw new IllegalArgumentException("roots == null");
     }
     if (G instanceof NumberedGraph) {
-      return new NumberedDFSDiscoverTimeIterator<T>((NumberedGraph<T>) G, roots);
+      return new NumberedDFSDiscoverTimeIterator<>((NumberedGraph<T>) G, roots);
     } else {
-      return new SlowDFSDiscoverTimeIterator<T>(G, roots);
+      return new SlowDFSDiscoverTimeIterator<>(G, roots);
     }
   }
 
@@ -176,9 +175,9 @@
       throw new IllegalArgumentException("G == null");
     }
     if (G instanceof NumberedGraph) {
-      return new NumberedDFSDiscoverTimeIterator<T>((NumberedGraph<T>) G, N);
+      return new NumberedDFSDiscoverTimeIterator<>((NumberedGraph<T>) G, N);
     } else {
-      return new SlowDFSDiscoverTimeIterator<T>(G, N);
+      return new SlowDFSDiscoverTimeIterator<>(G, N);
     }
   }
 
@@ -192,9 +191,9 @@
       throw new IllegalArgumentException("G == null");
     }
     if (G instanceof NumberedGraph) {
-      return new NumberedDFSFinishTimeIterator<T>((NumberedGraph<T>) G);
+      return new NumberedDFSFinishTimeIterator<>((NumberedGraph<T>) G);
     } else {
-      return new SlowDFSFinishTimeIterator<T>(G);
+      return new SlowDFSFinishTimeIterator<>(G);
     }
   }
 
@@ -208,9 +207,9 @@
       throw new IllegalArgumentException("null ie");
     }
     if (G instanceof NumberedGraph) {
-      return new NumberedDFSFinishTimeIterator<T>((NumberedGraph<T>) G, ie);
+      return new NumberedDFSFinishTimeIterator<>((NumberedGraph<T>) G, ie);
     } else {
-      return new SlowDFSFinishTimeIterator<T>(G, ie);
+      return new SlowDFSFinishTimeIterator<>(G, ie);
     }
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSPathFinder.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSPathFinder.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSPathFinder.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/DFSPathFinder.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,10 +15,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Stack;
+import java.util.function.Predicate;
 
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.HashMapFactory;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
 import com.ibm.wala.util.graph.Graph;
 
@@ -28,7 +28,7 @@
  * This class follows the outNodes of the graph nodes to define the graph, but this behavior can be changed by overriding the
  * getConnected method.
  */
-public class DFSPathFinder<T> extends Stack<T> {
+public class DFSPathFinder<T> extends ArrayList<T> {
   public static final long serialVersionUID = 9939900773328288L;
 
   /**
@@ -70,7 +70,7 @@
       throw new IllegalArgumentException("source node not in graph: " + N);
     }
     this.G = G;
-    this.roots = new NonNullSingletonIterator<T>(N);
+    this.roots = new NonNullSingletonIterator<>(N);
     this.filter = f;
   }
 
@@ -125,9 +125,9 @@
   }
 
   protected List<T> currentPath() {
-    ArrayList<T> result = new ArrayList<T>();
-    for (Iterator<T> path = iterator(); path.hasNext();) {
-      result.add(0, path.next());
+    ArrayList<T> result = new ArrayList<>();
+    for (T t : this) {
+      result.add(0, t);
     }
     return result;
   }
@@ -152,9 +152,6 @@
 
   /**
    * Method setPendingChildren.
-   * 
-   * @param v
-   * @param iterator
    */
   protected void setPendingChildren(T v, Iterator<? extends T> iterator) {
     pendingChildren.put(v, iterator);
@@ -172,8 +169,7 @@
     assert getPendingChildren(currentNode) != null;
     do {
       T stackTop = peek();
-      for (Iterator<? extends T> it = getPendingChildren(stackTop); it.hasNext();) {
-        T child = it.next();
+      for (T child : Iterator2Iterable.make(getPendingChildren(stackTop))) {
         if (getPendingChildren(child) == null) {
           // found a new child.
           push(child);
@@ -208,4 +204,23 @@
   protected Iterator<? extends T> getConnected(T n) {
     return G.getSuccNodes(n);
   }
+  
+  private boolean empty() {
+    return size() == 0;
+  }
+
+  private void push(T elt) {
+    add(elt);
+  }
+  
+  private T peek() {
+    return get(size()-1); 
+  }
+  
+  private T pop() {
+    T e = get(size()-1);
+    remove(size()-1);
+    return e;
+  }
+
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/FloydWarshall.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/FloydWarshall.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/FloydWarshall.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/FloydWarshall.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.util.graph.traverse;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -18,7 +19,6 @@
 
 import com.ibm.wala.util.graph.NumberedGraph;
 import com.ibm.wala.util.intset.IntSet;
-import com.ibm.wala.util.intset.IntSetAction;
 import com.ibm.wala.util.intset.IntSetUtil;
 import com.ibm.wala.util.intset.MutableIntSet;
 
@@ -45,10 +45,11 @@
     G = g;
   }
 
-  protected int edgeCost(int from, int to) {
+  protected int edgeCost() {
     return 1;
   }
   
+  @SuppressWarnings("unused")
   protected void pathCallback(int i, int j, int k) {
     
   }
@@ -65,12 +66,7 @@
     for(T from : G) {
       final int fn = G.getNumber(from);
       IntSet tos = G.getSuccNodeNumbers(from);
-      tos.foreach(new IntSetAction() {
-        @Override
-        public void act(int x) {
-          result[fn][x] = edgeCost(fn, x);
-        }
-      });
+      tos.foreach(x -> result[fn][x] = edgeCost());
     }
     
     for(T kn : G) {
@@ -94,13 +90,13 @@
   }
   
   public static <T> int[][] shortestPathLengths(NumberedGraph<T> G) {
-    return new FloydWarshall<T>(G).allPairsShortestPaths();
+    return new FloydWarshall<>(G).allPairsShortestPaths();
   }
   
   public static <T> GetPath<T> allPairsShortestPath(final NumberedGraph<T> G) {
      return new FloydWarshall<T>(G) {
        int[][] next = new int[G.getNumberOfNodes()][G.getNumberOfNodes()];
-
+       
        @Override
        protected void pathCallback(int i, int j, int k) {
          next[i][j] = k;
@@ -115,6 +111,22 @@
          
          final int[][] paths = allPairsShortestPaths();
          return new GetPath<T>() {
+
+           @Override
+          public String toString() {
+             final StringBuilder s = new StringBuilder();
+             for(int i = 0; i <= G.getMaxNumber(); i++) {
+               for(int j = 0; j <= G.getMaxNumber(); j++) {
+                 try {
+                   s.append(getPath(G.getNode(i), G.getNode(j)));
+                 } catch (UnsupportedOperationException e) {
+                   
+                 }
+               }
+             }
+             return s.toString();
+           }
+
           @Override
           public List<T> getPath(T from, T to) {
             int fn = G.getNumber(from);
@@ -127,7 +139,7 @@
                 return Collections.emptyList();
               } else {
                 T in = G.getNode(intermediate);
-                List<T> result = new LinkedList<T>(getPath(from, in));
+                List<T> result = new LinkedList<>(getPath(from, in));
                 result.add(in);
                 result.addAll(getPath(in, to));
                 return result;
@@ -154,7 +166,23 @@
       private GetPaths<T> doit() {        
         final int[][] paths = allPairsShortestPaths();
         return new GetPaths<T>() {
-         @Override
+          
+          @Override
+         public String toString() {
+            List<Set<List<T>>> x = new ArrayList<>();
+            for(int i = 0; i <= G.getMaxNumber(); i++) {
+              for(int j = 0; j <= G.getMaxNumber(); j++) {
+                try {
+                  x.add(getPaths(G.getNode(i), G.getNode(j)));
+                } catch (UnsupportedOperationException e) {
+                  
+                }
+              }
+            }
+            return x.toString();
+          }
+
+          @Override
         public Set<List<T>> getPaths(final T from, final T to) {
            int fn = G.getNumber(from);
            int tn = G.getNumber(to);
@@ -166,22 +194,19 @@
                List<T> none = Collections.emptyList();
                return Collections.singleton(none);
              } else {
-               final Set<List<T>> result = new HashSet<List<T>>();
+               final Set<List<T>> result = new HashSet<>();
               
-               intermediate.foreach(new IntSetAction() {
-                @Override
-                public void act(int x) {
-                  T in = G.getNode(x);
-                  for(List<T> pre : getPaths(from, in)) {
-                    for(List<T> post : getPaths(in, to)) {
-                      List<T> path = new LinkedList<T>(pre);
-                      path.add(in);
-                      path.addAll(post);
-                      result.add(path);
-                    }
+               intermediate.foreach(x -> {
+                T in = G.getNode(x);
+                for(List<T> pre : getPaths(from, in)) {
+                  for(List<T> post : getPaths(in, to)) {
+                    List<T> path = new LinkedList<>(pre);
+                    path.add(in);
+                    path.addAll(post);
+                    result.add(path);
                   }
-                }           
-               });
+                }
+              });
                
                return result;
              }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/GraphDFSDiscoverTimeIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/GraphDFSDiscoverTimeIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/GraphDFSDiscoverTimeIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/GraphDFSDiscoverTimeIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,6 +16,7 @@
 
 abstract class GraphDFSDiscoverTimeIterator<T> extends DFSDiscoverTimeIterator<T> {
 
+  private static final long serialVersionUID = -5673397879499010863L;
   /**
    * the graph being searched
    */
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSDiscoverTimeIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSDiscoverTimeIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSDiscoverTimeIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSDiscoverTimeIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,7 @@
  * increasing discover time. This class follows the outNodes of the graph nodes to define the graph, but this behavior can be
  * changed by overriding the getConnected method.
  */
-public class NumberedDFSDiscoverTimeIterator<T> extends GraphDFSDiscoverTimeIterator<T> implements Iterator<T> {
+public class NumberedDFSDiscoverTimeIterator<T> extends GraphDFSDiscoverTimeIterator<T> {
 
   private static final long serialVersionUID = -3919708273323217304L;
 
@@ -47,7 +47,7 @@
     }
     this.G = G;
     pendingChildren = new Iterator[G.getMaxNumber() + 1];
-    init(G, new NonNullSingletonIterator<T>(N));
+    init(G, new NonNullSingletonIterator<>(N));
   }
 
   /**
@@ -76,7 +76,6 @@
   /**
    * Constructor DFSFinishTimeIterator.
    * 
-   * @param G
    * @throws NullPointerException if G is null
    */
   public NumberedDFSDiscoverTimeIterator(NumberedGraph<T> G) throws NullPointerException {
@@ -95,9 +94,6 @@
 
   /**
    * Method setPendingChildren.
-   * 
-   * @param v
-   * @param iterator
    */
   @Override
   protected void setPendingChildren(T v, Iterator<? extends T> iterator) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSFinishTimeIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSFinishTimeIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSFinishTimeIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/NumberedDFSFinishTimeIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package com.ibm.wala.util.graph.traverse;
 
+import java.util.Arrays;
 import java.util.Iterator;
 
 import com.ibm.wala.util.collections.NonNullSingletonIterator;
@@ -20,7 +21,7 @@
  * increasing discover time. This class follows the outNodes of the graph nodes to define the graph, but this behavior can be
  * changed by overriding the getConnected method.
  */
-public class NumberedDFSFinishTimeIterator<T> extends DFSFinishTimeIterator<T> implements Iterator<T> {
+public class NumberedDFSFinishTimeIterator<T> extends DFSFinishTimeIterator<T> {
   public static final long serialVersionUID = 8737376661L;
 
   /**
@@ -42,7 +43,7 @@
   NumberedDFSFinishTimeIterator(NumberedGraph<T> G, T N) {
     this.G = G;
     pendingChildren = new Iterator[G.getMaxNumber() + 1];
-    init(G, new NonNullSingletonIterator<T>(N));
+    init(G, new NonNullSingletonIterator<>(N));
   }
 
   /**
@@ -61,35 +62,27 @@
 
   /**
    * Constructor DFSFinishTimeIterator.
-   * 
-   * @param G
    */
   NumberedDFSFinishTimeIterator(NumberedGraph<T> G) {
     this(G, G.iterator());
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   Iterator<T> getPendingChildren(T n) {
     int number = G.getNumber(n);
     if (number >= pendingChildren.length) {
       // the graph is probably growing as we travserse
-      Iterator<T>[] old = pendingChildren;
-      pendingChildren = new Iterator[number * 2];
-      System.arraycopy(old, 0, pendingChildren, 0, old.length);
+      pendingChildren = Arrays.copyOf(pendingChildren, number * 2);
       return null;
     }
     if (number < 0) {
-      assert false : "negative number for " + n + " " + n.getClass();
+      assert false : "negative number for " + n + ' ' + n.getClass();
     }
     return pendingChildren[number];
   }
 
   /**
    * Method setPendingChildren.
-   * 
-   * @param v
-   * @param iterator
    */
   @Override
   void setPendingChildren(T v, Iterator<T> iterator) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/SlowDFSDiscoverTimeIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/SlowDFSDiscoverTimeIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/SlowDFSDiscoverTimeIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/SlowDFSDiscoverTimeIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,11 +22,11 @@
  * discover time. This class follows the outNodes of the graph nodes to define the graph, but this behavior can be changed by
  * overriding the getConnected method.
  */
-public class SlowDFSDiscoverTimeIterator<T> extends GraphDFSDiscoverTimeIterator<T> implements Iterator<T> {
+public class SlowDFSDiscoverTimeIterator<T> extends GraphDFSDiscoverTimeIterator<T> {
   public static final long serialVersionUID = 9439217987188L;
 
   /**
-   * An iterator of child nodes for each node being searched A Map: Node -> Iterator
+   * An iterator of child nodes for each node being searched A Map: Node -&gt; Iterator
    */
   final private Map<T, Iterator<? extends T>> pendingChildren = HashMapFactory.make(25);
 
@@ -42,7 +42,7 @@
    * @param G the graph whose nodes to enumerate
    */
   public SlowDFSDiscoverTimeIterator(Graph<T> G, T N) {
-    init(G, new NonNullSingletonIterator<T>(N));
+    init(G, new NonNullSingletonIterator<>(N));
   }
 
   /**
@@ -62,7 +62,6 @@
   /**
    * Constructor SlowDFSDiscoverTimeIterator.
    * 
-   * @param G
    * @throws NullPointerException if G is null
    */
   public SlowDFSDiscoverTimeIterator(Graph<T> G) throws NullPointerException {
@@ -79,9 +78,6 @@
 
   /**
    * Method setPendingChildren.
-   * 
-   * @param v
-   * @param iterator
    */
   @Override
   protected void setPendingChildren(T v, Iterator<? extends T> iterator) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/SlowDFSFinishTimeIterator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/SlowDFSFinishTimeIterator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/SlowDFSFinishTimeIterator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/SlowDFSFinishTimeIterator.java	2019-01-29 17:08:39.000000000 +0000
@@ -43,7 +43,7 @@
     if (!G.containsNode(N)) {
       throw new IllegalArgumentException("source node not in graph: " + N);
     }
-    init(G, new NonNullSingletonIterator<T>(N));
+    init(G, new NonNullSingletonIterator<>(N));
   }
 
   /**
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/Topological.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/Topological.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/Topological.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/Topological.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,29 +26,30 @@
    * 
    * @throws IllegalArgumentException if graph == null
    */
-  public static <T> Iterator<T> makeTopologicalIter(Graph<T> graph) throws IllegalArgumentException {
-    // the following code ensures a topological order over SCCs.
-    // note that the first two lines of the following give a topological
-    // order for dags, but that can get screwed up by cycles. so
-    // instead, we use Tarjan's SCC algorithm, which happens to
-    // visit nodes in an order consistent with a top. order over SCCs.
-
+  public static <T> Iterable<T> makeTopologicalIter(final Graph<T> graph) throws IllegalArgumentException {
     if (graph == null) {
       throw new IllegalArgumentException("graph == null");
     }
-    // finish time is post-order
-    // note that if you pay attention only to the first representative
-    // of each SCC discovered, we have a top. order of these SCC
-    // representatives
-    Iterator<T> finishTime = DFS.iterateFinishTime(graph);
-    // reverse postorder is usual topological sort.
-    Iterator<T> rev = ReverseIterator.reverse(finishTime);
-    // the following statement helps out the GC; note that finishTime holds
-    // on to a large array
-    finishTime = null;
-    Graph<T> G_T = GraphInverter.invert(graph);
-    Iterator<T> order = DFS.iterateFinishTime(G_T, rev);
-    return order;
-  }
 
+    return () -> {
+      // the following code ensures a topological order over SCCs.
+      // note that the first two lines of the following give a topological
+      // order for dags, but that can get screwed up by cycles. so
+      // instead, we use Tarjan's SCC algorithm, which happens to
+      // visit nodes in an order consistent with a top. order over SCCs.
+
+      // finish time is post-order
+      // note that if you pay attention only to the first representative
+      // of each SCC discovered, we have a top. order of these SCC
+      // representatives
+      Iterator<T> finishTime = DFS.iterateFinishTime(graph);
+      // reverse postorder is usual topological sort.
+      Iterator<T> rev = ReverseIterator.reverse(finishTime);
+      // the following statement helps out the GC; note that finishTime holds
+      // on to a large array
+      finishTime = null;
+      Graph<T> G_T = GraphInverter.invert(graph);
+      return DFS.iterateFinishTime(G_T, rev);
+    };
+  }
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/WelshPowell.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/WelshPowell.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/WelshPowell.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/WelshPowell.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,16 +11,15 @@
 package com.ibm.wala.util.graph.traverse;
 
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
 import com.ibm.wala.util.collections.HashMapFactory;
-import com.ibm.wala.util.graph.INodeWithNumber;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.graph.NumberedGraph;
 
-public class WelshPowell<T extends INodeWithNumber> {
+public class WelshPowell<T> {
 
   public static class ColoredVertices<T> {
     private final boolean fullColoring;
@@ -59,20 +58,20 @@
       this.numColors = numColors;
     }
 
+    @Override
+    public String toString() {
+      return colors.toString();
+    }
   }
 
   public static <T> Comparator<T> defaultComparator(final NumberedGraph<T> G) {
-    return new Comparator<T>() {
-
-      @Override
-      public int compare(T o1, T o2) {
-        int o1edges = G.getSuccNodeCount(o1) + G.getPredNodeCount(o1);
-        int o2edges = G.getSuccNodeCount(o2) + G.getPredNodeCount(o2);
-        if (o1edges != o2edges) {
-          return o2edges - o1edges;
-        } else {
-          return o2.toString().compareTo(o1.toString());
-        }
+    return (o1, o2) -> {
+      int o1edges = G.getSuccNodeCount(o1) + G.getPredNodeCount(o1);
+      int o2edges = G.getSuccNodeCount(o2) + G.getPredNodeCount(o2);
+      if (o1edges != o2edges) {
+        return o2edges - o1edges;
+      } else {
+        return o2.toString().compareTo(o1.toString());
       }
     };
   }
@@ -91,7 +90,7 @@
       colors[i] = -1;
     }
     
-    SortedSet<T> vertices = new TreeSet<T>(order);
+    SortedSet<T> vertices = new TreeSet<>(order);
 
     for (T n : G) {
       vertices.add(n);
@@ -101,33 +100,31 @@
     int colored = 0;
 
     for(T n : vertices) {
-      int id = n.getGraphNodeId();
+      int id = G.getNumber(n);
       if (colors[id] == -1) {
         colors[id] = currentColor;
         colored++;
 
         for(T m : vertices) {
-          if (colors[m.getGraphNodeId()] == -1) {
+          if (colors[G.getNumber(m)] == -1) {
             color_me: {
-              for(Iterator<T> ps = G.getPredNodes(m); ps.hasNext(); ) {
-                T p = ps.next();
-                if (colors[ p.getGraphNodeId() ] == currentColor) {
+              for(T p : Iterator2Iterable.make(G.getPredNodes(m)) ) {
+                if (colors[ G.getNumber(p) ] == currentColor) {
                   break color_me;
                 }
               }
   
-              for(Iterator<T> ss = G.getSuccNodes(m); ss.hasNext(); ) {
-                T s = ss.next();
-                if (colors[s.getGraphNodeId()] == currentColor) {
+              for(T s : Iterator2Iterable.make(G.getSuccNodes(m))) {
+                if (colors[G.getNumber(s)] == currentColor) {
                   break color_me;
                 }
               }
   
-              colors[m.getGraphNodeId()] = currentColor;
+              colors[G.getNumber(m)] = currentColor;
               colored++;
               
               if (currentColor == maxColors - 1) {
-                return new ColoredVertices<T>(false, G, colors, currentColor);
+                return new ColoredVertices<>(false, G, colors, currentColor);
               }
 
             }
@@ -138,14 +135,14 @@
         currentColor++;
 
         if (currentColor == maxColors - 1) {
-          return new ColoredVertices<T>(false, G, colors, currentColor);
+          return new ColoredVertices<>(false, G, colors, currentColor);
         }
       }
     }
     
     assert colored == G.getNumberOfNodes();
 
-    return new ColoredVertices<T>(true, G, colors, currentColor);
+    return new ColoredVertices<>(true, G, colors, currentColor);
   }
 
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/heapTrace/HeapTracer.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/heapTrace/HeapTracer.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/heapTrace/HeapTracer.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/heapTrace/HeapTracer.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,12 +51,12 @@
     /**
      * Stack of instance objects discovered but not yet traced.
      */
-    private final Stack<Object> scalarWorkList = new Stack<Object>();
+    private final Stack<Object> scalarWorkList = new Stack<>();
 
     /**
      * Stack of array objects discovered but not yet traced.
      */
-    private final Stack<Object> arrayWorkList = new Stack<Object>();
+    private final Stack<Object> arrayWorkList = new Stack<>();
 
     /**
      * How many bytes do we assume the JVM wastes on each instance?
@@ -69,7 +69,7 @@
     private final boolean traceStatics;
 
     /**
-     * Map: Class -> Integer, the size of each class
+     * Map: Class -&gt; Integer, the size of each class
      */
     private final HashMap<Class<?>, Integer> sizeMap = HashMapFactory.make();
 
@@ -129,18 +129,11 @@
 	this.traceStatics = traceStatics;
     }
 
-    /**
-     * @param c
-     * @param traceStatics
-     */
     public HeapTracer(Collection<?> c, boolean traceStatics) {
 	rootInstances = c;
 	this.traceStatics = traceStatics;
     }
 
-    /**
-     * @param args
-     */
     public static void main(String[] args) {
 	try {
 	    Result r = (new HeapTracer(true)).perform();
@@ -157,8 +150,8 @@
 	String classpath = System.getProperty("java.class.path");
 	Object[] binDirectories = extractBinDirectories(classpath);
 	HashSet<String> classFileNames = HashSetFactory.make();
-	for (int i = 0; i < binDirectories.length; i++) {
-	    String dir = (String) binDirectories[i];
+	for (Object binDirectorie : binDirectories) {
+	    String dir = (String) binDirectorie;
 	    File fdir = new File(dir);
 	    classFileNames.addAll(findClassNames(dir, fdir));
 	}
@@ -172,7 +165,7 @@
 
     /**
      * @param fdir
-     * @return Collection <String>representing the class names in a particular
+     * @return {@link Collection}&lt;{@link String}&gt; representing the class names in a particular
      *         file
      */
     /**
@@ -180,14 +173,14 @@
      *            root of the classpath governing file f
      * @param f
      *            a File or directory
-     * @return Collection <String>representing the class names in f
+     * @return {@link Collection}&lt;{@link String}&gt; representing the class names in f
      */
     private static Collection<String> findClassNames(String rootDir, File f) {
 	HashSet<String> result = HashSetFactory.make();
 	if (f.isDirectory()) {
 	    File[] files = f.listFiles();
-	    for (int i = 0; i < files.length; i++) {
-		result.addAll(findClassNames(rootDir, files[i]));
+	    for (File file : files) {
+		result.addAll(findClassNames(rootDir, file));
 	    }
 	} else {
 	    if (f.getName().indexOf(".class") > 0) {
@@ -203,7 +196,6 @@
     }
 
     /**
-     * @param classpath
      * @return set of strings that are names of directories that contain "bin"
      */
     private static Object[] extractBinDirectories(String classpath) {
@@ -224,24 +216,22 @@
     public Result perform() throws ClassNotFoundException,
 	    IllegalArgumentException, IllegalAccessException {
 	Result result = new Result();
-	IdentityHashMap<Object, Object> objectsVisited = new IdentityHashMap<Object, Object>();
+	IdentityHashMap<Object, Object> objectsVisited = new IdentityHashMap<>();
 	if (traceStatics) {
-	    for (int i = 0; i < rootClasses.length; i++) {
-		Class<?> c = Class.forName(rootClasses[i]);
+	    for (String rootClasse : rootClasses) {
+		Class<?> c = Class.forName(rootClasse);
 		Field[] fields = c.getDeclaredFields();
-		for (int j = 0; j < fields.length; j++) {
-		    if (isStatic(fields[j])) {
-			traverse(fields[j], result, objectsVisited);
+		for (Field field : fields) {
+		    if (isStatic(field)) {
+			traverse(field, result, objectsVisited);
 		    }
 		}
 	    }
 	}
-	for (Iterator<?> it = rootInstances.iterator(); it.hasNext();) {
-	    Object instance = it.next();
+	for (Object instance : rootInstances) {
 	    Class<?> c = instance.getClass();
 	    Set<Field> fields = getAllInstanceFields(c);
-	    for (Iterator<Field> it2 = fields.iterator(); it2.hasNext();) {
-		Field f = it2.next();
+	    for (Field f : fields) {
 		traverse(f, instance, result, objectsVisited);
 	    }
 	}
@@ -250,7 +240,6 @@
     }
 
     /**
-     * @param o
      * @return the estimated size of the object
      */
     private static int computeSizeOf(Object o) {
@@ -264,8 +253,7 @@
 	    throw new Error();
 	} else {
 	    Collection<Field> fields = getAllInstanceFields(c);
-	    for (Iterator<Field> it = fields.iterator(); it.hasNext();) {
-		Field f = it.next();
+	    for (Field f : fields) {
 		result += sizeOfSlot(f.getType());
 	    }
 	}
@@ -273,7 +261,6 @@
     }
 
     /**
-     * @param o
      * @return the estimated size of the object
      */
     private int sizeOf(Object o) {
@@ -283,7 +270,7 @@
 	} else {
 	    Integer S = sizeMap.get(c);
 	    if (S == null) {
-		S = new Integer(computeSizeOf(o));
+		S = Integer.valueOf(computeSizeOf(o));
 		sizeMap.put(c, S);
 	    }
 	    return S.intValue();
@@ -291,7 +278,6 @@
     }
 
     /**
-     * @param c
      * @return size of a field of type c, in bytes
      */
     private static int sizeOfSlot(Class<?> c) {
@@ -315,10 +301,6 @@
 
     /**
      * Traverse the heap starting at a static field
-     * 
-     * @param result
-     * @throws IllegalAccessException
-     * @throws IllegalArgumentException
      */
     private void traverse(Field root, Result result,
 	    IdentityHashMap<Object, Object> objectsVisited)
@@ -416,8 +398,8 @@
 	    System.err.println(("traverse scalar " + c));
 	}
 	Field[] fields = getAllReferenceInstanceFields(c);
-	for (int i = 0; i < fields.length; i++) {
-	    traverseFieldOfScalar(root, fields[i], scalar, container,
+	for (Field field : fields) {
+	    traverseFieldOfScalar(root, field, scalar, container,
 		    objectsVisited, result);
 	}
     }
@@ -456,16 +438,6 @@
 	}
     }
 
-    /**
-     * @param root
-     * @param f
-     * @param scalar
-     * @param container
-     * @param objectsVisited
-     * @param result
-     * @throws IllegalArgumentException
-     * @throws IllegalAccessException
-     */
     private void traverseFieldOfScalar(Field root, Field f, Object scalar,
 	    Object container, IdentityHashMap<Object, Object> objectsVisited,
 	    Result result) throws IllegalArgumentException,
@@ -630,13 +602,13 @@
      */
     class Demographics {
 	/**
-	 * mapping: Object (key) -> Integer (number of instances in a partition)
+	 * mapping: Object (key) -&gt; Integer (number of instances in a partition)
 	 */
 	private final HashMap<Object, Integer> instanceCount = HashMapFactory
 		.make();
 
 	/**
-	 * mapping: Object (key) -> Integer (bytes)
+	 * mapping: Object (key) -&gt; Integer (bytes)
 	 */
 	private final HashMap<Object, Integer> sizeCount = HashMapFactory
 		.make();
@@ -660,31 +632,30 @@
 	public void registerObject(Object key, Object o) {
 	    Integer I = instanceCount.get(key);
 	    int newCount = (I == null) ? 1 : I.intValue() + 1;
-	    instanceCount.put(key, new Integer(newCount));
+	    instanceCount.put(key, Integer.valueOf(newCount));
 	    totalInstances++;
 
 	    I = sizeCount.get(key);
 	    int s = sizeOf(o);
 	    int newSizeCount = (I == null) ? s : I.intValue() + s;
-	    sizeCount.put(key, new Integer(newSizeCount));
+	    sizeCount.put(key, Integer.valueOf(newSizeCount));
 	    totalSize += s;
 	}
 
 	@Override
 	public String toString() {
-	    StringBuffer result = new StringBuffer();
-	    result.append("Totals: " + totalInstances + " " + totalSize + "\n");
-	    TreeSet<Object> sorted = new TreeSet<Object>(new SizeComparator());
+	    StringBuilder result = new StringBuilder();
+	    result.append("Totals: ").append(totalInstances).append(' ').append(totalSize).append('\n');
+	    TreeSet<Object> sorted = new TreeSet<>(new SizeComparator());
 	    sorted.addAll(instanceCount.keySet());
-	    for (Iterator<Object> it = sorted.iterator(); it.hasNext();) {
-		Object key = it.next();
+	    for (Object key : sorted) {
 		Integer I = instanceCount.get(key);
 		Integer bytes = sizeCount.get(key);
 		result.append("  ").append(I).append("   ").append(bytes)
 			.append("   ");
 		result.append(bytes.intValue() / I.intValue()).append("   ");
 		result.append(key);
-		result.append("\n");
+		result.append('\n');
 	    }
 	    return result.toString();
 	}
@@ -729,13 +700,12 @@
     public class Result {
 
 	/**
-	 * a mapping from Field (static field roots) -> Demographics object
+	 * a mapping from Field (static field roots) -&gt; Demographics object
 	 */
 	private final HashMap<Field, Demographics> roots = HashMapFactory
 		.make();
 
 	/**
-	 * @param root
 	 * @return the Demographics object tracking objects traced from that
 	 *         root
 	 */
@@ -757,37 +727,33 @@
 
 	public int getTotalSize() {
 	    int totalSize = 0;
-	    for (Iterator<Demographics> it = roots.values().iterator(); it
-		    .hasNext();) {
-		Demographics d = it.next();
-		totalSize += d.getTotalSize();
-	    }
+	    for (Demographics d : roots.values()) {
+totalSize += d.getTotalSize();
+  }
 	    return totalSize;
 	}
 
 	@Override
 	public String toString() {
-	    StringBuffer result = new StringBuffer();
+	    StringBuilder result = new StringBuilder();
 	    result.append("Assuming " + BYTES_IN_HEADER
 		    + " header bytes per object\n");
 	    int totalInstances = 0;
 	    int totalSize = 0;
-	    for (Iterator<Demographics> it = roots.values().iterator(); it
-		    .hasNext();) {
-		Demographics d = it.next();
-		totalInstances += d.getTotalInstances();
-		totalSize += d.getTotalSize();
-	    }
-	    result.append("Total instances: " + totalInstances + "\n");
-	    result.append("Total size(bytes): " + totalSize + "\n");
+	    for (Demographics d : roots.values()) {
+totalInstances += d.getTotalInstances();
+totalSize += d.getTotalSize();
+  }
+	    result.append("Total instances: ").append(totalInstances).append('\n');
+	    result.append("Total size(bytes): ").append(totalSize).append('\n');
 
-	    TreeSet<Field> sortedDemo = new TreeSet<Field>(new SizeComparator());
+	    TreeSet<Field> sortedDemo = new TreeSet<>(new SizeComparator());
 	    sortedDemo.addAll(roots.keySet());
-	    for (Iterator<Field> it = sortedDemo.iterator(); it.hasNext();) {
-		Object root = it.next();
+	    for (Field field : sortedDemo) {
+		Object root = field;
 		Demographics d = roots.get(root);
 		if (d.getTotalSize() > 10000) {
-		    result.append(" root: ").append(root).append("\n");
+		    result.append(" root: ").append(root).append('\n');
 		    result.append(d);
 		}
 	    }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BasicNaturalRelation.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BasicNaturalRelation.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BasicNaturalRelation.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BasicNaturalRelation.java	2019-01-29 17:08:39.000000000 +0000
@@ -26,6 +26,8 @@
  */
 public final class BasicNaturalRelation implements IBinaryNaturalRelation, Serializable {
 
+  private static final long serialVersionUID = 4483720230344867621L;
+
   private final static boolean VERBOSE = false;
 
   private final static boolean DEBUG = false;
@@ -46,7 +48,7 @@
   /**
    * smallStore[i][x] holds
    * <ul>
-   * <li>if >=0, the ith integer associated with x
+   * <li>if &gt;=0, the ith integer associated with x
    * <li>if -2, then use the delegateStore instead of the small store
    * <li>if -1, then R(x) is empty
    * </ul>
@@ -96,10 +98,10 @@
     }
     switch (vectorImpl) {
     case SIMPLE:
-      delegateStore = new SimpleVector<IntSet>();
+      delegateStore = new SimpleVector<>();
       break;
     case TWO_LEVEL:
-      delegateStore = new TwoLevelVector<IntSet>();
+      delegateStore = new TwoLevelVector<>();
       break;
     default:
       throw new IllegalArgumentException("unsupported implementation " + vectorImpl);
@@ -153,8 +155,7 @@
         if (i == ssLength) {
           MutableIntSet s = new BimodalMutableIntSet(ssLength + 1, 1.1f);
           delegateStore.set(x, s);
-          for (int j = 0; j < smallStore.length; j++) {
-            IntVector vv = smallStore[j];
+          for (IntVector vv : smallStore) {
             s.add(vv.get(x));
             vv.set(x, DELEGATE_CODE);
           }
@@ -263,7 +264,6 @@
   }
 
   /**
-   * @param x
    * @return true iff there exists pair (x,y) for some y
    */
   @Override
@@ -302,11 +302,11 @@
             return SparseIntSet.singleton(ss0);
           } else {
             MutableSparseIntSet result = MutableSparseIntSet.createMutableSparseIntSet(ssLength);
-            for (int i = 0; i < smallStore.length; i++) {
-              if (smallStore[i].get(x) == EMPTY_CODE) {
+            for (IntVector element : smallStore) {
+              if (element.get(x) == EMPTY_CODE) {
                 break;
               }
-              result.add(smallStore[i].get(x));
+              result.add(element.get(x));
             }
             return result;
           }
@@ -330,8 +330,8 @@
         return getDelegate(x).size();
       } else {
         int result = 0;
-        for (int i = 0; i < smallStore.length; i++) {
-          if (smallStore[i].get(x) == EMPTY_CODE) {
+        for (IntVector element : smallStore) {
+          if (element.get(x) == EMPTY_CODE) {
             break;
           }
           result++;
@@ -355,8 +355,8 @@
       s.remove(y);
       if (s.size() == 0) {
         delegateStore.set(x, null);
-        for (int i = 0; i < smallStore.length; i++) {
-          smallStore[i].set(x, EMPTY_CODE);
+        for (IntVector element : smallStore) {
+          element.set(x, EMPTY_CODE);
         }
       }
     } else {
@@ -377,8 +377,8 @@
 
   @Override
   public void removeAll(int x) {
-    for (int i = 0; i < smallStore.length; i++) {
-      smallStore[i].set(x, EMPTY_CODE);
+    for (IntVector element : smallStore) {
+      element.set(x, EMPTY_CODE);
     }
     delegateStore.set(x, null);
   }
@@ -406,8 +406,7 @@
    */
   private int countPairs() {
     int result = 0;
-    for (Iterator<?> it = iterator(); it.hasNext();) {
-      it.next();
+    for (@SuppressWarnings("unused") Object name : this) {
       result++;
     }
     return result;
@@ -424,8 +423,8 @@
     if (usingDelegate(x)) {
       return getDelegate(x).contains(y);
     } else {
-      for (int i = 0; i < smallStore.length; i++) {
-        if (smallStore[i].get(x) == y) {
+      for (IntVector element : smallStore) {
+        if (element.get(x) == y) {
           return true;
         }
       }
@@ -440,11 +439,11 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     for (int i = 0; i <= maxX; i++) {
-      result.append(i).append(":");
+      result.append(i).append(':');
       result.append(getRelated(i));
-      result.append("\n");
+      result.append('\n');
     }
     return result.toString();
   }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BimodalMutableIntSetFactory.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BimodalMutableIntSetFactory.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BimodalMutableIntSetFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BimodalMutableIntSetFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -19,9 +19,6 @@
 
   private final MutableSparseIntSetFactory factory = new MutableSparseIntSetFactory();
 
-  /**
-   * @param set
-   */
   @Override
   public BimodalMutableIntSet make(int[] set) {
     BimodalMutableIntSet result = new BimodalMutableIntSet();
@@ -29,9 +26,6 @@
     return result;
   }
 
-  /**
-   * @param string
-   */
   @Override
   public BimodalMutableIntSet parse(String string) throws NumberFormatException {
     BimodalMutableIntSet result = new BimodalMutableIntSet();
@@ -57,4 +51,4 @@
   public BimodalMutableIntSet make() {
     return new BimodalMutableIntSet();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BimodalMutableIntSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BimodalMutableIntSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BimodalMutableIntSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BimodalMutableIntSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,6 +18,7 @@
  */
 public class BimodalMutableIntSet implements MutableIntSet {
 
+  private static final long serialVersionUID = 7332332295529936562L;
   MutableIntSet impl;
 
   /*
@@ -47,7 +48,7 @@
   /**
    * @return true iff we would like to use the same representation for V as we do for W
    */
-  private boolean sameRepresentation(IntSet V, IntSet W) {
+  private static boolean sameRepresentation(IntSet V, IntSet W) {
     // for now we assume that we always want to use the same representation for
     // V as
     // for W.
@@ -280,7 +281,6 @@
   }
   
   /**
-   * @param x
    * @throws IllegalArgumentException if x is null
    */
   public BimodalMutableIntSet(BimodalMutableIntSet x) {
@@ -385,4 +385,4 @@
     }
     return true;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -47,7 +47,7 @@
     if (B == null) {
       throw new IllegalArgumentException("null B");
     }
-    return new BitSet<T>(B);
+    return new BitSet<>(B);
   }
 
   private BitSet(BitSet<T> B) {
@@ -145,11 +145,11 @@
    */
   public Iterator<T> iterator() {
     return new Iterator<T>() {
-      private int next = -1;
+      private int nextCounter = -1;
       {
         for (int i = 0; i < vector.length(); i++) {
           if (vector.get(i)) {
-            next = i;
+            nextCounter = i;
             break;
           }
         }
@@ -157,17 +157,17 @@
 
       @Override
       public boolean hasNext() {
-        return (next != -1);
+        return (nextCounter != -1);
       }
 
       @Override
       public T next() {
-        T result = map.getMappedObject(next);
-        int start = next + 1;
-        next = -1;
+        T result = map.getMappedObject(nextCounter);
+        int start = nextCounter + 1;
+        nextCounter = -1;
         for (int i = start; i < vector.length(); i++) {
           if (vector.get(i)) {
-            next = i;
+            nextCounter = i;
             break;
           }
         }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/Bits.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/Bits.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/Bits.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/Bits.java	2019-01-29 17:08:39.000000000 +0000
@@ -65,7 +65,7 @@
    * Does an int literal val fit in bits bits?
    */
   public static boolean fits(int val, int bits) {
-    val = val >> bits - 1;
+    val = val >> (bits - 1);
     return (val == 0 || val == -1);
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorBase.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorBase.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorBase.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorBase.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,6 +18,8 @@
 @SuppressWarnings("rawtypes")
 abstract public class BitVectorBase<T extends BitVectorBase> implements Cloneable, Serializable {
 
+  private static final long serialVersionUID = 1151811022797406841L;
+
   protected final static boolean DEBUG = false;
 
   protected final static int LOG_BITS_PER_UNIT = 5;
@@ -83,8 +85,8 @@
    */
   public final int populationCount() {
     int count = 0;
-    for (int i = 0; i < bits.length; i++) {
-      count += Bits.populationCount(bits[i]);
+    for (int bit : bits) {
+      count += Bits.populationCount(bit);
     }
     return count;
   }
@@ -116,7 +118,7 @@
 
   @Override
   public String toString() {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     boolean needSeparator = false;
     buffer.append('{');
     int limit = length();
@@ -163,8 +165,8 @@
     int top = bits[lastWord];
 
     int j = 0;
-    for (int i = 0; i < masks.length; i++) {
-      if ((top & masks[i][j]) != 0) {
+    for (int[] mask2 : masks) {
+      if ((top & mask2[j]) != 0) {
         j <<= 1;
       } else {
         j <<= 1;
@@ -176,7 +178,7 @@
   }
 
   /**
-   * @return min j >= start s.t get(j)
+   * @return min j &gt;= start s.t get(j)
    */
   public int nextSetBit(int start) {
     if (start < 0) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorIntSetFactory.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorIntSetFactory.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorIntSetFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorIntSetFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.util.intset;
 
-import java.util.Iterator;
 import java.util.TreeSet;
 
 /**
@@ -18,7 +17,6 @@
 public class BitVectorIntSetFactory implements MutableIntSetFactory<BitVectorIntSet> {
 
   /**
-   * @param set
    * @throws IllegalArgumentException  if set is null
    */
   @Override
@@ -30,28 +28,24 @@
       return new BitVectorIntSet();
     } else {
       // XXX not very efficient.
-      TreeSet<Integer> T = new TreeSet<Integer>();
-      for (int i = 0; i < set.length; i++) {
-        T.add(new Integer(set[i]));
+      TreeSet<Integer> T = new TreeSet<>();
+      for (int element : set) {
+        T.add(element);
       }
       BitVectorIntSet result = new BitVectorIntSet();
-      for (Iterator<Integer> it = T.iterator(); it.hasNext();) {
-        Integer I = it.next();
+      for (Integer I : T) {
         result.add(I.intValue());
       }
       return result;
     }
   }
 
-  /**
-   * @param string
-   */
   @Override
   public BitVectorIntSet parse(String string) throws NumberFormatException {
     int[] data = SparseIntSet.parseIntArray(string);
     BitVectorIntSet result = new BitVectorIntSet();
-    for (int i = 0; i < data.length; i++) {
-      result.add(data[i]);
+    for (int element : data) {
+      result.add(element);
     }
     return result;
   }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorIntSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorIntSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorIntSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorIntSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,6 +20,8 @@
  */
 public final class BitVectorIntSet implements MutableIntSet {
 
+  private static final long serialVersionUID = 7477243071826223843L;
+
   // population count of -1 means needs to be computed again.
   private int populationCount = 0;
 
@@ -111,7 +113,6 @@
 
   /**
    * this version of add all will likely be faster if the client doesn't care about the change or the population count.
-   * @param set
    * @throws IllegalArgumentException if set == null
    */
   public void addAllOblivious(IntSet set) throws IllegalArgumentException {
@@ -290,9 +291,6 @@
 
   /**
    * internal optimized form
-   * 
-   * @param X
-   * @param action
    */
   private void fastForeachExcluding(BitVectorIntSet X, IntSetAction action) {
     int[] bits = bitVector.bits;
@@ -310,7 +308,7 @@
     }
   }
 
-  private void actOnWord(IntSetAction action, int startingIndex, int word) {
+  private static void actOnWord(IntSetAction action, int startingIndex, int word) {
     if (word != 0) {
       if ((word & 0x1) != 0) {
         action.act(startingIndex);
@@ -344,7 +342,7 @@
   }
 
   /**
-   * @return min j >= n s.t get(j)
+   * @return min j &gt;= n s.t get(j)
    */
   public int nextSetBit(int n) {
     return bitVector.nextSetBit(n);
@@ -431,7 +429,6 @@
   }
 
   /**
-   * @param set
    * @throws IllegalArgumentException if set is null
    */
   public boolean removeAll(BitVectorIntSet set) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package com.ibm.wala.util.intset;
 
-import java.io.Serializable;
+import java.util.Arrays;
 
 /**
  */
-public class BitVector extends BitVectorBase<BitVector> implements Serializable {
+public class BitVector extends BitVectorBase<BitVector> {
 
   private static final long serialVersionUID = 9087259335807761617L;
 
@@ -40,11 +40,7 @@
    * Expand this bit vector to size newCapacity.
    */
   void expand(int newCapacity) {
-    int[] oldbits = bits;
-    bits = new int[subscript(newCapacity) + 1];
-    for (int i = 0; i < oldbits.length; i++) {
-      bits[i] = oldbits[i];
-    }
+    bits = Arrays.copyOf(bits, subscript(newCapacity) + 1);
   }
 
   /**
@@ -196,7 +192,6 @@
    * Logically ORs this bit set with the specified set of bits. This is performance-critical, and so, a little ugly in an attempt to
    * help out the compiler.
    * 
-   * @param set
    * @return the number of bits added to this.
    * @throws IllegalArgumentException if set is null
    */
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorRepository.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorRepository.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorRepository.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/BitVectorRepository.java	2019-01-29 17:08:39.000000000 +0000
@@ -35,7 +35,6 @@
   final private static Map<Integer, LinkedList<WeakReference<BitVectorIntSet>>> buckets = HashMapFactory.make();
 
   /**
-   * @param value
    * @return the BitVector in this repository which is the canonical shared
    *         subset representative of value; the result will have the same bits
    *         as value, except it may exclude up to SUBSET_DELTA bits.
@@ -77,11 +76,11 @@
     // didn't find one. create one.
     LinkedList<WeakReference<BitVectorIntSet>> m = buckets.get(size);
     if (m == null) {
-      m = new LinkedList<WeakReference<BitVectorIntSet>>();
+      m = new LinkedList<>();
       buckets.put(size, m);
     }
     BitVectorIntSet bv = new BitVectorIntSet(value);
-    m.add(new WeakReference<BitVectorIntSet>(bv));
+    m.add(new WeakReference<>(bv));
     return bv;
   }
 
@@ -105,4 +104,4 @@
     return result;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/DebuggingMutableIntSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/DebuggingMutableIntSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/DebuggingMutableIntSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/DebuggingMutableIntSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -21,6 +21,8 @@
  */
 class DebuggingMutableIntSet implements MutableIntSet {
 
+  private static final long serialVersionUID = 6879912730471879687L;
+
   final MutableIntSet primaryImpl;
 
   final MutableIntSet secondaryImpl;
@@ -123,7 +125,7 @@
       boolean ssr = secondaryImpl.containsAny(db.secondaryImpl);
 
       if (ppr != ssr) {
-        assert ppr == ssr : "containsAny " + this + " " + set + " " + ppr + " " + ssr;
+        assert ppr == ssr : "containsAny " + this + ' ' + set + ' ' + ppr + ' ' + ssr;
       }
       return ppr;
     } else {
@@ -166,7 +168,7 @@
   }
 
   /**
-   * @return true iff <code>this</code> has the same value as <code>that</code>.
+   * @return true iff {@code this} has the same value as {@code that}.
    */
   @Override
   public boolean sameValue(IntSet that) {
@@ -185,7 +187,7 @@
   }
 
   /**
-   * @return true iff <code>this</code> is a subset of <code>that</code>.
+   * @return true iff {@code this} is a subset of {@code that}.
    */
   @Override
   public boolean isSubset(IntSet that) {
@@ -235,7 +237,7 @@
 
       if (ppr != ssr) {
         System.err.println("ppr was " + ppr + " (should be " + (ps != primaryImpl.size()) + ") but ssr was " + ssr + " (should be "
-            + (ss != secondaryImpl.size()) + ")");
+            + (ss != secondaryImpl.size()) + ')');
         System.err.println("adding " + set + " to " + this + " failed");
         Assertions.UNREACHABLE();
       }
@@ -311,19 +313,13 @@
   @Override
   public void foreach(IntSetAction action) {
     final Set<Integer> bits = HashSetFactory.make();
-    primaryImpl.foreach(new IntSetAction() {
-      @Override
-      public void act(int x) {
-        assert !bits.contains(new Integer(x));
-        bits.add(new Integer(x));
-      }
+    primaryImpl.foreach(x -> {
+      assert !bits.contains(Integer.valueOf(x));
+      bits.add(Integer.valueOf(x));
     });
-    secondaryImpl.foreach(new IntSetAction() {
-      @Override
-      public void act(int x) {
-        assert bits.contains(new Integer(x));
-        bits.remove(new Integer(x));
-      }
+    secondaryImpl.foreach(x -> {
+      assert bits.contains(Integer.valueOf(x));
+      bits.remove(Integer.valueOf(x));
     });
     assert bits.isEmpty();
 
@@ -336,19 +332,13 @@
   @Override
   public void foreachExcluding(IntSet X, IntSetAction action) {
     final Set<Integer> bits = HashSetFactory.make();
-    primaryImpl.foreachExcluding(X, new IntSetAction() {
-      @Override
-      public void act(int x) {
-        assert !bits.contains(new Integer(x));
-        bits.add(new Integer(x));
-      }
+    primaryImpl.foreachExcluding(X, x -> {
+      assert !bits.contains(Integer.valueOf(x));
+      bits.add(Integer.valueOf(x));
     });
-    secondaryImpl.foreachExcluding(X, new IntSetAction() {
-      @Override
-      public void act(int x) {
-        assert bits.contains(new Integer(x));
-        bits.remove(new Integer(x));
-      }
+    secondaryImpl.foreachExcluding(X, x -> {
+      assert bits.contains(Integer.valueOf(x));
+      bits.remove(Integer.valueOf(x));
     });
     assert bits.isEmpty();
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/EmptyIntSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/EmptyIntSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/EmptyIntSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/EmptyIntSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,6 +15,7 @@
 
 public class EmptyIntSet implements IntSet {
 
+	private static final long serialVersionUID = 5116475799916663164L;
 	public static EmptyIntSet instance = new EmptyIntSet();
 	
 	@Override
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/FixedSizeBitVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/FixedSizeBitVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/FixedSizeBitVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/FixedSizeBitVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -79,7 +79,7 @@
       int shiftBits = bit & LOW_MASK;
       bits[subscript(bit)] |= (1 << shiftBits);
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid bit " + bit);
+      throw new IllegalArgumentException("invalid bit " + bit, e);
     }
   }
 
@@ -102,7 +102,7 @@
       int shiftBits = bit & LOW_MASK;
       bits[subscript(bit)] &= ~(1 << shiftBits);
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("invalid bit: " + bit);
+      throw new IllegalArgumentException("invalid bit: " + bit, e);
     }
   }
 
@@ -268,8 +268,8 @@
    */
   public int populationCount() {
     int count = 0;
-    for (int i = 0; i < bits.length; i++) {
-      count += Bits.populationCount(bits[i]);
+    for (int bit : bits) {
+      count += Bits.populationCount(bit);
     }
     return count;
   }
@@ -338,7 +338,7 @@
    */
   @Override
   public String toString() {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     boolean needSeparator = false;
     buffer.append('{');
     // int limit = length();
@@ -356,4 +356,4 @@
     buffer.append('}');
     return buffer.toString();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/IBinaryNaturalRelation.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/IBinaryNaturalRelation.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/IBinaryNaturalRelation.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/IBinaryNaturalRelation.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,7 +13,7 @@
 import com.ibm.wala.util.debug.VerboseAction;
 
 /**
- * a relation R(x,y) where x >= 0
+ * a relation R(x,y) where x &gt;= 0
  */
 public interface IBinaryNaturalRelation extends VerboseAction, Iterable<IntPair> {
   /**
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntegerUnionFind.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntegerUnionFind.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntegerUnionFind.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntegerUnionFind.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,8 @@
 package com.ibm.wala.util.intset;
 
 
+import java.util.Arrays;
+
 /**
  * An implementation of Tarjan's union-find, using path compression and balancing, for non-negative integers
  */
@@ -23,8 +25,8 @@
    * 
    * parent[i+1] =
    * <ul>
-   * <li>j > 0 if i is in the same equiv class as j
-   * <li>j <= 0 if i is the representative of a class of size -(j)+1
+   * <li>j &gt; 0 if i is in the same equiv class as j
+   * <li>j &lt;= 0 if i is the representative of a class of size -(j)+1
    * </ul>
    * 
    * we initialize parent[j] = 0, so each element is a class of size 1
@@ -84,13 +86,10 @@
   }
 
   private void grow(int size) {
-    int[] old = parent;
-    parent = new int[size + 1];
-    System.arraycopy(old, 0, parent, 0, old.length);
+    parent = Arrays.copyOf(parent, size + 1);
   }
 
   /**
-   * @param x
    * @return representative of x's equivalence class
    */
   public int find(int x) {
@@ -106,7 +105,6 @@
   }
 
   /**
-   * @param x
    * @return representative of x's equivalence class
    */
   private int findInternal(int x) {
@@ -130,4 +128,4 @@
     return parent.length - 1;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntPair.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntPair.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntPair.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntPair.java	2019-01-29 17:08:39.000000000 +0000
@@ -57,7 +57,7 @@
 
   @Override
   public String toString() {
-    return "[" + x + "," + y + "]";
+    return "[" + x + ',' + y + ']';
   }
 
   public static IntPair make(int x, int y) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -72,13 +72,13 @@
   public int max();
 
   /**
-   * @return true iff <code>this</code> has the same value as <code>that</code>.
+   * @return true iff {@code this} has the same value as {@code that}.
    */
   public boolean sameValue(IntSet that);
 
   /**
-   * @return true iff <code>this</code> is a subset of <code>that</code>.
+   * @return true iff {@code this} is a subset of {@code that}.
    */
   public boolean isSubset(IntSet that);
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSetUtil.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSetUtil.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSetUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntSetUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -29,8 +29,9 @@
     MutableIntSetFactory<?> defaultFactory = new MutableSharedBitVectorIntSetFactory();
     if (System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME) != null) {
       try {
-        Class<?> intSetFactoryClass = Class.forName(System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME));
-        MutableIntSetFactory<?> intSetFactory = (MutableIntSetFactory<?>) intSetFactoryClass.newInstance();
+        @SuppressWarnings("unchecked")
+        Class<? extends MutableIntSetFactory<?>> intSetFactoryClass = (Class<? extends MutableIntSetFactory<?>>) Class.forName(System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME));
+        MutableIntSetFactory<?> intSetFactory = intSetFactoryClass.newInstance();
         setDefaultIntSetFactory(intSetFactory);
       } catch (Exception e) {
         System.err.println(("Cannot use int set factory " + System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME)));
@@ -115,7 +116,7 @@
     // TODO: this is slow ... optimize please.
     MutableIntSet result = factory.makeCopy(A);
     if (DEBUG) {
-      System.err.println(("initial result " + result + " " + result.getClass()));
+      System.err.println(("initial result " + result + ' ' + result.getClass()));
     }
     for (IntIterator it = B.intIterator(); it.hasNext();) {
       int I = it.next();
@@ -196,7 +197,7 @@
       return -1;
     }
     if (low <= high && (low < 0 || high < 0)) {
-      throw new IllegalArgumentException("can't search negative indices " + low + " " + high);
+      throw new IllegalArgumentException("can't search negative indices " + low + ' ' + high);
     }
     if (high > data.length - 1) {
       high = data.length - 1;
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,7 +17,6 @@
 public interface LongSet {
 
   /**
-   * @param i
    * @return true iff this set contains long i
    */
   public boolean contains(long i);
@@ -51,13 +50,13 @@
   public long max();
 
   /**
-   * @return true iff <code>this</code> has the same value as
-   *         <code>that</code>.
+   * @return true iff {@code this} has the same value as
+   *         {@code that}.
    */
   public boolean sameValue(LongSet that);
 
   /**
-   * @return true iff <code>this</code> is a subset of <code>that</code>.
+   * @return true iff {@code this} is a subset of {@code that}.
    */
   public boolean isSubset(LongSet that);
 
@@ -68,16 +67,12 @@
 
   /**
    * Invoke an action on each element of the Set
-   * 
-   * @param action
    */
   public void foreach(LongSetAction action);
 
   /**
    * Invoke an action on each element of the Set, excluding elements of Set X
-   * 
-   * @param action
    */
   public void foreachExcluding(LongSet X, LongSetAction action);
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSetUtil.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSetUtil.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSetUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/LongSetUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -27,7 +27,7 @@
     if (System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME) != null) {
       try {
         Class<?> intSetFactoryClass = Class.forName(System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME));
-        MutableLongSetFactory intSetFactory = (MutableLongSetFactory) intSetFactoryClass.newInstance();
+        MutableLongSetFactory intSetFactory = (MutableLongSetFactory) intSetFactoryClass.getDeclaredConstructor().newInstance();
         setDefaultLongSetFactory(intSetFactory);
       } catch (Exception e) {
         System.err.println(("Cannot use int set factory " + System.getProperty(INT_SET_FACTORY_CONFIG_PROPERTY_NAME)));
@@ -48,7 +48,6 @@
   /**
    * This method constructs an appropriate mutable copy of set.
    * 
-   * @param set
    * @return a new MutableLongSet object with the same value as set
    * @throws UnimplementedError if (not ( set instanceof com.ibm.wala.util.intset.SparseLongSet ) ) and (not ( set instanceof
    *           com.ibm.wala.util.intset.BitVectorLongSet ) ) and (not ( set instanceof
@@ -87,7 +86,7 @@
     // TODO: this is slow ... optimize please.
     MutableLongSet result = factory.makeCopy(A);
     if (DEBUG) {
-      System.err.println(("initial result " + result + " " + result.getClass()));
+      System.err.println(("initial result " + result + ' ' + result.getClass()));
     }
     for (LongIterator it = B.longIterator(); it.hasNext();) {
       long I = it.next();
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MultiModalIntVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MultiModalIntVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MultiModalIntVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MultiModalIntVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -77,7 +77,6 @@
   /**
    * Will determine a dynamic growth factor that depends on the current size of the array
    * 
-   * @param size
    * @return the new growth factor
    */
 
@@ -207,8 +206,6 @@
 
   /**
    * make sure we can store to a particular index
-   * 
-   * @param capacity
    */
   private void ensureCapacity(int capacity, int value) {
     int length = getStoreLength();
@@ -220,27 +217,24 @@
         int[] old = intStore;
         // New array size
         int newSize = 1 + (int) (getGrowthFactor(length) * capacity) - byteStore.length - shortStore.length;
-        int[] newData = new int[newSize];
-        Arrays.fill(newData, defaultValue);
-        System.arraycopy(old, 0, newData, 0, old.length);
+        int[] newData = Arrays.copyOf(old, newSize);
+        Arrays.fill(newData, old.length, newSize, defaultValue);
         intStore = newData;
       }
     } else if (shortStore.length > 0 || NumberUtility.isShort(value)) {
       if (capacity >= length) {
         short[] old = shortStore;
         int newSize = 1 + (int) (getGrowthFactor(length) * capacity) - byteStore.length;
-        short[] newData = new short[newSize];
-        Arrays.fill(newData, (short) defaultValue);
-        System.arraycopy(old, 0, newData, 0, old.length);
+        short[] newData = Arrays.copyOf(old, newSize);
+        Arrays.fill(newData, old.length, newSize, (short) defaultValue);
         shortStore = newData;
       }
     } else {
       if (capacity >= length) {
         byte[] old = byteStore;
         int newSize = 1 + (int) (getGrowthFactor(length) * capacity);
-        byte[] newData = new byte[newSize];
-        Arrays.fill(newData, (byte) defaultValue);
-        System.arraycopy(old, 0, newData, 0, old.length);
+        byte[] newData = Arrays.copyOf(old, newSize);
+        Arrays.fill(newData, old.length, newSize, (byte) defaultValue);
         byteStore = newData;
       }
     }
@@ -252,17 +246,17 @@
   }
 
   public void print() {
-    String str = "";
-    for (int i = 0; i < byteStore.length; i++) {
-      str += byteStore[i] + ",";
+    final StringBuilder str = new StringBuilder();
+    for (byte element : byteStore) {
+      str.append(element).append(',');
     }
-    for (int i = 0; i < shortStore.length; i++) {
-      str += shortStore[i] + ",";
+    for (short element : shortStore) {
+      str.append(element).append(',');
     }
-    for (int i = 0; i < intStore.length; i++) {
-      str += intStore[i] + ",";
+    for (int element : intStore) {
+      str.append(element).append(',');
     }
     System.out.println(str);
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableIntSetFactory.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableIntSetFactory.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableIntSetFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableIntSetFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,19 +14,8 @@
  * An object that creates some flavor of mutable int set.
  */
 public interface MutableIntSetFactory<T extends MutableIntSet> {
-  /**
-  	* @param set
-  	*/
   public T make(int[] set);
-  /**
-  	* @param string
-  	*/
   public T parse(String string);
-  /**
-   * @param x
-   */
   public T makeCopy(IntSet x);
-  /**
-   */
   public T make();
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableMapping.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableMapping.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableMapping.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableMapping.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.util.intset;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -23,12 +24,14 @@
  */
 public class MutableMapping<T> implements OrdinalSetMapping<T>, Serializable {
 
+  private static final long serialVersionUID = 4011751404163534418L;
+
   private static final int INITIAL_CAPACITY = 20;
   
   private final static int MAX_SIZE = Integer.MAX_VALUE / 4;
   
   public static <T> MutableMapping<T> make() {
-    return new MutableMapping<T>();
+    return new MutableMapping<>();
   }
 
   private Object[] array;
@@ -67,7 +70,7 @@
     try {
       return (T) array[n];
     } catch (ArrayIndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("n out of range " + n);
+      throw new IllegalArgumentException("n out of range " + n, e);
     }
   }
 
@@ -98,11 +101,9 @@
     if (I != null) {
       return I.intValue();
     }
-    map.put(o, new Integer(nextIndex));
+    map.put(o, nextIndex);
     if (nextIndex >= array.length) {
-      Object[] old = array;
-      array = new Object[2 * array.length];
-      System.arraycopy(old, 0, array, 0, old.length);
+      array = Arrays.copyOf(array, 2 * array.length);
     }
     int result = nextIndex++;
     array[result] = o;
@@ -111,9 +112,9 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     for (int i = 0; i < nextIndex; i++) {
-      result.append(i).append("  ").append(array[i]).append("\n");
+      result.append(i).append("  ").append(array[i]).append('\n');
     }
     return result.toString();
   }
@@ -130,12 +131,9 @@
    * @see com.ibm.wala.util.intset.OrdinalSetMapping#makeSingleton(int)
    */
   public OrdinalSet<T> makeSingleton(int i) {
-    return new OrdinalSet<T>(SparseIntSet.singleton(i), this);
+    return new OrdinalSet<>(SparseIntSet.singleton(i), this);
   }
 
-  /**
-   * @param n
-   */
   public void deleteMappedObject(T n) {
     int index = getMappedIndex(n);
     if (index != -1) {
@@ -157,7 +155,7 @@
       throw new IllegalArgumentException("first element does not exist in map");
     }
     map.remove(a);
-    map.put(b, new Integer(i));
+    map.put(b, i);
     array[i] = b;
   }
 
@@ -172,9 +170,7 @@
     Integer I = Integer.valueOf(i);
     map.put(o, I);
     if (i >= array.length) {
-      Object[] old = array;
-      array = new Object[2 * i];
-      System.arraycopy(old, 0, array, 0, old.length);
+      array = Arrays.copyOf(array, 2 * i);
     }
     array[i] = o;
     nextIndex = Math.max(nextIndex, i + 1);
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSharedBitVectorIntSetFactory.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSharedBitVectorIntSetFactory.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSharedBitVectorIntSetFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSharedBitVectorIntSetFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -70,4 +70,4 @@
     return new MutableSharedBitVectorIntSet();
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSharedBitVectorIntSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSharedBitVectorIntSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSharedBitVectorIntSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSharedBitVectorIntSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,6 +20,8 @@
  */
 public class MutableSharedBitVectorIntSet implements MutableIntSet {
 
+  private static final long serialVersionUID = -6630888692508092370L;
+
   private final static boolean DEBUG = false;
 
   private final static boolean PARANOID = false;
@@ -37,7 +39,6 @@
   }
 
   /**
-   * @param set
    * @throws IllegalArgumentException if set is null
    */
   public MutableSharedBitVectorIntSet(MutableSharedBitVectorIntSet set) {
@@ -51,7 +52,6 @@
   }
 
   /**
-   * @param s
    * @throws IllegalArgumentException if s is null
    */
   public MutableSharedBitVectorIntSet(SparseIntSet s) {
@@ -70,7 +70,6 @@
   }
 
   /**
-   * @param s
    * @throws IllegalArgumentException if s is null
    */
   public MutableSharedBitVectorIntSet(BitVectorIntSet s) {
@@ -84,9 +83,6 @@
     }
   }
 
-  /**
-   * @param s
-   */
   private void copyValue(BitVectorIntSet s) {
     if (s.size() == 0) {
       sharedPart = null;
@@ -651,9 +647,6 @@
     }
   }
 
-  /**
-   * @param set
-   */
   private boolean addAllInternal(BitVectorIntSet set) {
     // should have hijacked this case before getting here!
     assert sharedPart != set;
@@ -669,9 +662,6 @@
     return result;
   }
 
-  /**
-   * @param set
-   */
   private boolean addAllInternal(SparseIntSet set) {
     if (privatePart == null) {
       if (sharedPart == null) {
@@ -710,9 +700,6 @@
     }
   }
 
-  /**
-   * @param set
-   */
   private boolean addAll(MutableSharedBitVectorIntSet set) {
     if (set.isEmpty()) {
       return false;
@@ -874,9 +861,6 @@
     }
   }
 
-  /**
-   * @param set
-   */
   private void intersectWithInternal(MutableSharedBitVectorIntSet set) {
 
     if (sharedPart != null) {
@@ -1069,10 +1053,6 @@
     }
   }
 
-  /**
-   * @param other
-   * @param filter
-   */
   private boolean addAllInIntersectionInternal(SparseIntSet other, IntSet filter) {
     if (sharedPart == null) {
       if (privatePart == null) {
@@ -1112,4 +1092,4 @@
     privatePart = null;
     sharedPart = null;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseIntSetFactory.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseIntSetFactory.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseIntSetFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseIntSetFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.util.intset;
 
-import java.util.Iterator;
 import java.util.TreeSet;
 
 /**
@@ -30,14 +29,13 @@
       return MutableSparseIntSet.makeEmpty();
     } else {
       // XXX not very efficient.
-      TreeSet<Integer> T = new TreeSet<Integer>();
-      for (int i = 0; i < set.length; i++) {
-        T.add(new Integer(set[i]));
+      TreeSet<Integer> T = new TreeSet<>();
+      for (int element : set) {
+        T.add(element);
       }
       int[] copy = new int[T.size()];
       int i = 0;
-      for (Iterator<Integer> it = T.iterator(); it.hasNext();) {
-        Integer I = it.next();
+      for (Integer I : T) {
         copy[i++] = I.intValue();
       }
       MutableSparseIntSet result = new MutableSparseIntSet(copy);
@@ -45,9 +43,6 @@
     }
   }
 
-  /**
-   * @param string
-   */
   @Override
   public MutableSparseIntSet parse(String string) throws NumberFormatException {
     int[] backingStore = SparseIntSet.parseIntArray(string);
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseIntSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseIntSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseIntSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseIntSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.util.intset;
 
-import java.io.Serializable;
-
 import com.ibm.wala.util.debug.Assertions;
 
 /**
@@ -23,7 +21,9 @@
  * TODO: even for small sets, we probably want to work on this to reduce the
  * allocation activity.
  */
-public class MutableSparseIntSet extends SparseIntSet implements MutableIntSet, Serializable {
+public class MutableSparseIntSet extends SparseIntSet implements MutableIntSet {
+
+	private static final long serialVersionUID = 1479453398189400698L;
 
 	/**
 	 * If forced to grow the backing array .. then by how much
@@ -118,7 +118,6 @@
 	}
 
 	/**
-	 * @param value
 	 * @return true iff this value changes
 	 */
 	@Override
@@ -193,9 +192,7 @@
 				// SJF: clone is performance problem. don't use it.
 				// elements = set.elements.clone();
 				elements = new int[set.elements.length];
-				for (int i = 0; i < set.size; i++) {
-					elements[i] = set.elements[i];
-				}
+				System.arraycopy(set.elements, 0, elements, 0, set.size);
 				size = set.size;
 			} else {
 				elements = null;
@@ -325,13 +322,10 @@
 			return addAll((SparseIntSet) set);
 		} else {
 			int oldSize = size;
-			set.foreach(new IntSetAction() {
-				@Override
-        public void act(int i) {
-					if (!contains(i))
-						add(i);
-				}
-			});
+			set.foreach(i -> {
+      	if (!contains(i))
+      		add(i);
+      });
 
 			if (DEBUG_LARGE && size() > TRAP_SIZE) {
 				Assertions.UNREACHABLE();
@@ -344,7 +338,6 @@
 	/**
 	 * Add all elements from another int set.
 	 * 
-	 * @param that
 	 * @return true iff this set changes
 	 */
 	public boolean addAll(SparseIntSet that) {
@@ -466,7 +459,6 @@
 	/**
 	 * TODO optimize
 	 * 
-	 * @param set
 	 * @throws IllegalArgumentException
 	 *             if set is null
 	 */
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseLongSetFactory.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseLongSetFactory.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseLongSetFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseLongSetFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.util.intset;
 
-import java.util.Iterator;
 import java.util.TreeSet;
 
 /**
@@ -19,7 +18,6 @@
 public class MutableSparseLongSetFactory implements MutableLongSetFactory {
 
   /**
-   * @param set
    * @throws IllegalArgumentException  if set is null
    */
   @Override
@@ -31,14 +29,13 @@
       return new MutableSparseLongSet();
     } else {
       // XXX not very efficient.
-      TreeSet<Long> T = new TreeSet<Long>();
-      for (int i = 0; i < set.length; i++) {
-        T.add(Long.valueOf(set[i]));
+      TreeSet<Long> T = new TreeSet<>();
+      for (long element : set) {
+        T.add(Long.valueOf(element));
       }
       long[] copy = new long[T.size()];
       int i = 0;
-      for (Iterator<Long> it = T.iterator(); it.hasNext();) {
-        Long I = it.next();
+      for (Long I : T) {
         copy[i++] = I.longValue();
       }
       MutableSparseLongSet result = new MutableSparseLongSet(copy);
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseLongSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseLongSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseLongSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/MutableSparseLongSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -96,7 +96,6 @@
   }
 
   /**
-   * @param value
    * @return true iff this value changes
    */
   @Override
@@ -277,7 +276,6 @@
   /**
    * Add all elements from another int set.
    * 
-   * @param that
    * @return true iff this set changes
    */
   public boolean addAll(SparseLongSet that) {
@@ -365,4 +363,4 @@
     size = ci;
     return (al != size);
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/OffsetBitVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/OffsetBitVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/OffsetBitVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/OffsetBitVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,9 +14,10 @@
  */
 public final class OffsetBitVector extends BitVectorBase<OffsetBitVector> {
 
+  private static final long serialVersionUID = -5846568678514886375L;
   int offset;
 
-  private int wordDiff(int offset1, int offset2) {
+  private static int wordDiff(int offset1, int offset2) {
     return (offset1 > offset2) ? (offset1 - offset2) >> LOG_BITS_PER_UNIT : -((offset2 - offset1) >> LOG_BITS_PER_UNIT);
   }
 
@@ -28,9 +29,7 @@
 
     int[] oldbits = bits;
     bits = new int[subscript(newCapacity) + 1];
-    for (int i = 0; i < oldbits.length; i++) {
-      bits[i - wordDiff] = oldbits[i];
-    }
+    System.arraycopy(oldbits, 0, bits, 0 - wordDiff, oldbits.length);
     offset = newOffset;
   }
 
@@ -72,13 +71,12 @@
       throw new IllegalArgumentException("s is null");
     }
     offset = s.offset;
-    bits = new int[s.bits.length];
-    System.arraycopy(s.bits, 0, bits, 0, s.bits.length);
+    bits = s.bits.clone();
   }
 
   @Override
   public String toString() {
-    return super.toString() + "(offset:" + offset + ")";
+    return super.toString() + "(offset:" + offset + ')';
   }
 
   void growCapacity(float fraction) {
@@ -171,8 +169,7 @@
   }
 
   /**
-   * @param start
-   * @return min j >= start s.t get(j)
+   * @return min j &gt;= start s.t get(j)
    */
   @Override
   public int nextSetBit(int start) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/OffsetOrdinalSetMapping.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/OffsetOrdinalSetMapping.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/OffsetOrdinalSetMapping.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/OffsetOrdinalSetMapping.java	2019-01-29 17:08:39.000000000 +0000
@@ -41,12 +41,12 @@
     if (delegate == null) {
       throw new IllegalArgumentException("null delegate");
     }
-    return new OffsetOrdinalSetMapping<T>(delegate, offset);
+    return new OffsetOrdinalSetMapping<>(delegate, offset);
   }
 
   public static <T> OffsetOrdinalSetMapping<T> make(int offset) {
     MutableMapping<T> m = MutableMapping.make();
-    return new OffsetOrdinalSetMapping<T>(m, offset);
+    return new OffsetOrdinalSetMapping<>(m, offset);
   }
 
   @Override
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/OrdinalSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/OrdinalSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/OrdinalSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/OrdinalSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -29,7 +29,6 @@
   @SuppressWarnings("rawtypes")
   private final static OrdinalSet EMPTY = new OrdinalSet();
 
-  @SuppressWarnings("unchecked")
   public static <T> OrdinalSet<T> empty() {
     return EMPTY;
   }
@@ -97,10 +96,10 @@
       assert A.mapping.equals(B.mapping);
     }
     if (A.S == null || B.S == null) {
-      return new OrdinalSet<T>(null, A.mapping);
+      return new OrdinalSet<>(null, A.mapping);
     }
     IntSet isect = A.S.intersection(B.S);
-    return new OrdinalSet<T>(isect, A.mapping);
+    return new OrdinalSet<>(isect, A.mapping);
   }
 
   /**
@@ -110,8 +109,9 @@
     if ((a == null && b == null) || a == b || (a.mapping == b.mapping && a.S == b.S)) {
       return true;
     }
-    
-    if (a != null && b != null && a.size() == b.size()) {
+
+    assert a != null && b != null;
+    if (a.size() == b.size()) {
       if (a.mapping == b.mapping || (a.mapping != null && b.mapping != null && a.mapping.equals(b.mapping))) {
         return a.S == b.S || (a.S != null && b.S != null && a.S.sameValue(b.S));
       }
@@ -140,13 +140,13 @@
     }
 
     if (A.S == null) {
-      return (B.S == null) ? OrdinalSet.<T> empty() : new OrdinalSet<T>(B.S, B.mapping);
+      return (B.S == null) ? OrdinalSet.<T> empty() : new OrdinalSet<>(B.S, B.mapping);
     } else if (B.S == null) {
-      return new OrdinalSet<T>(A.S, A.mapping);
+      return new OrdinalSet<>(A.S, A.mapping);
     }
 
     IntSet union = A.S.union(B.S);
-    return new OrdinalSet<T>(union, A.mapping);
+    return new OrdinalSet<>(union, A.mapping);
   }
 
   @Override
@@ -203,16 +203,16 @@
       throw new IllegalArgumentException("m is null");
     }
     MutableSparseIntSet s = MutableSparseIntSet.makeEmpty();
-    for (Iterator<T> it = c.iterator(); it.hasNext();) {
-      int index = m.getMappedIndex(it.next());
+    for (T t : c) {
+      int index = m.getMappedIndex(t);
       assert index >= 0;
       s.add(index);
     }
-    return new OrdinalSet<T>(s, m);
+    return new OrdinalSet<>(s, m);
   }
 
   public OrdinalSetMapping<T> getMapping() {
     return mapping;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SemiSparseMutableIntSetFactory.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SemiSparseMutableIntSetFactory.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SemiSparseMutableIntSetFactory.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SemiSparseMutableIntSetFactory.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.util.intset;
 
-import java.util.Iterator;
 import java.util.TreeSet;
 
 /**
@@ -18,7 +17,6 @@
 public class SemiSparseMutableIntSetFactory implements MutableIntSetFactory<SemiSparseMutableIntSet> {
 
   /**
-   * @param set
    * @throws IllegalArgumentException  if set is null
    */
   @Override
@@ -30,28 +28,24 @@
       return make();
     } else {
       // XXX not very efficient.
-      TreeSet<Integer> T = new TreeSet<Integer>();
-      for (int i = 0; i < set.length; i++) {
-        T.add(Integer.valueOf(set[i]));
+      TreeSet<Integer> T = new TreeSet<>();
+      for (int element : set) {
+        T.add(Integer.valueOf(element));
       }
       SemiSparseMutableIntSet result = new SemiSparseMutableIntSet();
-      for (Iterator<Integer> it = T.iterator(); it.hasNext();) {
-        Integer I = it.next();
+      for (Integer I : T) {
         result.add(I.intValue());
       }
       return result;
     }
   }
 
-  /**
-   * @param string
-   */
   @Override
   public SemiSparseMutableIntSet parse(String string) throws NumberFormatException {
     int[] data = SparseIntSet.parseIntArray(string);
     SemiSparseMutableIntSet result = new SemiSparseMutableIntSet();
-    for (int i = 0; i < data.length; i++)
-      result.add(data[i]);
+    for (int element : data)
+      result.add(element);
     return result;
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SemiSparseMutableIntSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SemiSparseMutableIntSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SemiSparseMutableIntSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SemiSparseMutableIntSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,6 +14,8 @@
 import com.ibm.wala.util.collections.EmptyIntIterator;
 
 public class SemiSparseMutableIntSet implements MutableIntSet {
+  private static final long serialVersionUID = 8647721176321526013L;
+
   private static final boolean DEBUG = true;
 
   private static final double FIX_SPARSE_MOD = 12;
@@ -234,7 +236,6 @@
   }
   
   /**
-   * @param i
    * @return true iff this set contains integer i
    */
   @Override
@@ -339,7 +340,6 @@
         return next;
       }
     }
-    ;
 
     if (sparsePart.isEmpty()) {
       if (densePart == null || densePart.isZero()) {
@@ -374,8 +374,6 @@
 
   /**
    * Invoke an action on each element of the Set, excluding elements of Set X
-   * 
-   * @param action
    */
   @Override
   public void foreachExcluding(IntSet X, IntSetAction action) {
@@ -402,7 +400,7 @@
   }
 
   /**
-   * @return true iff <code>this</code> has the same value as <code>that</code>.
+   * @return true iff {@code this} has the same value as {@code that}.
    * @throws IllegalArgumentException if that is null
    */
   @Override
@@ -429,7 +427,7 @@
   }
 
   /**
-   * @return true iff <code>this</code> is a subset of <code>that</code>.
+   * @return true iff {@code this} is a subset of {@code that}.
    * @throws IllegalArgumentException if that is null
    */
   @Override
@@ -615,8 +613,6 @@
 
   /**
    * Interset this with another set.
-   * 
-   * @param set
    */
   @Override
   public void intersectWith(IntSet set) {
@@ -654,11 +650,11 @@
 
   @Override
   public String toString() {
-    StringBuffer sb = new StringBuffer("[");
+    StringBuilder sb = new StringBuilder("[");
     if (densePart != null) {
-      sb.append("densePart: ").append(densePart.toString()).append(" ");
+      sb.append("densePart: ").append(densePart.toString()).append(' ');
     }
-    sb.append("sparsePart: ").append(sparsePart.toString()).append("]");
+    sb.append("sparsePart: ").append(sparsePart.toString()).append(']');
     return sb.toString();
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SimpleIntVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SimpleIntVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SimpleIntVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SimpleIntVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,6 +18,8 @@
  */
 public class SimpleIntVector implements IntVector, Serializable {
   
+  private static final long serialVersionUID = -7909547846468543777L;
+
   private final static int MAX_SIZE = Integer.MAX_VALUE / 4;
 
   private final static float GROWTH_FACTOR = 1.5f;
@@ -94,15 +96,12 @@
 
   /**
    * make sure we can store to a particular index
-   * 
-   * @param capacity
    */
   private void ensureCapacity(int capacity) {
     if (capacity >= store.length) {
       int[] old = store;
-      store = new int[1 + (int) (getGrowthFactor() * capacity)];
-      Arrays.fill(store, defaultValue);
-      System.arraycopy(old, 0, store, 0, old.length);
+      store = Arrays.copyOf(old, 1 + (int) (getGrowthFactor() * capacity));
+      Arrays.fill(store, old.length, store.length, defaultValue);
     }
   }
 
@@ -119,8 +118,8 @@
    */
   private double computeOccupancy() {
     int count1 = 0;
-    for (int i = 0; i < store.length; i++) {
-      if (store[i] != -1) {
+    for (int element : store) {
+      if (element != -1) {
         count1++;
       }
     }
@@ -133,4 +132,4 @@
     return maxIndex;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseIntSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseIntSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseIntSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseIntSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.util.intset;
 
-import java.io.Serializable;
-import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
@@ -22,7 +20,9 @@
 /**
  * A sparse ordered, duplicate-free, fully-encapsulated set of integers; not necessary mutable
  */
-public class SparseIntSet implements IntSet, Serializable {
+public class SparseIntSet implements IntSet {
+
+  private static final long serialVersionUID = 2394141733718319022L;
 
   private final static int SINGLETON_CACHE_SIZE = 5000;
 
@@ -106,8 +106,7 @@
 
   /**
    * Does this set contain value x?
-   * 
-   * @see com.ibm.wala.util.intset.IntSet#contains(int)
+   *
    */
   @Override
   public final boolean contains(int x) {
@@ -180,9 +179,9 @@
   }
 
   /**
-   * @return true iff <code>this</code> is a subset of <code>that</code>.
+   * @return true iff {@code this} is a subset of {@code that}.
    * 
-   * Faster than: <code>this.diff(that) == EMPTY</code>.
+   * Faster than: {@code this.diff(that) == EMPTY}.
    */
   private boolean isSubsetInternal(SparseIntSet that) {
 
@@ -289,20 +288,20 @@
 
   @Override
   public String toString() {
-    StringBuffer sb = new StringBuffer(6 * size);
+    StringBuilder sb = new StringBuilder(6 * size);
     sb.append("{ ");
     if (elements != null) {
       for (int ii = 0; ii < size; ii++) {
         sb.append(elements[ii]);
-        sb.append(" ");
+        sb.append(' ');
       }
     }
-    sb.append("}");
+    sb.append('}');
     return sb.toString();
   }
 
   /**
-   * Reverse of toString(): "{2,3}" -> [2,3]
+   * Reverse of toString(): "{2,3}" -&gt; [2,3]
    * @throws IllegalArgumentException if str is null
    */
   public static int[] parseIntArray(String str)  {
@@ -317,14 +316,13 @@
     StringTokenizer tok = new StringTokenizer(str, " ,");
 
     // XXX not very efficient:
-    TreeSet<Integer> set = new TreeSet<Integer>();
+    TreeSet<Integer> set = new TreeSet<>();
     while (tok.hasMoreTokens()) {
       set.add(Integer.decode(tok.nextToken()));
     }
     int[] result = new int[set.size()];
     int i = 0;
-    for (Iterator<Integer> it = set.iterator(); it.hasNext();) {
-      Integer I = it.next();
+    for (Integer I : set) {
       result[i++] = I.intValue();
     }
     return result;
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseIntVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseIntVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseIntVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseIntVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,7 @@
 package com.ibm.wala.util.intset;
 
 import java.io.Serializable;
+import java.util.Arrays;
 
 
 /**
@@ -22,6 +23,7 @@
  */
 public class SparseIntVector implements IntVector, Serializable {
 
+  private static final long serialVersionUID = -2428993854689991888L;
   private final static int INITIAL_SIZE = 5;
   private final double EXPANSION = 1.5;
   int maxIndex = -1;
@@ -73,9 +75,7 @@
 
   private void ensureCapacity(int capacity) {
     if (data.length  < capacity + 1) {
-      int[] old = data;
-      data = new int[1 + (int) (capacity * EXPANSION)];
-      System.arraycopy(old, 0, data, 0, old.length);
+      data = Arrays.copyOf(data, 1 + (int) (capacity * EXPANSION));
     }
   }
 
@@ -93,4 +93,4 @@
   public int getMaxIndex() {
     return maxIndex;
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseLongIntVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseLongIntVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseLongIntVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseLongIntVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,6 +11,8 @@
 package com.ibm.wala.util.intset;
 
 
+import java.util.Arrays;
+
 /**
  * an int vector implementation designed for low occupancy. Note that get() from
  * this vector is a binary search.
@@ -71,9 +73,7 @@
 
   private void ensureCapacity(int capacity) {
     if (data.length < capacity + 1) {
-      int[] old = data;
-      data = new int[1 + (int) (capacity * EXPANSION)];
-      System.arraycopy(old, 0, data, 0, old.length);
+      data = Arrays.copyOf(data, 1 + (int) (capacity * EXPANSION));
     }
   }
 
@@ -86,4 +86,4 @@
     System.err.println(("indices.size() " + indices.size()));
 
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseLongSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseLongSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseLongSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/SparseLongSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package com.ibm.wala.util.intset;
 
-import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
@@ -45,13 +44,12 @@
    */
   protected int size = 0;
 
-  /*****************************************************************************
-   * * * Constructors & Factories *
-   ****************************************************************************/
+  /////////////////////////////////////////////////////////////////////////////
+  //
+  //  Constructors & Factories
+  //
+  /////////////////////////////////////////////////////////////////////////////
 
-  /**
-   * @param size
-   */
   protected SparseLongSet(int size) {
     elements = new long[size];
     this.size = size;
@@ -59,8 +57,6 @@
 
   /**
    * Subclasses should use this with extreme care. Do not allow the backing array to escape elsewhere.
-   * 
-   * @param backingArray
    */
   protected SparseLongSet(long[] backingArray) {
     if (backingArray == null) {
@@ -82,9 +78,6 @@
     cloneState(S);
   }
 
-  /**
-   * @param S
-   */
   private void cloneState(SparseLongSet S) {
     elements = S.elements.clone();
     this.size = S.size;
@@ -124,7 +117,6 @@
   }
 
   /**
-   * @param x
    * @return index i s.t. elements[i] == x, or -1 if not found.
    */
   public final int getIndex(long x) {
@@ -178,9 +170,9 @@
   }
 
   /**
-   * @return true iff <code>this</code> is a subset of <code>that</code>.
+   * @return true iff {@code this} is a subset of {@code that}.
    * 
-   *         Faster than: <code>this.diff(that) == EMPTY</code>.
+   *         Faster than: {@code this.diff(that) == EMPTY}.
    */
   private boolean isSubsetInternal(SparseLongSet that) {
 
@@ -285,20 +277,20 @@
 
   @Override
   public String toString() {
-    StringBuffer sb = new StringBuffer(6 * size);
+    StringBuilder sb = new StringBuilder(6 * size);
     sb.append("{ ");
     if (elements != null) {
       for (int ii = 0; ii < size; ii++) {
         sb.append(elements[ii]);
-        sb.append(" ");
+        sb.append(' ');
       }
     }
-    sb.append("}");
+    sb.append('}');
     return sb.toString();
   }
 
   /**
-   * Reverse of toString(): "{2,3}" -> [2,3]
+   * Reverse of toString(): "{2,3}" -&gt; [2,3]
    * 
    * @throws IllegalArgumentException if str is null
    */
@@ -317,14 +309,13 @@
     StringTokenizer tok = new StringTokenizer(str, " ,");
 
     // XXX not very efficient:
-    TreeSet<Long> set = new TreeSet<Long>();
+    TreeSet<Long> set = new TreeSet<>();
     while (tok.hasMoreTokens()) {
       set.add(Long.decode(tok.nextToken()));
     }
     long[] result = new long[set.size()];
     int i = 0;
-    for (Iterator<Long> it = set.iterator(); it.hasNext();) {
-      Long L = it.next();
+    for (Long L : set) {
       result[i++] = L.longValue();
     }
     return result;
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/TunedMutableSparseIntSet.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/TunedMutableSparseIntSet.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/TunedMutableSparseIntSet.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/TunedMutableSparseIntSet.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,6 +18,8 @@
  */
 public class TunedMutableSparseIntSet extends MutableSparseIntSet {
 
+  private static final long serialVersionUID = -1559172158241923881L;
+
   private final int initialSize;
 
   private final float expansion;
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/TunedSimpleIntVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/TunedSimpleIntVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/TunedSimpleIntVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/TunedSimpleIntVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,6 +15,8 @@
  */
 public class TunedSimpleIntVector extends SimpleIntVector {
 
+  private static final long serialVersionUID = -1380867351543398351L;
+
   private final int initialSize;
 
   private final float expansion;
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/TwoLevelIntVector.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/TwoLevelIntVector.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/intset/TwoLevelIntVector.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/intset/TwoLevelIntVector.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,6 +20,8 @@
  */
 public class TwoLevelIntVector implements IntVector, Serializable {
 
+  private static final long serialVersionUID = -7383053435395846217L;
+
   private static final int PAGE_SIZE = 4096;
 
   private static final int LOG_PAGE_SIZE = Logs.log2(PAGE_SIZE);
@@ -29,7 +31,7 @@
   /**
    * Array of IntVector: data.get(i) holds data[i*PAGE_SIZE] ... data[(i+1)*PAGESIZE - 1]
    */
-  final private Vector<SparseIntVector> data = new Vector<SparseIntVector>();
+  final private Vector<SparseIntVector> data = new Vector<>();
 
   private final int defaultValue;
 
@@ -54,15 +56,15 @@
     return v.get(localX);
   }
 
-  private int toLocalIndex(int x, int page) {
+  private static int toLocalIndex(int x, int page) {
     return x - getFirstIndexOnPage(page);
   }
 
-  private int getFirstIndexOnPage(int page) {
+  private static int getFirstIndexOnPage(int page) {
     return page << LOG_PAGE_SIZE;
   }
 
-  private int getPageNumber(int x) {
+  private static int getPageNumber(int x) {
     return x >> LOG_PAGE_SIZE;
   }
 
@@ -109,4 +111,4 @@
     return maxIndex;
   }
 
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/io/FileUtil.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/io/FileUtil.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/io/FileUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/io/FileUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -11,22 +11,23 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Writer;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.HashSetFactory;
-import com.ibm.wala.util.functions.VoidFunction;
 
 /**
  * Simple utilities for accessing files.
@@ -59,12 +60,12 @@
       return Collections.emptyList();
     }
     HashSet<File> result = HashSetFactory.make();
-    for (int i = 0; i < files.length; i++) {
-      if (p == null || p.matcher(files[i].getAbsolutePath()).matches()) {
-        result.add(files[i]);
+    for (File file : files) {
+      if (p == null || p.matcher(file.getAbsolutePath()).matches()) {
+        result.add(file);
       }
-      if (recurse && files[i].isDirectory()) {
-        result.addAll(listFiles(files[i], recurse, p));
+      if (recurse && file.isDirectory()) {
+        result.addAll(listFiles(file, recurse, p));
       }
     }
     return result;
@@ -84,27 +85,15 @@
     if (destFileName == null) {
       throw new IllegalArgumentException("destFileName is null");
     }
-    FileChannel src = null;
-    FileChannel dest = null;
-    try {
-      src = new FileInputStream(srcFileName).getChannel();
-      dest = new FileOutputStream(destFileName).getChannel();
+    try (
+      final FileInputStream srcStream = new FileInputStream(srcFileName);
+      final FileOutputStream dstStream = new FileOutputStream(destFileName);
+      final FileChannel src = srcStream.getChannel();
+      final FileChannel dest = dstStream.getChannel();
+    ) {
       long n = src.size();
       MappedByteBuffer buf = src.map(FileChannel.MapMode.READ_ONLY, 0, n);
       dest.write(buf);
-    } finally {
-      if (dest != null) {
-        try {
-          dest.close();
-        } catch (IOException e1) {
-        }
-      }
-      if (src != null) {
-        try {
-          src.close();
-        } catch (IOException e1) {
-        }
-      }
     }
   }
 
@@ -168,50 +157,39 @@
 
   /**
    * read fully the contents of s and return a byte array holding the result
-   * 
-   * @throws IOException
    */
   public static byte[] readBytes(InputStream s) throws IOException {
     if (s == null) {
       throw new IllegalArgumentException("null s");
     }
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    byte[] b = new byte[1024];
-    int n = s.read(b);
-    while (n != -1) {
-      out.write(b, 0, n);
-      n = s.read(b);
-    }
-    byte[] bb = out.toByteArray();
-    out.close();
-    return bb;
+    try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+      byte[] b = new byte[1024];
+      int n = s.read(b);
+      while (n != -1) {
+        out.write(b, 0, n);
+        n = s.read(b);
+      }
+      byte[] bb = out.toByteArray();
+      return bb;
+    }
   }
 
   /**
    * write string s into file f
-   * 
-   * @param f
-   * @param content
-   * @throws IOException
    */
   public static void writeFile(File f, String content) throws IOException {
-    final FileWriter fw = new FileWriter(f);
-    fw.append(content);
-    fw.close();
+    try (final Writer fw = Files.newBufferedWriter(f.toPath(), StandardCharsets.UTF_8)) {
+      fw.append(content);
+    }
   }
 
-  public static void recurseFiles(VoidFunction<File> action, final Predicate<File> filter, File top) {
+  public static void recurseFiles(Consumer<File> action, final Predicate<File> filter, File top) {
   	if (top.isDirectory()) {
-  		for(File f : top.listFiles(new FileFilter() {
-  			@Override
-  			public boolean accept(File file) {
-  				return filter.test(file) || file.isDirectory();
-  			}	
-  		})) {
+  		for(File f : top.listFiles(file -> filter.test(file) || file.isDirectory())) {
   			recurseFiles(action, filter, f);
   		}
   	} else {
-  		action.apply(top);
+  		action.accept(top);
   	}
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/io/JavaHome.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/io/JavaHome.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/io/JavaHome.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/io/JavaHome.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,9 @@
+package com.ibm.wala.util.io;
+
+public class JavaHome {
+
+  public static void main(String[] args) {
+    System.err.println(System.getProperty("java.home"));
+  }
+  
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/io/RtJar.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/io/RtJar.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/io/RtJar.java	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/io/RtJar.java	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,50 @@
+package com.ibm.wala.util.io;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.jar.JarFile;
+
+import com.ibm.wala.util.PlatformUtil;
+import com.ibm.wala.util.collections.ArrayIterator;
+import com.ibm.wala.util.collections.FilterIterator;
+import com.ibm.wala.util.collections.MapIterator;
+
+public class RtJar {
+
+  public static JarFile getRtJar(Iterator<JarFile> x) {
+    while (x.hasNext()) {
+      JarFile JF = x.next();
+      if (JF.getName().endsWith(File.separator + "rt.jar")) {
+        return JF;
+      }
+      if (JF.getName().endsWith(File.separator + "core.jar")) {
+        return JF;
+      }
+      // hack for Mac
+      if (PlatformUtil.onMacOSX() && JF.getName().endsWith(File.separator + "classes.jar")) {
+        return JF;
+      }
+    }
+    
+    return null;
+  }
+
+  public static void main(String[] args) {
+    @SuppressWarnings("resource")
+    JarFile rt = getRtJar(new MapIterator<>(
+        new FilterIterator<>(
+            new ArrayIterator<>(System.getProperty("sun.boot.class.path").split(File.pathSeparator)),
+            t -> t.endsWith(".jar")),
+        object -> {
+          try {
+            return new JarFile(object);
+          } catch (IOException e) {
+            assert false : e.toString();
+            return null;
+          }
+        }));
+    
+    System.err.println(rt.getName());
+  }
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/io/Streams.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/io/Streams.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/io/Streams.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/io/Streams.java	2019-01-29 17:08:39.000000000 +0000
@@ -20,7 +20,6 @@
 public class Streams {
 
   /**
-   * @param in
    * @return byte[] holding the contents of the stream
    * @throws IllegalArgumentException  if in == null
    */
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/io/TemporaryFile.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/io/TemporaryFile.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/io/TemporaryFile.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/io/TemporaryFile.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,25 +15,23 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 
 public class TemporaryFile {
 
-  private final static String outputDir;
-
-  static {
-    String dir = System.getProperty("java.io.tmpdir");
-
-    while (dir.endsWith(File.separator))
-      dir = dir.substring(0, dir.length()-1);
-      
-    dir = dir + File.separator;
-    
-    outputDir = dir;
-  }
+  private static Path outputDir;
 
   public static File urlToFile(String fileName, URL input) throws IOException {
-    File F = new File(outputDir + File.separator + fileName);
-    return urlToFile(F , input);
+    if (input == null) {
+      throw new NullPointerException("input == null");
+    }
+    if (outputDir == null) {
+      outputDir = Files.createTempDirectory("wala");      
+    }
+    Path filePath = outputDir.resolve(fileName);
+    return urlToFile(filePath.toFile(), input);
   }
 
   public static File urlToFile(File F, URL input) throws IOException {
@@ -41,18 +39,28 @@
   }
   
   public static File streamToFile(File F, InputStream... inputs) throws IOException {
-    FileOutputStream output = new FileOutputStream(F);
-    
-    int read;
-    byte[] buffer = new byte[ 1024 ];
-    for(InputStream input : inputs) {
-      while ( (read = input.read(buffer)) != -1 ) {
-        output.write(buffer, 0, read);
+    try (final FileOutputStream output = new FileOutputStream(F)) {
+      
+      int read;
+      byte[] buffer = new byte[ 1024 ];
+      for(InputStream input : inputs) {
+        while ( (read = input.read(buffer)) != -1 ) {
+          output.write(buffer, 0, read);
+        }
+        input.close();
       }
-      input.close();
     }
-    
-    output.close();
+    return F;
+  }
+  
+  public static File stringToFile(File F, String... inputs) throws IOException {
+    try (final FileOutputStream output = new FileOutputStream(F)) {
+
+      for(String input : inputs) {
+        output.write(input.getBytes(StandardCharsets.UTF_8));
+      }
+    }
+
     return F;
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/math/Factorial.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/math/Factorial.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/math/Factorial.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/math/Factorial.java	2019-01-29 17:08:39.000000000 +0000
@@ -68,7 +68,7 @@
    * Factorial on doubles; avoids overflow problems present when using integers.
    * 
    * @param n arg on which to compute factorial
-   * @return (<code>double</code> approximation to) factorial of largest positive integer <= (n_ + epsilon)
+   * @return (<code>double</code> approximation to) factorial of largest positive integer &lt;= (n_ + epsilon)
    */
   public static double fact(double n) {
     n += 1e-6;
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/math/Logs.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/math/Logs.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/math/Logs.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/math/Logs.java	2019-01-29 17:08:39.000000000 +0000
@@ -77,7 +77,7 @@
     return -1;
   }
 
-  /** Binary log: finds the smallest power k such that 2^k>=n */
+  /** Binary log: finds the smallest power k such that 2^k &gt;= n */
   public static int binaryLogUp(int n) {
     int k = 0;
     while ((1 << k) < n) {
@@ -86,7 +86,7 @@
     return k;
   }
 
-  /** Binary log: finds the smallest power k such that 2^k>=n */
+  /** Binary log: finds the smallest power k such that 2^k &gt;= n */
   public static int binaryLogUp(long n) {
     int k = 0;
     while ((1 << k) < n) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/perf/StopwatchGC.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/perf/StopwatchGC.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/perf/StopwatchGC.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/perf/StopwatchGC.java	2019-01-29 17:08:39.000000000 +0000
@@ -51,7 +51,7 @@
   public final String report() {
     String result = "";
     if (getCount() > 0) {
-      result += "Stopwatch: " + name + " " + getElapsedMillis() + " ms" + "\n";
+      result += "Stopwatch: " + name + ' ' + getElapsedMillis() + " ms" + '\n';
 
     }
     if (getCount() == 1) {
@@ -92,13 +92,10 @@
 
   @Override
   public String toString() {
-    StringBuffer sb = new StringBuffer();
-    sb.append(super.toString());
-//    if (count == 1){
+    //    if (count == 1){
 //      sb.append (", Footprint at entry: " + (float) startMemory / 1000000 + " MB");
 //      sb.append (", Footprint at exit: " + (float) endMemory / 1000000 + " MB");
-      sb.append (", Delta: " + (float) (endMemory - startMemory) / 1000000 + " MB");
-//    }
-    return sb.toString();
+    //    }
+    return super.toString() + ", Delta: " + (float) (endMemory - startMemory) / 1000000 + " MB";
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/perf/Stopwatch.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/perf/Stopwatch.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/perf/Stopwatch.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/perf/Stopwatch.java	2019-01-29 17:08:39.000000000 +0000
@@ -53,12 +53,12 @@
   
   @Override
   public String toString() {
-    StringBuffer sb = new StringBuffer();
-    sb.append("total: " + getElapsedMillis());
+    StringBuilder sb = new StringBuilder();
+    sb.append("total: ").append(getElapsedMillis());
     if (count > 0){
-      sb.append(", inv: " + count);
-      sb.append(", avg: " + getElapsedMillis()/count);
+      sb.append(", inv: ").append(count);
+      sb.append(", avg: ").append(getElapsedMillis() / count);
     }
     return sb.toString();
   }
-}
\ No newline at end of file
+}
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/PlatformUtil.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/PlatformUtil.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/PlatformUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/PlatformUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -62,12 +62,12 @@
       throw new IllegalStateException("could not find boot classpath");
     }
     String[] jars = classpath.split(File.pathSeparator);
-    ArrayList<String> result = new ArrayList<String>();
+    ArrayList<String> result = new ArrayList<>();
     for (String jar : jars) {
       if (jar.endsWith(".jar") && (new File(jar)).exists()) {
         result.add(jar);
       }
     }
-    return result.toArray(new String[result.size()]);
+    return result.toArray(new String[0]);
   }
 }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/Predicate.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/Predicate.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/Predicate.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/Predicate.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html.
- * 
- * This file is a derivative of code released by the University of
- * California under the terms listed below.  
- *
- * Refinement Analysis Tools is Copyright (c) 2007 The Regents of the
- * University of California (Regents). Provided that this notice and
- * the following two paragraphs are included in any distribution of
- * Refinement Analysis Tools or its derivative work, Regents agrees
- * not to assert any of Regents' copyright rights in Refinement
- * Analysis Tools against recipient for recipient's reproduction,
- * preparation of derivative works, public display, public
- * performance, distribution or sublicensing of Refinement Analysis
- * Tools and derivative works, in source code and object code form.
- * This agreement not to assert does not confer, by implication,
- * estoppel, or otherwise any license or rights in any intellectual
- * property of Regents, including, but not limited to, any patents
- * of Regents or Regents' employees.
- * 
- * IN NO EVENT SHALL REGENTS BE LIABLE TO ANY PARTY FOR DIRECT,
- * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
- * INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE
- * AND ITS DOCUMENTATION, EVEN IF REGENTS HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *   
- * REGENTS SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE AND FURTHER DISCLAIMS ANY STATUTORY
- * WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE AND ACCOMPANYING
- * DOCUMENTATION, IF ANY, PROVIDED HEREUNDER IS PROVIDED "AS
- * IS". REGENTS HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
- * UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- */
-package com.ibm.wala.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Interface for defining an arbitrary predicate on {@link Object}s.
- */
-public abstract class Predicate<T> {
-  @SuppressWarnings("rawtypes")
-  public static final Predicate FALSE = new Predicate() {
-    @Override
-    public boolean test(Object o) {
-      return false;
-    }
-  };
-
-  @SuppressWarnings("rawtypes")
-  public static final Predicate TRUE = FALSE.not();
-
-  @SuppressWarnings("unchecked")
-  public static <T> Predicate<T> truePred() {
-    return TRUE;
-  }
-
-  @SuppressWarnings("unchecked")
-  public static <T> Predicate<T> falsePred() {
-    return FALSE;
-  }
-
-  /** Test whether an {@link Object} satisfies this {@link Predicate} */
-  public abstract boolean test(T t);
-
-  /** Return a predicate that is a negation of this predicate */
-  public Predicate<T> not() {
-    final Predicate<T> originalPredicate = this;
-    return new Predicate<T>() {
-      @Override
-      public boolean test(T t) {
-        return !originalPredicate.test(t);
-      }
-    };
-  }
-
-  /**
-   * Return a predicate that is a conjunction of this predicate and another predicate
-   */
-  public Predicate<T> and(final Predicate<T> conjunct) {
-    final Predicate<T> originalPredicate = this;
-    return new Predicate<T>() {
-      @Override
-      public boolean test(T t) {
-        return originalPredicate.test(t) && conjunct.test(t);
-      }
-    };
-  }
-
-  /**
-   * Return a predicate that is a conjunction of this predicate and another predicate
-   */
-  public Predicate<T> or(final Predicate<T> disjunct) {
-    final Predicate<T> originalPredicate = this;
-    return new Predicate<T>() {
-      @Override
-      public boolean test(T t) {
-        return originalPredicate.test(t) || disjunct.test(t);
-      }
-    };
-  }
-  
-  /**
-   * Create the predicate "is an element of c"
-   */
-  public static <T> Predicate<T> isElementOf(final Collection<T> c) {
-    return new Predicate<T>() {
-      @Override
-      public boolean test(T t) {
-        return c.contains(t);
-      }
-    };
-  }
-  
-  /**
-   * Filter a collection: generate a new list from an existing collection, consisting of the elements satisfying some predicate.
-   * 
-   * @throws IllegalArgumentException if src == null
-   */
-  public static <T> List<T> filter(Iterator<T> src, Predicate<T> pred) throws IllegalArgumentException {
-    if (src == null) {
-      throw new IllegalArgumentException("src == null");
-    }
-    ArrayList<T> result = new ArrayList<T>();
-    for (; src.hasNext();) {
-      T curElem = src.next();
-      if (pred.test(curElem))
-        result.add(curElem);
-    }
-    return result;
-  }
-}
-
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/processes/BasicLauncher.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/processes/BasicLauncher.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/processes/BasicLauncher.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/processes/BasicLauncher.java	2019-01-29 17:08:39.000000000 +0000
@@ -35,10 +35,7 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (cmd: ");
-    result.append(cmd);
-    return result.toString();
+    return super.toString() + " (cmd: " + cmd;
   }
 
   /**
@@ -49,11 +46,9 @@
     Thread d1 = isCaptureErr() ? captureStdErr(p) : drainStdErr(p);
     Thread d2 = isCaptureOutput() ? captureStdOut(p) : drainStdOut(p);
     if (getInput() != null) {
-      final BufferedOutputStream input = new BufferedOutputStream(p.getOutputStream());
-      try {
+      try (final BufferedOutputStream input = new BufferedOutputStream(p.getOutputStream())) {
         input.write(getInput(), 0, getInput().length);
         input.flush();
-        input.close();
       } catch (IOException e) {
         e.printStackTrace();
         throw new IOException("error priming stdin", e);
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/processes/JavaLauncher.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/processes/JavaLauncher.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/processes/JavaLauncher.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/processes/JavaLauncher.java	2019-01-29 17:08:39.000000000 +0000
@@ -14,11 +14,11 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Logger;
 
 import com.ibm.wala.util.PlatformUtil;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 
 /**
  * A Java process launcher
@@ -84,7 +84,7 @@
   /**
    * Paths that will be added to the default classpath
    */
-  private final List<String> xtraClasspath = new ArrayList<String>();
+  private final List<String> xtraClasspath = new ArrayList<>();
 
   /**
    * A {@link Thread} which spins and drains stdout of the running process.
@@ -104,7 +104,7 @@
   /**
    * Extra args to pass to the JVM
    */
-  private List<String> vmArgs = new ArrayList<String>();
+  private List<String> vmArgs = new ArrayList<>();
 
   /**
    * The last process returned by a call to start() on this object.
@@ -149,15 +149,9 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (programArgs: ");
-    result.append(programArgs);
-    result.append(", mainClass: ");
-    result.append(mainClass);
-    result.append(", xtraClasspath: ");
-    result.append(xtraClasspath);
-    result.append(')');
-    return result.toString();
+    return super.toString() + " (programArgs: " + programArgs
+            + ", mainClass: " + mainClass
+            + ", xtraClasspath: " + xtraClasspath + ')';
   }
 
   /**
@@ -180,7 +174,7 @@
     // Java process
     String signalParam = PlatformUtil.onMacOSX() ? "-Xrs" : null;
 
-    List<String> cmd = new ArrayList<String>();
+    List<String> cmd = new ArrayList<>();
 
     cmd.add(javaExe);
     cmd.add(heap);
@@ -197,9 +191,7 @@
       cmd.add("-ea");
     }
     if (vmArgs != null) {
-      for (String s : vmArgs) {
-        cmd.add(s);
-      }
+      cmd.addAll(vmArgs);
     }
     cmd.add(getMainClass());
     if (getProgramArgs() != null) {
@@ -225,7 +217,7 @@
     return lastProcess;
   }
 
-  private String makeLibPath() {
+  private static String makeLibPath() {
     String libPath = System.getProperty("java.library.path");
     if (libPath == null) {
       return null;
@@ -265,15 +257,17 @@
    * Compute the classpath for the spawned process
    */
   public String makeClasspath() {
-    String cp = inheritClasspath ? System.getProperty("java.class.path") : "";
+    final StringBuilder cp = inheritClasspath
+            ? new StringBuilder(System.getProperty("java.class.path"))
+            : new StringBuilder();
     if (getXtraClassPath() == null || getXtraClassPath().isEmpty()) {
-      return cp.trim();
+      return cp.toString().trim();
     } else {
-      for (Iterator<String> it = getXtraClassPath().iterator(); it.hasNext();) {
-        cp += File.pathSeparatorChar;
-        cp += it.next();
+      for (String p : Iterator2Iterable.make(getXtraClassPath().iterator())) {
+        cp.append(File.pathSeparatorChar);
+        cp.append(p);
       }
-      return cp.trim();
+      return cp.toString().trim();
     }
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/processes/Launcher.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/processes/Launcher.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/processes/Launcher.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/processes/Launcher.java	2019-01-29 17:08:39.000000000 +0000
@@ -15,8 +15,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.logging.Logger;
 
@@ -83,13 +83,7 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (workingDir: ");
-    result.append(workingDir);
-    result.append(", env: ");
-    result.append(env);
-    result.append(')');
-    return result.toString();
+    return super.toString() + " (workingDir: " + workingDir + ", env: " + env + ')';
   }
 
   /**
@@ -126,12 +120,11 @@
     return p;
   }
 
-  private String[] buildEnv(Map<String,String> ev) {
+  private static String[] buildEnv(Map<String,String> ev) {
     String[] result = new String[ev.size()];
     int i = 0;
-    for (Iterator<Map.Entry<String,String>> it = ev.entrySet().iterator(); it.hasNext();) {
-      Map.Entry<String,String> e = it.next();
-      result[i++] = e.getKey() + "=" + e.getValue();
+    for (Map.Entry<String, String> e : ev.entrySet()) {
+      result[i++] = e.getKey() + '=' + e.getValue();
     }
     return result;
   }
@@ -273,12 +266,12 @@
   /**
    * Drain some data from the input stream, and print said data to p.  Do not block.
    */
-  private void drainAndPrint(BufferedInputStream s, PrintStream p) throws IOException {
+  private static void drainAndPrint(BufferedInputStream s, PrintStream p) {
     try {
       while (s.available() > 0) {
         byte[] data = new byte[s.available()];
         s.read(data);
-        p.print(new String(data));
+        p.print(new String(data, StandardCharsets.UTF_8));
       }
     } catch (IOException e) {
       // assume the stream has been closed (e.g. the process died)
@@ -289,7 +282,7 @@
   /**
    * Drain all data from the input stream, and print said data to p.  Block if necessary.
    */
-  private void blockingDrainAndPrint(BufferedInputStream s, PrintStream p) throws IOException {
+  private static void blockingDrainAndPrint(BufferedInputStream s, PrintStream p) {
     ByteArrayOutputStream b = new ByteArrayOutputStream();
     try {
       // gather all the data from the stream.
@@ -310,7 +303,7 @@
   /**
    * Drain some data from the input stream, and append said data to b.  Do not block.
    */
-  private void drainAndCatch(BufferedInputStream s, ByteArrayOutputStream b) throws IOException {
+  private static void drainAndCatch(BufferedInputStream s, ByteArrayOutputStream b) {
     try {
       while (s.available() > 0) {
         byte[] data = new byte[s.available()];
@@ -326,7 +319,7 @@
   /**
    * Drain all data from the input stream, and append said data to p.  Block if necessary.
    */
-  private void blockingDrainAndCatch(BufferedInputStream s, ByteArrayOutputStream b) throws IOException {
+  private static void blockingDrainAndCatch(BufferedInputStream s, ByteArrayOutputStream b) {
     try {
       int next = s.read();
       while (next != -1) {
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/tables/Query.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/tables/Query.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/tables/Query.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/tables/Query.java	2019-01-29 17:08:39.000000000 +0000
@@ -13,8 +13,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
+import java.util.function.Predicate;
 
-import com.ibm.wala.util.Predicate;
 import com.ibm.wala.util.collections.HashSetFactory;
 
 /**
@@ -30,7 +30,7 @@
     if (t == null) {
       throw new IllegalArgumentException("t == null");
     }
-    Collection<Map<String,T>> result = new ArrayList<Map<String,T>>();
+    Collection<Map<String,T>> result = new ArrayList<>();
     for (int i = 0 ; i < t.getNumberOfRows(); i++) {
       Map<String,T> p = t.row2Map(i);
       if (p.get(column).equals(value)) {
@@ -59,7 +59,7 @@
     if (t == null) {
       throw new IllegalArgumentException("t == null");
     }
-    Collection<Map<String,T>> c = new ArrayList<Map<String,T>>();
+    Collection<Map<String,T>> c = new ArrayList<>();
     for (int i = 0 ; i < t.getNumberOfRows(); i++) {
       Map<String,T> p = t.row2Map(i);
       T s = p.get(column);
@@ -73,7 +73,7 @@
 
   public static <T> Table<T> viewWhereEquals(Table<T> t, String column, T value) {
     Collection<Map<String,T>> c = selectStarWhereEquals(t, column, value);
-    Table<T> result = new Table<T>(t);
+    Table<T> result = new Table<>(t);
     for (Map<String,T> p : c) {
       result.addRow(p);
     }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/tables/StringTable.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/tables/StringTable.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/tables/StringTable.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/tables/StringTable.java	2019-01-29 17:08:39.000000000 +0000
@@ -17,6 +17,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
+import java.nio.charset.StandardCharsets;
 import java.util.StringTokenizer;
 
 import com.ibm.wala.util.collections.SimpleVector;
@@ -50,10 +51,7 @@
   /**
    * read from a direct (native) text file
    * 
-   * @throws IOException
-   * @throws FileNotFoundException
    * @throws IllegalArgumentException if fileName is null
-   * 
    */
   public static StringTable readFromDirectTextFile(String fileName, Character comment) throws FileNotFoundException, IOException {
     if (fileName == null) {
@@ -76,19 +74,18 @@
 
   /**
    * @param f a file containing a table in text format, whitespace delimited
-   * @throws IOException
-   * @throws FileNotFoundException
    */
   public static StringTable readFromTextFile(File f, Character comment) throws FileNotFoundException, IOException {
     if (f == null) {
       throw new IllegalArgumentException("null f");
     }
-    return readFromStream(new FileInputStream(f), comment);
+    try (final FileInputStream in = new FileInputStream(f)) {
+      return readFromStream(in, comment);
+    }
   }
 
   /**
    * @param s a stream containing a table in text format, whitespace delimited
-   * @throws IOException
    * @throws IllegalArgumentException if s is null
    */
   public static StringTable readFromStream(InputStream s, Character commentToken) throws IOException {
@@ -97,7 +94,6 @@
 
   /**
    * @param s a stream containing a table in text format, whitespace delimited
-   * @throws IOException
    * @throws IllegalArgumentException if s is null
    */
   public static StringTable readFromStream(InputStream s, Character commentToken, Character delimiter) throws IOException {
@@ -106,7 +102,7 @@
     }
     StringTable result = new StringTable();
 
-    LineNumberReader reader = new LineNumberReader(new InputStreamReader(s));
+    LineNumberReader reader = new LineNumberReader(new InputStreamReader(s, StandardCharsets.UTF_8));
 
     // LineNumberReader reader = new LineNumberReader(new
     // InputStreamReader(new FileInputStream(f)));
@@ -152,8 +148,8 @@
     StringTokenizer st = delimiter == null ? new StringTokenizer(line) : new StringTokenizer(line, delimiter.toString());
     int nColumns = st.countTokens();
     Assertions.productionAssertion(nColumns == getNumberOfColumns(), "expected " + getNumberOfColumns() + " got " + nColumns
-        + " row " + row + " " + line.length() + " " + line);
-    SimpleVector<String> r = new SimpleVector<String>();
+        + " row " + row + ' ' + line.length() + ' ' + line);
+    SimpleVector<String> r = new SimpleVector<>();
     rows.add(row, r);
     for (int i = 0; i < nColumns; i++) {
       r.set(i, (String) st.nextElement());
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/tables/Table.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/tables/Table.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/tables/Table.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/tables/Table.java	2019-01-29 17:08:39.000000000 +0000
@@ -22,10 +22,10 @@
 public class Table<T> {
 
   // table is implemented as an ArrayList of rows. Each row is a SimpleVector<T>.
-  protected final ArrayList<SimpleVector<T>> rows = new ArrayList<SimpleVector<T>>();
+  protected final ArrayList<SimpleVector<T>> rows = new ArrayList<>();
 
   // SimpleVector<String> ... headings of columns
-  protected final SimpleVector<String> columnHeadings = new SimpleVector<String>();
+  protected final SimpleVector<String> columnHeadings = new SimpleVector<>();
 
   /**
    * create an empty table
@@ -67,21 +67,21 @@
   @Override
   public String toString() {
     int[] format = computeColumnWidths();
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     for (int i = 0; i < getNumberOfColumns(); i++) {
-      StringBuffer heading = new StringBuffer(getColumnHeading(i));
+      StringBuilder heading = new StringBuilder(getColumnHeading(i));
       padWithSpaces(heading, format[i]);
       result.append(heading);
     }
-    result.append("\n");
+    result.append('\n');
     for (int j = 0; j < getNumberOfRows(); j++) {
       for (int i = 0; i < getNumberOfColumns(); i++) {
         T e = getElement(j, i);
-        StringBuffer element = e == null ? new StringBuffer() : new StringBuffer(e.toString());
+        StringBuilder element = e == null ? new StringBuilder() : new StringBuilder(e.toString());
         padWithSpaces(element, format[i]);
         result.append(element);
       }
-      result.append("\n");
+      result.append('\n');
     }
     return result.toString();
   }
@@ -91,7 +91,7 @@
       SimpleVector<T> r = rows.get(row);
       return r.get(column);
     } catch (IndexOutOfBoundsException e) {
-      throw new IllegalArgumentException("row: " + row + " column: " + column);
+      throw new IllegalArgumentException("row: " + row + " column: " + column, e);
     }
   }
 
@@ -136,7 +136,7 @@
     if (p == null) {
       throw new IllegalArgumentException("null p " + p);
     }
-    SimpleVector<T> r = new SimpleVector<T>();
+    SimpleVector<T> r = new SimpleVector<>();
     rows.add(r);
     for (int i = 0; i < getNumberOfColumns(); i++) {
       r.set(i, p.get(getColumnHeading(i)));
@@ -162,13 +162,13 @@
 
   }
   
-  public static void padWithSpaces(StringBuffer b, int length) {
+  public static void padWithSpaces(StringBuilder b, int length) {
     if (b == null) {
       throw new IllegalArgumentException("b is null");
     }
     if (b.length() < length) {
       for (int i = b.length(); i < length; i++) {
-        b.append(" ");
+        b.append(' ');
       }
     }
   }
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/WalaRuntimeException.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/WalaRuntimeException.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/util/WalaRuntimeException.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/util/WalaRuntimeException.java	2019-01-29 17:08:39.000000000 +0000
@@ -16,6 +16,7 @@
  */
 public class WalaRuntimeException extends RuntimeException {
 
+  private static final long serialVersionUID = -272544923431659418L;
   /**
    * @param s a message describing the failure
    */
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/viz/DotUtil.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/viz/DotUtil.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/viz/DotUtil.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/viz/DotUtil.java	2019-01-29 17:08:39.000000000 +0000
@@ -12,15 +12,15 @@
 
 import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Iterator;
-
 import com.ibm.wala.util.WalaException;
 import com.ibm.wala.util.collections.Iterator2Collection;
-import com.ibm.wala.util.debug.Assertions;
+import com.ibm.wala.util.collections.Iterator2Iterable;
 import com.ibm.wala.util.graph.Graph;
 
 /**
@@ -33,7 +33,16 @@
    * 
    */
   public static enum DotOutputType {
-    PS, SVG, PDF, EPS
+    PS("ps"),
+    SVG("svg"),
+    PDF("pdf"),
+    EPS("eps");
+
+    public final String suffix;
+
+    DotOutputType(final String suffix) {
+      this.suffix = suffix;
+    }
   }
 
   private static DotOutputType outputType = DotOutputType.PDF;
@@ -51,19 +60,7 @@
   }
 
   private static String outputTypeCmdLineParam() {
-    switch (outputType) {
-    case PS:
-      return "-Tps";
-    case EPS:
-      return "-Teps";
-    case SVG:
-      return "-Tsvg";
-    case PDF:
-      return "-Tpdf";
-    default:
-      Assertions.UNREACHABLE();
-      return null;
-    }
+    return "-T" + outputType.suffix;
   }
 
   /**
@@ -160,7 +157,7 @@
     if (g == null) {
       throw new IllegalArgumentException("g is null");
     }
-    StringBuffer dotStringBuffer = dotOutput(g, labels, title);
+    StringBuilder dotStringBuffer = dotOutput(g, labels, title);
 
     // retrieve the filename parameter to this component, a String
     if (dotfile == null) {
@@ -168,32 +165,31 @@
     }
     try {
       File f = new File(dotfile);
-      FileWriter fw = new FileWriter(f);
-      fw.write(dotStringBuffer.toString());
-      fw.close();
+      try (Writer fw = Files.newBufferedWriter(f.toPath(), StandardCharsets.UTF_8)) {
+        fw.write(dotStringBuffer.toString());
+      }
       return f;
 
     } catch (Exception e) {
-      throw new WalaException("Error writing dot file " + dotfile);
+      throw new WalaException("Error writing dot file " + dotfile, e);
     }
   }
 
   /**
    * @return StringBuffer holding dot output representing G
-   * @throws WalaException
    */
-  private static <T> StringBuffer dotOutput(Graph<T> g, NodeDecorator<T> labels, String title) throws WalaException {
-    StringBuffer result = new StringBuffer("digraph \"DirectedGraph\" {\n");
+  public static <T> StringBuilder dotOutput(Graph<T> g, NodeDecorator<T> labels, String title) throws WalaException {
+    StringBuilder result = new StringBuilder("digraph \"DirectedGraph\" {\n");
 
     if (title != null) {
-      result.append("graph [label = \""+title+"\", labelloc=t, concentrate = true];");
+      result.append("graph [label = \"").append(title).append("\", labelloc=t, concentrate = true];");
     } else {
       result.append("graph [concentrate = true];");
     }
     
     String rankdir = getRankDir();
     if (rankdir != null) {
-      result.append("rankdir=" + rankdir + ";");
+      result.append("rankdir=").append(rankdir).append(';');
     }
     String fontsizeStr = "fontsize=" + fontSize;
     String fontcolorStr = (fontColor != null) ? ",fontcolor="+fontColor : "";
@@ -215,11 +211,9 @@
 
     outputNodes(labels, result, dotNodes);
 
-    for (Iterator<? extends T> it = g.iterator(); it.hasNext();) {
-      T n = it.next();
-      for (Iterator<? extends T> it2 = g.getSuccNodes(n); it2.hasNext();) {
-        T s = it2.next();
-        result.append(" ");
+    for (T n : g) {
+      for (T s : Iterator2Iterable.make(g.getSuccNodes(n))) {
+        result.append(' ');
         result.append(getPort(n, labels));
         result.append(" -> ");
         result.append(getPort(s, labels));
@@ -231,28 +225,28 @@
     return result;
   }
 
-  private static <T> void outputNodes(NodeDecorator<T> labels, StringBuffer result, Collection<T> dotNodes) throws WalaException {
-    for (Iterator<T> it = dotNodes.iterator(); it.hasNext();) {
-      outputNode(labels, result, it.next());
+  private static <T> void outputNodes(NodeDecorator<T> labels, StringBuilder result, Collection<T> dotNodes) throws WalaException {
+    for (T t : dotNodes) {
+      outputNode(labels, result, t);
     }
   }
 
-  private static <T> void outputNode(NodeDecorator<T> labels, StringBuffer result, T n) throws WalaException {
+  private static <T> void outputNode(NodeDecorator<T> labels, StringBuilder result, T n) throws WalaException {
     result.append("   ");
-    result.append("\"");
+    result.append('\"');
     result.append(getLabel(n, labels));
-    result.append("\"");
+    result.append('\"');
     result.append(decorateNode(n, labels));
   }
 
   /**
    * Compute the nodes to visualize
    */
-  private static <T> Collection<T> computeDotNodes(Graph<T> g) throws WalaException {
+  private static <T> Collection<T> computeDotNodes(Graph<T> g) {
     return Iterator2Collection.toSet(g.iterator());
   }
 
-  private static String getRankDir() throws WalaException {
+  private static String getRankDir() {
     return null;
   }
 
@@ -261,9 +255,7 @@
    * @param d decorating master
    */
   private static <T> String decorateNode(T n, NodeDecorator<T> d) throws WalaException {
-    StringBuffer result = new StringBuffer();
-    result.append(" [ ]\n");
-    return result.toString();
+    return " [ label=\"" + getLabel(n, d) + "\"]\n";
   }
 
   private static <T> String getLabel(T n, NodeDecorator<T> d) throws WalaException {
@@ -281,7 +273,7 @@
   }
 
   private static <T> String getPort(T n, NodeDecorator<T> d) throws WalaException {
-    return "\"" + getLabel(n, d) + "\"";
+    return '"' + getLabel(n, d) + '"';
 
   }
 
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/viz/NodeDecorator.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/viz/NodeDecorator.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/viz/NodeDecorator.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/viz/NodeDecorator.java	2019-01-29 17:08:39.000000000 +0000
@@ -18,7 +18,6 @@
 public interface NodeDecorator<T> {
   
   /**
-   * @param n
    * @return the String label for node n
    */
   String getLabel(T n) throws WalaException;
diff -Nru wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/viz/PDFViewLauncher.java wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/viz/PDFViewLauncher.java
--- wala-1.3.9/com.ibm.wala.util/src/com/ibm/wala/viz/PDFViewLauncher.java	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/com.ibm.wala.util/src/com/ibm/wala/viz/PDFViewLauncher.java	2019-01-29 17:08:39.000000000 +0000
@@ -56,13 +56,7 @@
 
   @Override
   public String toString() {
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(", psfile: ");
-    result.append(pdffile);
-    result.append(", gvExe: ");
-    result.append(gvExe);
-    result.append(')');
-    return result.toString();
+    return super.toString() + ", psfile: " + pdffile + ", gvExe: " + gvExe + ')';
   }
 
   private WalaException exception = null;
diff -Nru wala-1.3.9/debian/build.gradle wala-1.5.1/debian/build.gradle
--- wala-1.3.9/debian/build.gradle	2017-05-05 03:38:04.000000000 +0000
+++ wala-1.5.1/debian/build.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-subprojects {
-  apply plugin: 'java'
-  group = 'com.ibm.wala'
-  version = DEB_VERSION_UPSTREAM
-  archivesBaseName = "wala-${name}"
-  sourceSets.main.java.srcDirs 'src', 'source'
-  jar.manifest.from 'META-INF/MANIFEST.MF'
-}
-
-project(':cast') {
-  dependencies {
-    compile 'commons-io:commons-io:debian'
-    compile project(':core')
-    compile project(':shrike')
-  }
-}
-
-project(':core') {
-  dependencies {
-    compile project(':shrike')
-    compile project(':util')
-  }
-}
-
-project(':dalvik') {
-  dependencies {
-    compile 'ch.qos.logback:logback-classic:debian'
-    compile 'ch.qos.logback:logback-core:debian'
-    compile 'com.google.guava:guava:debian'
-    compile 'commons-cli:commons-cli:debian'
-    compile 'commons-io:commons-io:debian'
-    compile 'org.slf4j:slf4j-api:debian'
-    compile 'org.smali:dexlib:debian'
-    compile project(':cast')
-    compile project(':core')
-    compile project(':shrike')
-  }
-}
-
-project(':shrike') {
-  dependencies {
-    compile project(':util')
-  }
-}
-
-task javadocAll(type: Javadoc) {
-  group = 'documentation'
-  def outputDir = file("${buildDir}/javadocAll")
-  outputs.dir outputDir
-  outputs.files "${outputDir}/**/*"
-  options.links 'file:///usr/share/doc/default-jdk-doc/api'
-  options.encoding = 'UTF-8'
-  source subprojects.collect { project ->
-    project.sourceSets.main.allJava
-  }
-  classpath = files(subprojects.collect { project ->
-    project.sourceSets.main.compileClasspath
-  })
-  destinationDir = outputDir
-  title = "API Reference for wala $DEB_VERSION_UPSTREAM"
-}
-
-defaultTasks 'assemble', 'javadocAll'
\ No newline at end of file
diff -Nru wala-1.3.9/debian/changelog wala-1.5.1/debian/changelog
--- wala-1.3.9/debian/changelog	2017-05-05 03:38:04.000000000 +0000
+++ wala-1.5.1/debian/changelog	2019-03-11 14:45:04.000000000 +0000
@@ -1,3 +1,32 @@
+wala (1.5.1-1~18.04) bionic; urgency=medium
+
+  * Backport for OpenJDK 11. LP: #1819448.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 11 Mar 2019 15:45:04 +0100
+
+wala (1.5.1-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream version
+  * update Vcs tags to point to salsa.debian.org
+
+ -- Hans-Christoph Steiner <hans@eds.org>  Wed, 30 Jan 2019 23:29:03 +0100
+
+wala (1.5.0-1) experimental; urgency=medium
+
+  * Team upload.
+  * New upstream version
+
+ -- Hans-Christoph Steiner <hans@eds.org>  Mon, 21 Jan 2019 16:38:54 +0100
+
+wala (1.3.9-3) unstable; urgency=medium
+
+  * Team upload.
+  * Standards-Version: 4.3.0 remove get-orig-source
+  * update Vcs URLs to salsa.debian.org
+
+ -- Hans-Christoph Steiner <hans@eds.org>  Mon, 21 Jan 2019 14:28:16 +0100
+
 wala (1.3.9-2) unstable; urgency=medium
 
   [ tony mancill ]
diff -Nru wala-1.3.9/debian/control wala-1.5.1/debian/control
--- wala-1.3.9/debian/control	2017-05-05 03:38:04.000000000 +0000
+++ wala-1.5.1/debian/control	2019-01-30 22:29:03.000000000 +0000
@@ -13,11 +13,11 @@
                libguava-java,
                liblogback-java,
                libslf4j-java,
-               libsmali-1-java,
+               libsmali-java (>= 2.2.6),
                maven-repo-helper
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/wala.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/wala.git
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/java-team/wala.git
+Vcs-Browser: https://salsa.debian.org/java-team/wala
 Homepage: http://wala.sourceforge.net
 
 Package: libwala-java
@@ -27,7 +27,7 @@
          libguava-java,
          liblogback-java,
          libslf4j-java,
-         libsmali-1-java,
+         libsmali-java (>= 2.2.6),
          ${misc:Depends}
 Description: Static analysis on Java bytecode and related languages
  The T. J. Watson Libraries for Analysis (WALA) provide static analysis
@@ -71,6 +71,6 @@
    * General framework for iterative dataflow
    * General analysis utilities and data structures
    * A bytecode instrumentation library (Shrike) and a dynamic load-time
-     instrumentation library for Java (Dila) 
+     instrumentation library for Java (Dila)
  .
  This package provides the documentations.
\ No newline at end of file
diff -Nru wala-1.3.9/debian/copyright wala-1.5.1/debian/copyright
--- wala-1.3.9/debian/copyright	2017-05-05 03:38:04.000000000 +0000
+++ wala-1.5.1/debian/copyright	2019-01-30 22:26:26.000000000 +0000
@@ -1,4 +1,4 @@
--Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Source: https://github.com/wala/WALA
 Upstream-Name: T. J. Watson Libraries for Analysis
 Files-Excluded: *.apk
@@ -21,7 +21,7 @@
        com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/*
 Copyright: 2002-2014, IBM Corporation
            2013, Tobias Blaschke <code@tobiasblaschke.de>
-License: BSD-3-clause and/or EPL-1.0
+License: EPL-1.0
 
 Files: com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassAA.java
        com.ibm.wala.cast.java.test.data/src/alreadywalaunittests/InnerClassSuperA.java
@@ -47,7 +47,6 @@
        com.ibm.wala.util/src/com/ibm/wala/util/collections/ObjectVisitor.java
        com.ibm.wala.util/src/com/ibm/wala/util/collections/Util.java
        com.ibm.wala.util/src/com/ibm/wala/util/math/Factorial.java
-       com.ibm.wala.util/src/com/ibm/wala/util/Predicate.java
 Copyright: 2007-2008, The Regents of the University of California
            2002-2014, IBM Corporation
 License: EPL-1.0
@@ -55,7 +54,7 @@
 Files: com.ibm.wala.scandroid/source/org/scandroid/*
 Copyright: 2009-2012, Galois, Inc.
            2009-2012, Steve Suh <suhsteve@gmail.com>
-License: BSD-3-clause and/or EPL-1.0
+License: EPL-1.0
 
 Files: debian/*
 Copyright: 2017, Kai-Chung Yan (殷啟聰)
@@ -275,30 +274,3 @@
  this Agreement will bring a legal action under this Agreement more than
  one year after the cause of action arose. Each party waives its rights to
  a jury trial in any resulting litigation.
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
-   1. Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-  .
-   2. Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
- .
-   3. The names of the contributors may not be used to endorse or promote
-      products derived from this software without specific prior written
-      permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff -Nru wala-1.3.9/debian/.gitlab-ci.yml wala-1.5.1/debian/.gitlab-ci.yml
--- wala-1.3.9/debian/.gitlab-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/debian/.gitlab-ci.yml	2019-01-30 22:27:01.000000000 +0000
@@ -0,0 +1,12 @@
+pages:
+  image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest
+  stage: deploy
+  only:
+    - master
+  artifacts:
+    paths:
+      - public
+    expire_in: 1 day
+  script:
+    - gitlab-ci-git-buildpackage-all
+    - gitlab-ci-aptly
diff -Nru wala-1.3.9/debian/libwala-java-doc.javadoc wala-1.5.1/debian/libwala-java-doc.javadoc
--- wala-1.3.9/debian/libwala-java-doc.javadoc	2017-05-05 03:38:04.000000000 +0000
+++ wala-1.5.1/debian/libwala-java-doc.javadoc	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/build/javadocAll   usr/share/doc/libwala-java/api
\ No newline at end of file
diff -Nru wala-1.3.9/debian/patches/AndroidAnalysisScope_NullPointer.patch wala-1.5.1/debian/patches/AndroidAnalysisScope_NullPointer.patch
--- wala-1.3.9/debian/patches/AndroidAnalysisScope_NullPointer.patch	2017-05-05 03:38:04.000000000 +0000
+++ wala-1.5.1/debian/patches/AndroidAnalysisScope_NullPointer.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
---- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidAnalysisScope.java
-+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidAnalysisScope.java
-@@ -34,13 +34,15 @@
- 	public static AnalysisScope setUpAndroidAnalysisScope(URI classpath, String exclusions, ClassLoader loader, URI... androidLib) throws IOException {
- 		AnalysisScope scope;
- 		if (androidLib == null || androidLib.length == 0) {
--			scope = AnalysisScopeReader.readJavaScope(BASIC_FILE, new File(exclusions), loader);
-+			scope = AnalysisScopeReader.readJavaScope(BASIC_FILE, (exclusions == null) ? null : new File(exclusions), loader);
- 		} else {
- 			scope = AnalysisScope.createJavaAnalysisScope();
- 
-+      if (exclusions != null) {
- 			File exclusionsFile = new File(exclusions);
- 	        InputStream fs = exclusionsFile.exists()? new FileInputStream(exclusionsFile): FileProvider.class.getClassLoader().getResourceAsStream(exclusionsFile.getName());
- 	        scope.setExclusions(new FileOfClasses(fs));
-+			}
- 	        
- 			scope.setLoaderImpl(ClassLoaderReference.Primordial,
- 					"com.ibm.wala.dalvik.classLoader.WDexClassLoaderImpl");
diff -Nru wala-1.3.9/debian/patches/patch-out-ides-from-gradle-build.patch wala-1.5.1/debian/patches/patch-out-ides-from-gradle-build.patch
--- wala-1.3.9/debian/patches/patch-out-ides-from-gradle-build.patch	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/debian/patches/patch-out-ides-from-gradle-build.patch	2019-01-30 22:29:03.000000000 +0000
@@ -0,0 +1,223 @@
+From: Hans-Christoph Steiner <hans@eds.org>
+Subject: patch out IDEs from gradle build
+
+This now includes its own gradle build, but it builds lots of things
+that we are not going to package, like IntelliJ and Eclipse
+integration.  For now, the tests are also patched out to get things
+building.
+
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -1,51 +1,3 @@
+-////////////////////////////////////////////////////////////////////////
+-//
+-//  plugin configuration must precede everything else
+-//
+-
+-plugins {
+-	id 'com.diffplug.gradle.p2.asmaven' version '3.17.0'
+-	id 'com.github.hauner.jarTest' version '1.0.1' apply false
+-	id 'de.undercouch.download'
+-	id 'nebula.lint' version '8.3.1'
+-	id 'nebula.source-jar' version '7.0.1' apply false
+-	id 'maven-publish'
+-}
+-
+-
+-////////////////////////////////////////////////////////////////////////
+-//
+-//  required Eclipse components
+-//
+-
+-p2AsMaven {
+-	group 'eclipse-deps', {
+-		repoEclipse '4.7.2'
+-		slicingOption 'latestVersionOnly', 'true'
+-		iu 'org.eclipse.core.commands'
+-		iu 'org.eclipse.core.contenttype'
+-		iu 'org.eclipse.core.jobs'
+-		iu 'org.eclipse.core.resources'
+-		iu 'org.eclipse.core.runtime'
+-		iu 'org.eclipse.equinox.app'
+-		iu 'org.eclipse.equinox.common'
+-		iu 'org.eclipse.equinox.preferences'
+-		iu 'org.eclipse.jdt.core'
+-		iu 'org.eclipse.jface'
+-		iu 'org.eclipse.osgi'
+-		iu 'org.eclipse.pde.core'
+-		iu 'org.eclipse.swt'
+-		iu 'org.eclipse.ui.ide'
+-		iu 'org.eclipse.ui.workbench'
+-	}
+-	group 'wst-deps', {
+-		repo 'http://download.eclipse.org/releases/oxygen'
+-		slicingOption 'latestVersionOnly', 'true'
+-		iu 'org.eclipse.wst.jsdt.core'
+-		iu 'org.eclipse.wst.jsdt.ui'
+-	}
+-}
+-
+ 
+ ////////////////////////////////////////////////////////////////////////
+ //
+@@ -64,8 +16,6 @@
+ 	}
+ 
+ 	apply plugin: 'java'
+-	apply plugin: 'maven-publish'
+-	apply plugin: 'nebula.source-jar'
+ 
+ 	version rootProject.version
+ 
+@@ -78,13 +28,6 @@
+ 
+ 	jar.manifest.from('META-INF/MANIFEST.MF')
+ 
+-	publishing.publications {
+-		mavenJava(MavenPublication) {
+-			from components.java
+-		}
+-	}
+-
+-	task afterEclipseBuildshipImport(dependsOn: processTestResources)
+ 	task prepareIntelliJIDEA
+ 
+ 	test {
+@@ -98,10 +41,6 @@
+ 	}
+ }
+ 
+-task afterEclipseBuildshipImport(type: Exec) {
+-	commandLine './revert-launchers.sh'
+-}
+-
+ 
+ ////////////////////////////////////////////////////////////////////////
+ //
+@@ -124,37 +63,6 @@
+ 
+ System.setProperty('osgi.platform', osgi_platform)
+ 
+-subprojects {
+-	configurations.all {
+-		resolutionStrategy {
+-			// failOnVersionConflict()
+-			dependencySubstitution {
+-				substitute module('eclipse-deps:org.eclipse.swt.${osgi.platform}') with module("eclipse-deps:org.eclipse.swt.${System.getProperty('osgi.platform')}:3.+")
+-			}
+-		}
+-	}
+-}
+-
+-
+-////////////////////////////////////////////////////////////////////////
+-//
+-//  optional lint checking of Gradle scripts
+-//
+-
+-allprojects {
+-	apply plugin: 'nebula.lint'
+-	gradleLint.alwaysRun = false
+-	gradleLint {
+-		rules = ['all-dependency']
+-		excludedRules = [
+-			'duplicate-dependency-class',
+-			'transitive-duplicate-dependency-class',
+-			'unused-dependency',
+-			]
+-	}
+-}
+-
+-
+ ////////////////////////////////////////////////////////////////////////
+ //
+ //  disable Javadoc linter until documentation is in better shape
+@@ -166,21 +74,3 @@
+ 		options.quiet()
+ 	}
+ }
+-
+-
+-////////////////////////////////////////////////////////////////////////
+-//
+-//  Eclipse IDE integration
+-//
+-
+-// workaround for <https://github.com/gradle/gradle/issues/4802>
+-allprojects {
+-	apply plugin: 'eclipse'
+-
+-	eclipse.classpath.file.whenMerged {
+-		entries.each {
+-			if (it in org.gradle.plugins.ide.eclipse.model.AbstractClasspathEntry && it.entryAttributes['gradle_used_by_scope'] == 'test')
+-				it.entryAttributes['test'] = true
+-		}
+-	}
+-}
+--- a/settings.gradle
++++ b/settings.gradle
+@@ -4,30 +4,8 @@
+ 	'com.ibm.wala-repository',
+ 	'com.ibm.wala.cast',
+ 	'com.ibm.wala.cast.java',
+-	'com.ibm.wala.cast.java.ecj',
+-	'com.ibm.wala.cast.java.test',
+-	'com.ibm.wala.cast.java.test.data',
+-	'com.ibm.wala.cast.js',
+-	'com.ibm.wala.cast.js.html.nu_validator',
+-	'com.ibm.wala.cast.js.nodejs',
+-	'com.ibm.wala.cast.js.nodejs.test',
+-	'com.ibm.wala.cast.js.rhino',
+-	'com.ibm.wala.cast.js.rhino.test',
+-	'com.ibm.wala.cast.js.test',
+-	'com.ibm.wala.cast.js.test.data',
+-	'com.ibm.wala.cast.test',
+ 	'com.ibm.wala.core',
+-	'com.ibm.wala.core.testdata',
+-	'com.ibm.wala.core.tests',
+ 	'com.ibm.wala.dalvik',
+-	'com.ibm.wala.dalvik.test',
+-	'com.ibm.wala.ide',
+-	'com.ibm.wala.ide.jdt',
+-	'com.ibm.wala.ide.jdt.test',
+-	'com.ibm.wala.ide.jsdt',
+-	'com.ibm.wala.ide.jsdt.tests',
+-	'com.ibm.wala.ide.tests',
+-	'com.ibm.wala.ide_feature',
+ 	'com.ibm.wala.scandroid',
+ 	'com.ibm.wala.shrike',
+ 	'com.ibm.wala.tests.ide_feature',
+--- a/buildSrc/build.gradle
++++ /dev/null
+@@ -1,7 +0,0 @@
+-repositories {
+-	mavenCentral()
+-}
+-
+-dependencies {
+-	compile 'de.undercouch:gradle-download-task:3.4.3'
+-}
+--- a/com.ibm.wala.cast/build.gradle
++++ b/com.ibm.wala.cast/build.gradle
+@@ -16,20 +16,6 @@
+ 		)
+ }
+ 
+-javadoc {
+-	def js = ':com.ibm.wala.cast.js'
+-	evaluationDependsOn(js)
+-
+-	dependsOn "$js:compileJava"
+-	js = project(js)
+-	doFirst {
+-		classpath += files js.compileJava
+-	}
+-
+-	dependsOn js.createPackageList
+-	options.linksOffline js.javadoc.outputDirectory.path, js.createPackageList.packageList.parent
+-}
+-
+ def currentJavaHome = org.gradle.internal.jvm.Jvm.current().javaHome
+ 
+ model {
diff -Nru wala-1.3.9/debian/patches/series wala-1.5.1/debian/patches/series
--- wala-1.3.9/debian/patches/series	2017-05-05 03:38:04.000000000 +0000
+++ wala-1.5.1/debian/patches/series	2019-01-30 22:29:03.000000000 +0000
@@ -1 +1 @@
-AndroidAnalysisScope_NullPointer.patch
+patch-out-ides-from-gradle-build.patch
diff -Nru wala-1.3.9/debian/rules wala-1.5.1/debian/rules
--- wala-1.3.9/debian/rules	2017-05-05 03:38:04.000000000 +0000
+++ wala-1.5.1/debian/rules	2019-01-30 22:26:26.000000000 +0000
@@ -3,16 +3,15 @@
 include /usr/share/dpkg/pkg-info.mk
 
 %:
-	dh $@ --buildsystem=gradle --with javahelper,maven-repo-helper
+	dh $@ --buildsystem=gradle --with javahelper,maven_repo_helper
 
 override_dh_auto_build:
-	dh_auto_build -- --project-prop DEB_VERSION_UPSTREAM=$(DEB_VERSION_UPSTREAM) \
-	                 --settings-file debian/settings.gradle \
-	                 -Dfile.encoding=UTF-8
+	dh_auto_build
+	dh_auto_build -- javadoc || true  # generates but fails with bizarre error
 
 override_dh_auto_clean:
 	dh_auto_clean
 	$(RM) -r debian/.gradle
 
-get-orig-source:
-	uscan --download-current-version --force-download --repack --compression xz
+override_jh_installjavadoc:
+	jh_installjavadoc -plibwala-java-doc com.ibm.wala.util/build/docs/javadoc usr/share/doc/libwala-java/api
diff -Nru wala-1.3.9/debian/settings.gradle wala-1.5.1/debian/settings.gradle
--- wala-1.3.9/debian/settings.gradle	2017-05-05 03:38:04.000000000 +0000
+++ wala-1.5.1/debian/settings.gradle	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-rootProject.name = 'wala'
-
-include 'cast'
-include 'core'
-include 'dalvik'
-include 'shrike'
-include 'util'
-
-rootProject.children.each {
-  it.projectDir = file("../com.ibm.wala.${it.name}")
-}
\ No newline at end of file
diff -Nru wala-1.3.9/debian/source/lintian-overrides wala-1.5.1/debian/source/lintian-overrides
--- wala-1.3.9/debian/source/lintian-overrides	2017-05-05 03:38:04.000000000 +0000
+++ wala-1.5.1/debian/source/lintian-overrides	2019-01-30 22:26:26.000000000 +0000
@@ -1,3 +1,7 @@
 # For com.ibm.wala.cast.js.test.data/examples-src/tests/jquery_spec_test.js,
 # the file is the source.
-source-is-missing
\ No newline at end of file
+source-is-missing
+
+# these are test files required by the test suite
+source-includes-file-in-files-excluded com.ibm.wala.dalvik/StringTest.apk
+source-includes-file-in-files-excluded com.ibm.wala.dalvik/models/ActivityModel.apk
diff -Nru wala-1.3.9/dependent-projects-trigger.sh wala-1.5.1/dependent-projects-trigger.sh
--- wala-1.3.9/dependent-projects-trigger.sh	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/dependent-projects-trigger.sh	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+body='{
+"request": {
+"branch":"master"
+}}'
+
+curl -s -X POST \
+   -H "Content-Type: application/json" \
+   -H "Accept: application/json" \
+   -H "Travis-API-Version: 3" \
+   -H "Authorization: token $1" \
+   -d "$body" \
+   https://api.travis-ci.org/repo/wala%2FClient/requests
+
+curl -s -X POST \
+   -H "Content-Type: application/json" \
+   -H "Accept: application/json" \
+   -H "Travis-API-Version: 3" \
+   -H "Authorization: token $1" \
+   -d "$body" \
+   https://api.travis-ci.org/repo/wala%2FWALA-Mobile/requests
+
+curl -s -X POST \
+   -H "Content-Type: application/json" \
+   -H "Accept: application/json" \
+   -H "Travis-API-Version: 3" \
+   -H "Authorization: token $1" \
+   -d "$body" \
+   https://api.travis-ci.org/repo/wala%2FMemSAT/requests
+
+curl -s -X POST \
+   -H "Content-Type: application/json" \
+   -H "Accept: application/json" \
+   -H "Travis-API-Version: 3" \
+   -H "Authorization: token $1" \
+   -d "$body" \
+   https://api.travis-ci.org/repo/april1989%2FIncremental_Points_to_Analysis/requests
+
+curl -s -X POST \
+   -H "Content-Type: application/json" \
+   -H "Accept: application/json" \
+   -H "Travis-API-Version: 3" \
+   -H "Authorization: token $1" \
+   -d "$body" \
+   https://api.travis-ci.org/repo/SunghoLee%2FHybriDroid/requests
+
+curl -s -X POST \
+   -H "Content-Type: application/json" \
+   -H "Accept: application/json" \
+   -H "Travis-API-Version: 3" \
+   -H "Authorization: token $1" \
+   -d "$body" \
+   https://api.travis-ci.org/repo/wala%2FML/requests
diff -Nru wala-1.3.9/.dir-locals.el wala-1.5.1/.dir-locals.el
--- wala-1.3.9/.dir-locals.el	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/.dir-locals.el	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,6 @@
+((groovy-mode
+  (c-file-style . "bsd")))
+
+;; Local variables:
+;; flycheck-disabled-checkers: (emacs-lisp emacs-lisp-checkdoc)
+;; End:
diff -Nru wala-1.3.9/.gitignore wala-1.5.1/.gitignore
--- wala-1.3.9/.gitignore	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/.gitignore	2019-01-29 17:08:39.000000000 +0000
@@ -4,40 +4,48 @@
 *.swp
 */bin/
 */bin/*
+*/build/
 *~
+.classpath
 .metadata/
-com.ibm.wala.cast/lib/
-com.ibm.wala.cast.java.jdt.test/
-com.ibm.wala.cast.java.polyglot/lib/
-com.ibm.wala.cast.java.test.data/src/JLex/
-com.ibm.wala.cast.java.test/testdata/
-com.ibm.wala.cast.js.html.nu_validator/lib/
-com.ibm.wala.cast.js.rhino.test/*.dump
-com.ibm.wala.cast.js.rhino.test/*.html*
-com.ibm.wala.cast.js.rhino.test/2009_swine_flu_outbreak
-com.ibm.wala.cast.js.rhino.test/?game*
-com.ibm.wala.cast.js.rhino.test/BunnyHunt
-com.ibm.wala.cast.js.rhino.test/digg_attack
-com.ibm.wala.cast.js.rhino.test/game.php*
-com.ibm.wala.cast.js.rhino.test/xxxx
-com.ibm.wala.cast.js.rhino/lib/
-com.ibm.wala.cast.js.test.data/examples-src/ajaxslt/
-com.ibm.wala.cast.js.test/examples-src/ajaxslt/
-com.ibm.wala.cast.js/lib/
-com.ibm.wala.core.testdata/*.jar
-com.ibm.wala.core.testdata/@dot/
-com.ibm.wala.core.testdata/lib/
-com.ibm.wala.core.testdata/ocaml/
-com.ibm.wala.core.tests/dat/wala.examples.properties
-com.ibm.wala.core.tests/report
-com.ibm.wala.core/@dot
-com.ibm.wala.core/com.ibm.wala.core*.jar
-com.ibm.wala.core/dat/wala.properties
-com.ibm.wala.dalvik/src/logback.xml
-com.ibm.wala.ide.jdt.test/testdata/
-edu.kit.wala.smali.test/out/
+.project
+/*/.settings/org.eclipse.buildship.core.prefs
+/.gradle/
+/.settings/org.eclipse.buildship.core.prefs
+/.vscode/settings.json
+/build/
+/com.ibm.wala.*/out/
+/com.ibm.wala.cast.java.jdt.test/
+/com.ibm.wala.cast.java.polyglot/lib/
+/com.ibm.wala.cast.java.test.data/src/JLex/
+/com.ibm.wala.cast.java.test/testdata/
+/com.ibm.wala.cast.js.html.nu_validator/lib/
+/com.ibm.wala.cast.js.nodejs/lib/
+/com.ibm.wala.cast.js.rhino.test/*.dump
+/com.ibm.wala.cast.js.rhino.test/*.html*
+/com.ibm.wala.cast.js.rhino.test/2009_swine_flu_outbreak
+/com.ibm.wala.cast.js.rhino.test/?game*
+/com.ibm.wala.cast.js.rhino.test/BunnyHunt
+/com.ibm.wala.cast.js.rhino.test/digg_attack
+/com.ibm.wala.cast.js.rhino.test/game.php*
+/com.ibm.wala.cast.js.rhino.test/xxxx
+/com.ibm.wala.cast.js.rhino/lib/
+/com.ibm.wala.cast.js.test.data/examples-src/ajaxslt/
+/com.ibm.wala.cast.js.test/examples-src/ajaxslt/
+/com.ibm.wala.cast.js/lib/
+/com.ibm.wala.cast/lib/
+/com.ibm.wala.core.testdata/*.jar
+/com.ibm.wala.core.testdata/@dot/
+/com.ibm.wala.core.testdata/lib/
+/com.ibm.wala.core.tests/report
+/com.ibm.wala.core/@dot
+/com.ibm.wala.core/com.ibm.wala.core*.jar
+/com.ibm.wala.core/dat/wala.properties
+/com.ibm.wala.dalvik.test/data/sample.cup
+/com.ibm.wala.dalvik.test/parser.java
+/com.ibm.wala.dalvik.test/report
+/com.ibm.wala.dalvik.test/sym.java
+/com.ibm.wala.ide.jdt.test/testdata/
+/edu.kit.wala.smali.test/out/
+results
 target/
-com.ibm.wala.dalvik.test/data/sample.cup
-com.ibm.wala.dalvik.test/parser.java
-com.ibm.wala.dalvik.test/report
-com.ibm.wala.dalvik.test/sym.java
\ No newline at end of file
Binary files /tmp/tmpdO65hx/hoNCbJkA_9/wala-1.3.9/gradle/wrapper/gradle-wrapper.jar and /tmp/tmpdO65hx/vj4dUdzt1P/wala-1.5.1/gradle/wrapper/gradle-wrapper.jar differ
diff -Nru wala-1.3.9/gradle/wrapper/gradle-wrapper.properties wala-1.5.1/gradle/wrapper/gradle-wrapper.properties
--- wala-1.3.9/gradle/wrapper/gradle-wrapper.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/gradle/wrapper/gradle-wrapper.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff -Nru wala-1.3.9/gradle.properties wala-1.5.1/gradle.properties
--- wala-1.3.9/gradle.properties	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/gradle.properties	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,2 @@
+org.gradle.caching=true
+org.gradle.parallel=true
diff -Nru wala-1.3.9/gradlew wala-1.5.1/gradlew
--- wala-1.3.9/gradlew	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/gradlew	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff -Nru wala-1.3.9/gradlew.bat wala-1.5.1/gradlew.bat
--- wala-1.3.9/gradlew.bat	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/gradlew.bat	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff -Nru wala-1.3.9/.idea/codeStyles/codeStyleConfig.xml wala-1.5.1/.idea/codeStyles/codeStyleConfig.xml
--- wala-1.3.9/.idea/codeStyles/codeStyleConfig.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/.idea/codeStyles/codeStyleConfig.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file
diff -Nru wala-1.3.9/.idea/codeStyles/Project.xml wala-1.5.1/.idea/codeStyles/Project.xml
--- wala-1.3.9/.idea/codeStyles/Project.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/.idea/codeStyles/Project.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    </JavaCodeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff -Nru wala-1.3.9/.idea/encodings.xml wala-1.5.1/.idea/encodings.xml
--- wala-1.3.9/.idea/encodings.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/.idea/encodings.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff -Nru wala-1.3.9/.idea/.gitignore wala-1.5.1/.idea/.gitignore
--- wala-1.3.9/.idea/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/.idea/.gitignore	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,6 @@
+*.iml
+/libraries/*.xml
+/modules.xml
+/tasks.xml
+/usage.statistics.xml
+/workspace.xml
diff -Nru wala-1.3.9/.idea/gradle.xml wala-1.5.1/.idea/gradle.xml
--- wala-1.3.9/.idea/gradle.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/.idea/gradle.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/buildSrc" />
+            <option value="$PROJECT_DIR$/com.ibm.wala-repository" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast.java" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast.java.ecj" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast.java.test" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast.java.test.data" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast.js" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast.js.html.nu_validator" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast.js.nodejs" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast.js.nodejs.test" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast.js.rhino" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast.js.rhino.test" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast.js.test" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast.js.test.data" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.cast.test" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.core" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.core.testdata" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.core.tests" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.dalvik" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.dalvik.test" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.ide" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.ide.jdt" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.ide.jdt.test" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.ide.jsdt" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.ide.jsdt.tests" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.ide.tests" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.ide_feature" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.scandroid" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.shrike" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.tests.ide_feature" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.tests_feature" />
+            <option value="$PROJECT_DIR$/com.ibm.wala.util" />
+            <option value="$PROJECT_DIR$/com.ibm.wala_feature" />
+          </set>
+        </option>
+        <option name="useAutoImport" value="true" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff -Nru wala-1.3.9/.idea/inspectionProfiles/.gitignore wala-1.5.1/.idea/inspectionProfiles/.gitignore
--- wala-1.3.9/.idea/inspectionProfiles/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/.idea/inspectionProfiles/.gitignore	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1 @@
+/profiles_settings.xml
diff -Nru wala-1.3.9/.idea/inspectionProfiles/Javadoc.xml wala-1.5.1/.idea/inspectionProfiles/Javadoc.xml
--- wala-1.3.9/.idea/inspectionProfiles/Javadoc.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/.idea/inspectionProfiles/Javadoc.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,726 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Javadoc" />
+    <inspection_tool class="AccessStaticViaInstance" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AmdModulesDependencies" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="Annotator" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="Anonymous2MethodRef" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AnonymousHasLambdaAlternative" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AppEngineDeprecatedRuntimeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AppEngineThreadsafeCGIHandlerInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AppEngineThreadsafeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ArrayCreationWithoutNewKeyword" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ArrayEquals" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ArrayHashCode" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ArrayObjectsEquals" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ArraysAsListWithZeroOrOneArgument" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AssertEqualsBetweenInconvertibleTypes" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AssertWithSideEffects" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AssertionCanBeIf" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="AtomicFieldUpdaterIssues" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AtomicFieldUpdaterNotStaticFinal" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BadExpressionStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashAddShebang" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashBuiltInVariable" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashDuplicateFunction" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashEvaluateArithmeticExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashEvaluateExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashFixShebang" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashFloatArithmetic" enabled="false" level="INFO" enabled_by_default="false" />
+    <inspection_tool class="BashGlobalLocalVarDef" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashGloballyRegisteredVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashInternalCommandFunctionOverride" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashMissingInclude" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashReadOnlyVariable" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="BashRecursiveInclusion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashReplaceWithDoubleBrackets" enabled="false" level="INFO" enabled_by_default="false" />
+    <inspection_tool class="BashSimpleArrayUse" enabled="false" level="INFO" enabled_by_default="false" />
+    <inspection_tool class="BashSimpleVarUsage" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashUnknownFileDescriptor" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashUnresolvedVariable" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashUnusedFunction" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashUnusedFunctionParams" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashWrapFunction" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="BigDecimalMethodWithoutRoundingCalled" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BlockingMethodInNonBlockingContext" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BooleanConstructor" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BoxingBoxedValue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BuildoutUnresolvedPartInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CStyleArrayDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CachedNumberConstructorCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CallerJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CanBeFinal" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="REPORT_CLASSES" value="false" />
+      <option name="REPORT_METHODS" value="false" />
+      <option name="REPORT_FIELDS" value="true" />
+    </inspection_tool>
+    <inspection_tool class="CapturingCleaner" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CastCanBeRemovedNarrowingVariableType" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CatchMayIgnoreException" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CaughtExceptionImmediatelyRethrown" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ChangeToMethod" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ChangeToOperator" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CharsetObjectCanBeUsed" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckDtdRefs" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CheckEmptyScriptTag" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckNodeTest" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckTagEmptyBody" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckValidXmlInScriptTagBody" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CheckXmlFileWithXercesValidator" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="ClashingTraitMethods" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ClassEscapesItsScope" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ClassGetClass" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ClassInDefaultPackage" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="ClassInitializerMayBeStatic" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ClassMayBeInterface" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="CloneDeclaresCloneNotSupported" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CodeBlock2Expr" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CollectionAddAllCanBeReplacedWithConstructor" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CollectionAddedToSelf" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CommaExpressionJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CommandLineInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComparatorCombinators" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComparatorMethodParameterNotUsed" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComparatorResultComparison" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComparisonToNaN" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComposeUnknownKeys" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="ComposeUnknownValues" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="ConditionCoveredByFurtherCondition" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ConditionalBreakInInfiniteLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ConditionalCanBeOptional" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ConditionalCanBePushedInsideExpression" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ConditionalExpression" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ConfusingElse" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ConstantConditionalExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ConstantConditionalExpressionJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ConstantConditions" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ConstantExpression" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ConstantIfStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ContinueOrBreakFromFinallyBlock" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ContinueOrBreakFromFinallyBlockJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Contract" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ControlFlowStatementWithoutBraces" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="Convert2Diamond" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Convert2Lambda" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Convert2MethodRef" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Convert2streamapi" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CopyConstructorMissesField" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssFloatPxLength" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidAtRule" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidCharsetRule" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidElement" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidFunction" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidHtmlTagReference" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidImport" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidMediaFeature" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidPropertyValue" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidPseudoSelector" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssMissingComma" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssNegativeValue" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssNoGenericFontName" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssOverwrittenProperties" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssRedundantUnit" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssReplaceWithShorthandSafely" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssReplaceWithShorthandUnsafely" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="CssUnitlessNumber" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssUnknownProperty" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssUnknownTarget" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedClass" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedCustomProperty" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedCustomPropertySet" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnusedSymbol" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CsvValidation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CythonUsageBeforeDeclarationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DanglingJavadoc" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DefaultAnnotationParam" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DefaultFileTemplate" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DelegatesTo" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Dependency" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="DeprecatedClassUsageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DeprecatedIsStillUsed" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Deprecation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DiamondCanBeReplacedWithExplicitTypeArguments" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="DivideByZero" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoBrokenLineCommentInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoCloseTagInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoIncompatibleInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoOrmInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoRelationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoUnresolvedFilterInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoUnresolvedLoadInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoUnresolvedStaticReferenceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoUnresolvedTagInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoUnresolvedTemplateReferenceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoUrlArgumentsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DockerFileAddOrCopySemantic" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DockerFileArgumentCount" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="DockerFileAssignments" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="DoubleNegation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DuplicateCaseLabelJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DuplicateCondition" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DuplicateExpressions" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="DuplicateThrows" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DuplicatedBlockNamesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Duplicates" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6BindWithArrowFunction" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6CheckImport" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6ClassMemberInitializationOrder" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6ConvertModuleExportToExport" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ES6ConvertRequireIntoImport" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ES6ConvertToForOf" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ES6ConvertVarToLetConst" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6MissingAwait" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ES6ModulesDependencies" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6PossiblyAsyncFunction" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6ShorthandObjectProperty" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ES6UnusedImports" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EmptyFinallyBlock" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EmptyMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EmptyStatementBody" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EmptyStatementBodyJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EmptyTryBlock" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EndBlockNamesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EndlessStream" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EnumSwitchStatementWhichMissesCases" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="EqualsBetweenInconvertibleTypes" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EqualsOnSuspiciousObject" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EqualsReplaceableByObjectsCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EqualsWhichDoesntCheckParameterClass" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EqualsWithItself" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExceptionCaughtLocallyJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExcessiveLambdaUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExplicitArgumentCanBeLambda" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ExtendsAnnotation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExtendsObject" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExtendsTagPositionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExternalizableWithoutPublicNoArgConstructor" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FallThroughInSwitchStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FieldCanBeLocal" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FinalPrivateMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FinalStaticMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FinallyBlockCannotCompleteNormally" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FlowJSConfig" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FlowJSFlagCommentPlacement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FoldExpressionIntoStream" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ForCanBeForeach" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ForLoopReplaceableByWhile" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="FrequentlyUsedInheritorInspection" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="FunctionalExpressionCanBeFolded" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FuseStreamOperations" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrDeprecatedAPIUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrEqualsBetweenInconvertibleTypes" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrFinalVariableAccess" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrMethodMayBeStatic" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrPackage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrReassignedInClosureLocalVar" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrUnnecessaryAlias" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrUnnecessaryDefModifier" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrUnnecessaryPublicModifier" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrUnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrUnresolvedAccess" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyAccessToStaticFieldLockedOnInstance" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyAccessibility" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyAssignabilityCheck" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyConditionalWithIdenticalBranches" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyConstantConditional" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyConstantIfStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyConstructorNamedArguments" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyDivideByZero" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyDocCheck" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="GroovyDoubleNegation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyDuplicateSwitchBranch" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyEmptyStatementBody" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyFallthrough" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyGStringKey" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyIfStatementWithIdenticalBranches" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyInArgumentCheck" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyInfiniteLoopStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyInfiniteRecursion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyLabeledStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyMissingReturnStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyPointlessBoolean" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyResultOfObjectAllocationIgnored" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovySillyAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovySynchronizationOnNonFinalField" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovySynchronizationOnVariableInitializedWithLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyTrivialConditional" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyTrivialIf" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUncheckedAssignmentOfMemberOfRawType" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnnecessaryContinue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnnecessaryReturn" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnreachableStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnsynchronizedMethodOverridesSynchronizedMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnusedAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnusedCatchParameter" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnusedDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnusedIncOrDec" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyVariableNotAssigned" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Guava" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HardwiredNamespacePrefix" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlExtraClosingTag" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlMissingClosingTag" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="HtmlTagCanBeJavadocTag" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="HtmlUnknownAnchorTarget" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownAttribute" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownBooleanAttribute" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownTag" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownTarget" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IdempotentLoopBody" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IfCanBeAssertion" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="IfCanBeSwitch" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IgnoreCoverEntry" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IgnoreDuplicateEntry" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="IgnoreIncorrectEntry" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="IgnoreRelativeEntry" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="IgnoreResultOfCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IgnoreSyntaxEntry" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="IgnoreUnusedEntry" enabled="false" level="UNUSED ENTRY" enabled_by_default="false" />
+    <inspection_tool class="ImplicitArrayToString" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ImplicitSubclassInspection" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="ImplicitTypeConversion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IncompatibleMask" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IncompatibleMaskJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IncompleteProperty" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="IndexOfReplaceableByContains" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IndexZeroUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InfiniteLoopJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InfiniteLoopStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InfiniteRecursion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InfiniteRecursionJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InstantiatingObjectToGetClassObject" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IntegerDivisionInFloatingPointContext" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InterfaceMethodClashesWithObject" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InvalidComparatorMethodReference" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSAccessibilityCheck" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSAnnotator" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="JSArrowFunctionBracesCanBeRemoved" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="JSAssignmentUsedAsCondition" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSBitwiseOperatorUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSCheckFunctionSignatures" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSClosureCompilerSyntax" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSCommentMatchesSignature" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSComparisonWithNaN" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSConsecutiveCommasInArrayLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSConstructorReturnsPrimitive" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSDeprecatedSymbols" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSDuplicatedDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSEqualityComparisonWithCoercion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSFileReferences" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSFunctionExpressionToArrowFunction" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="JSIgnoredPromiseFromCall" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSJQueryEfficiency" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSLastCommaInArrayLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSLastCommaInObjectLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSMethodCanBeStatic" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSMismatchedCollectionQueryUpdate" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSNonASCIINames" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSObjectNullOrUndefined" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSPotentiallyInvalidConstructorUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSPotentiallyInvalidTargetOfIndexedPropertyAccess" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSPotentiallyInvalidUsageOfClassThis" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSPotentiallyInvalidUsageOfThis" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSPrimitiveTypeWrapperUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSRedeclarationOfBlockScope" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="JSReferencingArgumentsOutsideOfFunction" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="JSReferencingMutableVariableFromClosure" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSRemoveUnnecessaryParentheses" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="JSStringConcatenationToES6Template" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="JSSuspiciousNameCombination" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSTypeOfValues" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUndeclaredVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUndefinedPropertyAssignment" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnfilteredForInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedExtXType" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedFunction" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedLibraryURL" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnusedAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnusedGlobalSymbols" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnusedLocalSymbols" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSValidateJSDoc" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSValidateTypes" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSXNamespaceValidation" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JUnit4AnnotatedMethodInJUnit3TestCase" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JUnit5MalformedNestedClass" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JUnit5MalformedParameterized" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JUnit5MalformedRepeated" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JUnit5Platform" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java8ArraySetAll" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java8CollectionRemoveIf" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java8ListSort" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java8MapApi" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java8MapForEach" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java9CollectionFactory" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java9ModuleExportsPackageToItself" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java9RedundantRequiresStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java9ReflectionClassVisibility" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java9UndeclaredServiceUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavaLangInvokeHandleSignature" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavaModuleNaming" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavaReflectionInvocation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavaReflectionMemberAccess" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavaRequiresAutoModule" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavacQuirks" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavadocHtmlLint" enabled="true" level="ERROR" enabled_by_default="true" />
+    <inspection_tool class="JoinDeclarationAndAssignmentJava" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="Json5StandardCompliance" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="JsonDuplicatePropertyKeys" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JsonSchemaCompliance" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JsonSchemaRefReference" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JsonStandardCompliance" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="LambdaBodyCanBeCodeBlock" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="LambdaCanBeMethodCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LambdaCanBeReplacedWithAnonymous" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="LambdaParameterTypeCanBeSpecified" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="LengthOneStringsInConcatenation" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ListRemoveInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LongLiteralsEndingWithLowercaseL" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LoopConditionNotUpdatedInsideLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LoopStatementThatDoesntLoopJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LoopStatementsThatDontLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LossyEncoding" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MagicConstant" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MakoArgumentListInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MalformedFormatString" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MalformedXPath" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ManualArrayCopy" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ManualArrayToCollectionCopy" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MarkdownUnresolvedFileReference" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MarkedForRemoval" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="MathRandomCastToInt" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MetaAnnotationWithoutRuntimeRetention" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MethodCanBeVariableArityMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MethodNameSameAsClassName" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MethodRefCanBeReplacedWithLambda" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="MismatchedArrayReadWrite" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MismatchedCollectionQueryUpdate" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MismatchedStringBuilderQueryUpdate" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MissingDeprecatedAnnotation" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MissingFinalNewline" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="MissingOverrideAnnotation" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="MisspelledHeader" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="MoveFieldAssignmentToInitializer" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="MultiCatchCanBeSplit" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="MultipleRepositoryUrls" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NewInstanceOfSingleton" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NewObjectEquality" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NewStringBufferWithCharArgument" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NoExplicitFinalizeCalls" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NodeModulesDependencies" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="NonAsciiCharacters" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NonAtomicOperationOnVolatileField" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NpmUsedModulesInstalled" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="NullArgumentToVariableArgMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NullableProblems" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NumberEquality" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NumericOverflow" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ObjectEquality" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ObjectEqualsCanBeEquality" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ObjectsEqualsCanBeSimplified" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ObviousNullCheck" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OctalIntegerJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OctalLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OptionalAssignedToNull" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OptionalGetWithoutIsPresent" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OptionalIsPresent" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OptionalUsedAsFieldOrParameterType" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OverwrittenKey" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PackageAccessibility" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="PackageJsonMismatchedDependency" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ParameterCanBeLocal" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PointlessArithmeticExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PointlessArithmeticExpressionJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PointlessBitwiseExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PointlessBitwiseExpressionJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PointlessBooleanExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PointlessBooleanExpressionJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PointlessNullCheck" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PrimitiveArrayArgumentToVariableArgMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyAbstractClassInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyArgumentListInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyAssignmentToLoopOrWithParameterInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyAsyncCallInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyAttributeOutsideInitInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyBroadExceptionInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyByteLiteralInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyCallByClassInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyCallingNonCallableInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyChainedComparisonsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyClassHasNoInitInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyComparisonWithNoneInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDataclassInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDecoratorInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDefaultArgumentInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDeprecationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDictCreationInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDictDuplicateKeysInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDocstringTypesInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDunderSlotsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyExceptClausesOrderInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyExceptionInheritInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyFromFutureImportInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyGlobalUndefinedInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyInconsistentIndentationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyIncorrectDocstringInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyInitNewSignatureInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyInterpreterInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyListCreationInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyMethodFirstArgAssignmentInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyMethodMayBeStaticInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyMethodOverridingInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyMethodParametersInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyMissingConstructorInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyNamedTupleInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyNestedDecoratorsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyNonAsciiCharInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyNoneFunctionAssignmentInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyOldStyleClassesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyOverloadsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyPep8Inspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyPep8NamingInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyPropertyAccessInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyPropertyDefinitionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyProtectedMemberInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyProtocolInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyRedeclarationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyRedundantParenthesesInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyReturnFromInitInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PySetFunctionToLiteralInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyShadowingBuiltinsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyShadowingNamesInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PySimplifyBooleanCheckInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PySingleQuotedDocstringInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyStatementEffectInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyStringExceptionInspection" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="PyStringFormatInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyStubPackagesAdvertiser" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyStubPackagesCompatibilityInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PySuperArgumentsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyTestParametrizedInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyTrailingSemicolonInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyTupleAssignmentBalanceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyTupleItemAssignmentInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyTypeCheckerInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyTypeHintsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyUnboundLocalVariableInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyUnnecessaryBackslashInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyUnreachableCodeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyUnusedLocalInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyramidSetupInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Query_bound_parameters" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Query_index_required" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Query_restricted" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RawTypeCanBeGeneric" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ReadWriteStringCanBeUsed" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantArrayCreation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantCast" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantClassCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantCollectionOperation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantComparatorComparing" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantCompareCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantExplicitClose" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantExplicitVariableType" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="RedundantLambdaParameterType" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="RedundantStreamOptionalCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantStringFormatCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantSuppression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantThrows" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantTypeArguments" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantTypeConversion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ReflectionForUnavailableAnnotation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RefusedBequest" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RegExpDuplicateAlternationBranch" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RegExpEmptyAlternationBranch" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RegExpEscapedMetaCharacter" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="RegExpOctalEscape" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="RegExpRedundantEscape" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RegExpRepeatedSpace" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RegExpSingleCharAlternation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RegExpUnexpectedAnchor" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ReplaceAllDot" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ReplaceInefficientStreamCount" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ReplaceNullCheck" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RequiredAttributes" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ReservedWordUsedAsNameJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Restricted_Python_calls" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ReturnFromFinallyBlock" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ReturnFromFinallyBlockJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ReturnSeparatedFromComputation" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="SafeVarargsDetector" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SameParameterValue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SameReturnValue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ScheduledForRemoval" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SecondUnsafeCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ShiftOutOfRange" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ShiftOutOfRangeJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SillyAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SillyAssignmentJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SimplifiableBooleanExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SimplifiableConditionalExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SimplifiableIfStatement" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="SimplifiableJUnitAssertion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SimplifyCollector" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SimplifyForEach" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SimplifyOptionalCallChains" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SimplifyStreamApiCallChains" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Since15" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="SingleElementAnnotation" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="SingleStatementInBlock" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="SingletonConstructor" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="SortedCollectionWithNonComparableKeys" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false" />
+    <inspection_tool class="StaticInitializerReferencesSubClass" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StaticPseudoFunctionalStyleMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StreamToLoop" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="StringBufferReplaceableByString" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StringBufferReplaceableByStringBuilder" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StringConcatenationInLoops" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StringConcatenationInsideStringBufferAppend" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StringEquality" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StringEqualsCharSequence" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StringOperationCanBeSimplified" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StringTokenizerDelimiter" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SuspiciousArrayMethodCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SuspiciousListRemoveInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SuspiciousMethodCalls" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SuspiciousNameCombination" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SuspiciousSystemArraycopy" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SuspiciousToArrayCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SuspiciousTypeOfGuard" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SwitchStatementWithTooFewBranches" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SynchronizationOnGetClass" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SynchronizationOnLocalVariableOrMethodParameter" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SynchronizeOnNonFinalField" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SyntaxError" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="TailRecursion" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="TestFailedLine" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ThisExpressionReferencesGlobalObjectJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ThrowFromFinallyBlock" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ThrowFromFinallyBlockJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ThrowableNotThrown" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ThrowablePrintedToSystemOut" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ToArrayCallWithZeroLengthArrayArgument" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TooBroadScope" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="TrailingSpacesInProperty" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TrivialConditionalJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TrivialFunctionalExpressionUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TrivialIf" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TrivialIfJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TryFinallyCanBeTryWithResources" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TryStatementWithMultipleResources" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="TryWithIdenticalCatches" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeCustomizer" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeParameterExtendsObject" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeParameterHidesVisibleType" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptAbstractClassConstructorCanBeMadeProtected" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptAccessibilityCheck" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptCheckImport" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptConfig" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptFieldCanBeMadeReadonly" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptMissingAugmentationImport" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptPreferShortImport" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptSuspiciousConstructorParameterAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptUMDGlobal" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptUnresolvedFunction" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptUnresolvedVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptValidateJSTypes" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptValidateTypes" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="TypescriptExplicitMemberType" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="UNCHECKED_WARNING" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UNUSED_IMPORT" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnclearBinaryExpression" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="UnnecessarilyQualifiedInnerClassAccess" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryBlockStatement" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryBoxing" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryBreak" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryCallToStringValueOf" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryConditionalExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryContinue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryContinueJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryEmptyArrayUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryEnumModifier" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryFullyQualifiedName" enabled="false" level="INFORMATION" enabled_by_default="false">
+      <option name="m_ignoreJavadoc" value="false" />
+      <option name="ignoreInModuleStatements" value="true" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessaryInheritDoc" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UnnecessaryInitCause" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryInterfaceModifier" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLabelJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLabelOnBreakStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLabelOnBreakStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLabelOnContinueStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLabelOnContinueStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLocalVariable" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLocalVariableJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryModuleDependencyInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryParentheses" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryQualifiedReference" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryReturn" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryReturnJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryTemporaryOnConversionFromString" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryTemporaryOnConversionToString" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryUnboxing" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnreachableCodeJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnregisteredActivator" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="UnresolvedReference" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="UnstableApiUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnterminatedStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnusedAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnusedLabel" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnusedProperty" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnusedReturnValue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UseBulkOperation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UseCompareMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="VarargParameter" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="VariableTypeCanBeExplicit" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="WeakerAccess" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="true" />
+      <option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="true" />
+      <option name="SUGGEST_PRIVATE_FOR_INNERS" value="false" />
+    </inspection_tool>
+    <inspection_tool class="WebpackConfigHighlighting" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="WhileCanBeForeach" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="WhileLoopSpinsOnField" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="WithStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="WrapperTypeMayBePrimitive" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="WrongImportPackage" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="WrongPackageStatement" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="WrongPropertyKeyValueDelimiter" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlDefaultAttributeValue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlDeprecatedElement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlDuplicatedId" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XmlHighlighting" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XmlInvalidId" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XmlPathReference" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XmlUnboundNsPrefix" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlUnusedNamespaceDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlWrongRootElement" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XsltDeclarations" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XsltTemplateInvocation" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XsltUnusedDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XsltVariableShadowing" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="YAMLDuplicatedKeys" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="YAMLRecursiveAlias" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="YAMLSchemaValidation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="YAMLUnresolvedAlias" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="YAMLUnusedAnchor" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="unused" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="LOCAL_VARIABLE" value="true" />
+      <option name="FIELD" value="true" />
+      <option name="METHOD" value="true" />
+      <option name="CLASS" value="true" />
+      <option name="PARAMETER" value="true" />
+      <option name="REPORT_PARAMETER_FOR_PUBLIC_METHODS" value="true" />
+      <option name="ADD_MAINS_TO_ENTRIES" value="true" />
+      <option name="ADD_APPLET_TO_ENTRIES" value="true" />
+      <option name="ADD_SERVLET_TO_ENTRIES" value="true" />
+      <option name="ADD_NONJAVA_TO_ENTRIES" value="true" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff -Nru wala-1.3.9/.idea/inspectionProfiles/Java_Performance.xml wala-1.5.1/.idea/inspectionProfiles/Java_Performance.xml
--- wala-1.3.9/.idea/inspectionProfiles/Java_Performance.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/.idea/inspectionProfiles/Java_Performance.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,911 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Java Performance" />
+    <inspection_tool class="AccessStaticViaInstance" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AmdModulesDependencies" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="Annotator" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="Anonymous2MethodRef" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AnonymousHasLambdaAlternative" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AppEngineDeprecatedRuntimeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AppEngineThreadsafeCGIHandlerInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AppEngineThreadsafeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ArrayCreationWithoutNewKeyword" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ArrayEquals" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ArrayHashCode" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ArrayObjectsEquals" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AssertEqualsBetweenInconvertibleTypes" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AssertWithSideEffects" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AssertionCanBeIf" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="AtomicFieldUpdaterIssues" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AtomicFieldUpdaterNotStaticFinal" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BadExpressionStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashAddShebang" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashBuiltInVariable" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashDuplicateFunction" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashEvaluateArithmeticExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashEvaluateExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashFixShebang" enabled="false" level="WARNING" enabled_by_default="false">
+      <shebang>/bin/bash</shebang>
+      <shebang>/bin/sh</shebang>
+    </inspection_tool>
+    <inspection_tool class="BashFloatArithmetic" enabled="false" level="INFO" enabled_by_default="false" />
+    <inspection_tool class="BashGlobalLocalVarDef" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashGloballyRegisteredVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashInternalCommandFunctionOverride" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashMissingInclude" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashReadOnlyVariable" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="BashRecursiveInclusion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashReplaceWithDoubleBrackets" enabled="false" level="INFO" enabled_by_default="false" />
+    <inspection_tool class="BashSimpleArrayUse" enabled="false" level="INFO" enabled_by_default="false" />
+    <inspection_tool class="BashSimpleVarUsage" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashUnknownFileDescriptor" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashUnresolvedVariable" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashUnusedFunction" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashUnusedFunctionParams" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BashWrapFunction" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="BigDecimalMethodWithoutRoundingCalled" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BlockingMethodInNonBlockingContext" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="BuildoutUnresolvedPartInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CStyleArrayDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CachedNumberConstructorCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CallerJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CanBeFinal" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="REPORT_CLASSES" value="false" />
+      <option name="REPORT_METHODS" value="false" />
+      <option name="REPORT_FIELDS" value="true" />
+    </inspection_tool>
+    <inspection_tool class="CapturingCleaner" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CastCanBeRemovedNarrowingVariableType" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CatchMayIgnoreException" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CaughtExceptionImmediatelyRethrown" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ChangeToMethod" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ChangeToOperator" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CharsetObjectCanBeUsed" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckDtdRefs" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CheckEmptyScriptTag" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckNodeTest" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckTagEmptyBody" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckValidXmlInScriptTagBody" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CheckXmlFileWithXercesValidator" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="ClashingTraitMethods" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ClassEscapesItsScope" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ClassGetClass" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ClassInDefaultPackage" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="ClassMayBeInterface" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="CloneDeclaresCloneNotSupported" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CodeBlock2Expr" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CollectionAddedToSelf" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CommaExpressionJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CommandLineInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComparatorCombinators" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComparatorMethodParameterNotUsed" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComparatorResultComparison" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComparisonToNaN" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComposeUnknownKeys" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="ComposeUnknownValues" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="ConditionCoveredByFurtherCondition" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ConditionalBreakInInfiniteLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ConditionalCanBeOptional" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ConditionalCanBePushedInsideExpression" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ConditionalExpression" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ConfusingElse" enabled="false" level="INFORMATION" enabled_by_default="false">
+      <option name="reportWhenNoStatementFollow" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ConstantConditionalExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ConstantConditionalExpressionJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ConstantConditions" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="SUGGEST_NULLABLE_ANNOTATIONS" value="false" />
+      <option name="DONT_REPORT_TRUE_ASSERT_STATEMENTS" value="false" />
+    </inspection_tool>
+    <inspection_tool class="ConstantExpression" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ConstantIfStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ContinueOrBreakFromFinallyBlock" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ContinueOrBreakFromFinallyBlockJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Contract" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ControlFlowStatementWithoutBraces" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="Convert2Diamond" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Convert2Lambda" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Convert2MethodRef" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Convert2streamapi" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="CopyConstructorMissesField" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssFloatPxLength" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidAtRule" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidCharsetRule" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidElement" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidFunction" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidHtmlTagReference" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidImport" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidMediaFeature" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidPropertyValue" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidPseudoSelector" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssMissingComma" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssNegativeValue" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssNoGenericFontName" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssOverwrittenProperties" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssRedundantUnit" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssReplaceWithShorthandSafely" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssReplaceWithShorthandUnsafely" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="CssUnitlessNumber" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssUnknownProperty" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myCustomPropertiesEnabled" value="false" />
+      <option name="myIgnoreVendorSpecificProperties" value="false" />
+      <option name="myCustomPropertiesList">
+        <value>
+          <list size="0" />
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="CssUnknownTarget" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedClass" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedCustomProperty" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedCustomPropertySet" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnusedSymbol" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CsvValidation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CythonUsageBeforeDeclarationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DanglingJavadoc" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DefaultAnnotationParam" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DefaultFileTemplate" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="CHECK_FILE_HEADER" value="true" />
+      <option name="CHECK_TRY_CATCH_SECTION" value="true" />
+      <option name="CHECK_METHOD_BODY" value="true" />
+    </inspection_tool>
+    <inspection_tool class="DelegatesTo" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Dependency" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="DeprecatedClassUsageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DeprecatedIsStillUsed" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Deprecation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DiamondCanBeReplacedWithExplicitTypeArguments" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="DivideByZero" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoBrokenLineCommentInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoCloseTagInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoIncompatibleInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoOrmInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoRelationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoUnresolvedFilterInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoUnresolvedLoadInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoUnresolvedStaticReferenceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoUnresolvedTagInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoUnresolvedTemplateReferenceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DjangoUrlArgumentsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DockerFileAddOrCopySemantic" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DockerFileArgumentCount" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="DockerFileAssignments" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="DoubleNegation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DuplicateCaseLabelJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DuplicateCondition" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="ignoreSideEffectConditions" value="true" />
+    </inspection_tool>
+    <inspection_tool class="DuplicateExpressions" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="DuplicateThrows" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DuplicatedBlockNamesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Duplicates" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6BindWithArrowFunction" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6CheckImport" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6ClassMemberInitializationOrder" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6ConvertModuleExportToExport" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ES6ConvertRequireIntoImport" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ES6ConvertToForOf" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ES6ConvertVarToLetConst" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6MissingAwait" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ES6ModulesDependencies" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6PossiblyAsyncFunction" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="ES6ShorthandObjectProperty" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ES6UnusedImports" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EmptyFinallyBlock" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EmptyMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EmptyStatementBody" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_reportEmptyBlocks" value="true" />
+    </inspection_tool>
+    <inspection_tool class="EmptyStatementBodyJS" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_reportEmptyBlocks" value="false" />
+    </inspection_tool>
+    <inspection_tool class="EmptyTryBlock" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EndBlockNamesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EndlessStream" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EnumSwitchStatementWhichMissesCases" enabled="false" level="INFORMATION" enabled_by_default="false">
+      <option name="ignoreSwitchStatementsWithDefault" value="true" />
+    </inspection_tool>
+    <inspection_tool class="EqualsBetweenInconvertibleTypes" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EqualsOnSuspiciousObject" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EqualsReplaceableByObjectsCall" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="EqualsWhichDoesntCheckParameterClass" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EqualsWithItself" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExceptionCaughtLocallyJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExcessiveLambdaUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExtendsAnnotation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExtendsObject" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExtendsTagPositionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ExternalizableWithoutPublicNoArgConstructor" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FallThroughInSwitchStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FieldCanBeLocal" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FinalPrivateMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FinalStaticMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FinallyBlockCannotCompleteNormally" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FlowJSConfig" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FlowJSFlagCommentPlacement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FoldExpressionIntoStream" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ForCanBeForeach" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="REPORT_INDEXED_LOOP" value="true" />
+      <option name="ignoreUntypedCollections" value="false" />
+    </inspection_tool>
+    <inspection_tool class="ForLoopReplaceableByWhile" enabled="false" level="INFORMATION" enabled_by_default="false">
+      <option name="m_ignoreLoopsWithoutConditions" value="false" />
+    </inspection_tool>
+    <inspection_tool class="FrequentlyUsedInheritorInspection" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="FunctionalExpressionCanBeFolded" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FuseStreamOperations" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrDeprecatedAPIUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrEqualsBetweenInconvertibleTypes" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrFinalVariableAccess" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrMethodMayBeStatic" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrPackage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrReassignedInClosureLocalVar" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrUnnecessaryAlias" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrUnnecessaryDefModifier" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrUnnecessaryPublicModifier" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrUnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrUnresolvedAccess" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyAccessToStaticFieldLockedOnInstance" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyAccessibility" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyAssignabilityCheck" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyConditionalWithIdenticalBranches" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyConstantConditional" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyConstantIfStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyConstructorNamedArguments" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyDivideByZero" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyDocCheck" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="GroovyDoubleNegation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyDuplicateSwitchBranch" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyEmptyStatementBody" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyFallthrough" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyGStringKey" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyIfStatementWithIdenticalBranches" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyInArgumentCheck" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyInfiniteLoopStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyInfiniteRecursion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyLabeledStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyMissingReturnStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyPointlessBoolean" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyResultOfObjectAllocationIgnored" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovySillyAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovySynchronizationOnNonFinalField" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovySynchronizationOnVariableInitializedWithLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyTrivialConditional" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyTrivialIf" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUncheckedAssignmentOfMemberOfRawType" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnnecessaryContinue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnnecessaryReturn" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnreachableStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnsynchronizedMethodOverridesSynchronizedMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnusedAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnusedCatchParameter" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnusedDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyUnusedIncOrDec" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GroovyVariableNotAssigned" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Guava" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HardwiredNamespacePrefix" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlExtraClosingTag" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlMissingClosingTag" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownAnchorTarget" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownAttribute" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myValues">
+        <value>
+          <list size="0" />
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="HtmlUnknownBooleanAttribute" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownTag" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myValues">
+        <value>
+          <list size="6">
+            <item index="0" class="java.lang.String" itemvalue="nobr" />
+            <item index="1" class="java.lang.String" itemvalue="noembed" />
+            <item index="2" class="java.lang.String" itemvalue="comment" />
+            <item index="3" class="java.lang.String" itemvalue="noscript" />
+            <item index="4" class="java.lang.String" itemvalue="embed" />
+            <item index="5" class="java.lang.String" itemvalue="script" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="HtmlUnknownTarget" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IdempotentLoopBody" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IfCanBeAssertion" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="IfCanBeSwitch" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="minimumBranches" value="3" />
+      <option name="suggestIntSwitches" value="false" />
+      <option name="suggestEnumSwitches" value="false" />
+    </inspection_tool>
+    <inspection_tool class="IgnoreCoverEntry" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IgnoreDuplicateEntry" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="IgnoreIncorrectEntry" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="IgnoreRelativeEntry" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="IgnoreResultOfCall" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_reportAllNonLibraryCalls" value="false" />
+      <option name="callCheckString" value="java.io.File,.*,java.io.InputStream,read|skip|available|markSupported,java.io.Reader,read|skip|ready|markSupported,java.lang.Boolean,.*,java.lang.Byte,.*,java.lang.Character,.*,java.lang.Double,.*,java.lang.Float,.*,java.lang.Integer,.*,java.lang.Long,.*,java.lang.Math,.*,java.lang.Object,equals|hashCode|toString,java.lang.Short,.*,java.lang.StrictMath,.*,java.lang.String,.*,java.lang.Thread,interrupted,java.math.BigInteger,.*,java.math.BigDecimal,.*,java.net.InetAddress,.*,java.net.URI,.*,java.util.Arrays,.*,java.util.List,of,java.util.Set,of,java.util.Map,of|ofEntries|entry,java.util.Collections,(?!addAll).*,java.util.UUID,.*,java.util.regex.Matcher,pattern|toMatchResult|start|end|group|groupCount|matches|find|lookingAt|quoteReplacement|replaceAll|replaceFirst|regionStart|regionEnd|hasTransparentBounds|hasAnchoringBounds|hitEnd|requireEnd,java.util.regex.Pattern,.*,java.util.stream.BaseStream,.*" />
+    </inspection_tool>
+    <inspection_tool class="IgnoreSyntaxEntry" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="IgnoreUnusedEntry" enabled="false" level="UNUSED ENTRY" enabled_by_default="false" />
+    <inspection_tool class="ImplicitArrayToString" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ImplicitSubclassInspection" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="ImplicitTypeConversion" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="BITS" value="1720" />
+      <option name="FLAG_EXPLICIT_CONVERSION" value="true" />
+      <option name="IGNORE_NODESET_TO_BOOLEAN_VIA_STRING" value="true" />
+    </inspection_tool>
+    <inspection_tool class="IncompatibleMask" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IncompatibleMaskJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IncompleteProperty" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="IndexOfReplaceableByContains" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IndexZeroUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InfiniteLoopJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InfiniteLoopStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InfiniteRecursion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InfiniteRecursionJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="IntegerDivisionInFloatingPointContext" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InterfaceMethodClashesWithObject" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="InvalidComparatorMethodReference" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSAccessibilityCheck" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSAnnotator" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="JSArrowFunctionBracesCanBeRemoved" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="JSAssignmentUsedAsCondition" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSBitwiseOperatorUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSCheckFunctionSignatures" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSClosureCompilerSyntax" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSCommentMatchesSignature" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSComparisonWithNaN" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSConsecutiveCommasInArrayLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSConstructorReturnsPrimitive" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSDeprecatedSymbols" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSDuplicatedDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSEqualityComparisonWithCoercion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSFileReferences" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSFunctionExpressionToArrowFunction" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="JSIgnoredPromiseFromCall" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSJQueryEfficiency" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSLastCommaInArrayLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSLastCommaInObjectLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSMethodCanBeStatic" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSMismatchedCollectionQueryUpdate" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="queries" value="trace,write,forEach,length" />
+      <option name="updates" value="pop,push,shift,splice,unshift,add,insert,remove" />
+    </inspection_tool>
+    <inspection_tool class="JSNonASCIINames" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSObjectNullOrUndefined" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSPotentiallyInvalidConstructorUsage" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myConsiderUppercaseFunctionsToBeConstructors" value="true" />
+    </inspection_tool>
+    <inspection_tool class="JSPotentiallyInvalidTargetOfIndexedPropertyAccess" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSPotentiallyInvalidUsageOfClassThis" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSPotentiallyInvalidUsageOfThis" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSPrimitiveTypeWrapperUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSRedeclarationOfBlockScope" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="JSReferencingArgumentsOutsideOfFunction" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="JSReferencingMutableVariableFromClosure" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSRemoveUnnecessaryParentheses" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="JSStringConcatenationToES6Template" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="JSSuspiciousNameCombination" enabled="false" level="WARNING" enabled_by_default="false">
+      <group names="x,width,left,right" />
+      <group names="y,height,top,bottom" />
+      <exclude classes="Math" />
+    </inspection_tool>
+    <inspection_tool class="JSTypeOfValues" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUndeclaredVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUndefinedPropertyAssignment" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnfilteredForInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedExtXType" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedFunction" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedLibraryURL" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnusedAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnusedGlobalSymbols" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnusedLocalSymbols" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSValidateJSDoc" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSValidateTypes" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSXNamespaceValidation" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JUnit4AnnotatedMethodInJUnit3TestCase" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JUnit5MalformedNestedClass" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JUnit5MalformedParameterized" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JUnit5MalformedRepeated" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JUnit5Platform" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java8ArraySetAll" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="Java8CollectionRemoveIf" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java8ListSort" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java8MapApi" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java8MapForEach" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java9CollectionFactory" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java9ModuleExportsPackageToItself" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java9RedundantRequiresStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java9ReflectionClassVisibility" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Java9UndeclaredServiceUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavaDoc" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="TOP_LEVEL_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="INNER_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="METHOD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+        </value>
+      </option>
+      <option name="FIELD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="IGNORE_DEPRECATED" value="false" />
+      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+      <option name="myAdditionalJavadocTags" value="" />
+    </inspection_tool>
+    <inspection_tool class="JavaLangInvokeHandleSignature" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavaModuleNaming" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavaReflectionInvocation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavaReflectionMemberAccess" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavaRequiresAutoModule" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavacQuirks" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JavadocReference" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="JoinDeclarationAndAssignmentJava" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="Json5StandardCompliance" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="JsonDuplicatePropertyKeys" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JsonSchemaCompliance" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JsonSchemaRefReference" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JsonStandardCompliance" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="KeySetIterationMayUseEntrySet" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="LambdaBodyCanBeCodeBlock" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="LambdaCanBeMethodCall" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="LambdaCanBeReplacedWithAnonymous" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="LambdaParameterTypeCanBeSpecified" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="LengthOneStringInIndexOf" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="LongLiteralsEndingWithLowercaseL" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LoopConditionNotUpdatedInsideLoop" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="ignoreIterators" value="false" />
+    </inspection_tool>
+    <inspection_tool class="LoopStatementThatDoesntLoopJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LoopStatementsThatDontLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="LossyEncoding" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MagicConstant" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MakoArgumentListInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MalformedFormatString" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MalformedXPath" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MarkdownUnresolvedFileReference" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MarkedForRemoval" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="MathRandomCastToInt" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MetaAnnotationWithoutRuntimeRetention" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MethodCanBeVariableArityMethod" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="MethodNameSameAsClassName" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MethodRefCanBeReplacedWithLambda" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="MismatchedArrayReadWrite" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MismatchedCollectionQueryUpdate" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="queryNames">
+        <value />
+      </option>
+      <option name="updateNames">
+        <value />
+      </option>
+      <option name="ignoredClasses">
+        <value />
+      </option>
+    </inspection_tool>
+    <inspection_tool class="MismatchedStringBuilderQueryUpdate" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MissingFinalNewline" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="MissingOverrideAnnotation" enabled="false" level="INFORMATION" enabled_by_default="false">
+      <option name="ignoreObjectMethods" value="true" />
+      <option name="ignoreAnonymousClassMethods" value="false" />
+    </inspection_tool>
+    <inspection_tool class="MisspelledHeader" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="MoveFieldAssignmentToInitializer" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="MultiCatchCanBeSplit" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="MultipleRepositoryUrls" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NewInstanceOfSingleton" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NewObjectEquality" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NewStringBufferWithCharArgument" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NoExplicitFinalizeCalls" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NodeModulesDependencies" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="NonAsciiCharacters" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NonAtomicOperationOnVolatileField" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NpmUsedModulesInstalled" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="NullArgumentToVariableArgMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NullableProblems" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="REPORT_NULLABLE_METHOD_OVERRIDES_NOTNULL" value="true" />
+      <option name="REPORT_NOT_ANNOTATED_METHOD_OVERRIDES_NOTNULL" value="true" />
+      <option name="REPORT_NOTNULL_PARAMETER_OVERRIDES_NULLABLE" value="true" />
+      <option name="REPORT_NOT_ANNOTATED_PARAMETER_OVERRIDES_NOTNULL" value="true" />
+      <option name="REPORT_NOT_ANNOTATED_GETTER" value="true" />
+      <option name="REPORT_NOT_ANNOTATED_SETTER_PARAMETER" value="true" />
+      <option name="REPORT_ANNOTATION_NOT_PROPAGATED_TO_OVERRIDERS" value="true" />
+      <option name="REPORT_NULLS_PASSED_TO_NON_ANNOTATED_METHOD" value="true" />
+    </inspection_tool>
+    <inspection_tool class="NumberEquality" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NumericOverflow" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ObjectEquality" enabled="false" level="INFORMATION" enabled_by_default="false">
+      <option name="m_ignoreEnums" value="true" />
+      <option name="m_ignoreClassObjects" value="true" />
+      <option name="m_ignorePrivateConstructors" value="false" />
+    </inspection_tool>
+    <inspection_tool class="ObjectsEqualsCanBeSimplified" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ObviousNullCheck" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OctalIntegerJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OctalLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OptionalAssignedToNull" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OptionalGetWithoutIsPresent" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OptionalIsPresent" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OptionalUsedAsFieldOrParameterType" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="OverwrittenKey" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PackageAccessibility" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="PackageJsonMismatchedDependency" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ParameterCanBeLocal" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PointlessArithmeticExpression" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_ignoreExpressionsContainingConstants" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PointlessArithmeticExpressionJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PointlessBitwiseExpression" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_ignoreExpressionsContainingConstants" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PointlessBitwiseExpressionJS" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_ignoreExpressionsContainingConstants" value="false" />
+    </inspection_tool>
+    <inspection_tool class="PointlessBooleanExpression" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_ignoreExpressionsContainingConstants" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PointlessBooleanExpressionJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PointlessNullCheck" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PrimitiveArrayArgumentToVariableArgMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyAbstractClassInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyArgumentListInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyAssignmentToLoopOrWithParameterInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyAsyncCallInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyAttributeOutsideInitInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyBroadExceptionInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyByteLiteralInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyCallByClassInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyCallingNonCallableInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyChainedComparisonsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyClassHasNoInitInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyComparisonWithNoneInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDataclassInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDecoratorInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDefaultArgumentInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDeprecationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDictCreationInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDictDuplicateKeysInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDocstringTypesInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyDunderSlotsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyExceptClausesOrderInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyExceptionInheritInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyFromFutureImportInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyGlobalUndefinedInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyInconsistentIndentationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyIncorrectDocstringInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyInitNewSignatureInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyInterpreterInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyListCreationInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyMethodFirstArgAssignmentInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyMethodMayBeStaticInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyMethodOverridingInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyMethodParametersInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyMissingConstructorInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyNamedTupleInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyNestedDecoratorsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyNonAsciiCharInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyNoneFunctionAssignmentInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyOldStyleClassesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyOverloadsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="ignoredPackages">
+        <value>
+          <list size="0" />
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyPep8Inspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyPep8NamingInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyPropertyAccessInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyPropertyDefinitionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyProtectedMemberInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyProtocolInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyRedeclarationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyRedundantParenthesesInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyReturnFromInitInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PySetFunctionToLiteralInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyShadowingBuiltinsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyShadowingNamesInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PySimplifyBooleanCheckInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PySingleQuotedDocstringInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyStatementEffectInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyStringExceptionInspection" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="PyStringFormatInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyStubPackagesAdvertiser" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyStubPackagesCompatibilityInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PySuperArgumentsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyTestParametrizedInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyTrailingSemicolonInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyTupleAssignmentBalanceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyTupleItemAssignmentInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyTypeCheckerInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyTypeHintsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyUnboundLocalVariableInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyUnnecessaryBackslashInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyUnreachableCodeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyUnusedLocalInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false">
+      <option name="ignoreTupleUnpacking" value="true" />
+      <option name="ignoreLambdaParameters" value="true" />
+      <option name="ignoreLoopIterationVariables" value="true" />
+      <option name="ignoreVariablesStartingWithUnderscore" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PyramidSetupInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Query_bound_parameters" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Query_index_required" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Query_restricted" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RawTypeCanBeGeneric" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="ReadWriteStringCanBeUsed" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantArrayCreation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantBackticksAroundRawStringLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantCast" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantClassCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantCollectionOperation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantComparatorComparing" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantCompareCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantExplicitClose" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantExplicitVariableType" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="RedundantLambdaParameterType" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="RedundantStreamOptionalCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantSuppression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantThrows" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantTypeArguments" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantTypeConversion" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="CHECK_ANY" value="false" />
+    </inspection_tool>
+    <inspection_tool class="ReflectionForUnavailableAnnotation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RefusedBequest" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="ignoreEmptySuperMethods" value="false" />
+      <option name="onlyReportWhenAnnotated" value="true" />
+    </inspection_tool>
+    <inspection_tool class="RegExpDuplicateAlternationBranch" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RegExpEmptyAlternationBranch" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RegExpEscapedMetaCharacter" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="RegExpOctalEscape" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="RegExpRedundantEscape" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RegExpRepeatedSpace" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RegExpSingleCharAlternation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RegExpUnexpectedAnchor" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ReplaceAllDot" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ReplaceNullCheck" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RequiredAttributes" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myAdditionalRequiredHtmlAttributes" value="" />
+    </inspection_tool>
+    <inspection_tool class="ReservedWordUsedAsNameJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Restricted_Python_calls" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ReturnFromFinallyBlock" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ReturnFromFinallyBlockJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ReturnSeparatedFromComputation" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="SafeVarargsDetector" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SameParameterValue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SameReturnValue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ScheduledForRemoval" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SecondUnsafeCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ShiftOutOfRange" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ShiftOutOfRangeJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SillyAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SillyAssignmentJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SimplifiableBooleanExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SimplifiableConditionalExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SimplifiableIfStatement" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="SimplifiableJUnitAssertion" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SimplifyCollector" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SimplifyForEach" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="SimplifyOptionalCallChains" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SimplifyStreamApiCallChains" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="Since15" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="SingleElementAnnotation" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="SingleStatementInBlock" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="SingletonConstructor" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="SortedCollectionWithNonComparableKeys" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+    <inspection_tool class="StaticInitializerReferencesSubClass" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StaticPseudoFunctionalStyleMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StreamToLoop" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="StringBufferReplaceableByStringBuilder" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StringBufferToStringInConcatenation" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="StringEquality" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StringEqualsCharSequence" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StringEqualsEmptyString" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="StringOperationCanBeSimplified" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="StringReplaceableByStringBuffer" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="onlyWarnOnLoop" value="true" />
+    </inspection_tool>
+    <inspection_tool class="StringTokenizerDelimiter" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SuspiciousArrayMethodCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SuspiciousListRemoveInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SuspiciousMethodCalls" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="REPORT_CONVERTIBLE_METHOD_CALLS" value="true" />
+    </inspection_tool>
+    <inspection_tool class="SuspiciousNameCombination" enabled="false" level="WARNING" enabled_by_default="false">
+      <group names="x,width,left,right" />
+      <group names="y,height,top,bottom" />
+      <ignored>
+        <option name="METHOD_MATCHER_CONFIG" value="java.io.PrintStream,println,java.io.PrintWriter,println,java.lang.System,identityHashCode,java.sql.PreparedStatement,set.*,java.sql.ResultSet,update.*,java.sql.SQLOutput,write.*,java.lang.Integer,compare.*,java.lang.Long,compare.*,java.lang.Short,compare,java.lang.Byte,compare,java.lang.Character,compare,java.lang.Boolean,compare,java.lang.Math,.*,java.lang.StrictMath,.*" />
+      </ignored>
+    </inspection_tool>
+    <inspection_tool class="SuspiciousSystemArraycopy" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SuspiciousToArrayCall" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SuspiciousTypeOfGuard" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SwitchStatementWithTooFewBranches" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_limit" value="2" />
+    </inspection_tool>
+    <inspection_tool class="SynchronizationOnGetClass" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SynchronizationOnLocalVariableOrMethodParameter" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="reportLocalVariables" value="true" />
+      <option name="reportMethodParameters" value="true" />
+    </inspection_tool>
+    <inspection_tool class="SynchronizeOnNonFinalField" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SyntaxError" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="TestFailedLine" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ThisExpressionReferencesGlobalObjectJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ThrowFromFinallyBlock" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ThrowFromFinallyBlockJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ThrowableNotThrown" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ThrowablePrintedToSystemOut" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TooBroadScope" enabled="false" level="INFORMATION" enabled_by_default="false">
+      <option name="m_allowConstructorAsInitializer" value="false" />
+      <option name="m_onlyLookAtBlocks" value="false" />
+    </inspection_tool>
+    <inspection_tool class="TrailingSpacesInProperty" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TrivialConditionalJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TrivialFunctionalExpressionUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TrivialIf" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TrivialIfJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TrivialStringConcatenation" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="TryFinallyCanBeTryWithResources" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TryStatementWithMultipleResources" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="TryWithIdenticalCatches" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeCustomizer" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeParameterExtendsObject" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeParameterHidesVisibleType" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptAbstractClassConstructorCanBeMadeProtected" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptAccessibilityCheck" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptCheckImport" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptConfig" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptFieldCanBeMadeReadonly" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptMissingAugmentationImport" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptPreferShortImport" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptSuspiciousConstructorParameterAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptUMDGlobal" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptUnresolvedFunction" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptUnresolvedVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptValidateJSTypes" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptValidateTypes" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="TypescriptExplicitMemberType" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="UNCHECKED_WARNING" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UNUSED_IMPORT" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnclearBinaryExpression" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="UnnecessarilyQualifiedInnerClassAccess" enabled="false" level="INFORMATION" enabled_by_default="false">
+      <option name="ignoreReferencesNeedingImport" value="false" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessaryBlockStatement" enabled="false" level="INFORMATION" enabled_by_default="false">
+      <option name="ignoreSwitchBranches" value="false" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessaryBoxing" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryBreak" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryCallToStringValueOf" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryConditionalExpression" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryContinue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryContinueJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryEmptyArrayUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryEnumModifier" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryFullyQualifiedName" enabled="false" level="INFORMATION" enabled_by_default="false">
+      <option name="m_ignoreJavadoc" value="false" />
+      <option name="ignoreInModuleStatements" value="true" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessaryInitCause" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryInterfaceModifier" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLabelJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLabelOnBreakStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLabelOnBreakStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLabelOnContinueStatement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLabelOnContinueStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryLocalVariable" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_ignoreImmediatelyReturnedVariables" value="false" />
+      <option name="m_ignoreAnnotatedVariables" value="false" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessaryLocalVariableJS" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_ignoreImmediatelyReturnedVariables" value="false" />
+      <option name="m_ignoreAnnotatedVariables" value="false" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessaryModuleDependencyInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryParentheses" enabled="false" level="INFORMATION" enabled_by_default="false">
+      <option name="ignoreClarifyingParentheses" value="false" />
+      <option name="ignoreParenthesesOnConditionals" value="false" />
+      <option name="ignoreParenthesesOnLambdaParameter" value="false" />
+    </inspection_tool>
+    <inspection_tool class="UnnecessaryQualifiedReference" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryReturn" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryReturnJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnnecessaryUnboxing" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnreachableCodeJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnregisteredActivator" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="UnresolvedReference" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="UnstableApiUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnterminatedStatementJS" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="ignoreSemicolonAtEndOfBlock" value="true" />
+    </inspection_tool>
+    <inspection_tool class="UnusedAssignment" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="REPORT_PREFIX_EXPRESSIONS" value="false" />
+      <option name="REPORT_POSTFIX_EXPRESSIONS" value="true" />
+      <option name="REPORT_REDUNDANT_INITIALIZER" value="true" />
+    </inspection_tool>
+    <inspection_tool class="UnusedLabel" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnusedProperty" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UnusedReturnValue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="UseCompareMethod" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="VarargParameter" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="VariableTypeCanBeExplicit" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="WeakerAccess" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="true" />
+      <option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="true" />
+      <option name="SUGGEST_PRIVATE_FOR_INNERS" value="false" />
+    </inspection_tool>
+    <inspection_tool class="WebpackConfigHighlighting" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="WhileCanBeForeach" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="WhileLoopSpinsOnField" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="ignoreNonEmtpyLoops" value="true" />
+    </inspection_tool>
+    <inspection_tool class="WithStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="WrapperTypeMayBePrimitive" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="WrongImportPackage" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="WrongPackageStatement" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="WrongPropertyKeyValueDelimiter" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlDefaultAttributeValue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlDeprecatedElement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlDuplicatedId" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XmlHighlighting" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XmlInvalidId" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XmlPathReference" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XmlUnboundNsPrefix" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlUnusedNamespaceDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlWrongRootElement" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XsltDeclarations" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XsltTemplateInvocation" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="XsltUnusedDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XsltVariableShadowing" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="YAMLDuplicatedKeys" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="YAMLRecursiveAlias" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="YAMLSchemaValidation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="YAMLUnresolvedAlias" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="YAMLUnusedAnchor" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="unused" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="LOCAL_VARIABLE" value="true" />
+      <option name="FIELD" value="true" />
+      <option name="METHOD" value="true" />
+      <option name="CLASS" value="true" />
+      <option name="PARAMETER" value="true" />
+      <option name="REPORT_PARAMETER_FOR_PUBLIC_METHODS" value="true" />
+      <option name="ADD_MAINS_TO_ENTRIES" value="true" />
+      <option name="ADD_APPLET_TO_ENTRIES" value="true" />
+      <option name="ADD_SERVLET_TO_ENTRIES" value="true" />
+      <option name="ADD_NONJAVA_TO_ENTRIES" value="true" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff -Nru wala-1.3.9/.idea/misc.xml wala-1.5.1/.idea/misc.xml
--- wala-1.3.9/.idea/misc.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/.idea/misc.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <type id="Osmorc" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="Java 1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff -Nru wala-1.3.9/.idea/.name wala-1.5.1/.idea/.name
--- wala-1.3.9/.idea/.name	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/.idea/.name	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1 @@
+com.ibm.wala
\ No newline at end of file
diff -Nru wala-1.3.9/.idea/runConfigurations/After_Opening_Pristine_Project.xml wala-1.5.1/.idea/runConfigurations/After_Opening_Pristine_Project.xml
--- wala-1.3.9/.idea/runConfigurations/After_Opening_Pristine_Project.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/.idea/runConfigurations/After_Opening_Pristine_Project.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="After Opening Pristine Project" type="GradleRunConfiguration" factoryName="Gradle" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="prepareIntelliJIDEA" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <method />
+  </configuration>
+</component>
diff -Nru wala-1.3.9/.idea/vcs.xml wala-1.5.1/.idea/vcs.xml
--- wala-1.3.9/.idea/vcs.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/.idea/vcs.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CommitMessageInspectionProfile">
+    <profile version="1.0">
+      <inspection_tool class="BodyLimit" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="SubjectBodySeparation" enabled="true" level="WARNING" enabled_by_default="true" />
+      <inspection_tool class="SubjectLimit" enabled="true" level="WARNING" enabled_by_default="true">
+        <option name="RIGHT_MARGIN" value="50" />
+      </inspection_tool>
+    </profile>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff -Nru wala-1.3.9/LICENSE wala-1.5.1/LICENSE
--- wala-1.3.9/LICENSE	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/LICENSE	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,277 @@
+Eclipse Public License - v 2.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
+
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free copyright
+  license to reproduce, prepare Derivative Works of, publicly display,
+  publicly perform, Distribute and sublicense the Contribution of such
+  Contributor, if any, and such Derivative Works.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  c) Recipient understands that although each Contributor grants the
+  licenses to its Contributions set forth herein, no assurances are
+  provided by any Contributor that the Program does not infringe the
+  patent or other intellectual property rights of any other entity.
+  Each Contributor disclaims any liability to Recipient for claims
+  brought by any other entity based on infringement of intellectual
+  property rights or otherwise. As a condition to exercising the
+  rights and licenses granted hereunder, each Recipient hereby
+  assumes sole responsibility to secure any other intellectual
+  property rights needed, if any. For example, if a third party
+  patent license is required to allow Recipient to Distribute the
+  Program, it is Recipient's responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
+
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following 
+Secondary Licenses when the conditions for such availability set forth 
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.
diff -Nru wala-1.3.9/pom.xml wala-1.5.1/pom.xml
--- wala-1.3.9/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,89 +5,77 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.ibm.wala</groupId>
   <artifactId>WALA</artifactId>
-  <version>1.3.9</version>
+  <version>1.5.1</version>
   <packaging>pom</packaging>
   <properties>
-    <project-version>1.3.9</project-version>
+    <project-version>1.5.1</project-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <build-alias>b000</build-alias>
     <tycho-version>0.23.1</tycho-version>
     <tycho.scmUrl>scm:git:ssh://github.com:wala/WALA.git</tycho.scmUrl>
   </properties>
-  
-  <modules>
-    <module>targets</module>
 
-    <module>com.ibm.wala-feature</module>
-    <module>com.ibm.wala.core</module>
-    <module>com.ibm.wala.shrike</module>
-    <module>com.ibm.wala.util</module>
-    
-    <module>com.ibm.wala.core.testdata</module>
-    <module>com.ibm.wala.core.tests</module>
-    
-    <module>com.ibm.wala.cast</module>
-    <module>com.ibm.wala.cast.test</module>
-    <module>com.ibm.wala.cast.java</module>
-    <module>com.ibm.wala.cast.java.test</module>
-    <module>com.ibm.wala.cast.java.test.data</module>
-    
-    <module>com.ibm.wala.ide-feature</module>
-    <module>com.ibm.wala.ide</module>
-    <module>com.ibm.wala.ide.tests</module>
-    
-    <module>com.ibm.wala.ide.jdt</module>
-    <module>com.ibm.wala.ide.jdt.test</module>
-    
-    <module>com.ibm.wala.cast.js</module>
-    <module>com.ibm.wala.cast.js.html.nu_validator</module> 
-    <module>com.ibm.wala.cast.js.test</module>
-    <module>com.ibm.wala.cast.js.test.data</module>
-    <module>com.ibm.wala.cast.js.rhino</module>
-    <module>com.ibm.wala.cast.js.rhino.test</module>
-    
-    <module>com.ibm.wala.ide.jsdt</module>
-    <module>com.ibm.wala.ide.jsdt.tests</module>
-    
-    <module>com.ibm.wala.dalvik</module>
-    <module>com.ibm.wala.dalvik.test</module>
-    
-    <module>com.ibm.wala.scandroid</module>
-    
-    <module>com.ibm.wala.cast.java.polyglot</module>
-    <!-- figure out why this dies -->
-    <!-- module>com.ibm.wala.cast.java.polyglot.test</module -->
-    
-    <module>com.ibm.wala-repository</module>
-    
-  </modules>
+      <modules>
+	<module>targets</module>
+	<module>com.ibm.wala_feature</module>
+	<module>com.ibm.wala.core</module>
+	<module>com.ibm.wala.shrike</module>
+	<module>com.ibm.wala.util</module>
+	<module>com.ibm.wala.core.testdata</module>
+	<module>com.ibm.wala.core.tests</module>
+	<module>com.ibm.wala.cast</module>
+	<module>com.ibm.wala.cast.test</module>
+	<module>com.ibm.wala.cast.java</module>
+	<module>com.ibm.wala.cast.java.test</module>
+	<module>com.ibm.wala.cast.java.test.data</module>
+	<module>com.ibm.wala.cast.java.ecj</module>
+	<module>com.ibm.wala.ide_feature</module>
+	<module>com.ibm.wala.ide</module>
+	<module>com.ibm.wala.ide.tests</module>
+	<module>com.ibm.wala.ide.jdt</module>
+	<module>com.ibm.wala.ide.jdt.test</module>
+	<module>com.ibm.wala.cast.js</module>
+	<module>com.ibm.wala.cast.js.html.nu_validator</module> 
+	<module>com.ibm.wala.cast.js.test</module>
+	<module>com.ibm.wala.cast.js.test.data</module>
+	<module>com.ibm.wala.cast.js.rhino</module>
+	<module>com.ibm.wala.cast.js.rhino.test</module>
+	<module>com.ibm.wala.cast.js.nodejs</module>
+	<module>com.ibm.wala.cast.js.nodejs.test</module>
+	<module>com.ibm.wala.ide.jsdt</module>
+	<module>com.ibm.wala.ide.jsdt.tests</module>
+	<module>com.ibm.wala.dalvik</module>
+	<module>com.ibm.wala.dalvik.test</module>
+	<module>com.ibm.wala.scandroid</module>
+	<module>com.ibm.wala-repository</module>
+      </modules>
 
-  <profiles>
-   <profile>
-    <id>linux</id>
-    <activation>
-      <os> 
-        <family>unix</family> 
-        <name>Linux</name>
-      </os>
-    </activation>
-    <build>
-      <plugins>
-	<plugin>
-	  <groupId>org.eclipse.tycho</groupId>
-	  <artifactId>target-platform-configuration</artifactId>
-	  <version>${tycho-version}</version>
-	  <configuration>
-	    <dependency-resolution>
-              <optionalDependencies>ignore</optionalDependencies>
-	    </dependency-resolution>
-	  </configuration>
-	</plugin>
-      </plugins>
-    </build>
-   </profile>
+      <profiles>
+    <profile>
+      <id>linux</id>
+      <activation>
+	<os> 
+          <family>unix</family> 
+          <name>Linux</name>
+	</os>
+      </activation>
+      <build>
+	<plugins>
+	  <plugin>
+	    <groupId>org.eclipse.tycho</groupId>
+	    <artifactId>target-platform-configuration</artifactId>
+	    <version>${tycho-version}</version>
+	    <configuration>
+	      <dependency-resolution>
+		<optionalDependencies>ignore</optionalDependencies>
+	      </dependency-resolution>
+	    </configuration>
+	  </plugin>
+	</plugins>
+      </build>
+    </profile>
   </profiles>
-
+  
   <build>
     <plugins>
       <plugin>
@@ -104,7 +92,7 @@
 	  <target>
 	    <artifact>
 	      <groupId>com.ibm.wala.target</groupId>
-	      <artifactId>e44</artifactId>
+	      <artifactId>e47</artifactId>
 	      <version>${project-version}</version>
 	    </artifact>
 	  </target>
@@ -115,12 +103,8 @@
 	<artifactId>tycho-compiler-plugin</artifactId>
 	<version>${tycho-version}</version>
 	<configuration>
-	  <source>1.7</source>
-	  <target>1.7</target>
-          <compilerArgument>-err:-forbidden</compilerArgument>
-          <compilerArguments>                 
-            <properties>${project.basedir}/.settings/org.eclipse.jdt.core.prefs</properties>
-          </compilerArguments>
+	  <compilerId>jdt</compilerId>
+	  <useProjectSettings>true</useProjectSettings>
 	</configuration>
       </plugin>
       <plugin>
@@ -244,9 +228,73 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.14.1</version>
       </plugin>		
-</plugins>
-</build>
-<pluginRepositories>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>3.0.0-M1</version>
+            <configuration>
+              <additionalparam>-quiet</additionalparam>
+              <additionalparam>-private</additionalparam>
+              <additionalparam>-Xdoclint:none</additionalparam>
+            </configuration>
+            <executions>
+                <execution>
+                    <id>javadoc</id>
+                    <goals>
+                        <goal>javadoc</goal>
+                    </goals>
+                    <phase>generate-resources</phase>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <versionRange>[3.0.0-M1,)</versionRange>
+                    <goals>
+                      <goal>javadoc</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute>
+                      <runOnIncremental>false</runOnIncremental>
+                    </execute>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>tycho-source-plugin</artifactId>
+                    <versionRange>[0.23.1,)</versionRange>
+                    <goals>
+                      <goal>plugin-source</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute>
+                      <runOnIncremental>false</runOnIncremental>
+                    </execute>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+  <pluginRepositories>
   <pluginRepository>
     <id>sonatype-public-repository</id>
     <url>https://oss.sonatype.org/content/groups/public</url>
diff -Nru wala-1.3.9/README-Gradle.md wala-1.5.1/README-Gradle.md
--- wala-1.3.9/README-Gradle.md	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/README-Gradle.md	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,340 @@
+This document describes some WALA-specific aspects of our new Gradle
+build system, plus a few general Gradle features that may be of
+particular interest to WALA developers.  However, it is not a Gradle
+tutorial.
+
+# Pros and Cons of Switching to Gradle
+
+## Selected Gradle Advantages in Brief
+
+- [more comprehensive management of external
+  dependencies](#comprehensive-external-dependencies)
+- faster builds using [parallel task
+  execution](https://docs.gradle.org/current/userguide/multi_project_builds.html#sec:parallel_execution)
+  and [user-scoped
+  caching](https://docs.gradle.org/current/userguide/build_cache.html)
+  (both enabled by default)
+- [trustworthy dependencies for incremental
+  builds](#trustworthy-dependencies-for-incremental-builds)
+- [composite builds](#composite-builds) for easier integration of WALA
+  into larger projects
+- [automated Travis CI testing on macOS](#travis-ci-macos)
+
+## Known Shortcomings
+
+The Gradle build system is not yet ready to replace Maven, due to a
+few [known shortcomings](https://github.com/liblit/WALA/milestone/1).
+Paramount among these is that [Gradle WALA builds do not yet package
+up Eclipse plug-ins / features in the proper
+manner](https://github.com/liblit/WALA/issues/6).  I have [poked at
+this a
+bit](https://github.com/liblit/WALA/tree/gradle-artifact-publishing),
+but I simply do not understand Eclipse and/or OSGi well enough to get
+the job done.  I welcome help from anyone with the right knowledge!
+
+Either Gradle or Maven can be used to build WALA from the command
+line.  However, it was not possible to extend this dual-build-system
+support to Eclipse.  Working with WALA in Eclipse *requires* [doing
+things the Gradle way](#eclipse).  Fortunately, this is rather
+seamless; I see no reason why an Eclipse-using WALA developer should
+need to avoid this switch.
+
+As noted [below](#classpath-and-project-as-generated-files), Eclipse
+`.classpath` and `.project` files are now generated rather than being
+repository-tracked source files.  However, a few Maven-run tests
+depend on having certain of these files present.  One way to create
+them is to [import WALA into
+Eclipse](#importing-wala-projects-into-eclipse) before starting your
+Maven tests.  If you prefer a non-interactive approach, you can
+instead run `./gradlew prepareMavenBuild` before starting your Maven
+tests.
+
+# Getting Started
+
+## External Dependencies: Patience is a Virtue
+
+Gradle downloads many packages and supporting Java libraries as
+needed.  Your first Gradle build may take a long time.  On a fast
+workstation with a University-grade network and no local caches, my
+initial run of `./gradlew assemble processTestResources` took five
+minutes.  On a decent laptop with residential DSL and no local caches,
+the same initial build took twenty minutes.  Fortunately, user- and
+project-level Gradle caches will make incremental rebuilds much
+faster.  Rerunning `./gradlew assemble processTestResources` with a
+warm cache in an already-built tree takes under three seconds.
+
+Maven is the same, really.  You may already have most of what Maven
+needs downloaded and cached locally, but your first Maven WALA build
+was probably slow as well.  Recent Travis CI runs have showed Gradle
+and Maven builds completing in fifteen to twenty minutes, without
+significant variation between the two build systems.
+
+<a id="comprehensive-external-dependencies"/>The good news is that the
+Gradle build knows about all of its external dependencies and will
+download them as needed.  This even includes some complex dependencies
+that the Maven build does not automate.  For example, the Gradle build
+will automatically gather required Android SDK components:  setting
+`$ANDROID_HOME` is not needed.  Gradle builds will also download
+`/tmp/DroidBench` when needed to run tests; the Maven build system
+required that each developer do this by hand.
+
+## Eclipse
+
+### One-Time Eclipse Configuration
+
+To work with WALA inside Eclipse, first **install Eclipse Buildship**
+using either [the Eclipse
+Marketplace](http://www.vogella.com/tutorials/EclipseGradle/article.html#installation-via-the-marketplace)
+or [the Eclipse update
+manager](http://www.vogella.com/tutorials/EclipseGradle/article.html#installation-via-the-eclipse-update-manager).
+Buildship integrates Eclipse with Gradle, much like how M2Eclipse
+integrates Eclipse with Maven.  Restart Eclipse after installing this
+feature.
+
+### Importing WALA Projects Into Eclipse
+
+Once you are running a Buildship-enabled Eclipse, **[use the “Existing
+Gradle Project” import
+wizard](http://www.vogella.com/tutorials/EclipseGradle/article.html#import-an-existing-gradle-project)
+to import WALA into Eclipse.** Select and import the topmost level of
+your WALA source tree.  On the “Import Options” page of the import
+wizard, leave all settings at their defaults: the “Override workspace
+settings” option should be off, and the grayed-out “Gradle
+distribution” choice should be set to “Gradle wrapper”.  You do not
+need to select each of WALA’s sub-projects; import only the top-level
+WALA source tree, and the rest will follow.
+
+After the lengthy import process completes, **use “Run → After
+Importing WALA Into Eclipse” to perform some post-import cleanup and
+configuration.** Immediately after importing, you may see some errors
+in the Eclipse “Problems” view.  These should all go away after
+running the “After Importing WALA Into Eclipse” step.
+
+Note: a pristine WALA source tree is *not* pre-configured as a group
+of Eclipse projects.  Using the standard Eclipse “Existing Projects
+into Workspace” import wizard will not work correctly.  You must [use
+the “Existing Gradle Project” import
+wizard](http://www.vogella.com/tutorials/EclipseGradle/article.html#import-an-existing-gradle-project)
+instead.
+
+### `.classpath` and `.project` as Generated Files
+
+You will find no `.classpath` or `.project` files anywhere in [the
+Gradle fork of WALA’s git repository](https://github.com/liblit/WALA).
+Importing using the “Existing Gradle Project” wizard creates these
+Eclipse project configuration files automatically based on the
+underlying Gradle configuration.
+
+Therefore, when working with Eclipse + Gradle, you should **treat
+`.classpath` and `.project` files as *generated* artifacts,** not as
+files to edit directly or through the Eclipse project configuration
+GUI.  For example, avoid using the Java Build Path settings dialog to
+make changes that are stored in a `.classpath` file:  the modified
+`.classpath` file is not git-tracked, so your changes will eventually
+be lost or overwritten.
+
+The right way to change the contents of any of a `.classpath` or
+`.project` file is to change the Gradle configuration such that the
+generated `.classpath` and `.project` files will have the desired
+contents, likely by using [Gradle’s `eclipse`
+plugin](https://docs.gradle.org/current/userguide/eclipse_plugin.html).
+A few WALA sub-projects already use this:  look for `eclipse.project`
+in `*/build.gradle` for examples.
+
+## IntelliJ IDEA
+
+### Opening WALA in IntelliJ IDEA
+
+WALA comes preconfigured as an openable IntelliJ IDEA project.  Open
+the top-level WALA directory as a project; it should have a
+distinctive badge on its folder icon marking it as a directory
+containing a recognized IntelliJ IDEA project.  Do *not* open the
+top-level WALA `build.gradle` in that directory as a project:  this
+will begin an “Import Project from Gradle” process that is *not* the
+recommended way to bring WALA up in IntelliJ IDEA.
+
+The first time you open the WALA project, IntelliJ IDEA will
+synchronize its project model with the Gradle build configuration,
+including downloading some large supporting libraries.  After the
+lengthy import process completes, **use “Run → Run… → After Opening
+Pristine Project” to perform some post-import configuration.** This
+also can take tens of minutes, but is only necessary in a clean,
+never-previously-built tree.  Immediately after importing, you may see
+some Java compilation errors in the IntelliJ IDEA “Messages” view.
+These should all go away after running the “After Opening Pristine
+Project” step.  [Be
+patient](#external-dependencies-patience-is-a-virtue) during the
+initial project open and also during the “After Opening Pristine
+Project” step, especially if you have a slow network connection.
+
+If you prefer a non-interactive approach, instead of using “After
+Opening Pristine Project” you can run `./gradlew prepareIntelliJIDEA`
+either before or after opening WALA in IntelliJ IDEA.
+
+### Benign Warning About Non-Managed Maven Project
+
+Each time you open the WALA project, IntelliJ IDEA may report
+“Non-managed pom.xml file found” in its event log.  This arises
+because WALA supports both Gradle and Maven, but WALA in IntelliJ IDEA
+needs only the Gradle configuration.  You can safely ignore this
+notification, permanently disable it using the offered “Disable
+notification” link, or even disable the IntelliJ IDEA Maven plugin
+entirely if you have no other need for it.
+
+### Project Configuration as Derived Model
+
+IntelliJ IDEA automatically derives its project models from the Gradle
+build configuration, including all information about both internal and
+external build dependencies.  However, this synchronization only goes
+in one direction: from Gradle to IntelliJ IDEA, not from IntelliJ IDEA
+back into Gradle.  If you manipulate the project structure using the
+IntelliJ IDEA’s user interface, your changes will likely be
+overwritten the next time IntelliJ IDEA scans the Gradle build
+configuration.
+
+This particularly applies to settings found in the “Modules” and
+“Libraries” sections of the “Project Structure” dialog.  The right way
+to change module and library settings is to change the Gradle
+configuration such that the *derived* IntelliJ IDEA model is what you
+want it to be.
+
+## Gradle Command Line
+
+You do not need to install Gradle separately.  **WALA includes its own
+copy of Gradle, available as the `gradlew` script in the top-level
+WALA directory.** Use this script for all command-line Gradle actions.
+For example, to compile all of WALA’s main (non-test) code and gather
+it into jar archives, run `./gradlew assemble`.
+
+In general, most Gradle-generated artifacts will appear somewhere
+under `*/build`.  For example the jar archives created by the
+`assemble` task can be found as `*/build/libs/*.jar`.  Note, however,
+that Eclipse-generated artifacts will still appear in the same places
+as before, such as `*/bin` and `*/target`.
+
+### Trustworthy Dependencies For Incremental Builds
+
+Gradle has excellent understanding of task and file dependencies.  You
+can trust it to perform incremental rebuilds rather than always
+rebuilding from scratch.  If you are used to always running `mvn clean
+compile` instead of `mvn compile`, or `mvn clean install` instead of
+`mvn install`, I recommend that you drop `clean` as a reflexive extra
+step and **trust Gradle to do incremental builds correctly.**
+
+### Favorite Build Tasks
+
+Some useful Gradle tasks include:
+
+- `assemble`: build WALA’s main (non-test) code
+
+- `build`: build all WALA code and run all automated tests
+
+- `javadoc`: build all Javadoc documentation
+
+- `publishToMavenLocal`: install WALA’s jar files under `~/.m2`
+
+- `clean`: remove all Gradle-generated artifacts
+
+### Tasks in Specific Sub-Projects
+
+When you run `./gradlew` in the top-level WALA directory, any tasks
+you list will be built in all sub-projects.  For example, `./gradlew
+assemble` builds all non-test WALA jars in all sub-projects.  If you
+want to build tasks only in specific sub-projects, you have two options:
+
+1. Give the fully-qualified name of the sub-project task.  For
+   example, to assemble only the Dalvik jar, you could run `./gradlew
+   :com.ibm.wala.dalvik:assemble`.
+
+1. Run Gradle from within some sub-project directory.  For example, to
+   assemble only the Dalvik jar, you could `cd com.ibm.wala.dalvik`
+   and then run `../gradlew assemble`.  Note the proper relative path
+   to the top-level Gradle script: `../gradle` instead of `./gradlew`.
+
+### Task Name Abbreviation
+
+[Any build task can be
+abbreviated](https://docs.gradle.org/current/userguide/command_line_interface.html#_task_name_abbreviation)
+by shortening each camel-case-delimited word in its name.  For
+example, the `processTestResources` task can probably be abbreviated
+as `procTeRes` or even `pTR`.
+
+### Useful Command-Line Flags
+
+Among Gradle’s command-line flags, I have found the following
+particularly useful:
+
+- [`--continue`](https://docs.gradle.org/current/userguide/command_line_interface.html#sec:continue_build_on_failure):
+  keep building non-dependent sub-tasks even after an initial failure.
+  Especially useful in conjunction with the `build` or `test` tasks to
+  see multiple test failures rather than giving up after the first
+  failure.
+
+- [`-t`,
+  `--continuous`](https://docs.gradle.org/current/userguide/command_line_interface.html#_continuous_build):
+  keep Gradle process running and re-execute the given tasks whenever
+  input files change.  Similar to Eclipse’s behavior of updating the
+  build whenever you change and save a file.
+
+- [`--tests=...`](https://docs.gradle.org/current/userguide/java_plugin.html#test_filtering):
+  run only the selected tests.  Use in conjunction with the `build` or
+  `test` tasks for faster turnaround if you are focusing on getting
+  just one or a few failing tests to pass.
+
+- [`--scan`](https://scans.gradle.com/): upload a detailed report of
+  the build process to a Gradle-hosted server for further exploration
+  and analysis.  The only security here is the obscurity of the
+  generated URL for the build report.  If you are not concerned about
+  potentially making your build details public, then `--scan` is a
+  good way to gain insights into why Gradle did what it did, and how
+  long each piece took.
+
+### Composite Builds
+
+Gradle’s [composite
+builds](https://docs.gradle.org/current/userguide/composite_builds.html)
+allow a Gradle-managed project to recursively include other
+Gradle-managed projects, with Gradle managing the entire build process
+in a coherent, integrated manner.  Thus, if you use Gradle to build
+your WALA-based project, you can easily have it use WALA from your
+own, private WALA tree instead of from `~/.m2` or the public Maven
+repository.
+
+This is especially useful if you frequently find yourself switching
+between multiple different personal or experimental WALA builds.  By
+avoiding `~/.m2`, each WALA-based project can be its own composite
+build, with its own WALA subtree, and no project interferes with any
+other.
+
+# Travis CI
+
+I use a [Travis CI build
+matrix](https://docs.travis-ci.com/user/customizing-the-build/#Build-Matrix)
+to perform automated testing in three configurations:
+
+1. Gradle build on Ubuntu 14 (Trusty Tahr)
+1. Maven build on Ubuntu 14 (Trusty Tahr)
+1. Gradle build on macOS 10.12 (Sierra)
+
+Until we are ready to completely replace Maven with Gradle, it is
+important that both keep working.  Therefore, I use Travis CI to build
+and test WALA on Ubuntu using both Gradle and Maven.  Every new pull
+request must be validated in both of these configurations before I
+will accept it onto the `gradle-and-buildship` branch.
+
+<a id="travis-ci-macos"/>The official WALA repository has no macOS CI
+testing.  However, [macOS is the main development platform for at
+least one WALA
+maintainer](https://github.com/liblit/WALA/issues/3#issuecomment-356823287),
+so it is great to have Travis CI helping us keep that platform
+working.  I will not accept pull requests that introduce regressions
+into Gradle macOS builds.  However, I am not using Travis CI to test
+Maven macOS builds.  Initial attempts using [the official WALA master
+sources](https://github.com/wala/WALA) failed.  As it is my goal to
+replace Maven entirely, investigating Maven+macOS failures further is
+not a priority.
+
+<!--
+LocalWords:  processTestResources pre classpath gradlew mvn
+LocalWords:  javadoc buildship issuecomment
+-->
diff -Nru wala-1.3.9/README.md wala-1.5.1/README.md
--- wala-1.3.9/README.md	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/README.md	2019-01-29 17:08:39.000000000 +0000
@@ -1,2 +1,10 @@
+WALA [![Build Status](https://travis-ci.org/wala/WALA.svg?branch=master)](https://travis-ci.org/wala/WALA)
+=====================
+
 This is the main source repository for WALA.  For more details on WALA, see <a
-href="http://wala.sourceforge.net">the WALA home page</a>.
+href="http://wala.sourceforge.net">the WALA home page</a> and <a href="https://wala.github.io/javadoc">WALA Javadoc</a>.
+
+**Note:** historically, WALA has used Maven as its build system.
+However, this WALA branch can also use Gradle as an alternative to
+Maven.  See [the Gradle-specific README](README-Gradle.md) for more
+instructions and helpful tips.
diff -Nru wala-1.3.9/revert-launchers.sh wala-1.5.1/revert-launchers.sh
--- wala-1.3.9/revert-launchers.sh	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/revert-launchers.sh	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash -eu
+
+cd "$(dirname "$0")"
+
+# be selective; revert only launchers we think we know about
+launchers=(com.ibm.wala.*/launchers/*.launch com.ibm.wala.*/.launchConfigurations/*.launch)
+
+# if no launchers have changed, then there's nothing for us to do
+if git diff --quiet "${launchers[@]}"; then
+  exit
+fi
+
+# create a backup in case we revert something that we should have left alone
+git stash save --quiet 'safety snapshot before reverting launcher changes made by Eclipse Buildship import'
+git stash apply --quiet
+
+# revert launch configurations that Buildship import has mangled
+# <https://github.com/eclipse/buildship/issues/653>
+git checkout -- "${launchers[@]}"
diff -Nru wala-1.3.9/settings.gradle wala-1.5.1/settings.gradle
--- wala-1.3.9/settings.gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/settings.gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,37 @@
+rootProject.name = 'com.ibm.wala'
+
+include(
+	'com.ibm.wala-repository',
+	'com.ibm.wala.cast',
+	'com.ibm.wala.cast.java',
+	'com.ibm.wala.cast.java.ecj',
+	'com.ibm.wala.cast.java.test',
+	'com.ibm.wala.cast.java.test.data',
+	'com.ibm.wala.cast.js',
+	'com.ibm.wala.cast.js.html.nu_validator',
+	'com.ibm.wala.cast.js.nodejs',
+	'com.ibm.wala.cast.js.nodejs.test',
+	'com.ibm.wala.cast.js.rhino',
+	'com.ibm.wala.cast.js.rhino.test',
+	'com.ibm.wala.cast.js.test',
+	'com.ibm.wala.cast.js.test.data',
+	'com.ibm.wala.cast.test',
+	'com.ibm.wala.core',
+	'com.ibm.wala.core.testdata',
+	'com.ibm.wala.core.tests',
+	'com.ibm.wala.dalvik',
+	'com.ibm.wala.dalvik.test',
+	'com.ibm.wala.ide',
+	'com.ibm.wala.ide.jdt',
+	'com.ibm.wala.ide.jdt.test',
+	'com.ibm.wala.ide.jsdt',
+	'com.ibm.wala.ide.jsdt.tests',
+	'com.ibm.wala.ide.tests',
+	'com.ibm.wala.ide_feature',
+	'com.ibm.wala.scandroid',
+	'com.ibm.wala.shrike',
+	'com.ibm.wala.tests.ide_feature',
+	'com.ibm.wala.tests_feature',
+	'com.ibm.wala.util',
+	'com.ibm.wala_feature',
+)
diff -Nru wala-1.3.9/targets/e42/pom.xml wala-1.5.1/targets/e42/pom.xml
--- wala-1.3.9/targets/e42/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/targets/e42/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.ibm.wala.target</groupId>
 		<artifactId>targets</artifactId>
-		<version>1.3.9</version>
+		<version>1.5.1</version>
 	</parent>
 	<artifactId>e42</artifactId>
 	<packaging>eclipse-target-definition</packaging>
diff -Nru wala-1.3.9/targets/e44/e44.target wala-1.5.1/targets/e44/e44.target
--- wala-1.3.9/targets/e44/e44.target	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/targets/e44/e44.target	2019-01-29 17:08:39.000000000 +0000
@@ -11,7 +11,7 @@
 <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.osgi" version="0.0.0"/>
 <unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/luna"/>
+<repository location="http://ftp.acc.umu.se/mirror/eclipse.org/releases/luna"/>
 </location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
diff -Nru wala-1.3.9/targets/e44/pom.xml wala-1.5.1/targets/e44/pom.xml
--- wala-1.3.9/targets/e44/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/targets/e44/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.ibm.wala.target</groupId>
 		<artifactId>targets</artifactId>
-		<version>1.3.9</version>
+		<version>1.5.1</version>
 	</parent>
 	<artifactId>e44</artifactId>
 	<packaging>eclipse-target-definition</packaging>
diff -Nru wala-1.3.9/targets/e46/e46.target wala-1.5.1/targets/e46/e46.target
--- wala-1.3.9/targets/e46/e46.target	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/targets/e46/e46.target	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="WALA Eclipse Luna Target Platform" sequenceNumber="130">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.wst.jsdt.ui" version="0.0.0"/>
+<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.osgi" version="0.0.0"/>
+<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/neon"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+</target>
diff -Nru wala-1.3.9/targets/e46/pom.xml wala-1.5.1/targets/e46/pom.xml
--- wala-1.3.9/targets/e46/pom.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/targets/e46/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.ibm.wala.target</groupId>
+		<artifactId>targets</artifactId>
+		<version>1.5.1</version>
+	</parent>
+	<artifactId>e46</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+</project>
diff -Nru wala-1.3.9/targets/e47/e47.target wala-1.5.1/targets/e47/e47.target
--- wala-1.3.9/targets/e47/e47.target	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/targets/e47/e47.target	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="WALA Eclipse Oxygen Target Platform" sequenceNumber="130">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.wst.jsdt.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.wst.jsdt.ui" version="0.0.0"/>
+<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.osgi" version="0.0.0"/>
+<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/oxygen"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+</target>
diff -Nru wala-1.3.9/targets/e47/pom.xml wala-1.5.1/targets/e47/pom.xml
--- wala-1.3.9/targets/e47/pom.xml	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/targets/e47/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.ibm.wala.target</groupId>
+		<artifactId>targets</artifactId>
+		<version>1.5.1</version>
+	</parent>
+	<artifactId>e47</artifactId>
+	<packaging>eclipse-target-definition</packaging>
+</project>
diff -Nru wala-1.3.9/targets/pom.xml wala-1.5.1/targets/pom.xml
--- wala-1.3.9/targets/pom.xml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/targets/pom.xml	2019-01-29 17:08:39.000000000 +0000
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>com.ibm.wala</groupId>
 		<artifactId>WALA</artifactId>
-		<version>1.3.9</version>
+		<version>1.5.1</version>
 	</parent>
 	<groupId>com.ibm.wala.target</groupId>
 	<artifactId>targets</artifactId>
 	<packaging>pom</packaging>
 	<modules>
 		<!-- module>e42</module -->
-		<module>e44</module>
+		<module>e47</module>
 	</modules>
 </project>
diff -Nru wala-1.3.9/travis/before-cache-gradle wala-1.5.1/travis/before-cache-gradle
--- wala-1.3.9/travis/before-cache-gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/travis/before-cache-gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,7 @@
+# -*- mode: sh; sh-shell: sh -*-
+
+caches="$HOME/.gradle/caches"
+
+rm -rf \
+   "$caches/modules-2/modules-2.lock" \
+   "$caches"/*/plugin-resolution
diff -Nru wala-1.3.9/travis/before-install-maven wala-1.5.1/travis/before-install-maven
--- wala-1.3.9/travis/before-install-maven	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/travis/before-install-maven	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,11 @@
+# -*- mode: sh; sh-shell: sh -*-
+
+git clone --depth=1 https://github.com/secure-software-engineering/DroidBench.git /tmp/DroidBench
+
+export M2_HOME=$HOME/apache-maven-3.5.0
+
+if [ ! -d $M2_HOME/bin ]; then
+  curl https://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz | tar zxf - -C $HOME
+fi
+
+export PATH=$M2_HOME/bin:$PATH
diff -Nru wala-1.3.9/travis/install-gradle wala-1.5.1/travis/install-gradle
--- wala-1.3.9/travis/install-gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/travis/install-gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,8 @@
+# -*- mode: sh; sh-shell: sh -*-
+
+# initial p2AsMaven downloads are sometimes slow
+travis_wait 30 ./gradlew --dry-run
+
+submodule=${BUILD_ONLY_SUBMODULE:+:$BUILD_ONLY_SUBMODULE:}
+
+./gradlew --continue --no-build-cache "$submodule"assemble
diff -Nru wala-1.3.9/travis/install-maven wala-1.5.1/travis/install-maven
--- wala-1.3.9/travis/install-maven	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/travis/install-maven	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,4 @@
+# -*- mode: sh; sh-shell: sh -*-
+
+./gradlew prepareMavenBuild
+mvn clean verify -DskipTests=true -B -q
diff -Nru wala-1.3.9/travis/script-gradle wala-1.5.1/travis/script-gradle
--- wala-1.3.9/travis/script-gradle	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/travis/script-gradle	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,11 @@
+# -*- mode: sh; sh-shell: sh -*-
+
+case "$TRAVIS_OS_NAME" in
+  (linux) headless=xvfb-run ;;
+  (osx) headless='' ;;
+esac
+
+$headless ./gradlew --continue --no-build-cache --stacktrace \
+	  "$submodule"build \
+	  "$submodule"javadoc \
+	  lintGradle
diff -Nru wala-1.3.9/travis/script-maven wala-1.5.1/travis/script-maven
--- wala-1.3.9/travis/script-maven	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/travis/script-maven	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,7 @@
+# -*- mode: sh; sh-shell: sh -*-
+
+xvfb-run mvn clean install -B -q
+bash ./dependent-projects-trigger.sh "$AUTH_TOKEN"
+mvn javadoc:aggregate -B -q
+bash ./upload-javascript.sh "$GH_TOKEN"
+./build-maven-jars.py "install -Dgpg.skip"
diff -Nru wala-1.3.9/.travis.yml wala-1.5.1/.travis.yml
--- wala-1.3.9/.travis.yml	2016-05-10 12:59:26.000000000 +0000
+++ wala-1.5.1/.travis.yml	2019-01-29 17:08:39.000000000 +0000
@@ -1,18 +1,320 @@
-language: android
-jdk: oraclejdk8
+android:
+  components:
+    - build-tools-26.0.2
+addons:
+  apt:
+    packages:
+    - realpath
+    - xvfb
 before_install:
- - "export DISPLAY=:99.0"
- - "sh -e /etc/init.d/xvfb start"
- - "pushd /tmp"
- - "git clone https://github.com/secure-software-engineering/DroidBench.git"
- - "popd"
- - "mkdir -p $TRAVIS_BUILD_DIR/com.ibm.wala.dalvik.test/lib"
- - "find /usr/local -name dx.jar -exec cp '{}' $TRAVIS_BUILD_DIR/com.ibm.wala.dalvik.test/lib/dx.jar ';'"
-install: mvn clean verify -DskipTests=true -B -q
-script: mvn clean verify -B -q
-sudo: false
+  - set -e
+  - source "travis/before-install-$BUILD_SYSTEM"
+install: source "travis/install-$BUILD_SYSTEM"
+script: source "travis/script-$BUILD_SYSTEM"
+before_cache: source "travis/before-cache-$BUILD_SYSTEM"
 cache:
   directories:
-    - $HOME/.m2
-    - $TRAVIS_BUILD_DIR/com.ibm.wala.core.testdata/ocaml/ocamljava-2.0-alpha1/lib
-    
\ No newline at end of file
+  - "$HOME/.goomph"
+  - "$HOME/.gradle/caches"
+  - "$HOME/.gradle/wrapper"
+  - "$HOME/.m2"
+  - "$HOME/apache-maven-3.5.0"
+  - "$TRAVIS_BUILD_DIR/com.ibm.wala.core.testdata/ocaml/ocamljava-2.0-alpha1/lib"
+env:
+  global:
+    - secure: KcugjQYnBqeZ7XenZD5QY7jhekVPO0QpQyjDUteLytaokhyRK2g6eNvr/pPerN2uWUvsPwO18P9F+oOupge1cpPZf4cEY8RzLIromyUoRWd6JA0SKciUYdN2kSqnC4uZSJGXeGLoroyEEL4Q2sqimpkbIGxgxYtVniWgJULOyR4=
+    - secure: jacvGPYX4ugG/HgwJEEpWnllWsS/ipX+qRJ7qM5mbDYryeqsz0eiaxBxQ6IpDyj0v6O4DUi74lSQs/UxCWcUxvOn/5AweCZfoF1U8vt1xivanR4MbC2kr6rJ6ohICuJ4PHDS4IffncgaP3Y8cfExHq6+d0tbibYkjRIiMUGpSik=
+matrix:
+  include:
+    - os: linux
+      env: BUILD_SYSTEM=gradle
+      language: java
+      jdk: oraclejdk8
+    - os: linux
+      env: BUILD_SYSTEM=maven
+      language: android
+      jdk: oraclejdk8
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle
+      language: java
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.java
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.java.ecj
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.java.test
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.java.test.data
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.html.nu_validator
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.nodejs
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.nodejs.test
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.rhino
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.rhino.test
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.test
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.test.data
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.test
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.core
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.core.testdata
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.core.tests
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.dalvik
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.dalvik.test
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.ide
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.ide.jdt
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.ide.jdt.test
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.ide.jsdt
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.ide.jsdt.tests
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.ide.tests
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.scandroid
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.shrike
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: linux
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.util
+      language: java
+      jdk: oraclejdk8
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.java
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.java.ecj
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.java.test
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.java.test.data
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.html.nu_validator
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.nodejs
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.nodejs.test
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.rhino
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.rhino.test
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.test
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.js.test.data
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.cast.test
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.core
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.core.testdata
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.core.tests
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.dalvik
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.dalvik.test
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.ide
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.ide.jdt
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.ide.jdt.test
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.ide.jsdt
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.ide.jsdt.tests
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.ide.tests
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.scandroid
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.shrike
+      language: java
+      if: type = cron
+    - os: osx
+      osx_image: xcode8.3
+      env: BUILD_SYSTEM=gradle BUILD_ONLY_SUBMODULE=com.ibm.wala.util
+      language: java
+      if: type = cron
diff -Nru wala-1.3.9/upload-javascript.sh wala-1.5.1/upload-javascript.sh
--- wala-1.3.9/upload-javascript.sh	1970-01-01 00:00:00.000000000 +0000
+++ wala-1.5.1/upload-javascript.sh	2019-01-29 17:08:39.000000000 +0000
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ "$TRAVIS_REPO_SLUG" == "wala/WALA" ] &&
+   [ "$TRAVIS_PULL_REQUEST" == "false" ] &&
+   [ "$TRAVIS_BRANCH" == "master" ]; then
+
+    cd $HOME
+    git config --global user.email "travis@travis-ci.org"
+    git config --global user.name "travis-ci"
+    git clone --quiet https://${GH_TOKEN}@github.com/wala/javadoc > /dev/null
+
+    cd javadoc
+    git rm -rf --quiet *
+    cp -Rf $HOME/build/wala/WALA/target/site/apidocs/* .
+    git add -f .
+    git commit -m "Latest javadoc on successful travis build $TRAVIS_BUILD_NUMBER auto-pushed to gh-pages"
+    git push > /dev/null
+
+    echo -e "Published Javadoc to gh-pages.\n"
+
+fi