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

Side by Side Diff: src/objects-inl.h

Issue 170253002: Revert r19409: "Allow ICs to be generated for own global proxy." (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/isolate.cc ('k') | src/runtime.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 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 920
921 bool Object::IsPrimitive() { 921 bool Object::IsPrimitive() {
922 return IsOddball() || IsNumber() || IsString(); 922 return IsOddball() || IsNumber() || IsString();
923 } 923 }
924 924
925 925
926 bool Object::IsJSGlobalProxy() { 926 bool Object::IsJSGlobalProxy() {
927 bool result = IsHeapObject() && 927 bool result = IsHeapObject() &&
928 (HeapObject::cast(this)->map()->instance_type() == 928 (HeapObject::cast(this)->map()->instance_type() ==
929 JS_GLOBAL_PROXY_TYPE); 929 JS_GLOBAL_PROXY_TYPE);
930 ASSERT(!result || 930 ASSERT(!result || IsAccessCheckNeeded());
931 HeapObject::cast(this)->map()->is_access_check_needed());
932 return result; 931 return result;
933 } 932 }
934 933
935 934
936 bool Object::IsGlobalObject() { 935 bool Object::IsGlobalObject() {
937 if (!IsHeapObject()) return false; 936 if (!IsHeapObject()) return false;
938 937
939 InstanceType type = HeapObject::cast(this)->map()->instance_type(); 938 InstanceType type = HeapObject::cast(this)->map()->instance_type();
940 return type == JS_GLOBAL_OBJECT_TYPE || 939 return type == JS_GLOBAL_OBJECT_TYPE ||
941 type == JS_BUILTINS_OBJECT_TYPE; 940 type == JS_BUILTINS_OBJECT_TYPE;
942 } 941 }
943 942
944 943
945 TYPE_CHECKER(JSGlobalObject, JS_GLOBAL_OBJECT_TYPE) 944 TYPE_CHECKER(JSGlobalObject, JS_GLOBAL_OBJECT_TYPE)
946 TYPE_CHECKER(JSBuiltinsObject, JS_BUILTINS_OBJECT_TYPE) 945 TYPE_CHECKER(JSBuiltinsObject, JS_BUILTINS_OBJECT_TYPE)
947 946
948 947
949 bool Object::IsUndetectableObject() { 948 bool Object::IsUndetectableObject() {
950 return IsHeapObject() 949 return IsHeapObject()
951 && HeapObject::cast(this)->map()->is_undetectable(); 950 && HeapObject::cast(this)->map()->is_undetectable();
952 } 951 }
953 952
954 953
955 bool Object::IsAccessCheckNeeded() { 954 bool Object::IsAccessCheckNeeded() {
956 if (!IsHeapObject()) return false; 955 return IsHeapObject()
957 if (IsJSGlobalProxy()) { 956 && HeapObject::cast(this)->map()->is_access_check_needed();
958 JSGlobalProxy* proxy = JSGlobalProxy::cast(this);
959 GlobalObject* global =
960 proxy->GetIsolate()->context()->global_object();
961 return proxy->IsDetachedFrom(global);
962 }
963 return HeapObject::cast(this)->map()->is_access_check_needed();
964 } 957 }
965 958
966 959
967 bool Object::IsStruct() { 960 bool Object::IsStruct() {
968 if (!IsHeapObject()) return false; 961 if (!IsHeapObject()) return false;
969 switch (HeapObject::cast(this)->map()->instance_type()) { 962 switch (HeapObject::cast(this)->map()->instance_type()) {
970 #define MAKE_STRUCT_CASE(NAME, Name, name) case NAME##_TYPE: return true; 963 #define MAKE_STRUCT_CASE(NAME, Name, name) case NAME##_TYPE: return true;
971 STRUCT_LIST(MAKE_STRUCT_CASE) 964 STRUCT_LIST(MAKE_STRUCT_CASE)
972 #undef MAKE_STRUCT_CASE 965 #undef MAKE_STRUCT_CASE
973 default: return false; 966 default: return false;
(...skipping 5765 matching lines...) Expand 10 before | Expand all | Expand 10 after
6739 #undef READ_UINT32_FIELD 6732 #undef READ_UINT32_FIELD
6740 #undef WRITE_UINT32_FIELD 6733 #undef WRITE_UINT32_FIELD
6741 #undef READ_SHORT_FIELD 6734 #undef READ_SHORT_FIELD
6742 #undef WRITE_SHORT_FIELD 6735 #undef WRITE_SHORT_FIELD
6743 #undef READ_BYTE_FIELD 6736 #undef READ_BYTE_FIELD
6744 #undef WRITE_BYTE_FIELD 6737 #undef WRITE_BYTE_FIELD
6745 6738
6746 } } // namespace v8::internal 6739 } } // namespace v8::internal
6747 6740
6748 #endif // V8_OBJECTS_INL_H_ 6741 #endif // V8_OBJECTS_INL_H_
OLDNEW
« no previous file with comments | « src/isolate.cc ('k') | src/runtime.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698