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

Side by Side Diff: src/builtins.cc

Issue 660173: Fix bad merge of serialize.cc numbers for external references to ... (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/partial_snapshots/
Patch Set: Created 10 years, 9 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/builtins.h ('k') | src/ia32/ic-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 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 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after
1072 static void Generate_StoreIC_Miss(MacroAssembler* masm) { 1072 static void Generate_StoreIC_Miss(MacroAssembler* masm) {
1073 StoreIC::GenerateMiss(masm); 1073 StoreIC::GenerateMiss(masm);
1074 } 1074 }
1075 1075
1076 1076
1077 static void Generate_StoreIC_Megamorphic(MacroAssembler* masm) { 1077 static void Generate_StoreIC_Megamorphic(MacroAssembler* masm) {
1078 StoreIC::GenerateMegamorphic(masm); 1078 StoreIC::GenerateMegamorphic(masm);
1079 } 1079 }
1080 1080
1081 1081
1082 static void Generate_StoreIC_ArrayLength(MacroAssembler* masm) {
1083 StoreIC::GenerateArrayLength(masm);
1084 }
1085
1086
1087 static void Generate_KeyedStoreIC_Generic(MacroAssembler* masm) { 1082 static void Generate_KeyedStoreIC_Generic(MacroAssembler* masm) {
1088 KeyedStoreIC::GenerateGeneric(masm); 1083 KeyedStoreIC::GenerateGeneric(masm);
1089 } 1084 }
1090 1085
1091 1086
1092 static void Generate_KeyedStoreIC_ExternalByteArray(MacroAssembler* masm) { 1087 static void Generate_KeyedStoreIC_ExternalByteArray(MacroAssembler* masm) {
1093 KeyedStoreIC::GenerateExternalArray(masm, kExternalByteArray); 1088 KeyedStoreIC::GenerateExternalArray(masm, kExternalByteArray);
1094 } 1089 }
1095 1090
1096 1091
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
1311 if (entry->contains(pc)) { 1306 if (entry->contains(pc)) {
1312 return names_[i]; 1307 return names_[i];
1313 } 1308 }
1314 } 1309 }
1315 } 1310 }
1316 return NULL; 1311 return NULL;
1317 } 1312 }
1318 1313
1319 1314
1320 } } // namespace v8::internal 1315 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/builtins.h ('k') | src/ia32/ic-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698