Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/src/ast/scopes.h b/src/ast/scopes.h
index d767a33..e420cfe 100644
--- a/src/ast/scopes.h
+++ b/src/ast/scopes.h
@@ -6,7 +6,7 @@
#define V8_AST_SCOPES_H_
#include "src/ast/ast.h"
-#include "src/hashmap.h"
+#include "src/base/hashmap.h"
#include "src/pending-compilation-error-handler.h"
#include "src/zone.h"
@@ -216,7 +216,11 @@
// Adds a temporary variable in this scope's TemporaryScope. This is for
// adjusting the scope of temporaries used when desugaring parameter
// initializers.
- void AddTemporary(Variable* var) { temps_.Add(var, zone()); }
+ void AddTemporary(Variable* var) {
+ // Temporaries are only placed in ClosureScopes.
+ DCHECK_EQ(ClosureScope(), this);
+ temps_.Add(var, zone());
+ }
// Adds the specific declaration node to the list of declarations in
// this scope. The declarations are processed as part of entering
@@ -571,11 +575,6 @@
return &sloppy_block_function_map_;
}
- // Error handling.
- void ReportMessage(int start_position, int end_position,
- MessageTemplate::Template message,
- const AstRawString* arg);
-
// ---------------------------------------------------------------------------
// Debugging.