Merge pull request diffblue#1986 from thk123/revert/1816/overlay-classes

Revert overlay classes and follow on fix, which broke a functionality of the `--classpath` option that allows to load several classes having the same name.
smowton · Mar 29, 2018 · a695814 · a695814
2 parents 58beeb4 + 9933b58
commit a695814
Show file tree

Hide file tree

Showing 33 changed files with 315 additions and 870 deletions.
diff --git a/regression/cbmc-java/generics_type_param/test.desc b/regression/cbmc-java/generics_type_param/test.desc
@@ -3,9 +3,9 @@ GenericFields$SimpleGenericField.class
 --cover location --function GenericFields\$SimpleGenericField.foo --verbosity 10
 ^EXIT=0$
 ^SIGNAL=0$
-Parsing class AWrapper
-Parsing class FWrapper
-Parsing class IWrapper
+Reading class AWrapper
+Reading class FWrapper
+Reading class IWrapper
 --
 failed to load class \`AWrapper\'
 failed to load class \`FWrapper\'

diff --git a/regression/cbmc-java/invalid_classpath/Test.class b/regression/cbmc-java/invalid_classpath/Test.class
diff --git a/regression/cbmc-java/invalid_classpath/Test.java b/regression/cbmc-java/invalid_classpath/Test.java
diff --git a/regression/cbmc-java/invalid_classpath/test-jar.desc b/regression/cbmc-java/invalid_classpath/test-jar.desc
diff --git a/regression/cbmc-java/invalid_classpath/test-path.desc b/regression/cbmc-java/invalid_classpath/test-path.desc
diff --git a/regression/cbmc-java/overlay-class/Test.class b/regression/cbmc-java/overlay-class/Test.class
diff --git a/regression/cbmc-java/overlay-class/Test.java b/regression/cbmc-java/overlay-class/Test.java
diff --git a/regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayClassImplementation.class b/regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayClassImplementation.class
diff --git a/regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayClassImplementation.java b/regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayClassImplementation.java
diff --git a/...ession/cbmc-java/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.class b/...ession/cbmc-java/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.class
diff --git a/regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.java b/regression/cbmc-java/overlay-class/annotations/com/diffblue/OverlayMethodImplementation.java
diff --git a/regression/cbmc-java/overlay-class/correct-overlay/Test.class b/regression/cbmc-java/overlay-class/correct-overlay/Test.class
diff --git a/regression/cbmc-java/overlay-class/correct-overlay/Test.java b/regression/cbmc-java/overlay-class/correct-overlay/Test.java
diff --git a/regression/cbmc-java/overlay-class/correct-test.desc b/regression/cbmc-java/overlay-class/correct-test.desc
diff --git a/regression/cbmc-java/overlay-class/duplicate-test.desc b/regression/cbmc-java/overlay-class/duplicate-test.desc
diff --git a/regression/cbmc-java/overlay-class/format_classpath.sh b/regression/cbmc-java/overlay-class/format_classpath.sh
diff --git a/regression/cbmc-java/overlay-class/misordered-test.desc b/regression/cbmc-java/overlay-class/misordered-test.desc
diff --git a/regression/cbmc-java/overlay-class/unmarked-overlay/Test.class b/regression/cbmc-java/overlay-class/unmarked-overlay/Test.class
diff --git a/regression/cbmc-java/overlay-class/unmarked-overlay/Test.java b/regression/cbmc-java/overlay-class/unmarked-overlay/Test.java
diff --git a/regression/cbmc-java/overlay-class/unmarked-test.desc b/regression/cbmc-java/overlay-class/unmarked-test.desc
diff --git a/regression/cbmc-java/provide_object_implementation/java/lang/Object.class b/regression/cbmc-java/provide_object_implementation/java/lang/Object.class
diff --git a/regression/cbmc-java/provide_object_implementation/java/lang/Object.java b/regression/cbmc-java/provide_object_implementation/java/lang/Object.java
diff --git a/regression/cbmc-java/provide_object_implementation/test.desc b/regression/cbmc-java/provide_object_implementation/test.desc
diff --git a/src/java_bytecode/ci_lazy_methods.cpp b/src/java_bytecode/ci_lazy_methods.cpp
@@ -85,15 +85,15 @@ bool ci_lazy_methodst::operator()(
       reachable_classes.push_back(main_class);
     else
       reachable_classes = main_jar_classes;
-    for(const irep_idt &class_name : reachable_classes)
+    for(const auto &classname : reachable_classes)
     {
-      const auto &methods =
-        java_class_loader.get_original_class(class_name).parsed_class.methods;
+      const auto &methods=
+        java_class_loader.class_map.at(classname).parsed_class.methods;
       for(const auto &method : methods)
       {
-        const irep_idt methodid =
-          "java::" + id2string(class_name) + "." + id2string(method.name)
-            + ":" + id2string(method.descriptor);
+        const irep_idt methodid="java::"+id2string(classname)+"."+
+          id2string(method.name)+":"+
+          id2string(method.descriptor);
         method_worklist2.push_back(methodid);
       }
     }