Merge r9430, r9433 and r9508 into 3.5 branch.

src/func-name-inferrer.h

Index: src/func-name-inferrer.h
===================================================================
--- src/func-name-inferrer.h	(revision 9618)
+++ src/func-name-inferrer.h	(working copy)
@@ -70,6 +70,12 @@
     }
   }
 
+  void RemoveLastFunction() {
+    if (IsOpen() && !funcs_to_infer_.is_empty()) {
+      funcs_to_infer_.RemoveLast();
+    }
+  }
+
   // Infers a function name and leaves names collection state.
   void Infer() {
     ASSERT(IsOpen());