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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 code->Disassemble(*function->debug_name()->ToCString()); | 164 code->Disassemble(*function->debug_name()->ToCString()); |
165 } | 165 } |
166 } | 166 } |
167 #endif // ENABLE_DISASSEMBLER | 167 #endif // ENABLE_DISASSEMBLER |
168 } | 168 } |
169 | 169 |
170 | 170 |
171 bool CodeGenerator::ShouldGenerateLog(Expression* type) { | 171 bool CodeGenerator::ShouldGenerateLog(Expression* type) { |
172 ASSERT(type != NULL); | 172 ASSERT(type != NULL); |
173 Isolate* isolate = Isolate::Current(); | 173 Isolate* isolate = Isolate::Current(); |
174 if (!isolate->logger()->is_logging() && !CpuProfiler::is_profiling(isolate)) { | 174 if (!isolate->logger()->is_logging() && |
| 175 !isolate->cpu_profiler()->is_profiling()) { |
175 return false; | 176 return false; |
176 } | 177 } |
177 Handle<String> name = Handle<String>::cast(type->AsLiteral()->handle()); | 178 Handle<String> name = Handle<String>::cast(type->AsLiteral()->handle()); |
178 if (FLAG_log_regexp) { | 179 if (FLAG_log_regexp) { |
179 if (name->IsOneByteEqualTo(STATIC_ASCII_VECTOR("regexp"))) | 180 if (name->IsOneByteEqualTo(STATIC_ASCII_VECTOR("regexp"))) |
180 return true; | 181 return true; |
181 } | 182 } |
182 return false; | 183 return false; |
183 } | 184 } |
184 | 185 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 ASSERT(result_size_ == 1 || result_size_ == 2); | 221 ASSERT(result_size_ == 1 || result_size_ == 2); |
221 #ifdef _WIN64 | 222 #ifdef _WIN64 |
222 return result | ((result_size_ == 1) ? 0 : 2); | 223 return result | ((result_size_ == 1) ? 0 : 2); |
223 #else | 224 #else |
224 return result; | 225 return result; |
225 #endif | 226 #endif |
226 } | 227 } |
227 | 228 |
228 | 229 |
229 } } // namespace v8::internal | 230 } } // namespace v8::internal |
OLD | NEW |