5 files changed, 64 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index fa9a4ba9ea..3f546c9a51 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -1255,7 +1255,11 @@ trait Namers extends MethodSynthesis {
           case defn: MemberDef =>
             val ainfos = defn.mods.annotations filterNot (_ eq null) map { ann =>
               // need to be lazy, #1782. beforeTyper to allow inferView in annotation args, SI-5892.
-              AnnotationInfo lazily beforeTyper(typer typedAnnotation ann)
+              AnnotationInfo lazily {
+                val context1 = typer.context.make(ann)
+                context1.setReportErrors()
+                beforeTyper(newTyper(context1) typedAnnotation ann)
+              }
             }
             if (ainfos.nonEmpty) {
               annotated setAnnotations ainfos
diff --git a/test/files/neg/t6558.check b/test/files/neg/t6558.check
new file mode 100644
index 0000000000..1b39ef9986
--- /dev/null
+++ b/test/files/neg/t6558.check
@@ -0,0 +1,10 @@
+t6558.scala:19: error: not found: type classs
+  @classs
+   ^
+t6558.scala:22: error: not found: type typeparam
+  class D[@typeparam T]
+           ^
+t6558.scala:25: error: not found: type valueparam
+  	@valueparam x: Any
+         ^
+three errors found
diff --git a/test/files/neg/t6558.scala b/test/files/neg/t6558.scala
new file mode 100644
index 0000000000..bdc441698f
--- /dev/null
+++ b/test/files/neg/t6558.scala
@@ -0,0 +1,27 @@
+class AnnotNotFound {
+  def foo(a: Any) = ()
+
+  foo {
+    // Not yet issued in the context of this file, see SI-6758
+    // This error is issued in t6558b.scala
+    @inargument
+    def foo = 0
+    foo
+  }
+
+  () => {
+    // As per above
+    @infunction
+    def foo = 0
+    ()
+  }
+
+  @classs
+  class C
+
+  class D[@typeparam T]
+
+  class E(
+  	@valueparam x: Any
+  )
+}
diff --git a/test/files/neg/t6558b.check b/test/files/neg/t6558b.check
new file mode 100644
index 0000000000..cfa384fc08
--- /dev/null
+++ b/test/files/neg/t6558b.check
@@ -0,0 +1,7 @@
+t6558b.scala:5: error: not found: type inargument
+    @inargument
+     ^
+t6558b.scala:11: error: not found: type infunction
+    @infunction
+     ^
+two errors found
diff --git a/test/files/neg/t6558b.scala b/test/files/neg/t6558b.scala
new file mode 100644
index 0000000000..2aa06f69cf
--- /dev/null
+++ b/test/files/neg/t6558b.scala
@@ -0,0 +1,15 @@
+class AnnotNotFound {
+  def foo(a: Any) = ()
+
+  foo {
+    @inargument
+    def foo = 0
+    foo
+  }
+
+  () => {
+    @infunction
+    def foo = 0
+    ()
+  }
+}