Merge bleeding edge up to 9192 into the GC branch.

src/parser.h

Index: src/parser.h
diff --git a/src/parser.h b/src/parser.h
index 686dac85afa81bde06b5d07099e4268372e3e754..381ff27143b4faf7cc028d7952e5471e0fa85e8e 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -645,6 +645,17 @@ class Parser {
   // Strict mode octal literal validation.
   void CheckOctalLiteral(int beg_pos, int end_pos, bool* ok);
 
+  // For harmony block scoping mode: Check if the scope has conflicting var/let
+  // declarations from different scopes. It covers for example
+  //
+  // function f() { { { var x; } let x; } }
+  // function g() { { var x; let x; } }
+  //
+  // The var declarations are hoisted to the function scope, but originate from
+  // a scope where the name has also been let bound or the var declaration is
+  // hoisted over such a scope.
+  void CheckConflictingVarDeclarations(Scope* scope, bool* ok);
+
   // Parser support
   VariableProxy* Declare(Handle<String> name, Variable::Mode mode,
                          FunctionLiteral* fun,