Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: src/background-parsing-task.cc

Issue 974213002: Extract ParseInfo from CompilationInfo. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/background-parsing-task.h ('k') | src/codegen.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 the V8 project authors. All rights reserved. 1 // Copyright 2014 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/background-parsing-task.h" 5 #include "src/background-parsing-task.h"
6 6
7 namespace v8 { 7 namespace v8 {
8 namespace internal { 8 namespace internal {
9 9
10 BackgroundParsingTask::BackgroundParsingTask( 10 BackgroundParsingTask::BackgroundParsingTask(
11 StreamedSource* source, ScriptCompiler::CompileOptions options, 11 StreamedSource* source, ScriptCompiler::CompileOptions options,
12 int stack_size, Isolate* isolate) 12 int stack_size, Isolate* isolate)
13 : source_(source), options_(options), stack_size_(stack_size) { 13 : source_(source), stack_size_(stack_size) {
14 // Prepare the data for the internalization phase and compilation phase, which
15 // will happen in the main thread after parsing.
16 source->info.Reset(new i::CompilationInfoWithZone(source->source_stream.get(),
17 source->encoding, isolate));
18 source->info->MarkAsGlobal();
19
20 // We don't set the context to the CompilationInfo yet, because the background 14 // We don't set the context to the CompilationInfo yet, because the background
21 // thread cannot do anything with it anyway. We set it just before compilation 15 // thread cannot do anything with it anyway. We set it just before compilation
22 // on the foreground thread. 16 // on the foreground thread.
23 DCHECK(options == ScriptCompiler::kProduceParserCache || 17 DCHECK(options == ScriptCompiler::kProduceParserCache ||
24 options == ScriptCompiler::kProduceCodeCache || 18 options == ScriptCompiler::kProduceCodeCache ||
25 options == ScriptCompiler::kNoCompileOptions); 19 options == ScriptCompiler::kNoCompileOptions);
26 source->allow_lazy =
27 !i::Compiler::DebuggerWantsEagerCompilation(source->info.get());
28 20
29 if (!source->allow_lazy && options_ == ScriptCompiler::kProduceParserCache) { 21 // Prepare the data for the internalization phase and compilation phase, which
22 // will happen in the main thread after parsing.
23 Zone* zone = new Zone();
24 ParseInfo* info = new ParseInfo(zone);
25 source->zone.Reset(zone);
26 source->info.Reset(info);
27 info->set_isolate(isolate);
28 info->set_source_stream(source->source_stream.get());
29 info->set_source_stream_encoding(source->encoding);
30 info->set_hash_seed(isolate->heap()->HashSeed());
31 info->set_global();
32 info->set_unicode_cache(&source_->unicode_cache);
33
34 bool disable_lazy = Compiler::DebuggerWantsEagerCompilation(isolate);
35 if (disable_lazy && options == ScriptCompiler::kProduceParserCache) {
30 // Producing cached data while parsing eagerly is not supported. 36 // Producing cached data while parsing eagerly is not supported.
31 options_ = ScriptCompiler::kNoCompileOptions; 37 options = ScriptCompiler::kNoCompileOptions;
32 } 38 }
33 source->hash_seed = isolate->heap()->HashSeed(); 39
40 info->set_compile_options(options);
41 info->set_allow_lazy_parsing(!disable_lazy);
34 } 42 }
35 43
36 44
37 void BackgroundParsingTask::Run() { 45 void BackgroundParsingTask::Run() {
38 DisallowHeapAllocation no_allocation; 46 DisallowHeapAllocation no_allocation;
39 DisallowHandleAllocation no_handles; 47 DisallowHandleAllocation no_handles;
40 DisallowHandleDereference no_deref; 48 DisallowHandleDereference no_deref;
41 49
42 ScriptData* script_data = NULL; 50 ScriptData* script_data = NULL;
43 if (options_ == ScriptCompiler::kProduceParserCache || 51 ScriptCompiler::CompileOptions options = source_->info->compile_options();
44 options_ == ScriptCompiler::kProduceCodeCache) { 52 if (options == ScriptCompiler::kProduceParserCache ||
45 source_->info->SetCachedData(&script_data, options_); 53 options == ScriptCompiler::kProduceCodeCache) {
54 source_->info->set_cached_data(&script_data);
46 } 55 }
47 56
48 uintptr_t stack_limit = 57 uintptr_t stack_limit =
49 reinterpret_cast<uintptr_t>(&stack_limit) - stack_size_ * KB; 58 reinterpret_cast<uintptr_t>(&stack_limit) - stack_size_ * KB;
50 59
60 source_->info->set_stack_limit(stack_limit);
51 // Parser needs to stay alive for finalizing the parsing on the main 61 // Parser needs to stay alive for finalizing the parsing on the main
52 // thread. Passing &parse_info is OK because Parser doesn't store it. 62 // thread. Passing &parse_info is OK because Parser doesn't store it.
53 source_->parser.Reset(new Parser(source_->info.get(), stack_limit, 63 source_->parser.Reset(new Parser(source_->info.get()));
54 source_->hash_seed,
55 &source_->unicode_cache));
56 source_->parser->set_allow_lazy(source_->allow_lazy);
57 source_->parser->ParseOnBackground(source_->info.get()); 64 source_->parser->ParseOnBackground(source_->info.get());
58 65
59 if (script_data != NULL) { 66 if (script_data != NULL) {
60 source_->cached_data.Reset(new ScriptCompiler::CachedData( 67 source_->cached_data.Reset(new ScriptCompiler::CachedData(
61 script_data->data(), script_data->length(), 68 script_data->data(), script_data->length(),
62 ScriptCompiler::CachedData::BufferOwned)); 69 ScriptCompiler::CachedData::BufferOwned));
63 script_data->ReleaseDataOwnership(); 70 script_data->ReleaseDataOwnership();
64 delete script_data; 71 delete script_data;
65 } 72 }
66 } 73 }
67 } 74 }
68 } // namespace v8::internal 75 } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/background-parsing-task.h ('k') | src/codegen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698