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

patch from Y. Havviv to enforce deterministic order loading classes 

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@3314 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
This commit is contained in:
sjfink 2009-03-15 13:01:57 +00:00
parent 22d92cdbba
commit f9aa9e6d96
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
com.ibm.wala.core/src/com/ibm/wala/classLoader/ClassLoaderImpl.java
View File

@ -30,7 +30,6 @@ 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.ToStringComparator;
import com.ibm.wala.util.debug.Assertions;
import com.ibm.wala.util.shrike.ShrikeClassReaderHandle;
import com.ibm.wala.util.strings.Atom;
@ -325,20 +324,16 @@ public class ClassLoaderImpl implements IClassLoader {
if (modules == null) {
throw new IllegalArgumentException("modules is null");
}
// use tree set to keep things sorted ... for deterministic class loading
TreeSet<Module> archives = new TreeSet<Module>(ToStringComparator.instance());
for (Iterator i = modules.iterator(); i.hasNext();) {
Module M = (Module) i.next();
if (DEBUG_LEVEL > 0) {
System.err.println("add archive: " + M);
}
archives.add(M);
}
// 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 = archives.iterator(); it.hasNext();) {
for (Iterator<Module> it = modules.iterator(); it.hasNext();) {
Module archive = it.next();
Set<ModuleEntry> classFiles = getClassFiles(archive);
if (DEBUG_LEVEL > 0) {
System.err.println("add archive: " + archive);
}
removeClassFiles(classFiles, classModuleEntries);
for (Iterator<ModuleEntry> it2 = classFiles.iterator(); it2.hasNext();) {
ModuleEntry file = it2.next();