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

Side by Side Diff: src/code-stubs-hydrogen.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.cc ('k') | src/compiler.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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 240
241 // Create the code object. 241 // Create the code object.
242 CodeDesc desc; 242 CodeDesc desc;
243 masm.GetCode(&desc); 243 masm.GetCode(&desc);
244 244
245 // Copy the generated code into a heap object. 245 // Copy the generated code into a heap object.
246 Code::Flags flags = Code::ComputeFlags( 246 Code::Flags flags = Code::ComputeFlags(
247 GetCodeKind(), 247 GetCodeKind(),
248 GetICState(), 248 GetICState(),
249 GetExtraICState(), 249 GetExtraICState(),
250 GetStubType(), 250 GetStubType());
251 GetHandlerKind());
252 Handle<Code> new_object = factory->NewCode( 251 Handle<Code> new_object = factory->NewCode(
253 desc, flags, masm.CodeObject(), NeedsImmovableCode()); 252 desc, flags, masm.CodeObject(), NeedsImmovableCode());
254 return new_object; 253 return new_object;
255 } 254 }
256 255
257 256
258 template <class Stub> 257 template <class Stub>
259 static Handle<Code> DoGenerateCode(Isolate* isolate, Stub* stub) { 258 static Handle<Code> DoGenerateCode(Isolate* isolate, Stub* stub) {
260 CodeStub::Major major_key = 259 CodeStub::Major major_key =
261 static_cast<HydrogenCodeStub*>(stub)->MajorKey(); 260 static_cast<HydrogenCodeStub*>(stub)->MajorKey();
(...skipping 1135 matching lines...) Expand 10 before | Expand all | Expand 10 after
1397 return BuildRegExpConstructResult(length, index, input); 1396 return BuildRegExpConstructResult(length, index, input);
1398 } 1397 }
1399 1398
1400 1399
1401 Handle<Code> RegExpConstructResultStub::GenerateCode(Isolate* isolate) { 1400 Handle<Code> RegExpConstructResultStub::GenerateCode(Isolate* isolate) {
1402 return DoGenerateCode(isolate, this); 1401 return DoGenerateCode(isolate, this);
1403 } 1402 }
1404 1403
1405 1404
1406 } } // namespace v8::internal 1405 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/code-stubs.cc ('k') | src/compiler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698