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

Side by Side Diff: src/compiler.cc

Issue 523121: Merge r3481 to branches/1.3 to increase the number of maps... (Closed) Base URL: http://v8.googlecode.com/svn/branches/1.3/
Patch Set: '' Created 10 years, 11 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/bootstrapper.cc ('k') | src/factory.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 2009 the V8 project authors. All rights reserved. 1 // Copyright 2009 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 #ifdef ENABLE_DEBUGGER_SUPPORT 158 #ifdef ENABLE_DEBUGGER_SUPPORT
159 bool is_json = (validate == Compiler::VALIDATE_JSON); 159 bool is_json = (validate == Compiler::VALIDATE_JSON);
160 if (is_eval || is_json) { 160 if (is_eval || is_json) {
161 script->set_compilation_type( 161 script->set_compilation_type(
162 is_json ? Smi::FromInt(Script::COMPILATION_TYPE_JSON) : 162 is_json ? Smi::FromInt(Script::COMPILATION_TYPE_JSON) :
163 Smi::FromInt(Script::COMPILATION_TYPE_EVAL)); 163 Smi::FromInt(Script::COMPILATION_TYPE_EVAL));
164 // For eval scripts add information on the function from which eval was 164 // For eval scripts add information on the function from which eval was
165 // called. 165 // called.
166 if (is_eval) { 166 if (is_eval) {
167 JavaScriptFrameIterator it; 167 JavaScriptFrameIterator it;
168 script->set_eval_from_function(it.frame()->function()); 168 script->set_eval_from_shared(
169 JSFunction::cast(it.frame()->function())->shared());
169 int offset = it.frame()->pc() - it.frame()->code()->instruction_start(); 170 int offset = it.frame()->pc() - it.frame()->code()->instruction_start();
170 script->set_eval_from_instructions_offset(Smi::FromInt(offset)); 171 script->set_eval_from_instructions_offset(Smi::FromInt(offset));
171 } 172 }
172 } 173 }
173 174
174 // Notify debugger 175 // Notify debugger
175 Debugger::OnBeforeCompile(script); 176 Debugger::OnBeforeCompile(script);
176 #endif 177 #endif
177 178
178 // Only allow non-global compiles for eval. 179 // Only allow non-global compiles for eval.
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
892 893
893 void CodeGenSelector::VisitThisFunction(ThisFunction* expr) { 894 void CodeGenSelector::VisitThisFunction(ThisFunction* expr) {
894 BAILOUT("ThisFunction"); 895 BAILOUT("ThisFunction");
895 } 896 }
896 897
897 #undef BAILOUT 898 #undef BAILOUT
898 #undef CHECK_BAILOUT 899 #undef CHECK_BAILOUT
899 900
900 901
901 } } // namespace v8::internal 902 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/bootstrapper.cc ('k') | src/factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698