diagnostics for SI-5692

1 files changed, 10 insertions, 3 deletions

diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
index 52648380ec..192cc94b90 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
@@ -62,9 +62,16 @@ abstract class Pickler extends SubComponent {
       // when we pickle it: so let's report an error instead.  We know next
       // to nothing about what happened, but our supposition is a lot better
       // than "bad type: <error>" in terms of explanatory power.
-      for (t <- unit.body ; if t.isErroneous) {
-        unit.error(t.pos, "erroneous or inaccessible type")
-        return
+      for (t <- unit.body) {
+        if (t.isErroneous) {
+          unit.error(t.pos, "erroneous or inaccessible type")
+          return
+        }
+
+        if (!t.isDef && t.hasSymbol && t.symbol.isTermMacro) {
+          unit.error(t.pos, "macro has not been expanded")
+          return
+        }
       }
 
       pickle(unit.body)