aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-08-02 15:15:34 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-08-02 15:15:34 +0000
commit1549b665c50bc1e51922e71d34c4be6f88285c50 (patch)
treebbee6235b8c72f6a6a224a80cec66717ad370873
parent358bd5333daef4a30902928cdcfccf9428338b54 (diff)
parent0df3fd9ca93d84d9bd71cff65bd6e6dce39e461c (diff)
downloadv8-1549b665c50bc1e51922e71d34c4be6f88285c50.tar.gz
[automerger] [DO NOT MERGE] Fix OOB Access am: 831c7be01c am: 0df3fd9ca9
Change-Id: I4861563aea5b455aeb80aa4e66b763608fbd6c11
-rw-r--r--src/ast/ast-traversal-visitor.h1
-rw-r--r--src/objects.cc4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ast/ast-traversal-visitor.h b/src/ast/ast-traversal-visitor.h
index 6d0c386f..3a102b42 100644
--- a/src/ast/ast-traversal-visitor.h
+++ b/src/ast/ast-traversal-visitor.h
@@ -245,6 +245,7 @@ void AstTraversalVisitor<Subclass>::VisitForStatement(ForStatement* stmt) {
template <class Subclass>
void AstTraversalVisitor<Subclass>::VisitForInStatement(ForInStatement* stmt) {
PROCESS_NODE(stmt);
+ RECURSE(Visit(stmt->each()));
RECURSE(Visit(stmt->enumerable()));
RECURSE(Visit(stmt->body()));
}
diff --git a/src/objects.cc b/src/objects.cc
index d5b77777..c2996aed 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -13168,8 +13168,8 @@ Handle<JSObject> Script::GetWrapper(Handle<Script> script) {
MaybeHandle<SharedFunctionInfo> Script::FindSharedFunctionInfo(
Isolate* isolate, const FunctionLiteral* fun) {
- DCHECK_NE(fun->function_literal_id(), FunctionLiteral::kIdTypeInvalid);
- DCHECK_LT(fun->function_literal_id(), shared_function_infos()->length());
+ CHECK_NE(fun->function_literal_id(), FunctionLiteral::kIdTypeInvalid);
+ CHECK_LT(fun->function_literal_id(), shared_function_infos()->length());
Object* shared = shared_function_infos()->get(fun->function_literal_id());
if (shared->IsUndefined(isolate) || WeakCell::cast(shared)->cleared()) {
return MaybeHandle<SharedFunctionInfo>();