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

Side by Side Diff: src/x64/regexp-macro-assembler-x64.cc

Issue 3970005: Make Failure inherit from MaybeObject instead of Object. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 10 years, 1 month 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/x64/macro-assembler-x64.cc ('k') | src/x64/stub-cache-x64.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 2009 the V8 project authors. All rights reserved. 1 // Copyright 2009 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 1151 matching lines...) Expand 10 before | Expand all | Expand 10 after
1162 Handle<Code> code_handle(re_code); 1162 Handle<Code> code_handle(re_code);
1163 1163
1164 Handle<String> subject(frame_entry<String*>(re_frame, kInputString)); 1164 Handle<String> subject(frame_entry<String*>(re_frame, kInputString));
1165 // Current string. 1165 // Current string.
1166 bool is_ascii = subject->IsAsciiRepresentation(); 1166 bool is_ascii = subject->IsAsciiRepresentation();
1167 1167
1168 ASSERT(re_code->instruction_start() <= *return_address); 1168 ASSERT(re_code->instruction_start() <= *return_address);
1169 ASSERT(*return_address <= 1169 ASSERT(*return_address <=
1170 re_code->instruction_start() + re_code->instruction_size()); 1170 re_code->instruction_start() + re_code->instruction_size());
1171 1171
1172 Object* result = Execution::HandleStackGuardInterrupt(); 1172 MaybeObject* result = Execution::HandleStackGuardInterrupt();
1173 1173
1174 if (*code_handle != re_code) { // Return address no longer valid 1174 if (*code_handle != re_code) { // Return address no longer valid
1175 intptr_t delta = *code_handle - re_code; 1175 intptr_t delta = *code_handle - re_code;
1176 // Overwrite the return address on the stack. 1176 // Overwrite the return address on the stack.
1177 *return_address += delta; 1177 *return_address += delta;
1178 } 1178 }
1179 1179
1180 if (result->IsException()) { 1180 if (result->IsException()) {
1181 return EXCEPTION; 1181 return EXCEPTION;
1182 } 1182 }
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
1375 } 1375 }
1376 } 1376 }
1377 1377
1378 #undef __ 1378 #undef __
1379 1379
1380 #endif // V8_INTERPRETED_REGEXP 1380 #endif // V8_INTERPRETED_REGEXP
1381 1381
1382 }} // namespace v8::internal 1382 }} // namespace v8::internal
1383 1383
1384 #endif // V8_TARGET_ARCH_X64 1384 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/macro-assembler-x64.cc ('k') | src/x64/stub-cache-x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698