 +///
 +///\param[in] source - An ExternalSemaSource.
 +///
-+MultiplexExternalSemaSource::MultiplexExternalSemaSource(
-+                                                   ExternalSemaSource &source) {
-+  Sources.push_back(&source);
++MultiplexExternalSemaSource::MultiplexExternalSemaSource(ExternalSemaSource &s1,
++                                                         ExternalSemaSource &s2){
++  Sources.push_back(&s1);
++  Sources.push_back(&s2);
 +}
 +
 +// pin the vtable here.

Index: tools/clang/include/clang/Sema/Sema.h
===================================================================
--- tools/clang/include/clang/Sema/Sema.h	(revision 46396)
+++ tools/clang/include/clang/Sema/Sema.h	(revision 46397)
@@ -190,6 +190,13 @@
   Sema(const Sema &) LLVM_DELETED_FUNCTION;
   void operator=(const Sema &) LLVM_DELETED_FUNCTION;

         
Index: tools/clang/lib/Sema/SemaDeclObjC.cpp
===================================================================
--- tools/clang/lib/Sema/SemaDeclObjC.cpp	(revision 165095)
+++ tools/clang/lib/Sema/SemaDeclObjC.cpp	(working copy)
@@ -2582,7 +2582,7 @@
     // with this selector before.
     Sema::GlobalMethodPool::iterator it = S.MethodPool.find(selector);
