Reverting patch rL323952 due to build errors that I

haven't encountered in local builds.

llvm-svn: 323956

1 files changed, 4 insertions, 20 deletions

diff --git a/clang/lib/CodeGen/CGDebugInfo.h b/clang/lib/CodeGen/CGDebugInfo.h
index de6dbdcd632..4f7b7f2a0d9 100644
--- a/clang/lib/CodeGen/CGDebugInfo.h
+++ b/clang/lib/CodeGen/CGDebugInfo.h
@@ -81,10 +81,6 @@ class CGDebugInfo {
 
   llvm::SmallDenseMap<llvm::StringRef, llvm::StringRef> DebugPrefixMap;
 
-  /// Cache that maps VLA types to size expressions for that type,
-  /// represented by instantiated Metadata nodes.
-  llvm::SmallDenseMap<QualType, llvm::Metadata *> SizeExprCache;
-
   struct ObjCInterfaceCacheEntry {
     const ObjCInterfaceType *Type;
     llvm::DIType *Decl;
@@ -313,11 +309,6 @@ public:
 
   void finalize();
 
-  /// Register VLA size expression debug node with the qualified type.
-  void registerVLASizeExpression(QualType Ty, llvm::Metadata *SizeExpr) {
-    SizeExprCache[Ty] = SizeExpr;
-  }
-
   /// Module debugging: Support for building PCMs.
   /// @{
   /// Set the main CU's DwoId field to \p Signature.
@@ -388,11 +379,8 @@ public:
 
   /// Emit call to \c llvm.dbg.declare for an automatic variable
   /// declaration.
-  /// Returns a pointer to the DILocalVariable associated with the
-  /// llvm.dbg.declare, or nullptr otherwise.
-  llvm::DILocalVariable *EmitDeclareOfAutoVariable(const VarDecl *Decl,
-                                                   llvm::Value *AI,
-                                                   CGBuilderTy &Builder);
+  void EmitDeclareOfAutoVariable(const VarDecl *Decl, llvm::Value *AI,
+                                 CGBuilderTy &Builder);
 
   /// Emit call to \c llvm.dbg.declare for an imported variable
   /// declaration in a block.
@@ -463,14 +451,10 @@ public:
   llvm::DIMacroFile *CreateTempMacroFile(llvm::DIMacroFile *Parent,
                                          SourceLocation LineLoc,
                                          SourceLocation FileLoc);
-
 private:
   /// Emit call to llvm.dbg.declare for a variable declaration.
-  /// Returns a pointer to the DILocalVariable associated with the
-  /// llvm.dbg.declare, or nullptr otherwise.
-  llvm::DILocalVariable *EmitDeclare(const VarDecl *decl, llvm::Value *AI,
-                                     llvm::Optional<unsigned> ArgNo,
-                                     CGBuilderTy &Builder);
+  void EmitDeclare(const VarDecl *decl, llvm::Value *AI,
+                   llvm::Optional<unsigned> ArgNo, CGBuilderTy &Builder);
 
   /// Build up structure info for the byref.  See \a BuildByRefType.
   llvm::DIType *EmitTypeForVarWithBlocksAttr(const VarDecl *VD,