Merge pull request #2344 from retronym/ticket/7147

SI-7147 Diagnostic for unexplained assertion in presentation compiler.

1 files changed, 9 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
index 348c7f688f..9e5186b731 100644
--- a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
+++ b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
@@ -97,8 +97,15 @@ abstract class SymbolLoaders {
     val clazz = enterClass(root, name, completer)
     val module = enterModule(root, name, completer)
     if (!clazz.isAnonymousClass) {
-      assert(clazz.companionModule == module, module)
-      assert(module.companionClass == clazz, clazz)
+      // Diagnostic for SI-7147
+      def msg: String = {
+        def symLocation(sym: Symbol) = if (sym == null) "null" else s"${clazz.fullLocationString} (from ${clazz.associatedFile})"
+        sm"""Inconsistent class/module symbol pair for `$name` loaded from ${symLocation(root)}.
+            |clazz = ${symLocation(clazz)}; clazz.companionModule = ${clazz.companionModule}
+            |module = ${symLocation(module)}; module.companionClass = ${module.companionClass}"""
+      }
+      assert(clazz.companionModule == module, msg)
+      assert(module.companionClass == clazz, msg)
     }
   }