Merge pull request #1 from gmu-swe/master

this is to update psl version hope this works

.travis.yml

@@ -1,5 +1,17 @@
 language: java
-#sudo: false
-script: "jdk_switcher use oraclejdk8; cd Phosphor; export INST_HOME=$JAVA_HOME/jre; mvn -Ddacapo.skip=false verify"
-after_success:
-  - cd phosphor; mvn install --settings ~/settings.xml
+script: jdk_switcher use oraclejdk8; cd Phosphor; export INST_HOME=$JAVA_HOME/jre;
+  mvn  -Ddacapo.skip=false install
+deploy:
+  provider: script
+  skip_cleanup: true
+  script: cd $TRAVIS_BUILD_DIR; bash deployment/deploy.sh
+  on:
+    branch: master
+env:
+  global:
+  - secure: biE9BxIfRYdAy0V4pcC+E266kX6qmPoBiy+nWUAO5QEpddIko3G8IUkaxFmeQa9ePNyjqHaygqBNFRk29vLTYmIEVtZrOchXnf9JCD+aLdnnhStZsiGaQZNOVbM5+U6hLD51+CI2Fwrm/06+x2HQnqFJzEWd2rAUE+QNok0xKtM=
+  - secure: DnEUm7IYhVJRKw384oUbKpRDFPZKiSNm7IcyBctDj7KbEIgV2ed20F5YNjpW7dJZ/YB6e06FFhnDORUvNxiz5M6/JkA8DZqMXAVqxSZWRPKHMH6TdUM+NsGpP2L5PAAX5MltpjzfDd/dKI5AT5D2C6CGY0jAwTO5o6lrLpEVf80=
+  - secure: UCM2HPlc/ivDMxtxicEXF91STHcLjWq4l5jVRr9T/ahWo1UloFOFlIqp3PwAUI/hdoz3w6iGcWFKi2x+9s7/0lPRMbz7miLDSkEsVr9SxQBdCPe4bs26HKeaXTpd9ughzif6DHEcCCAD8Jm+tj2moE+T9LlxCYnzrT2vo0Pa1bU=
+  - secure: DWah08k4GvqOmx6eg5ABC+BlpyxlP88pjbzwSRbBl05LVXa/h8xhsrfUCD9K2/rsH4l063cYieTlD04ss5q640yNm4pRlOfrIE3WXEKDDiT8EVBoNKI3XyDpCp+uMhqMdfBEeZxO2ovIqxeO7YuLAizrSIscDZIVDeG8UnLfZYc=
+dd:
+  secure: U3fyPVgjVPvUxY9C+vOTpT65BWqF9y2b+oMlLgR7wR+buNGY/A5CyJwC7l2p6cx92AD96Ch8PLQXOV6a0EyjV3vdpSvpB70+jQVafq6ZEXnPoah/mfsDzRk7hIsOfoPM+f1AuBFI37SY6COuH59M7QCzHV9rn+g+wPovZiFhe2U=

Phosphor/.gitignore

@@ -4,3 +4,42 @@
 .classpath
 .settings
 dacapo
+test.tmp.out
+
+# Remove dynamically generated pom
+dependency-reduced-pom.xml
+
+# Ignore vim .swp files
+**/*.swp
+
+
+# Ignore intellij stuff
+*.iml
+.idea
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

Phosphor/instrumentJRE.sh

@@ -8,13 +8,13 @@ else
 	echo "Ensuring instrumented JREs exist for tests... to refresh, do mvn clean\n";
 	if [ ! -d "target/jre-inst-int" ]; then
 		echo "Creating int tag instrumented JRE\n";
-		java -Xmx6g -jar target/Phosphor-0.0.4-SNAPSHOT.jar -serialization -forceUnboxAcmpEq -withEnumsByValue $INST_HOME target/jre-inst-int;
+		java -Xmx6g -Dphosphor.verify=true -jar target/Phosphor-0.0.4-SNAPSHOT.jar -serialization -forceUnboxAcmpEq -withEnumsByValue $INST_HOME target/jre-inst-int;
 	else
 		echo "Not regenerating int tag instrumented JRE\n";
 	fi
 	if [ ! -d "target/jre-inst-obj" ]; then
 			echo "Creating obj tag instrumented JRE\n";
-		java -Xmx6g -jar target/Phosphor-0.0.4-SNAPSHOT.jar -serialization -multiTaint -forceUnboxAcmpEq -withEnumsByValue $INST_HOME target/jre-inst-obj;
+		java -Xmx6g -Dphosphor.verify=true -jar target/Phosphor-0.0.4-SNAPSHOT.jar -serialization -multiTaint -forceUnboxAcmpEq -withEnumsByValue $INST_HOME target/jre-inst-obj;
 	else
 		echo "Not regenerating obj tag instrumented JRE\n";
 	fi
@@ -30,7 +30,7 @@ else
 	#fi
 	if [ ! -d "target/jre-inst-implicit" ]; then
 		echo "Creating obj tag + implicit flow instrumented JRE\n";
-		java -Xmx6g -jar target/Phosphor-0.0.4-SNAPSHOT.jar -controlTrack -multiTaint -forceUnboxAcmpEq -withEnumsByValue $INST_HOME target/jre-inst-implicit;
+		java -Xmx6g -Dphosphor.verify=true -jar target/Phosphor-0.0.4-SNAPSHOT.jar -controlTrack -multiTaint -forceUnboxAcmpEq -withEnumsByValue $INST_HOME target/jre-inst-implicit;
 	else
 		echo "Not regenerating implicit flow instrumented JRE\n";
 	fi

Phosphor/pom.xml

@@ -238,7 +238,9 @@
                                         <include>**/*IntTagITCase.java</include>
                                     </includes>
                                     <reuseForks>false</reuseForks>
