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

Side by Side Diff: src/ic.cc

Issue 222003005: Merged r20087, r20137, r20155, r20158, r20197 into 3.24 branch. (Closed) Base URL: https://v8.googlecode.com/svn/branches/3.24
Patch Set: Created 6 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 | « src/ia32/lithium-codegen-ia32.cc ('k') | src/mips/lithium-codegen-mips.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 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after
1085 (!target().is_identical_to(non_strict_arguments_stub()))) { 1085 (!target().is_identical_to(non_strict_arguments_stub()))) {
1086 stub = LoadElementStub(receiver); 1086 stub = LoadElementStub(receiver);
1087 } 1087 }
1088 } 1088 }
1089 } 1089 }
1090 1090
1091 if (!is_target_set()) { 1091 if (!is_target_set()) {
1092 if (*stub == *generic_stub()) { 1092 if (*stub == *generic_stub()) {
1093 TRACE_GENERIC_IC(isolate(), "KeyedLoadIC", "set generic"); 1093 TRACE_GENERIC_IC(isolate(), "KeyedLoadIC", "set generic");
1094 } 1094 }
1095 ASSERT(!stub.is_null());
1096 set_target(*stub); 1095 set_target(*stub);
1097 TRACE_IC("LoadIC", key); 1096 TRACE_IC("LoadIC", key);
1098 } 1097 }
1099 1098
1100 if (maybe_object != NULL) return maybe_object; 1099 if (maybe_object != NULL) return maybe_object;
1101 return Runtime::GetObjectPropertyOrFail(isolate(), object, key); 1100 return Runtime::GetObjectPropertyOrFail(isolate(), object, key);
1102 } 1101 }
1103 1102
1104 1103
1105 static bool LookupForWrite(Handle<JSObject> receiver, 1104 static bool LookupForWrite(Handle<JSObject> receiver,
(...skipping 1706 matching lines...) Expand 10 before | Expand all | Expand 10 after
2812 #undef ADDR 2811 #undef ADDR
2813 }; 2812 };
2814 2813
2815 2814
2816 Address IC::AddressFromUtilityId(IC::UtilityId id) { 2815 Address IC::AddressFromUtilityId(IC::UtilityId id) {
2817 return IC_utilities[id]; 2816 return IC_utilities[id];
2818 } 2817 }
2819 2818
2820 2819
2821 } } // namespace v8::internal 2820 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/ia32/lithium-codegen-ia32.cc ('k') | src/mips/lithium-codegen-mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698