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/ia32/ic-ia32.cc

Issue 155418: Attempt at work-around for http://crbug.com/16276 by explicitly checking... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 11 years, 5 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/objects.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 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 Immediate(1 << (Map::kHasNamedInterceptor + (3 * 8)))); 68 Immediate(1 << (Map::kHasNamedInterceptor + (3 * 8))));
69 69
70 // Jump to miss if the interceptor bit is set. 70 // Jump to miss if the interceptor bit is set.
71 __ j(not_zero, miss_label, not_taken); 71 __ j(not_zero, miss_label, not_taken);
72 72
73 // Bail out if we have a JS global proxy object. 73 // Bail out if we have a JS global proxy object.
74 __ movzx_b(r0, FieldOperand(r0, Map::kInstanceTypeOffset)); 74 __ movzx_b(r0, FieldOperand(r0, Map::kInstanceTypeOffset));
75 __ cmp(r0, JS_GLOBAL_PROXY_TYPE); 75 __ cmp(r0, JS_GLOBAL_PROXY_TYPE);
76 __ j(equal, miss_label, not_taken); 76 __ j(equal, miss_label, not_taken);
77 77
78 // Possible work-around for http://crbug.com/16276.
79 __ cmp(r0, JS_GLOBAL_OBJECT_TYPE);
80 __ j(equal, miss_label, not_taken);
81 __ cmp(r0, JS_BUILTINS_OBJECT_TYPE);
82 __ j(equal, miss_label, not_taken);
83
78 // Check that the properties array is a dictionary. 84 // Check that the properties array is a dictionary.
79 __ mov(r0, FieldOperand(r1, JSObject::kPropertiesOffset)); 85 __ mov(r0, FieldOperand(r1, JSObject::kPropertiesOffset));
80 __ cmp(FieldOperand(r0, HeapObject::kMapOffset), 86 __ cmp(FieldOperand(r0, HeapObject::kMapOffset),
81 Immediate(Factory::hash_table_map())); 87 Immediate(Factory::hash_table_map()));
82 __ j(not_equal, miss_label); 88 __ j(not_equal, miss_label);
83 89
84 // Compute the capacity mask. 90 // Compute the capacity mask.
85 const int kCapacityOffset = 91 const int kCapacityOffset =
86 Array::kHeaderSize + StringDictionary::kCapacityIndex * kPointerSize; 92 Array::kHeaderSize + StringDictionary::kCapacityIndex * kPointerSize;
87 __ mov(r2, FieldOperand(r0, kCapacityOffset)); 93 __ mov(r2, FieldOperand(r0, kCapacityOffset));
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 972
967 // Do tail-call to runtime routine. 973 // Do tail-call to runtime routine.
968 __ TailCallRuntime( 974 __ TailCallRuntime(
969 ExternalReference(IC_Utility(kSharedStoreIC_ExtendStorage)), 3); 975 ExternalReference(IC_Utility(kSharedStoreIC_ExtendStorage)), 3);
970 } 976 }
971 977
972 #undef __ 978 #undef __
973 979
974 980
975 } } // namespace v8::internal 981 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/objects.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698