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

Side by Side Diff: src/compiler.cc

Issue 7167006: Merge arguments branch to bleeding merge. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Fix test arguments.js." Created 9 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « src/codegen.cc ('k') | src/contexts.h » ('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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 function_info->set_start_position(lit->start_position()); 740 function_info->set_start_position(lit->start_position());
741 function_info->set_end_position(lit->end_position()); 741 function_info->set_end_position(lit->end_position());
742 function_info->set_is_expression(lit->is_expression()); 742 function_info->set_is_expression(lit->is_expression());
743 function_info->set_is_toplevel(is_toplevel); 743 function_info->set_is_toplevel(is_toplevel);
744 function_info->set_inferred_name(*lit->inferred_name()); 744 function_info->set_inferred_name(*lit->inferred_name());
745 function_info->SetThisPropertyAssignmentsInfo( 745 function_info->SetThisPropertyAssignmentsInfo(
746 lit->has_only_simple_this_property_assignments(), 746 lit->has_only_simple_this_property_assignments(),
747 *lit->this_property_assignments()); 747 *lit->this_property_assignments());
748 function_info->set_allows_lazy_compilation(lit->AllowsLazyCompilation()); 748 function_info->set_allows_lazy_compilation(lit->AllowsLazyCompilation());
749 function_info->set_strict_mode(lit->strict_mode()); 749 function_info->set_strict_mode(lit->strict_mode());
750 function_info->set_uses_arguments(lit->scope()->arguments() != NULL);
751 function_info->set_has_duplicate_parameters(lit->has_duplicate_parameters());
750 } 752 }
751 753
752 754
753 void Compiler::RecordFunctionCompilation(Logger::LogEventsAndTags tag, 755 void Compiler::RecordFunctionCompilation(Logger::LogEventsAndTags tag,
754 CompilationInfo* info, 756 CompilationInfo* info,
755 Handle<SharedFunctionInfo> shared) { 757 Handle<SharedFunctionInfo> shared) {
756 // SharedFunctionInfo is passed separately, because if CompilationInfo 758 // SharedFunctionInfo is passed separately, because if CompilationInfo
757 // was created using Script object, it will not have it. 759 // was created using Script object, it will not have it.
758 760
759 // Log the code generation. If source information is available include 761 // Log the code generation. If source information is available include
(...skipping 22 matching lines...) Expand all
782 shared->DebugName())); 784 shared->DebugName()));
783 } 785 }
784 } 786 }
785 787
786 GDBJIT(AddCode(Handle<String>(shared->DebugName()), 788 GDBJIT(AddCode(Handle<String>(shared->DebugName()),
787 Handle<Script>(info->script()), 789 Handle<Script>(info->script()),
788 Handle<Code>(info->code()))); 790 Handle<Code>(info->code())));
789 } 791 }
790 792
791 } } // namespace v8::internal 793 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/codegen.cc ('k') | src/contexts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698