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

Side by Side Diff: src/bootstrapper.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/accessors.cc ('k') | src/compiler.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 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 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 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after
1068 proxy_line_ends, 1068 proxy_line_ends,
1069 common_attributes); 1069 common_attributes);
1070 Handle<Proxy> proxy_context_data = 1070 Handle<Proxy> proxy_context_data =
1071 Factory::NewProxy(&Accessors::ScriptContextData); 1071 Factory::NewProxy(&Accessors::ScriptContextData);
1072 script_descriptors = 1072 script_descriptors =
1073 Factory::CopyAppendProxyDescriptor( 1073 Factory::CopyAppendProxyDescriptor(
1074 script_descriptors, 1074 script_descriptors,
1075 Factory::LookupAsciiSymbol("context_data"), 1075 Factory::LookupAsciiSymbol("context_data"),
1076 proxy_context_data, 1076 proxy_context_data,
1077 common_attributes); 1077 common_attributes);
1078 Handle<Proxy> proxy_eval_from_function = 1078 Handle<Proxy> proxy_eval_from_script =
1079 Factory::NewProxy(&Accessors::ScriptEvalFromFunction); 1079 Factory::NewProxy(&Accessors::ScriptEvalFromScript);
1080 script_descriptors = 1080 script_descriptors =
1081 Factory::CopyAppendProxyDescriptor( 1081 Factory::CopyAppendProxyDescriptor(
1082 script_descriptors, 1082 script_descriptors,
1083 Factory::LookupAsciiSymbol("eval_from_function"), 1083 Factory::LookupAsciiSymbol("eval_from_script"),
1084 proxy_eval_from_function, 1084 proxy_eval_from_script,
1085 common_attributes); 1085 common_attributes);
1086 Handle<Proxy> proxy_eval_from_position = 1086 Handle<Proxy> proxy_eval_from_script_position =
1087 Factory::NewProxy(&Accessors::ScriptEvalFromPosition); 1087 Factory::NewProxy(&Accessors::ScriptEvalFromScriptPosition);
1088 script_descriptors = 1088 script_descriptors =
1089 Factory::CopyAppendProxyDescriptor( 1089 Factory::CopyAppendProxyDescriptor(
1090 script_descriptors, 1090 script_descriptors,
1091 Factory::LookupAsciiSymbol("eval_from_position"), 1091 Factory::LookupAsciiSymbol("eval_from_script_position"),
1092 proxy_eval_from_position, 1092 proxy_eval_from_script_position,
1093 common_attributes);
1094 Handle<Proxy> proxy_eval_from_function_name =
1095 Factory::NewProxy(&Accessors::ScriptEvalFromFunctionName);
1096 script_descriptors =
1097 Factory::CopyAppendProxyDescriptor(
1098 script_descriptors,
1099 Factory::LookupAsciiSymbol("eval_from_function_name"),
1100 proxy_eval_from_function_name,
1093 common_attributes); 1101 common_attributes);
1094 1102
1095 Handle<Map> script_map = Handle<Map>(script_fun->initial_map()); 1103 Handle<Map> script_map = Handle<Map>(script_fun->initial_map());
1096 script_map->set_instance_descriptors(*script_descriptors); 1104 script_map->set_instance_descriptors(*script_descriptors);
1097 1105
1098 // Allocate the empty script. 1106 // Allocate the empty script.
1099 Handle<Script> script = Factory::NewScript(Factory::empty_string()); 1107 Handle<Script> script = Factory::NewScript(Factory::empty_string());
1100 script->set_type(Smi::FromInt(Script::TYPE_NATIVE)); 1108 script->set_type(Smi::FromInt(Script::TYPE_NATIVE));
1101 global_context()->set_empty_script(*script); 1109 global_context()->set_empty_script(*script);
1102 } 1110 }
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
1600 } 1608 }
1601 1609
1602 1610
1603 // Restore statics that are thread local. 1611 // Restore statics that are thread local.
1604 char* Genesis::RestoreState(char* from) { 1612 char* Genesis::RestoreState(char* from) {
1605 current_ = *reinterpret_cast<Genesis**>(from); 1613 current_ = *reinterpret_cast<Genesis**>(from);
1606 return from + sizeof(current_); 1614 return from + sizeof(current_);
1607 } 1615 }
1608 1616
1609 } } // namespace v8::internal 1617 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/accessors.cc ('k') | src/compiler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698