1 files changed, 27 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
index 3536e79a76..13ec75d04d 100644
--- a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
+++ b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
@@ -98,7 +98,7 @@ abstract class SymbolLoaders {
     private var ok = false
 
     private def setSource(sym: Symbol) {
-      sourcefile map (sf => sym match {
+      sourcefile foreach (sf => sym match {
         case cls: ClassSymbol => cls.sourceFile = sf
         case mod: ModuleSymbol => mod.moduleClass.sourceFile = sf
         case _ => ()
@@ -151,9 +151,32 @@ abstract class SymbolLoaders {
 
     def enterPackage(root: Symbol, name: String, completer: SymbolLoader) {
       val preExisting = root.info.decls.lookup(newTermName(name))
-      if (preExisting != NoSymbol)
-        throw new TypeError(
-          root+" contains object and package with same name: "+name+"\none of them needs to be removed from classpath")
+      if (preExisting != NoSymbol) {
+        // Some jars (often, obfuscated ones) include a package and
+        // object with the same name. Rather than render them unusable,
+        // offer a setting to resolve the conflict one way or the other.
+        // This was motivated by the desire to use YourKit probes, which
+        // require yjp.jar at runtime. See SI-2089.
+        if (settings.termConflict.isDefault)
+          throw new TypeError(
+            root+" contains object and package with same name: "+
+            name+"\none of them needs to be removed from classpath"
+          )
+        else if (settings.termConflict.value == "package") {
+          global.warning(
+            "Resolving package/object name conflict in favor of package " +
+            preExisting.fullName + ".  The object will be inaccessible."
+          )
+          root.info.decls.unlink(preExisting)
+        }
+        else {
+          global.warning(
+            "Resolving package/object name conflict in favor of object " +
+            preExisting.fullName + ".  The package will be inaccessible."
+          )
+          return
+        }
+      }
       val pkg = root.newPackage(NoPosition, newTermName(name))
       pkg.moduleClass.setInfo(completer)
       pkg.setInfo(pkg.moduleClass.tpe)