| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 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/compiler.h" | 5 #include "src/compiler.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "src/ast/ast-numbering.h" | 9 #include "src/ast/ast-numbering.h" |
| 10 #include "src/ast/prettyprinter.h" | 10 #include "src/ast/prettyprinter.h" |
| (...skipping 1830 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1841 shared->set_construct_stub(*construct_stub); | 1841 shared->set_construct_stub(*construct_stub); |
| 1842 | 1842 |
| 1843 // Copy the function data to the shared function info. | 1843 // Copy the function data to the shared function info. |
| 1844 shared->set_function_data(fun->shared()->function_data()); | 1844 shared->set_function_data(fun->shared()->function_data()); |
| 1845 int parameters = fun->shared()->internal_formal_parameter_count(); | 1845 int parameters = fun->shared()->internal_formal_parameter_count(); |
| 1846 shared->set_internal_formal_parameter_count(parameters); | 1846 shared->set_internal_formal_parameter_count(parameters); |
| 1847 | 1847 |
| 1848 return shared; | 1848 return shared; |
| 1849 } | 1849 } |
| 1850 | 1850 |
| 1851 MaybeHandle<Code> Compiler::GetOptimizedCodeForOSR( | 1851 MaybeHandle<Code> Compiler::GetOptimizedCodeForOSR(Handle<JSFunction> function, |
| 1852 Handle<JSFunction> function, Compiler::ConcurrencyMode mode, | 1852 BailoutId osr_ast_id, |
| 1853 BailoutId osr_ast_id, JavaScriptFrame* osr_frame) { | 1853 JavaScriptFrame* osr_frame) { |
| 1854 DCHECK(!osr_ast_id.IsNone()); | 1854 DCHECK(!osr_ast_id.IsNone()); |
| 1855 // TODO(mstarzinger): Once concurrent OSR is removed, the following check | 1855 DCHECK_NOT_NULL(osr_frame); |
| 1856 // should hold and can be enabled. | 1856 return GetOptimizedCode(function, NOT_CONCURRENT, osr_ast_id, osr_frame); |
| 1857 // DCHECK_NOT_NULL(osr_frame); | |
| 1858 return GetOptimizedCode(function, mode, osr_ast_id, osr_frame); | |
| 1859 } | 1857 } |
| 1860 | 1858 |
| 1861 MaybeHandle<Code> Compiler::GetConcurrentlyOptimizedCode( | 1859 MaybeHandle<Code> Compiler::GetConcurrentlyOptimizedCode( |
| 1862 OptimizedCompileJob* job) { | 1860 OptimizedCompileJob* job) { |
| 1863 // Take ownership of compilation info. Deleting compilation info | 1861 // Take ownership of compilation info. Deleting compilation info |
| 1864 // also tears down the zone and the recompile job. | 1862 // also tears down the zone and the recompile job. |
| 1865 base::SmartPointer<CompilationInfo> info(job->info()); | 1863 base::SmartPointer<CompilationInfo> info(job->info()); |
| 1866 Isolate* isolate = info->isolate(); | 1864 Isolate* isolate = info->isolate(); |
| 1867 | 1865 |
| 1868 VMState<COMPILER> state(isolate); | 1866 VMState<COMPILER> state(isolate); |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1911 | 1909 |
| 1912 #if DEBUG | 1910 #if DEBUG |
| 1913 void CompilationInfo::PrintAstForTesting() { | 1911 void CompilationInfo::PrintAstForTesting() { |
| 1914 PrintF("--- Source from AST ---\n%s\n", | 1912 PrintF("--- Source from AST ---\n%s\n", |
| 1915 PrettyPrinter(isolate()).PrintProgram(literal())); | 1913 PrettyPrinter(isolate()).PrintProgram(literal())); |
| 1916 } | 1914 } |
| 1917 #endif | 1915 #endif |
| 1918 | 1916 |
| 1919 } // namespace internal | 1917 } // namespace internal |
| 1920 } // namespace v8 | 1918 } // namespace v8 |
| OLD | NEW |