DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

basic compatibility with Java 7 (i.e., don't crash immediately)

This commit is contained in:
Manu Sridharan 2012-08-03 15:41:09 -07:00
parent f091bb3aca
commit 3317c1ccf6
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
com.ibm.wala.core.tests/src/com/ibm/wala/core/tests/cha/LibraryVersionTest.java
View File

@ -36,7 +36,7 @@ public class LibraryVersionTest extends WalaTestCase {
@Test public void testLibraryVersion() throws IOException {
AnalysisScope scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA, (new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), MY_CLASSLOADER);
System.err.println("java library version is " + scope.getJavaLibraryVersion());
Assert.assertTrue(scope.isJava16Libraries() || scope.isJava15Libraries()||scope.isJava14Libraries());
Assert.assertTrue(scope.isJava17Libraries() || scope.isJava16Libraries() || scope.isJava15Libraries()||scope.isJava14Libraries());
}
}

2
com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/DataflowTest.java
View File

@ -67,7 +67,7 @@ public class DataflowTest extends WalaTestCase {
public static void beforeClass() throws Exception {
scope = AnalysisScopeReader.readJavaScope(TestConstants.WALA_TESTDATA,
(new FileProvider()).getFile("J2SEClassHierarchyExclusions.txt"), DataflowTest.class.getClassLoader());
(new FileProvider()).getFile(CallGraphTestUtil.REGRESSION_EXCLUSIONS), DataflowTest.class.getClassLoader());
try {
cha = ClassHierarchy.make(scope);

4
com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/AnalysisScope.java
View File

@ -411,6 +411,10 @@ public class AnalysisScope {
}
}
public boolean isJava17Libraries() throws IllegalStateException {
return getJavaLibraryVersion().startsWith("1.7");
}
public boolean isJava16Libraries() throws IllegalStateException {
return getJavaLibraryVersion().startsWith("1.6");
}

2
com.ibm.wala.shrike/src/com/ibm/wala/shrikeCT/ClassReader.java
View File

@ -64,7 +64,7 @@ public final class ClassReader implements ClassConstants {
if (magic != MAGIC) {
throw new InvalidClassFileException(offset, "bad magic number: " + magic);
}
if (majorVersion < 45 || majorVersion > 50) {
if (majorVersion < 45 || majorVersion > 51) {
throw new InvalidClassFileException(offset, "unknown class file version: " + majorVersion + "." + minorVersion);
}