Merge branch 'develop' of github.com:Sable/soot into develop

Rroscha · Jan 14, 2014 · 62d066d · 62d066d
2 parents 2ef48b6 + 5843f1a
commit 62d066d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/soot/dexpler/DexClass.java b/src/soot/dexpler/DexClass.java
@@ -39,6 +39,7 @@
 import soot.Type;
 import soot.javaToJimple.IInitialResolver.Dependencies;
 import soot.options.Options;
+import soot.tagkit.SourceFileTag;
 
 /**
  * DexClass is a container for all relevant information of that class
@@ -74,6 +75,10 @@ public static Dependencies makeSootClass(SootClass sc, ClassDef defItem, DexFile
         String superClass = defItem.getSuperclass();
         Dependencies deps = new Dependencies();
 
+        // source file
+        String sourceFile = defItem.getSourceFile();
+        sc.addTag(new SourceFileTag(sourceFile));
+
         // super class for hierarchy level
         String superClassName = Util.dottedClassName(superClass);
         SootClass sootSuperClass = SootResolver.v().makeClassRef(superClassName);

diff --git a/src/soot/dexpler/DexResolver.java b/src/soot/dexpler/DexResolver.java
@@ -69,7 +69,8 @@ public Dependencies resolveFromFile(File file, String className, SootClass sc) {
     protected static void addSourceFileTag(SootClass sc, String fileName){
         soot.tagkit.SourceFileTag tag = null;
         if (sc.hasTag("SourceFileTag")) {
-            tag = (soot.tagkit.SourceFileTag)sc.getTag("SourceFileTag");
+            return; // do not add tag if original class already has debug
+                    // information
         }
         else {
             tag = new soot.tagkit.SourceFileTag();

diff --git a/src/soot/toDex/DexPrinter.java b/src/soot/toDex/DexPrinter.java
@@ -55,6 +55,7 @@
 import soot.jimple.toolkits.scalar.EmptySwitchEliminator;
 import soot.options.Options;
 import soot.tagkit.LineNumberTag;
+import soot.tagkit.SourceFileTag;
 import soot.tagkit.Tag;
 
 /**
@@ -203,7 +204,15 @@ private void addAsClassDefItem(SootClass c) {
 		ClassDataItem classData = toClassDataItem(c, dexFile);
 		AnnotationDirectoryItem di= dexAnnotation.finish();
 		// staticFieldInitializers is not used since the <clinit> method should be enough
-		ClassDefItem.internClassDefItem(dexFile, classType, accessFlags, superType, implementedInterfaces, null, di, classData, null);
+        // add source file tag if any
+        StringIdItem sourceFileItem = null;
+        if (c.hasTag("SourceFileTag")) {
+            SourceFileTag sft = (SourceFileTag) c.getTag("SourceFileTag");
+            String sourceFile = sft.getSourceFile();
+            sourceFileItem = StringIdItem.internStringIdItem(dexFile, sourceFile);
+        }
+        ClassDefItem.internClassDefItem(dexFile, classType, accessFlags, superType,
+                implementedInterfaces, sourceFileItem, di, classData, null);
 		dexAnnotation = null;
 	}