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

Side by Side Diff: src/compiler.cc

Issue 163363003: Don't mix handler flags into regular flag compuation. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
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/ia32/ic-ia32.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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 return scope()->num_heap_slots(); 208 return scope()->num_heap_slots();
209 } 209 }
210 } 210 }
211 211
212 212
213 Code::Flags CompilationInfo::flags() const { 213 Code::Flags CompilationInfo::flags() const {
214 if (IsStub()) { 214 if (IsStub()) {
215 return Code::ComputeFlags(code_stub()->GetCodeKind(), 215 return Code::ComputeFlags(code_stub()->GetCodeKind(),
216 code_stub()->GetICState(), 216 code_stub()->GetICState(),
217 code_stub()->GetExtraICState(), 217 code_stub()->GetExtraICState(),
218 code_stub()->GetStubType(), 218 code_stub()->GetStubType());
219 code_stub()->GetHandlerKind());
220 } else { 219 } else {
221 return Code::ComputeFlags(Code::OPTIMIZED_FUNCTION); 220 return Code::ComputeFlags(Code::OPTIMIZED_FUNCTION);
222 } 221 }
223 } 222 }
224 223
225 224
226 // Disable optimization for the rest of the compilation pipeline. 225 // Disable optimization for the rest of the compilation pipeline.
227 void CompilationInfo::DisableOptimization() { 226 void CompilationInfo::DisableOptimization() {
228 bool is_optimizable_closure = 227 bool is_optimizable_closure =
229 FLAG_optimize_closures && 228 FLAG_optimize_closures &&
(...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after
1302 AllowHandleDereference allow_deref; 1301 AllowHandleDereference allow_deref;
1303 bool tracing_on = info()->IsStub() 1302 bool tracing_on = info()->IsStub()
1304 ? FLAG_trace_hydrogen_stubs 1303 ? FLAG_trace_hydrogen_stubs
1305 : (FLAG_trace_hydrogen && 1304 : (FLAG_trace_hydrogen &&
1306 info()->closure()->PassesFilter(FLAG_trace_hydrogen_filter)); 1305 info()->closure()->PassesFilter(FLAG_trace_hydrogen_filter));
1307 return (tracing_on && 1306 return (tracing_on &&
1308 OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL); 1307 OS::StrChr(const_cast<char*>(FLAG_trace_phase), name_[0]) != NULL);
1309 } 1308 }
1310 1309
1311 } } // namespace v8::internal 1310 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/code-stubs-hydrogen.cc ('k') | src/ia32/ic-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698