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

Side by Side Diff: src/ic/arm/ic-compiler-arm.cc

Issue 592113002: Fix method dispatch in Keyed/StoreIC, and JumpIfNotUniqueName usage (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 3 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/ia32/macro-assembler-ia32.cc ('k') | src/ic/arm64/ic-compiler-arm64.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 2014 the V8 project authors. All rights reserved. 1 // Copyright 2014 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/v8.h" 5 #include "src/v8.h"
6 6
7 #if V8_TARGET_ARCH_ARM 7 #if V8_TARGET_ARCH_ARM
8 8
9 #include "src/ic/ic.h" 9 #include "src/ic/ic.h"
10 #include "src/ic/ic-compiler.h" 10 #include "src/ic/ic-compiler.h"
(...skipping 26 matching lines...) Expand all
37 Handle<Name> name, 37 Handle<Name> name,
38 Code::StubType type, 38 Code::StubType type,
39 IcCheckType check) { 39 IcCheckType check) {
40 Label miss; 40 Label miss;
41 41
42 if (check == PROPERTY && 42 if (check == PROPERTY &&
43 (kind() == Code::KEYED_LOAD_IC || kind() == Code::KEYED_STORE_IC)) { 43 (kind() == Code::KEYED_LOAD_IC || kind() == Code::KEYED_STORE_IC)) {
44 // In case we are compiling an IC for dictionary loads and stores, just 44 // In case we are compiling an IC for dictionary loads and stores, just
45 // check whether the name is unique. 45 // check whether the name is unique.
46 if (name.is_identical_to(isolate()->factory()->normal_ic_symbol())) { 46 if (name.is_identical_to(isolate()->factory()->normal_ic_symbol())) {
47 __ JumpIfNotUniqueName(this->name(), &miss); 47 Register tmp = scratch1();
48 __ JumpIfSmi(this->name(), &miss);
49 __ ldr(tmp, FieldMemOperand(this->name(), HeapObject::kMapOffset));
50 __ ldrb(tmp, FieldMemOperand(tmp, Map::kInstanceTypeOffset));
51 __ JumpIfNotUniqueNameInstanceType(tmp, &miss);
48 } else { 52 } else {
49 __ cmp(this->name(), Operand(name)); 53 __ cmp(this->name(), Operand(name));
50 __ b(ne, &miss); 54 __ b(ne, &miss);
51 } 55 }
52 } 56 }
53 57
54 Label number_case; 58 Label number_case;
55 Label* smi_target = IncludesNumberType(types) ? &number_case : &miss; 59 Label* smi_target = IncludesNumberType(types) ? &number_case : &miss;
56 __ JumpIfSmi(receiver(), smi_target); 60 __ JumpIfSmi(receiver(), smi_target);
57 61
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 // Return the generated code. 121 // Return the generated code.
118 return GetCode(kind(), Code::NORMAL, factory()->empty_string(), POLYMORPHIC); 122 return GetCode(kind(), Code::NORMAL, factory()->empty_string(), POLYMORPHIC);
119 } 123 }
120 124
121 125
122 #undef __ 126 #undef __
123 } 127 }
124 } // namespace v8::internal 128 } // namespace v8::internal
125 129
126 #endif // V8_TARGET_ARCH_ARM 130 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/ia32/macro-assembler-ia32.cc ('k') | src/ic/arm64/ic-compiler-arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698