diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp
index 3fe76646174710f1e129c2cf49209dc0185923f6..1b8801e236481314c4d50440521fcb8632fa1cb2 100644
--- a/clang/lib/Parse/ParseDecl.cpp
+++ b/clang/lib/Parse/ParseDecl.cpp
@@ -6523,7 +6523,8 @@ void Parser::ParseFunctionDeclarator(Declarator &D,
     if (Tok.isNot(tok::r_paren)) {
       const Type *typePtr = nullptr;
       if (D.getCXXScopeSpec().isValid())
-        typePtr = D.getCXXScopeSpec().getScopeRep()->getAsType();
+        typePtr = D.getCXXScopeSpec().getScopeRep()->getAsType()->getCanonicalTypeUnqualified().getTypePtr();
+
       ParseParameterDeclarationClause(D.getContext(), FirstArgAttrs, ParamInfo,
                                       EllipsisLoc, typePtr);
     }
diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp
index 6acf76d713fde1a915505357463f6a8103cb914d..9eb2e2af259f8f066325127fe03c367d1c2c85ef 100644
--- a/clang/lib/Parse/ParseExpr.cpp
+++ b/clang/lib/Parse/ParseExpr.cpp
@@ -1042,7 +1042,7 @@ ExprResult Parser::ParseCastExpression(CastParseKind ParseKind,
                                // constant: enumeration-constant
     // Turn a potentially qualified name into a annot_typename or
     // annot_cxxscope if it would be valid.  This handles things like x::y, etc.
-    if (getLangOpts().CPlusPlus) {
+    if (getLangOpts().CPlusPlus || getLangOpts().BSC) {
       // Avoid the unnecessary parse-time lookup in the common case
       // where the syntax forbids a type.
       const Token &Next = NextToken();
diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp
index bdbd4be9249b5e6cb9b48d07b34a24c04d86eeb7..d7fcdaf84dce875190298a07419d89a3e347cb6e 100644
--- a/clang/lib/Parse/ParseExprCXX.cpp
+++ b/clang/lib/Parse/ParseExprCXX.cpp
@@ -155,7 +155,7 @@ bool Parser::ParseOptionalCXXScopeSpecifier(
     CXXScopeSpec &SS, ParsedType ObjectType, bool ObjectHadErrors,
     bool EnteringContext, bool *MayBePseudoDestructor, bool IsTypename,
     IdentifierInfo **LastII, bool OnlyNamespace, bool InUsingDeclaration) {
-  assert(getLangOpts().CPlusPlus &&
+  assert((getLangOpts().CPlusPlus || getLangOpts().BSC) &&
          "Call sites of this function should be guarded by checking for C++");
 
   if (Tok.is(tok::annot_cxxscope)) {
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp
index f0b1a28a6e435db40dc0e46a1b891b349045f208..af07ad9dad3865b640216312e1302442244bc1af 100644
--- a/clang/lib/Parse/Parser.cpp
+++ b/clang/lib/Parse/Parser.cpp
@@ -1941,7 +1941,7 @@ bool Parser::TryAnnotateTypeOrScopeToken() {
   bool WasScopeAnnotation = Tok.is(tok::annot_cxxscope);
 
   CXXScopeSpec SS;
-  if (getLangOpts().CPlusPlus)
+  if (getLangOpts().CPlusPlus || getLangOpts().BSC)
     if (ParseOptionalCXXScopeSpecifier(SS, /*ObjectType=*/nullptr,
                                        /*ObjectHadErrors=*/false,
                                        /*EnteringContext*/ false))