 +                   uint64_t &Size, uint64_t &Alignment,
 +                   llvm::DenseMap<const FieldDecl *, uint64_t> &FieldOffsets,
 +                 llvm::DenseMap<const CXXRecordDecl *, CharUnits> &BaseOffsets,
-+           llvm::DenseMap<const CXXRecordDecl *, CharUnits> &VirtualBaseOffsets);
++          llvm::DenseMap<const CXXRecordDecl *, CharUnits> &VirtualBaseOffsets);
 +
 +  /// Return the amount of memory used by memory buffers, breaking down
 +  /// by heap-backed versus mmap'ed memory.

===================================================================
--- tools/clang/lib/Sema/MultiplexExternalSemaSource.cpp	(revision 0)
+++ tools/clang/lib/Sema/MultiplexExternalSemaSource.cpp	(revision 0)
@@ -0,0 +1,270 @@
+//===--- MultiplexExternalSemaSource.cpp  ---------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure

+  /// given vector of tentative definitions. Note that this routine may be
+  /// invoked multiple times; the external source should take care not to
+  /// introduce the same declarations repeatedly.
+  virtual void ReadTentativeDefinitions(SmallVectorImpl<VarDecl*> &Defs);
+  
+  /// \brief Read the set of unused file-scope declarations known to the
+  /// external Sema source.
