fc023664bd
Previously, we over-approximated Scope::scope_calls_eval_ in arrow functions: if either the outer scope or the arrow function parameters had a direct eval call, we marked both scopes as calling eval. This over-approximation kept getting us into trouble, though, especially when eager or lazy parsing would disagree about the "calls eval" bit. This patch instead tracks eval calls accurately, using a boolean on Scope::Snapshot that is reset as appropriately depending on whether a particular AssignmentExpression turned out to be an arrow parameter list or not. BUG=chromium:691687 Change-Id: I527dc59b4d32a2797805ff26dc9f70b1311377b2 Reviewed-on: https://chromium-review.googlesource.com/446094 Commit-Queue: Adam Klein <adamk@chromium.org> Reviewed-by: Marja Hölttä <marja@chromium.org> Reviewed-by: Toon Verwaest <verwaest@chromium.org> Cr-Commit-Position: refs/heads/master@{#43499}
175 lines
6.0 KiB
C++
175 lines
6.0 KiB
C++
// 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.
|
|
|
|
#include "src/parsing/parse-info.h"
|
|
|
|
#include "src/api.h"
|
|
#include "src/ast/ast-value-factory.h"
|
|
#include "src/ast/ast.h"
|
|
#include "src/heap/heap-inl.h"
|
|
#include "src/objects-inl.h"
|
|
#include "src/objects/scope-info.h"
|
|
#include "src/zone/zone.h"
|
|
|
|
namespace v8 {
|
|
namespace internal {
|
|
|
|
ParseInfo::ParseInfo(AccountingAllocator* zone_allocator)
|
|
: zone_(std::make_shared<Zone>(zone_allocator, ZONE_NAME)),
|
|
flags_(0),
|
|
source_stream_(nullptr),
|
|
source_stream_encoding_(ScriptCompiler::StreamedSource::ONE_BYTE),
|
|
character_stream_(nullptr),
|
|
extension_(nullptr),
|
|
compile_options_(ScriptCompiler::kNoCompileOptions),
|
|
script_scope_(nullptr),
|
|
asm_function_scope_(nullptr),
|
|
unicode_cache_(nullptr),
|
|
stack_limit_(0),
|
|
hash_seed_(0),
|
|
compiler_hints_(0),
|
|
start_position_(0),
|
|
end_position_(0),
|
|
parameters_end_pos_(kNoSourcePosition),
|
|
function_literal_id_(FunctionLiteral::kIdTypeInvalid),
|
|
max_function_literal_id_(FunctionLiteral::kIdTypeInvalid),
|
|
isolate_(nullptr),
|
|
cached_data_(nullptr),
|
|
ast_value_factory_(nullptr),
|
|
function_name_(nullptr),
|
|
literal_(nullptr),
|
|
deferred_handles_(nullptr) {}
|
|
|
|
ParseInfo::ParseInfo(Handle<SharedFunctionInfo> shared)
|
|
: ParseInfo(shared->GetIsolate()->allocator()) {
|
|
isolate_ = shared->GetIsolate();
|
|
|
|
set_toplevel(shared->is_toplevel());
|
|
set_allow_lazy_parsing(FLAG_lazy_inner_functions);
|
|
set_hash_seed(isolate_->heap()->HashSeed());
|
|
set_is_named_expression(shared->is_named_expression());
|
|
set_calls_eval(shared->scope_info()->CallsEval());
|
|
set_compiler_hints(shared->compiler_hints());
|
|
set_start_position(shared->start_position());
|
|
set_end_position(shared->end_position());
|
|
function_literal_id_ = shared->function_literal_id();
|
|
set_stack_limit(isolate_->stack_guard()->real_climit());
|
|
set_unicode_cache(isolate_->unicode_cache());
|
|
set_language_mode(shared->language_mode());
|
|
set_shared_info(shared);
|
|
set_module(shared->kind() == FunctionKind::kModule);
|
|
set_scope_info_is_empty(shared->scope_info() == ScopeInfo::Empty(isolate_));
|
|
|
|
Handle<Script> script(Script::cast(shared->script()));
|
|
set_script(script);
|
|
set_native(script->type() == Script::TYPE_NATIVE);
|
|
set_eval(script->compilation_type() == Script::COMPILATION_TYPE_EVAL);
|
|
|
|
Handle<HeapObject> scope_info(shared->outer_scope_info());
|
|
if (!scope_info->IsTheHole(isolate()) &&
|
|
Handle<ScopeInfo>::cast(scope_info)->length() > 0) {
|
|
set_outer_scope_info(Handle<ScopeInfo>::cast(scope_info));
|
|
}
|
|
}
|
|
|
|
ParseInfo::ParseInfo(Handle<SharedFunctionInfo> shared,
|
|
std::shared_ptr<Zone> zone)
|
|
: ParseInfo(shared) {
|
|
zone_.swap(zone);
|
|
}
|
|
|
|
ParseInfo::ParseInfo(Handle<Script> script)
|
|
: ParseInfo(script->GetIsolate()->allocator()) {
|
|
isolate_ = script->GetIsolate();
|
|
|
|
set_allow_lazy_parsing();
|
|
set_toplevel();
|
|
set_hash_seed(isolate_->heap()->HashSeed());
|
|
set_stack_limit(isolate_->stack_guard()->real_climit());
|
|
set_unicode_cache(isolate_->unicode_cache());
|
|
set_script(script);
|
|
|
|
set_native(script->type() == Script::TYPE_NATIVE);
|
|
set_eval(script->compilation_type() == Script::COMPILATION_TYPE_EVAL);
|
|
}
|
|
|
|
ParseInfo::~ParseInfo() {
|
|
if (ast_value_factory_owned()) {
|
|
delete ast_value_factory_;
|
|
set_ast_value_factory_owned(false);
|
|
}
|
|
ast_value_factory_ = nullptr;
|
|
}
|
|
|
|
// static
|
|
ParseInfo* ParseInfo::AllocateWithoutScript(Handle<SharedFunctionInfo> shared) {
|
|
Isolate* isolate = shared->GetIsolate();
|
|
ParseInfo* p = new ParseInfo(isolate->allocator());
|
|
p->isolate_ = isolate;
|
|
|
|
p->set_toplevel(shared->is_toplevel());
|
|
p->set_allow_lazy_parsing(FLAG_lazy_inner_functions);
|
|
p->set_hash_seed(isolate->heap()->HashSeed());
|
|
p->set_is_named_expression(shared->is_named_expression());
|
|
p->set_calls_eval(shared->scope_info()->CallsEval());
|
|
p->set_compiler_hints(shared->compiler_hints());
|
|
p->set_start_position(shared->start_position());
|
|
p->set_end_position(shared->end_position());
|
|
p->function_literal_id_ = shared->function_literal_id();
|
|
p->set_stack_limit(isolate->stack_guard()->real_climit());
|
|
p->set_unicode_cache(isolate->unicode_cache());
|
|
p->set_language_mode(shared->language_mode());
|
|
p->set_shared_info(shared);
|
|
p->set_module(shared->kind() == FunctionKind::kModule);
|
|
p->set_scope_info_is_empty(shared->scope_info() == ScopeInfo::Empty(isolate));
|
|
|
|
// BUG(5946): This function exists as a workaround until we can
|
|
// get rid of %SetCode in our native functions. The ParseInfo
|
|
// is explicitly set up for the case that:
|
|
// a) you have a native built-in,
|
|
// b) it's being run for the 2nd-Nth time in an isolate,
|
|
// c) we've already compiled bytecode and therefore don't need
|
|
// to parse.
|
|
// We tolerate a ParseInfo without a Script in this case.
|
|
p->set_native(true);
|
|
p->set_eval(false);
|
|
|
|
Handle<HeapObject> scope_info(shared->outer_scope_info());
|
|
if (!scope_info->IsTheHole(isolate) &&
|
|
Handle<ScopeInfo>::cast(scope_info)->length() > 0) {
|
|
p->set_outer_scope_info(Handle<ScopeInfo>::cast(scope_info));
|
|
}
|
|
return p;
|
|
}
|
|
|
|
DeclarationScope* ParseInfo::scope() const { return literal()->scope(); }
|
|
|
|
bool ParseInfo::is_declaration() const {
|
|
return (compiler_hints_ & (1 << SharedFunctionInfo::kIsDeclaration)) != 0;
|
|
}
|
|
|
|
FunctionKind ParseInfo::function_kind() const {
|
|
return SharedFunctionInfo::FunctionKindBits::decode(compiler_hints_);
|
|
}
|
|
|
|
void ParseInfo::set_deferred_handles(
|
|
std::shared_ptr<DeferredHandles> deferred_handles) {
|
|
DCHECK(deferred_handles_.get() == nullptr);
|
|
deferred_handles_.swap(deferred_handles);
|
|
}
|
|
|
|
void ParseInfo::set_deferred_handles(DeferredHandles* deferred_handles) {
|
|
DCHECK(deferred_handles_.get() == nullptr);
|
|
deferred_handles_.reset(deferred_handles);
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
bool ParseInfo::script_is_native() const {
|
|
return script_->type() == Script::TYPE_NATIVE;
|
|
}
|
|
#endif // DEBUG
|
|
|
|
} // namespace internal
|
|
} // namespace v8
|