Back out 46855 for now, it causes test failures on Darwin.

llvm-svn: 46867
diff --git a/clang/AST/Decl.cpp b/clang/AST/Decl.cpp
index 55abe6f..78916c5 100644
--- a/clang/AST/Decl.cpp
+++ b/clang/AST/Decl.cpp
@@ -38,7 +38,6 @@
 static unsigned nObjCCompatibleAlias = 0;
 static unsigned nObjCPropertyDecl = 0;
 static unsigned nLinkageSpecDecl = 0;
-static unsigned nFileScopeAsmDecl = 0;
 
 static bool StatSwitch = false;
 
@@ -170,8 +169,7 @@
               nObjCCategoryImpl*sizeof(ObjCCategoryImplDecl)+
               nObjCCompatibleAlias*sizeof(ObjCCompatibleAliasDecl)+
               nObjCPropertyDecl*sizeof(ObjCPropertyDecl)+
-              nLinkageSpecDecl*sizeof(LinkageSpecDecl)+
-              nFileScopeAsmDecl*sizeof(FileScopeAsmDecl)));
+              nLinkageSpecDecl*sizeof(LinkageSpecDecl)));
     
 }
 
@@ -242,9 +240,6 @@
     case LinkageSpec:
       nLinkageSpecDecl++;
       break;
-    case FileScopeAsm:
-      nFileScopeAsmDecl++;
-      break;
   }
 }
 
diff --git a/clang/AST/DeclSerialization.cpp b/clang/AST/DeclSerialization.cpp
index cb91846..146ebba 100644
--- a/clang/AST/DeclSerialization.cpp
+++ b/clang/AST/DeclSerialization.cpp
@@ -67,9 +67,6 @@
       
     case Typedef:
       return TypedefDecl::CreateImpl(D);
-      
-    case FileScopeAsm:
-      return FileScopeAsmDecl::CreateImpl(D);
   }
 }
 
@@ -441,23 +438,3 @@
   Language = static_cast<LanguageIDs>(D.ReadInt());
   D.ReadPtr(this->D);
 }
-
-//===----------------------------------------------------------------------===//
-//      FileScopeAsm Serialization.
-//===----------------------------------------------------------------------===//
-
-void FileScopeAsmDecl::EmitImpl(llvm::Serializer& S) const
-{
-  Decl::EmitInRec(S);
-  S.EmitOwnedPtr(AsmString);
-}
-
-FileScopeAsmDecl* FileScopeAsmDecl::CreateImpl(Deserializer& D) { 
-  FileScopeAsmDecl* decl = new FileScopeAsmDecl(SourceLocation(), 0);
-
-  decl->Decl::ReadInRec(D);
-  decl->AsmString = cast<StringLiteral>(D.ReadOwnedPtr<Expr>());
-//  D.ReadOwnedPtr(D.ReadOwnedPtr<StringLiteral>())<#T * * Ptr#>, <#bool AutoRegister#>)(decl->AsmString);
-  
-  return decl;
-}