diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 560edc1..17f5763 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -98,7 +98,7 @@
 ///         'extern' string-literal declaration
 ///
 Parser::DeclTy *Parser::ParseLinkage(unsigned Context) {
-  assert(Tok.is(tok::string_literal) && "Not a stringliteral!");
+  assert(Tok.is(tok::string_literal) && "Not a string literal!");
   llvm::SmallVector<char, 8> LangBuffer;
   // LangBuffer is guaranteed to be big enough.
   LangBuffer.resize(Tok.getLength());
@@ -110,7 +110,7 @@
   SourceLocation LBrace, RBrace;
   
   if (Tok.isNot(tok::l_brace)) {
-    D = ParseDeclaration(Context);
+    D = ParseDeclarationOrFunctionDefinition();
   } else {
     LBrace = ConsumeBrace();
     while (Tok.isNot(tok::r_brace) && Tok.isNot(tok::eof)) {