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

Side by Side Diff: src/liveedit.cc

Issue 149413010: A64: Synchronize with r16024. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/a64
Patch Set: Created 6 years, 10 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/lithium.cc ('k') | src/log.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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1283 1283
1284 isolate->heap()->EnsureHeapIsIterable(); 1284 isolate->heap()->EnsureHeapIsIterable();
1285 1285
1286 if (IsJSFunctionCode(shared_info->code())) { 1286 if (IsJSFunctionCode(shared_info->code())) {
1287 Handle<Code> code = compile_info_wrapper.GetFunctionCode(); 1287 Handle<Code> code = compile_info_wrapper.GetFunctionCode();
1288 ReplaceCodeObject(Handle<Code>(shared_info->code()), code); 1288 ReplaceCodeObject(Handle<Code>(shared_info->code()), code);
1289 Handle<Object> code_scope_info = compile_info_wrapper.GetCodeScopeInfo(); 1289 Handle<Object> code_scope_info = compile_info_wrapper.GetCodeScopeInfo();
1290 if (code_scope_info->IsFixedArray()) { 1290 if (code_scope_info->IsFixedArray()) {
1291 shared_info->set_scope_info(ScopeInfo::cast(*code_scope_info)); 1291 shared_info->set_scope_info(ScopeInfo::cast(*code_scope_info));
1292 } 1292 }
1293 shared_info->DisableOptimization("LiveEdit");
1294 } 1293 }
1295 1294
1296 if (shared_info->debug_info()->IsDebugInfo()) { 1295 if (shared_info->debug_info()->IsDebugInfo()) {
1297 Handle<DebugInfo> debug_info(DebugInfo::cast(shared_info->debug_info())); 1296 Handle<DebugInfo> debug_info(DebugInfo::cast(shared_info->debug_info()));
1298 Handle<Code> new_original_code = 1297 Handle<Code> new_original_code =
1299 isolate->factory()->CopyCode(compile_info_wrapper.GetFunctionCode()); 1298 isolate->factory()->CopyCode(compile_info_wrapper.GetFunctionCode());
1300 debug_info->set_original_code(*new_original_code); 1299 debug_info->set_original_code(*new_original_code);
1301 } 1300 }
1302 1301
1303 int start_position = compile_info_wrapper.GetStartPosition(); 1302 int start_position = compile_info_wrapper.GetStartPosition();
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 1550
1552 Handle<String> original_source(String::cast(original->source())); 1551 Handle<String> original_source(String::cast(original->source()));
1553 Handle<Script> copy = isolate->factory()->NewScript(original_source); 1552 Handle<Script> copy = isolate->factory()->NewScript(original_source);
1554 1553
1555 copy->set_name(original->name()); 1554 copy->set_name(original->name());
1556 copy->set_line_offset(original->line_offset()); 1555 copy->set_line_offset(original->line_offset());
1557 copy->set_column_offset(original->column_offset()); 1556 copy->set_column_offset(original->column_offset());
1558 copy->set_data(original->data()); 1557 copy->set_data(original->data());
1559 copy->set_type(original->type()); 1558 copy->set_type(original->type());
1560 copy->set_context_data(original->context_data()); 1559 copy->set_context_data(original->context_data());
1561 copy->set_compilation_type(original->compilation_type());
1562 copy->set_eval_from_shared(original->eval_from_shared()); 1560 copy->set_eval_from_shared(original->eval_from_shared());
1563 copy->set_eval_from_instructions_offset( 1561 copy->set_eval_from_instructions_offset(
1564 original->eval_from_instructions_offset()); 1562 original->eval_from_instructions_offset());
1565 1563
1564 // Copy all the flags, but clear compilation state.
1565 copy->set_flags(original->flags());
1566 copy->set_compilation_state(Script::COMPILATION_STATE_INITIAL);
1567
1566 return copy; 1568 return copy;
1567 } 1569 }
1568 1570
1569 1571
1570 Object* LiveEdit::ChangeScriptSource(Handle<Script> original_script, 1572 Object* LiveEdit::ChangeScriptSource(Handle<Script> original_script,
1571 Handle<String> new_source, 1573 Handle<String> new_source,
1572 Handle<Object> old_script_name) { 1574 Handle<Object> old_script_name) {
1573 Isolate* isolate = original_script->GetIsolate(); 1575 Isolate* isolate = original_script->GetIsolate();
1574 Handle<Object> old_script_object; 1576 Handle<Object> old_script_object;
1575 if (old_script_name->IsString()) { 1577 if (old_script_name->IsString()) {
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
2125 2127
2126 bool LiveEditFunctionTracker::IsActive(Isolate* isolate) { 2128 bool LiveEditFunctionTracker::IsActive(Isolate* isolate) {
2127 return false; 2129 return false;
2128 } 2130 }
2129 2131
2130 #endif // ENABLE_DEBUGGER_SUPPORT 2132 #endif // ENABLE_DEBUGGER_SUPPORT
2131 2133
2132 2134
2133 2135
2134 } } // namespace v8::internal 2136 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/lithium.cc ('k') | src/log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698