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

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

Issue 240053010: Return Object* instead of MaybeObject* from runtime calls. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: cmpp 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/x64/code-stubs-x64.cc ('k') | no next file » | 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 1215 matching lines...) Expand 10 before | Expand all | Expand 10 after
1226 1226
1227 Handle<String> subject(frame_entry<String*>(re_frame, kInputString)); 1227 Handle<String> subject(frame_entry<String*>(re_frame, kInputString));
1228 1228
1229 // Current string. 1229 // Current string.
1230 bool is_ascii = subject->IsOneByteRepresentationUnderneath(); 1230 bool is_ascii = subject->IsOneByteRepresentationUnderneath();
1231 1231
1232 ASSERT(re_code->instruction_start() <= *return_address); 1232 ASSERT(re_code->instruction_start() <= *return_address);
1233 ASSERT(*return_address <= 1233 ASSERT(*return_address <=
1234 re_code->instruction_start() + re_code->instruction_size()); 1234 re_code->instruction_start() + re_code->instruction_size());
1235 1235
1236 MaybeObject* result = Execution::HandleStackGuardInterrupt(isolate); 1236 Object* result = Execution::HandleStackGuardInterrupt(isolate);
1237 1237
1238 if (*code_handle != re_code) { // Return address no longer valid 1238 if (*code_handle != re_code) { // Return address no longer valid
1239 intptr_t delta = code_handle->address() - re_code->address(); 1239 intptr_t delta = code_handle->address() - re_code->address();
1240 // Overwrite the return address on the stack. 1240 // Overwrite the return address on the stack.
1241 *return_address += delta; 1241 *return_address += delta;
1242 } 1242 }
1243 1243
1244 if (result->IsException()) { 1244 if (result->IsException()) {
1245 return EXCEPTION; 1245 return EXCEPTION;
1246 } 1246 }
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
1457 } 1457 }
1458 } 1458 }
1459 1459
1460 #undef __ 1460 #undef __
1461 1461
1462 #endif // V8_INTERPRETED_REGEXP 1462 #endif // V8_INTERPRETED_REGEXP
1463 1463
1464 }} // namespace v8::internal 1464 }} // namespace v8::internal
1465 1465
1466 #endif // V8_TARGET_ARCH_X64 1466 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/x64/code-stubs-x64.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698