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

Side by Side Diff: src/arm/stub-cache-arm.cc

Issue 7051038: Merge fixes for reliability bot crashes to trunk. (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
Patch Set: Created 9 years, 7 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 | « no previous file | src/ia32/macro-assembler-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 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 3410 matching lines...) Expand 10 before | Expand all | Expand 10 after
3421 // -- lr : return address 3421 // -- lr : return address
3422 // ----------------------------------- 3422 // -----------------------------------
3423 MaybeObject* maybe_stub = 3423 MaybeObject* maybe_stub =
3424 KeyedStoreExternalArrayStub(array_type).TryGetCode(); 3424 KeyedStoreExternalArrayStub(array_type).TryGetCode();
3425 Code* stub; 3425 Code* stub;
3426 if (!maybe_stub->To(&stub)) return maybe_stub; 3426 if (!maybe_stub->To(&stub)) return maybe_stub;
3427 __ DispatchMap(r2, 3427 __ DispatchMap(r2,
3428 r3, 3428 r3,
3429 Handle<Map>(receiver->map()), 3429 Handle<Map>(receiver->map()),
3430 Handle<Code>(stub), 3430 Handle<Code>(stub),
3431 DONT_DO_SMI_CHECK); 3431 DO_SMI_CHECK);
3432 3432
3433 Handle<Code> ic = isolate()->builtins()->KeyedStoreIC_Miss(); 3433 Handle<Code> ic = isolate()->builtins()->KeyedStoreIC_Miss();
3434 __ Jump(ic, RelocInfo::CODE_TARGET); 3434 __ Jump(ic, RelocInfo::CODE_TARGET);
3435 3435
3436 return GetCode(); 3436 return GetCode();
3437 } 3437 }
3438 3438
3439 3439
3440 #undef __ 3440 #undef __
3441 #define __ ACCESS_MASM(masm) 3441 #define __ ACCESS_MASM(masm)
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
4209 masm->isolate()->builtins()->KeyedStoreIC_MissForceGeneric(); 4209 masm->isolate()->builtins()->KeyedStoreIC_MissForceGeneric();
4210 __ Jump(ic, RelocInfo::CODE_TARGET); 4210 __ Jump(ic, RelocInfo::CODE_TARGET);
4211 } 4211 }
4212 4212
4213 4213
4214 #undef __ 4214 #undef __
4215 4215
4216 } } // namespace v8::internal 4216 } } // namespace v8::internal
4217 4217
4218 #endif // V8_TARGET_ARCH_ARM 4218 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/ia32/macro-assembler-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698