diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index d90ec4ea081..dd1864ce124 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -5385,11 +5385,16 @@ fn parse_where_clause(&mut self) -> PResult<'a, WhereClause> {
 
     fn parse_fn_args(&mut self, named_args: bool, allow_variadic: bool)
                      -> PResult<'a, (Vec<Arg> , bool)> {
+        self.expect(&token::OpenDelim(token::Paren))?;
+
+        if let Ok(Some(_)) = self.parse_self_arg() {
+            return Err(self.fatal("unexpected `self` argument in bare function"))
+        }
+
         let sp = self.span;
         let mut variadic = false;
         let args: Vec<Option<Arg>> =
-            self.parse_unspanned_seq(
-                &token::OpenDelim(token::Paren),
+            self.parse_seq_to_before_end(
                 &token::CloseDelim(token::Paren),
                 SeqSep::trailing_allowed(token::Comma),
                 |p| {
@@ -5436,6 +5441,8 @@ fn parse_fn_args(&mut self, named_args: bool, allow_variadic: bool)
                 }
             )?;
 
+        self.eat(&token::CloseDelim(token::Paren));
+
         let args: Vec<_> = args.into_iter().filter_map(|x| x).collect();
 
         if variadic && args.is_empty() {
diff --git a/src/test/ui/bare-function-self.stderr b/src/test/ui/bare-function-self.stderr
new file mode 100644
index 00000000000..51db0ddd70d
--- /dev/null
+++ b/src/test/ui/bare-function-self.stderr
@@ -0,0 +1,8 @@
+error: unexpected `self` argument in bare function
+  --> $DIR/bare-function-self.rs:12:11
+   |
+LL | fn a(&self) { }
+   |           ^
+
+error: aborting due to previous error
+