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

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

Issue 10038010: Fix regular and ElementsKind transitions interfering with each other (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 8 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/stub-cache-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 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 int index, 436 int index,
437 Handle<Map> transition, 437 Handle<Map> transition,
438 Register receiver_reg, 438 Register receiver_reg,
439 Register name_reg, 439 Register name_reg,
440 Register scratch, 440 Register scratch,
441 Label* miss_label) { 441 Label* miss_label) {
442 // r0 : value 442 // r0 : value
443 Label exit; 443 Label exit;
444 444
445 // Check that the map of the object hasn't changed. 445 // Check that the map of the object hasn't changed.
446 CompareMapMode mode = transition.is_null() ? ALLOW_ELEMENT_TRANSITION_MAPS
447 : REQUIRE_EXACT_MAP;
446 __ CheckMap(receiver_reg, scratch, Handle<Map>(object->map()), miss_label, 448 __ CheckMap(receiver_reg, scratch, Handle<Map>(object->map()), miss_label,
447 DO_SMI_CHECK, ALLOW_ELEMENT_TRANSITION_MAPS); 449 DO_SMI_CHECK, mode);
448 450
449 // Perform global security token check if needed. 451 // Perform global security token check if needed.
450 if (object->IsJSGlobalProxy()) { 452 if (object->IsJSGlobalProxy()) {
451 __ CheckAccessGlobalProxy(receiver_reg, scratch, miss_label); 453 __ CheckAccessGlobalProxy(receiver_reg, scratch, miss_label);
452 } 454 }
453 455
454 // Stub never generated for non-global objects that require access 456 // Stub never generated for non-global objects that require access
455 // checks. 457 // checks.
456 ASSERT(object->IsJSGlobalProxy() || !object->IsAccessCheckNeeded()); 458 ASSERT(object->IsJSGlobalProxy() || !object->IsAccessCheckNeeded());
457 459
(...skipping 4028 matching lines...) Expand 10 before | Expand all | Expand 10 after
4486 __ Jump(ic_slow, RelocInfo::CODE_TARGET); 4488 __ Jump(ic_slow, RelocInfo::CODE_TARGET);
4487 } 4489 }
4488 } 4490 }
4489 4491
4490 4492
4491 #undef __ 4493 #undef __
4492 4494
4493 } } // namespace v8::internal 4495 } } // namespace v8::internal
4494 4496
4495 #endif // V8_TARGET_ARCH_ARM 4497 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/ia32/stub-cache-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698