Merge DeclarationScope::temps_ and Scope::ordered_variables_ into Scope::locals_

test/mjsunit/harmony/default-parameter-do-expression.js

Index: test/mjsunit/harmony/default-parameter-do-expression.js
diff --git a/test/mjsunit/harmony/default-parameter-do-expression.js b/test/mjsunit/harmony/default-parameter-do-expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..cb80d246bcc54016d393ce6dedbf29c07d95a2b7
--- /dev/null
+++ b/test/mjsunit/harmony/default-parameter-do-expression.js
@@ -0,0 +1,21 @@
+// Copyright 2016 the V8 project authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Flags: --harmony-do-expressions --nolazy
+
+function hoist_unique_do_var() {
+  var f = (y = do { var unique = 3 }) => unique;
+  assertEquals(3, f());
+  assertThrows(() => unique, ReferenceError);
+}
+hoist_unique_do_var();
+
+function hoist_duplicate_do_var() {
+  var duplicate = 100;
+  var f = (y = do { var duplicate = 3 }) => duplicate;
+  assertEquals(3, f());
+  // TODO(verwaest): The {duplicate} declarations were invalidly merged.
+  assertEquals(3, duplicate);
+}
+hoist_duplicate_do_var();