-                                    <argLine>-Xbootclasspath/p:${project.build.directory}/${project.build.finalName}.jar
+                                    <argLine>
+                                        -Dphosphor.verify=true
+                                        -Xbootclasspath/p:${project.build.directory}/${project.build.finalName}.jar
                                         -javaagent:${project.build.directory}/${project.build.finalName}.jar=enum,acmpeq,cacheDir=${project.build.directory}/cached-int
                                     </argLine>
                                 </configuration>
@@ -256,8 +258,10 @@
                                         <include>**/*ObjTagITCase.java</include>
                                     </includes>
                                     <reuseForks>false</reuseForks>
-                                    <argLine>-Xbootclasspath/p:${project.build.directory}/${project.build.finalName}.jar
-                                        -javaagent:${project.build.directory}/${project.build.finalName}.jar=enum,objmethods,acmpeq,cacheDir=${project.build.directory}/cached-obj,taintSources=src/taint-sources,taintSinks=src/taint-sinks
+                                    <argLine>
+                                        -Dphosphor.verify=true
+                                        -Xbootclasspath/p:${project.build.directory}/${project.build.finalName}.jar
+                                        -javaagent:${project.build.directory}/${project.build.finalName}.jar=enum,objmethods,acmpeq,cacheDir=${project.build.directory}/cached-obj,taintSources=src/taint-sources,taintSinks=src/taint-sinks,taintThrough=src/taint-through
                                     </argLine>
                                 </configuration>
                                 <goals>
@@ -293,7 +297,9 @@
                                         <include>**/*ImplicitITCase.java</include>
                                     </includes>
                                     <reuseForks>false</reuseForks>
-                                    <argLine>-Xbootclasspath/p:${project.build.directory}/${project.build.finalName}.jar
+                                    <argLine>
+                                        -Dphosphor.verify=true
+                                        -Xbootclasspath/p:${project.build.directory}/${project.build.finalName}.jar
                                         -javaagent:${project.build.directory}/${project.build.finalName}.jar=enum,acmpeq,cacheDir=${project.build.directory}/cached-implicit,implicitExceptions
                                     </argLine>
                                 </configuration>
@@ -349,27 +355,27 @@
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
-            <version>6.1.1</version>
+            <version>7.0</version>
         </dependency>
          <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-util</artifactId>
-            <version>6.1.1</version>
+            <version>7.0</version>
         </dependency>
          <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-tree</artifactId>
-            <version>6.1.1</version>
+            <version>7.0</version>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-analysis</artifactId>
-            <version>6.1.1</version>
+            <version>7.0</version>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-commons</artifactId>
-            <version>6.1.1</version>
+            <version>7.0</version>
         </dependency>
     </dependencies>
     <distributionManagement>

Phosphor/resources/META-INF/MANIFEST.MF

@@ -2,4 +2,4 @@ Manifest-Version: 1.0
 Created-By: 1.6.0_06 (Sun Microsystems Inc.)
 Main-Class: edu.columbia.cs.psl.phosphor.Instrumenter
 Premain-Class: edu.columbia.cs.psl.phosphor.PreMain
-
+Can-Retransform-Classes: true

Phosphor/runDacapo.sh

@@ -13,8 +13,8 @@ if [ ! -d "$DACAPO_DIR" ]; then
 echo "Downloading dacapo jar";
 mkdir dacapo;
 cd dacapo;
-wget --quiet https://maven.jonbell.net/repository/internal/org/dacapo/dacapo/9.12-bach/dacapo-9.12-bach.jar
-unzip dacapo-9.12-bach.jar;
+wget --quiet https://www.jonbell.net/dacapo-9.12-MR1-bach.jar
+unzip dacapo-9.12-MR1-bach.jar;
 cd ..;
 fi
     echo "Ensuring instrumented dacapo exist for tests... to refresh, do mvn clean\n";