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

Side by Side Diff: src/ia32/regexp-macro-assembler-ia32.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/ia32/code-stubs-ia32.cc ('k') | src/ic.h » ('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 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 1119
1120 Handle<String> subject(frame_entry<String*>(re_frame, kInputString)); 1120 Handle<String> subject(frame_entry<String*>(re_frame, kInputString));
1121 1121
1122 // Current string. 1122 // Current string.
1123 bool is_ascii = subject->IsOneByteRepresentationUnderneath(); 1123 bool is_ascii = subject->IsOneByteRepresentationUnderneath();
1124 1124
1125 ASSERT(re_code->instruction_start() <= *return_address); 1125 ASSERT(re_code->instruction_start() <= *return_address);
1126 ASSERT(*return_address <= 1126 ASSERT(*return_address <=
1127 re_code->instruction_start() + re_code->instruction_size()); 1127 re_code->instruction_start() + re_code->instruction_size());
1128 1128
1129 MaybeObject* result = Execution::HandleStackGuardInterrupt(isolate); 1129 Object* result = Execution::HandleStackGuardInterrupt(isolate);
1130 1130
1131 if (*code_handle != re_code) { // Return address no longer valid 1131 if (*code_handle != re_code) { // Return address no longer valid
1132 int delta = code_handle->address() - re_code->address(); 1132 int delta = code_handle->address() - re_code->address();
1133 // Overwrite the return address on the stack. 1133 // Overwrite the return address on the stack.
1134 *return_address += delta; 1134 *return_address += delta;
1135 } 1135 }
1136 1136
1137 if (result->IsException()) { 1137 if (result->IsException()) {
1138 return EXCEPTION; 1138 return EXCEPTION;
1139 } 1139 }
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 } 1322 }
1323 1323
1324 1324
1325 #undef __ 1325 #undef __
1326 1326
1327 #endif // V8_INTERPRETED_REGEXP 1327 #endif // V8_INTERPRETED_REGEXP
1328 1328
1329 }} // namespace v8::internal 1329 }} // namespace v8::internal
1330 1330
1331 #endif // V8_TARGET_ARCH_IA32 1331 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « src/ia32/code-stubs-ia32.cc ('k') | src/ic.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698