OLD | NEW |
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 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1019 } | 1019 } |
1020 } | 1020 } |
1021 } | 1021 } |
1022 } | 1022 } |
1023 | 1023 |
1024 if (shared->code()->back_edges_patched_for_osr()) { | 1024 if (shared->code()->back_edges_patched_for_osr()) { |
1025 // At this point we either put the function on recompilation queue or | 1025 // At this point we either put the function on recompilation queue or |
1026 // aborted optimization. In either case we want to continue executing | 1026 // aborted optimization. In either case we want to continue executing |
1027 // the unoptimized code without running into OSR. If the unoptimized | 1027 // the unoptimized code without running into OSR. If the unoptimized |
1028 // code has been patched for OSR, unpatch it. | 1028 // code has been patched for OSR, unpatch it. |
1029 InterruptStub interrupt_stub; | 1029 Deoptimizer::RevertInterruptCode(isolate, shared->code()); |
1030 Handle<Code> interrupt_code = interrupt_stub.GetCode(isolate); | |
1031 Handle<Code> replacement_code = | |
1032 isolate->builtins()->OnStackReplacement(); | |
1033 Deoptimizer::RevertInterruptCode(shared->code(), | |
1034 *interrupt_code, | |
1035 *replacement_code); | |
1036 } | 1030 } |
1037 | 1031 |
1038 if (isolate->has_pending_exception()) isolate->clear_pending_exception(); | 1032 if (isolate->has_pending_exception()) isolate->clear_pending_exception(); |
1039 } | 1033 } |
1040 | 1034 |
1041 | 1035 |
1042 void Compiler::InstallOptimizedCode(OptimizingCompiler* optimizing_compiler) { | 1036 void Compiler::InstallOptimizedCode(OptimizingCompiler* optimizing_compiler) { |
1043 SmartPointer<CompilationInfo> info(optimizing_compiler->info()); | 1037 SmartPointer<CompilationInfo> info(optimizing_compiler->info()); |
1044 // The function may have already been optimized by OSR. Simply continue. | 1038 // The function may have already been optimized by OSR. Simply continue. |
1045 // Except when OSR already disabled optimization for some reason. | 1039 // Except when OSR already disabled optimization for some reason. |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1265 AllowHandleDereference allow_deref; | 1259 AllowHandleDereference allow_deref; |
1266 bool tracing_on = info()->IsStub() | 1260 bool tracing_on = info()->IsStub() |
1267 ? FLAG_trace_hydrogen_stubs | 1261 ? FLAG_trace_hydrogen_stubs |
1268 : (FLAG_trace_hydrogen && | 1262 : (FLAG_trace_hydrogen && |
1269 info()->closure()->PassesFilter(FLAG_trace_hydrogen_filter)); | 1263 info()->closure()->PassesFilter(FLAG_trace_hydrogen_filter)); |
1270 return (tracing_on && | 1264 return (tracing_on && |
1271 OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL); | 1265 OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL); |
1272 } | 1266 } |
1273 | 1267 |
1274 } } // namespace v8::internal | 1268 } } // namespace v8::internal |
OLD | NEW |