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

Side by Side Diff: src/compiler.cc

Issue 148153010: Synchronize with r15701. (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/code-stubs-hydrogen.cc ('k') | src/d8.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 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 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 567
568 #ifdef ENABLE_DEBUGGER_SUPPORT 568 #ifdef ENABLE_DEBUGGER_SUPPORT
569 if (info->is_eval()) { 569 if (info->is_eval()) {
570 Script::CompilationType compilation_type = Script::COMPILATION_TYPE_EVAL; 570 Script::CompilationType compilation_type = Script::COMPILATION_TYPE_EVAL;
571 script->set_compilation_type(Smi::FromInt(compilation_type)); 571 script->set_compilation_type(Smi::FromInt(compilation_type));
572 // For eval scripts add information on the function from which eval was 572 // For eval scripts add information on the function from which eval was
573 // called. 573 // called.
574 if (info->is_eval()) { 574 if (info->is_eval()) {
575 StackTraceFrameIterator it(isolate); 575 StackTraceFrameIterator it(isolate);
576 if (!it.done()) { 576 if (!it.done()) {
577 script->set_eval_from_shared( 577 script->set_eval_from_shared(it.frame()->function()->shared());
578 JSFunction::cast(it.frame()->function())->shared());
579 Code* code = it.frame()->LookupCode(); 578 Code* code = it.frame()->LookupCode();
580 int offset = static_cast<int>( 579 int offset = static_cast<int>(
581 it.frame()->pc() - code->instruction_start()); 580 it.frame()->pc() - code->instruction_start());
582 script->set_eval_from_instructions_offset(Smi::FromInt(offset)); 581 script->set_eval_from_instructions_offset(Smi::FromInt(offset));
583 } 582 }
584 } 583 }
585 } 584 }
586 585
587 // Notify debugger 586 // Notify debugger
588 isolate->debugger()->OnBeforeCompile(script); 587 isolate->debugger()->OnBeforeCompile(script);
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
1257 1256
1258 1257
1259 bool CompilationPhase::ShouldProduceTraceOutput() const { 1258 bool CompilationPhase::ShouldProduceTraceOutput() const {
1260 // Produce trace output if flag is set so that the first letter of the 1259 // Produce trace output if flag is set so that the first letter of the
1261 // phase name matches the command line parameter FLAG_trace_phase. 1260 // phase name matches the command line parameter FLAG_trace_phase.
1262 return (FLAG_trace_hydrogen && 1261 return (FLAG_trace_hydrogen &&
1263 OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL); 1262 OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL);
1264 } 1263 }
1265 1264
1266 } } // namespace v8::internal 1265 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/code-stubs-hydrogen.cc ('k') | src/d8.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698